summaryrefslogtreecommitdiffstats
path: root/source/x
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-07-14 21:49:31 +0000
committer Eric Hameleers <alien@slackware.com>2018-07-15 09:00:34 +0200
commit67886560b215367bc14ea70569ba67d9f9551a12 (patch)
treeddcf4b0ed9618e4c7a3c9f73ca92ca2cdf4c4ddb /source/x
parente1b360e07d441ab3dac2f0bfb29f09f15069ad31 (diff)
downloadcurrent-67886560b215367bc14ea70569ba67d9f9551a12.tar.gz
current-67886560b215367bc14ea70569ba67d9f9551a12.tar.xz
Sat Jul 14 21:49:31 UTC 201820180714214931
l/pulseaudio-12.1-x86_64-1.txz: Upgraded. l/utf8proc-2.1.1-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x')
-rwxr-xr-xsource/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild2
-rw-r--r--source/x/intel-vaapi-driver/intel-vaapi-driver.url2
-rwxr-xr-xsource/x/libXaw3dXft/libXaw3dXft.SlackBuild6
-rwxr-xr-xsource/x/libepoxy/libepoxy.SlackBuild2
-rw-r--r--source/x/libepoxy/libepoxy.url2
-rwxr-xr-xsource/x/libva-utils/libva-utils.SlackBuild2
-rw-r--r--source/x/libva-utils/libva-utils.url2
-rwxr-xr-xsource/x/libva/libva.SlackBuild2
-rw-r--r--source/x/libva/libva.url2
-rwxr-xr-xsource/x/libvdpau/libvdpau.SlackBuild2
-rw-r--r--source/x/x11/build/xf86-video-s3virge2
-rw-r--r--source/x/x11/build/xf86-video-tseng2
-rw-r--r--source/x/x11/patch/xf86-video-s3virge.patch2
-rw-r--r--source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff19
-rw-r--r--source/x/x11/patch/xf86-video-tseng.patch3
-rw-r--r--source/x/x11/patch/xf86-video-tseng/xf86-video-tseng.xorg-server-1.20.x.diff32
16 files changed, 70 insertions, 14 deletions
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,