From 646a5c1cbfd95873950a87b5f75d52073a967023 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 28 May 2018 19:12:29 +0000 Subject: Mon May 28 19:12:29 UTC 2018 a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded. --- .../recordmydesktop/recordmydesktop-bitrate.patch | 50 ++++++++++++ .../recordmydesktop/recordmydesktop.SlackBuild | 90 ++++++++++++---------- .../recordmydesktop/shmstr-to-shmproto.patch | 20 +++++ extra/source/recordmydesktop/slack-desc | 6 +- 4 files changed, 124 insertions(+), 42 deletions(-) create mode 100644 extra/source/recordmydesktop/recordmydesktop-bitrate.patch create mode 100644 extra/source/recordmydesktop/shmstr-to-shmproto.patch (limited to 'extra/source/recordmydesktop') diff --git a/extra/source/recordmydesktop/recordmydesktop-bitrate.patch b/extra/source/recordmydesktop/recordmydesktop-bitrate.patch new file mode 100644 index 00000000..9b014486 --- /dev/null +++ b/extra/source/recordmydesktop/recordmydesktop-bitrate.patch @@ -0,0 +1,50 @@ +diff -ru recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c recordmydesktop-0.3.8.1/src/rmd_initialize_data.c +--- recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c 2009-11-25 10:05:58.708779029 -0500 ++++ recordmydesktop-0.3.8.1/src/rmd_initialize_data.c 2009-11-25 09:28:07.629507987 -0500 +@@ -224,7 +224,7 @@ + args->channels = 1; + args->frequency = 22050; + args->buffsize = 4096; +- args->v_bitrate = 45000; ++ args->v_bitrate = 0; + args->v_quality = 63; + args->s_quality = 10; + +diff -ru recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c recordmydesktop-0.3.8.1/src/rmd_parseargs.c +--- recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c 2009-11-25 10:06:07.409777969 -0500 ++++ recordmydesktop-0.3.8.1/src/rmd_parseargs.c 2009-11-25 09:39:32.786757292 -0500 +@@ -104,10 +104,10 @@ + "Encoding Options\n" + "\t--on-the-fly-encoding\tEncode the audio-video data, while recording.\n" + "\t--v_quality n\t\tA number from 0 to 63 for" +- " desired encoded video quality(default 63).\n" ++ " desired encoded video quality(default 63).\n\t (set quality to zero for bitrate controlled usage)\n" + +- "\t--v_bitrate n\t\tA number from 45000 to 2000000" +- " for desired encoded video bitrate(default 45000).\n" ++ "\t--v_bitrate n\t\tA number from 0 to 200000000" ++ " for desired encoded video bitrate(default 0 = not rate controlled).\n" + + "\t--s_quality n\t\tDesired audio quality(-1 to 10).\n\n" + +@@ -327,17 +327,17 @@ + strcmp(argv[i], "-v_bitrate") == 0) { + if(i+1=45000)&&(num<=2000000)) ++ if((num>=0)&&(num<=200000000)) + arg_return->v_bitrate=num; + else{ + fprintf(stderr,"Argument Usage:" +- " --v_bitrate n(number 45000-2000000)\n"); ++ " --v_bitrate n(number 0-200000000)\n"); + return FALSE; + } + } + else{ + fprintf(stderr,"Argument Usage:" +- " --v_bitrate n(number 45000-2000000)\n"); ++ " --v_bitrate n(number 0-200000000)\n"); + return FALSE; + } + i++; diff --git a/extra/source/recordmydesktop/recordmydesktop.SlackBuild b/extra/source/recordmydesktop/recordmydesktop.SlackBuild index 837f873e..f4655deb 100755 --- a/extra/source/recordmydesktop/recordmydesktop.SlackBuild +++ b/extra/source/recordmydesktop/recordmydesktop.SlackBuild @@ -1,6 +1,7 @@ #!/bin/sh # $Id: recordmydesktop.SlackBuild,v 1.8 2009/05/12 22:14:43 root Exp root $ # Copyright (c) 2008 Eric Hameleers +# Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -43,16 +44,16 @@ # Set initial variables: -PRGNAM=recordmydesktop +PKGNAM=recordmydesktop VERSION=${VERSION:-0.3.8.1} QTVER=${QTVER:-0.3.8} -BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:" -j4 "} +BUILD=${BUILD:-4} +NUMJOBS=${NUMJOBS:" -j7 "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -60,22 +61,30 @@ if [ -z "$ARCH" ]; then export ARCH fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + DOCS="AUTHORS COPYING README ChangeLog" QTDOCS="AUTHORS COPYING README ChangeLog" # Where do we look for sources? -SRCDIR=$(cd $(dirname $0); pwd) +cd $(dirname $0) ; SRCDIR=$(pwd) # Place to build (TMP) package (PKG) and output (OUTPUT) the program: TMP=${TMP:-/tmp/build} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM OUTPUT=${OUTPUT:-/tmp} -SOURCE[0]="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz" -SRCURL[0]="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz" +SOURCE[0]="$SRCDIR/${PKGNAM}-${VERSION}.tar.gz" +SRCURL[0]="http://downloads.sourceforge.net/${PKGNAM}/${PKGNAM}-${VERSION}.tar.gz" -SOURCE[1]="$SRCDIR/qt-${PRGNAM}-${QTVER}.tar.gz" -SRCURL[1]="http://downloads.sourceforge.net/${PRGNAM}/qt-${PRGNAM}-${QTVER}.tar.gz" +SOURCE[1]="$SRCDIR/qt-${PKGNAM}-${QTVER}.tar.gz" +SRCURL[1]="http://downloads.sourceforge.net/${PKGNAM}/qt-${PKGNAM}-${QTVER}.tar.gz" ## ## --- with a little luck, you won't have to edit below this point --- ## @@ -83,13 +92,13 @@ SRCURL[1]="http://downloads.sourceforge.net/${PRGNAM}/qt-${PRGNAM}-${QTVER}.tar. # Exit the script on errors: set -e -trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR +trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PKGNAM}.log' ERR # Catch unitialized variables: set -u P1=${1:-1} case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i586) SLKCFLAGS="-O2 -march=i586 -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; s390) SLKCFLAGS="-O2" @@ -108,11 +117,11 @@ esac # Create working directories: mkdir -p $OUTPUT # place for the package to be saved -mkdir -p $TMP/tmp-$PRGNAM # location to build the source +mkdir -p $TMP/tmp-$PKGNAM # location to build the source mkdir -p $PKG # place for the package to be built rm -rf $PKG/* # always erase old package's contents -rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build -rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log +rm -rf $TMP/tmp-$PKGNAM/* # remove the remnants of previous build +rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PKGNAM.log # remove old log files # Source file availability: @@ -144,11 +153,11 @@ fi # --- PACKAGE BUILDING --- echo "++" -echo "|| $PRGNAM-$VERSION" +echo "|| $PKGNAM-$VERSION" echo "++" -cd $TMP/tmp-$PRGNAM -echo "Extracting the source archive(s) for $PRGNAM..." +cd $TMP/tmp-$PKGNAM +echo "Extracting the source archive(s) for $PKGNAM..." for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do tar -xvf ${SOURCE[$i]} done @@ -158,7 +167,10 @@ chmod -R u+w,go+r-w,a-s * echo Building ... # First, the commandline program: -cd ${PRGNAM}-${VERSION} +cd ${PKGNAM}-${VERSION} + # Apply bugfix patches from Arch: + zcat $SRCDIR/recordmydesktop-bitrate.patch.gz | patch -p1 --verbose || exit 1 + zcat $SRCDIR/shmstr-to-shmproto.patch.gz | patch -p0 --verbose || exit 1 LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ @@ -170,18 +182,18 @@ cd ${PRGNAM}-${VERSION} --program-prefix= \ --program-suffix= \ --build=$ARCH-slackware-linux \ - 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log - make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log + 2>&1 | tee $OUTPUT/configure-${PKGNAM}.log + make 2>&1 | tee $OUTPUT/make-${PKGNAM}.log if $(which installwatch > /dev/null 2>&1); then - installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install + installwatch -o $OUTPUT/install-${PKGNAM}.log make DESTDIR=$PKG install else - make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log + make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PKGNAM}.log fi cd .. # Next, the QT4 GUI program: -cd qt-${PRGNAM}-${QTVER} +cd qt-${PKGNAM}-${QTVER} LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ @@ -193,13 +205,13 @@ cd qt-${PRGNAM}-${QTVER} --program-prefix= \ --program-suffix= \ --build=$ARCH-slackware-linux \ - 2>&1 | tee $OUTPUT/configure-qt-${PRGNAM}.log - make 2>&1 | tee $OUTPUT/make-qt-${PRGNAM}.log + 2>&1 | tee $OUTPUT/configure-qt-${PKGNAM}.log + make 2>&1 | tee $OUTPUT/make-qt-${PKGNAM}.log if $(which installwatch > /dev/null 2>&1); then - installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install + installwatch -o $OUTPUT/install-${PKGNAM}.log make DESTDIR=$PKG install else - make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log + make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PKGNAM}.log fi cd .. @@ -214,15 +226,15 @@ fi EOT # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/qt-${PRGNAM} -( cd ${PRGNAM}-${VERSION} - cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/qt-${PKGNAM} +( cd ${PKGNAM}-${VERSION} + cp -a $DOCS $PKG/usr/doc/$PKGNAM-$VERSION || true ) -( cd qt-${PRGNAM}-${QTVER} - cp -a $QTDOCS $PKG/usr/doc/$PRGNAM-$VERSION/qt-${PRGNAM} || true +( cd qt-${PKGNAM}-${QTVER} + cp -a $QTDOCS $PKG/usr/doc/$PKGNAM-$VERSION/qt-${PKGNAM} || true ) -cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild +chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; # Compress the man page(s): @@ -244,12 +256,12 @@ fi # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz 2>&1 | tee $OUTPUT/makepkg-${PKGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz.md5 +md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt +cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txt if [ -f $PKG/install/slack-required ]; then - cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.dep + cat $PKG/install/slack-required > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.dep fi diff --git a/extra/source/recordmydesktop/shmstr-to-shmproto.patch b/extra/source/recordmydesktop/shmstr-to-shmproto.patch new file mode 100644 index 00000000..6fc446e9 --- /dev/null +++ b/extra/source/recordmydesktop/shmstr-to-shmproto.patch @@ -0,0 +1,20 @@ +--- src/rmd_getzpixmap.c 2008-12-13 17:04:10.000000000 +0100 ++++ src/rmd_getzpixmap.c 2009-11-11 11:30:18.000000000 +0100 +@@ -32,7 +32,7 @@ + + #include + #include +-#include ++#include + #include + + +--- src/rmd_update_image.c 2008-12-13 17:20:49.000000000 +0100 ++++ src/rmd_update_image.c 2009-11-11 11:30:34.000000000 +0100 +@@ -32,7 +32,7 @@ + #include "rmd_types.h" + + #include +-#include ++#include + #include diff --git a/extra/source/recordmydesktop/slack-desc b/extra/source/recordmydesktop/slack-desc index 68091c86..49f1d726 100644 --- a/extra/source/recordmydesktop/slack-desc +++ b/extra/source/recordmydesktop/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -- cgit v1.2.3