From 67886560b215367bc14ea70569ba67d9f9551a12 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sat, 14 Jul 2018 21:49:31 +0000 Subject: Sat Jul 14 21:49:31 UTC 2018 l/pulseaudio-12.1-x86_64-1.txz: Upgraded. l/utf8proc-2.1.1-x86_64-1.txz: Upgraded. --- source/d/binutils/binutils.SlackBuild | 2 +- .../patches/binutils.export.demangle.h.diff | 37 ++++++++++------------ source/d/oprofile/oprofile.SlackBuild | 2 +- source/l/pulseaudio/pulseaudio.SlackBuild | 2 +- source/l/pulseaudio/slack-desc | 2 +- source/l/utf8proc/slack-desc | 2 +- source/l/utf8proc/utf8proc.url | 1 + .../intel-vaapi-driver.SlackBuild | 2 +- source/x/intel-vaapi-driver/intel-vaapi-driver.url | 2 +- source/x/libXaw3dXft/libXaw3dXft.SlackBuild | 6 ++-- source/x/libepoxy/libepoxy.SlackBuild | 2 +- source/x/libepoxy/libepoxy.url | 2 +- source/x/libva-utils/libva-utils.SlackBuild | 2 +- source/x/libva-utils/libva-utils.url | 2 +- source/x/libva/libva.SlackBuild | 2 +- source/x/libva/libva.url | 2 +- source/x/libvdpau/libvdpau.SlackBuild | 2 +- source/x/x11/build/xf86-video-s3virge | 2 +- source/x/x11/build/xf86-video-tseng | 2 +- source/x/x11/patch/xf86-video-s3virge.patch | 2 ++ .../xf86-video-s3virge.xorg-server-1.20.x.diff | 19 +++++++++++ source/x/x11/patch/xf86-video-tseng.patch | 3 ++ .../xf86-video-tseng.xorg-server-1.20.x.diff | 32 +++++++++++++++++++ 23 files changed, 93 insertions(+), 39 deletions(-) create mode 100644 source/l/utf8proc/utf8proc.url create mode 100644 source/x/x11/patch/xf86-video-s3virge.patch create mode 100644 source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff create mode 100644 source/x/x11/patch/xf86-video-tseng/xf86-video-tseng.xorg-server-1.20.x.diff (limited to 'source') diff --git a/source/d/binutils/binutils.SlackBuild b/source/d/binutils/binutils.SlackBuild index 717c0b6a7..05a715fa5 100755 --- a/source/d/binutils/binutils.SlackBuild +++ b/source/d/binutils/binutils.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=binutils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/d/binutils/patches/binutils.export.demangle.h.diff b/source/d/binutils/patches/binutils.export.demangle.h.diff index 1f31cd116..f6834dee5 100644 --- a/source/d/binutils/patches/binutils.export.demangle.h.diff +++ b/source/d/binutils/patches/binutils.export.demangle.h.diff @@ -1,33 +1,30 @@ ---- ./bfd/Makefile.in.orig 2013-02-27 14:28:03.000000000 -0600 -+++ ./bfd/Makefile.in 2013-04-02 15:54:59.559209068 -0500 -@@ -156,7 +156,8 @@ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +--- ./bfd/Makefile.in.orig 2018-07-14 14:46:34.003826061 -0500 ++++ ./bfd/Makefile.in 2018-07-14 14:49:56.038807188 -0500 +@@ -248,7 +248,7 @@ + esac am__bfdinclude_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \ -- $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h -+ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h \ -+ $(INCDIR)/demangle.h + $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h \ +- $(INCDIR)/diagnostics.h ++ $(INCDIR)/diagnostics.h $(INCDIR)/demangle.h HEADERS = $(bfdinclude_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -@@ -350,7 +351,8 @@ - @INSTALL_LIBBFD_FALSE@bfdinclude_HEADERS = $(am__append_2) +@@ -468,6 +468,7 @@ @INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) \ @INSTALL_LIBBFD_TRUE@ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ --@INSTALL_LIBBFD_TRUE@ $(INCDIR)/bfdlink.h $(am__append_2) -+@INSTALL_LIBBFD_TRUE@ $(INCDIR)/bfdlink.h $(INCDIR)/demangle.h \ -+@INSTALL_LIBBFD_TRUE@ $(am__append_2) + @INSTALL_LIBBFD_TRUE@ $(INCDIR)/bfdlink.h \ ++@INSTALL_LIBBFD_TRUE@ $(INCDIR)/demangle.h \ + @INSTALL_LIBBFD_TRUE@ $(INCDIR)/diagnostics.h $(am__append_2) @INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@ @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la - AM_CFLAGS = $(WARN_CFLAGS) ---- ./bfd/Makefile.am.orig 2013-02-27 14:28:03.000000000 -0600 -+++ ./bfd/Makefile.am 2013-04-02 15:54:59.558209068 -0500 -@@ -35,7 +35,7 @@ - bfdlibdir = @bfdlibdir@ +--- ./bfd/Makefile.am.orig 2018-07-14 14:46:34.019826059 -0500 ++++ ./bfd/Makefile.am 2018-07-14 14:47:53.976818590 -0500 +@@ -33,7 +33,7 @@ bfdincludedir = @bfdincludedir@ bfdlib_LTLIBRARIES = libbfd.la --bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h -+bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h $(INCDIR)/demangle.h + bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ +- $(INCDIR)/bfdlink.h $(INCDIR)/diagnostics.h ++ $(INCDIR)/bfdlink.h $(INCDIR)/diagnostics.h $(INCDIR)/demangle.h else !INSTALL_LIBBFD # Empty these so that the respective installation directories will not be created. bfdlibdir = diff --git a/source/d/oprofile/oprofile.SlackBuild b/source/d/oprofile/oprofile.SlackBuild index 28eada9ce..a14ef8955 100755 --- a/source/d/oprofile/oprofile.SlackBuild +++ b/source/d/oprofile/oprofile.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=oprofile VERSION=${VERSION:-$(echo oprofile-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j7 "} diff --git a/source/l/pulseaudio/pulseaudio.SlackBuild b/source/l/pulseaudio/pulseaudio.SlackBuild index 8e0859960..d673783c4 100755 --- a/source/l/pulseaudio/pulseaudio.SlackBuild +++ b/source/l/pulseaudio/pulseaudio.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pulseaudio VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/pulseaudio/slack-desc b/source/l/pulseaudio/slack-desc index 4bb3ac3b7..7526c4d81 100644 --- a/source/l/pulseaudio/slack-desc +++ b/source/l/pulseaudio/slack-desc @@ -8,7 +8,7 @@ |-----handy-ruler------------------------------------------------------| pulseaudio: pulseaudio (PulseAudio sound server) pulseaudio: -pulseaudio: pulseaudio is a networked low-latency sound server intended to be an +pulseaudio: Pulseaudio is a networked low-latency sound server intended to be an pulseaudio: improved replacement for the Enlightened Sound Daemon (EsounD). pulseaudio: pulseaudio: Homepage: http://www.pulseaudio.org diff --git a/source/l/utf8proc/slack-desc b/source/l/utf8proc/slack-desc index 0f58d6b53..c74677e64 100644 --- a/source/l/utf8proc/slack-desc +++ b/source/l/utf8proc/slack-desc @@ -15,5 +15,5 @@ utf8proc: rest of the Public Software Group, who deserve nearly all of the utf8proc: credit for this package. With the blessing of the Public Software utf8proc: Group, the Julia developers have taken over development of utf8proc. utf8proc: -utf8proc: Homepage: http://julialang.org/utf8proc/ +utf8proc: Homepage: https://github.com/JuliaStrings/utf8proc utf8proc: diff --git a/source/l/utf8proc/utf8proc.url b/source/l/utf8proc/utf8proc.url new file mode 100644 index 000000000..918bd47ab --- /dev/null +++ b/source/l/utf8proc/utf8proc.url @@ -0,0 +1 @@ +https://github.com/JuliaStrings/utf8proc diff --git a/source/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild b/source/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild index 15ed3265c..41b07015c 100755 --- a/source/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild +++ b/source/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=intel-vaapi-driver VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/x/intel-vaapi-driver/intel-vaapi-driver.url b/source/x/intel-vaapi-driver/intel-vaapi-driver.url index 36b93cc84..420a2bc82 100644 --- a/source/x/intel-vaapi-driver/intel-vaapi-driver.url +++ b/source/x/intel-vaapi-driver/intel-vaapi-driver.url @@ -1 +1 @@ -https://github.com/01org/libva-intel-driver +https://github.com/intel/intel-vaapi-driver/releases/download/2.2.0/intel-vaapi-driver-2.2.0.tar.bz2 diff --git a/source/x/libXaw3dXft/libXaw3dXft.SlackBuild b/source/x/libXaw3dXft/libXaw3dXft.SlackBuild index 3ac9ab1b4..ca493b807 100755 --- a/source/x/libXaw3dXft/libXaw3dXft.SlackBuild +++ b/source/x/libXaw3dXft/libXaw3dXft.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libXaw3dXft -VERSION=${VERSION:-$(echo ${PKGNAM}*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo ${PKGNAM}*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -65,7 +65,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ diff --git a/source/x/libepoxy/libepoxy.SlackBuild b/source/x/libepoxy/libepoxy.SlackBuild index e47470ef4..a7380d0ce 100755 --- a/source/x/libepoxy/libepoxy.SlackBuild +++ b/source/x/libepoxy/libepoxy.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libepoxy VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/x/libepoxy/libepoxy.url b/source/x/libepoxy/libepoxy.url index 79b94c186..1ae44a1c5 100644 --- a/source/x/libepoxy/libepoxy.url +++ b/source/x/libepoxy/libepoxy.url @@ -1 +1 @@ -https://github.com/anholt/libepoxy/releases/download/v1.3.1/libepoxy-1.3.1.tar.bz2 +https://github.com/anholt/libepoxy/releases/download/1.5.2/libepoxy-1.5.2.tar.xz diff --git a/source/x/libva-utils/libva-utils.SlackBuild b/source/x/libva-utils/libva-utils.SlackBuild index 2895949a4..570daafe9 100755 --- a/source/x/libva-utils/libva-utils.SlackBuild +++ b/source/x/libva-utils/libva-utils.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libva-utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/x/libva-utils/libva-utils.url b/source/x/libva-utils/libva-utils.url index 8e8e94fae..e58b382b5 100644 --- a/source/x/libva-utils/libva-utils.url +++ b/source/x/libva-utils/libva-utils.url @@ -1 +1 @@ -https://github.com/01org/libva-utils/releases/download/2.1.0/libva-utils-2.1.0.tar.bz2 +https://github.com/intel/libva-utils/releases/download/2.2.0/libva-utils-2.2.0.tar.bz2 diff --git a/source/x/libva/libva.SlackBuild b/source/x/libva/libva.SlackBuild index 1bb629158..fc75d1bd9 100755 --- a/source/x/libva/libva.SlackBuild +++ b/source/x/libva/libva.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libva VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/x/libva/libva.url b/source/x/libva/libva.url index e03539ee7..a38ac6867 100644 --- a/source/x/libva/libva.url +++ b/source/x/libva/libva.url @@ -1 +1 @@ -https://github.com/01org/libva/releases/download/2.1.0/libva-2.1.0.tar.bz2 +https://github.com/intel/libva/releases/download/2.2.0/libva-2.2.0.tar.bz2 diff --git a/source/x/libvdpau/libvdpau.SlackBuild b/source/x/libvdpau/libvdpau.SlackBuild index f44f36440..f64f28b74 100755 --- a/source/x/libvdpau/libvdpau.SlackBuild +++ b/source/x/libvdpau/libvdpau.SlackBuild @@ -114,7 +114,7 @@ cp -a AUTHORS COPYING INSTALL NEWS README \ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/x11/build/xf86-video-s3virge b/source/x/x11/build/xf86-video-s3virge index b8626c4cf..7ed6ff82d 100644 --- a/source/x/x11/build/xf86-video-s3virge +++ b/source/x/x11/build/xf86-video-s3virge @@ -1 +1 @@ -4 +5 diff --git a/source/x/x11/build/xf86-video-tseng b/source/x/x11/build/xf86-video-tseng index f599e28b8..b4de39476 100644 --- a/source/x/x11/build/xf86-video-tseng +++ b/source/x/x11/build/xf86-video-tseng @@ -1 +1 @@ -10 +11 diff --git a/source/x/x11/patch/xf86-video-s3virge.patch b/source/x/x11/patch/xf86-video-s3virge.patch new file mode 100644 index 000000000..5e65d8563 --- /dev/null +++ b/source/x/x11/patch/xf86-video-s3virge.patch @@ -0,0 +1,2 @@ +# Patch for xorg-server-1.20.x: +zcat $CWD/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff b/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff new file mode 100644 index 000000000..685282dfa --- /dev/null +++ b/source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff @@ -0,0 +1,19 @@ +diff -aurN xf86-video-s3virge-1.10.7/src/s3v_driver.c xf86-video-s3virge-1.10.7-mod/src/s3v_driver.c +--- xf86-video-s3virge-1.10.7/src/s3v_driver.c 2015-09-26 18:28:11.000000000 +0200 ++++ xf86-video-s3virge-1.10.7-mod/src/s3v_driver.c 2018-07-14 12:43:11.986789561 +0200 +@@ -1203,6 +1203,7 @@ + vga256InfoRec.directMode = XF86DGADirectPresent; + #endif + ++#if 0 + /* + * xf86ValidateModes will check that the mode HTotal and VTotal values + * don't exceed the chipset's limit if pScrn->maxHValue and +@@ -1214,6 +1215,7 @@ + /* true for all ViRGE? */ + pScrn->maxHValue = 2048; + pScrn->maxVValue = 2048; ++#endif + + /* Lower depths default to config file */ + pScrn->virtualX = pScrn->display->virtualX; diff --git a/source/x/x11/patch/xf86-video-tseng.patch b/source/x/x11/patch/xf86-video-tseng.patch index 17d7e8297..878d41354 100644 --- a/source/x/x11/patch/xf86-video-tseng.patch +++ b/source/x/x11/patch/xf86-video-tseng.patch @@ -5,3 +5,6 @@ done grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do sed -i "s/miInitializeBackingStore(pScreen);//g" $file done + +# Patch for xorg-server-1.20.x: +zcat $CWD/patch/xf86-video-tseng/xf86-video-tseng.xorg-server-1.20.x.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xf86-video-tseng/xf86-video-tseng.xorg-server-1.20.x.diff b/source/x/x11/patch/xf86-video-tseng/xf86-video-tseng.xorg-server-1.20.x.diff new file mode 100644 index 000000000..43c2f3a20 --- /dev/null +++ b/source/x/x11/patch/xf86-video-tseng/xf86-video-tseng.xorg-server-1.20.x.diff @@ -0,0 +1,32 @@ +diff -aurN xf86-video-tseng-1.2.5/src/tseng_driver.c xf86-video-tseng-1.2.5-mod/src/tseng_driver.c +--- xf86-video-tseng-1.2.5/src/tseng_driver.c 2012-07-17 07:21:17.000000000 +0200 ++++ xf86-video-tseng-1.2.5-mod/src/tseng_driver.c 2018-07-14 13:48:02.634774719 +0200 +@@ -1040,10 +1040,6 @@ + else + pTseng->Bytesperpixel = 1; /* this is fake for < 8bpp, but simplifies other code */ + +- /* hardware limits */ +- pScrn->maxHValue = Tseng_HMAX; +- pScrn->maxVValue = Tseng_VMAX; +- + /* + * This must happen after pScrn->display has been set because + * xf86SetWeight references it. +@@ -1129,15 +1125,14 @@ + /* + * xf86ValidateModes will check that the mode HTotal and VTotal values + * don't exceed the chipset's limit if pScrn->maxHValue and +- * pScrn->maxVValue are set. Since our TsengValidMode() already takes + * care of this, we don't worry about setting them here. + */ + + /* Select valid modes from those available */ + i = xf86ValidateModes(pScrn, pScrn->monitor->Modes, + pScrn->display->modes, &pTseng->clockRange, +- NULL, 32, pScrn->maxHValue, 8*pTseng->Bytesperpixel, /* H limits */ +- 0, pScrn->maxVValue, /* V limits */ ++ NULL, 32, Tseng_HMAX, 8*pTseng->Bytesperpixel, /* H limits */ ++ 0, Tseng_VMAX, /* V limits */ + pScrn->display->virtualX, + pScrn->display->virtualY, + pTseng->FbMapSize, -- cgit v1.2.3