summaryrefslogtreecommitdiff
path: root/source/x/x11
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-09-25 22:22:51 +0000
committerEric Hameleers <alien@slackware.com>2019-09-26 08:59:50 +0200
commit33af2d95f7fb454b335c48d176e1deed55b24fc6 (patch)
tree668506fc61eb766303f26ba5d9436fd704c15f65 /source/x/x11
parente95bfb887895c342fc1d8053d8cacda80cc36af4 (diff)
downloadcurrent-33af2d95f7fb454b335c48d176e1deed55b24fc6.tar.gz
Wed Sep 25 22:22:51 UTC 201920190925222251
d/libtool-2.4.6-x86_64-12.txz: Rebuilt. Recompiled to update embedded GCC version number. d/strace-5.3-x86_64-1.txz: Upgraded. n/iproute2-5.3.0-x86_64-1.txz: Upgraded. x/libXvMC-1.0.12-x86_64-2.txz: Rebuilt. Restored xv to xvmc.pc to fix Mesa build (and possibly others). x/mesa-19.2.0-x86_64-1.txz: Upgraded. xap/mozilla-thunderbird-68.1.1-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/thunderbird/68.1.1/releasenotes/ https://www.mozilla.org/security/known-vulnerabilities/thunderbird.html (* Security fix *)
Diffstat (limited to 'source/x/x11')
-rw-r--r--source/x/x11/build/libXvMC2
-rw-r--r--source/x/x11/patch/libXvMC.patch2
-rw-r--r--source/x/x11/patch/libXvMC/libXvMC.restore.xv.to.xvmc.pc.diff12
3 files changed, 15 insertions, 1 deletions
diff --git a/source/x/x11/build/libXvMC b/source/x/x11/build/libXvMC
index d00491fd..0cfbf088 100644
--- a/source/x/x11/build/libXvMC
+++ b/source/x/x11/build/libXvMC
@@ -1 +1 @@
-1
+2
diff --git a/source/x/x11/patch/libXvMC.patch b/source/x/x11/patch/libXvMC.patch
new file mode 100644
index 00000000..6b9488a2
--- /dev/null
+++ b/source/x/x11/patch/libXvMC.patch
@@ -0,0 +1,2 @@
+# Removing xv from xvmc.pc breaks building Mesa so restore it for now:
+zcat $CWD/patch/libXvMC/libXvMC.restore.xv.to.xvmc.pc.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/libXvMC/libXvMC.restore.xv.to.xvmc.pc.diff b/source/x/x11/patch/libXvMC/libXvMC.restore.xv.to.xvmc.pc.diff
new file mode 100644
index 00000000..c3ca1ad3
--- /dev/null
+++ b/source/x/x11/patch/libXvMC/libXvMC.restore.xv.to.xvmc.pc.diff
@@ -0,0 +1,12 @@
+--- ./xvmc.pc.in.orig 2019-09-24 11:54:56.000000000 -0500
++++ ./xvmc.pc.in 2019-09-25 15:49:26.561254254 -0500
+@@ -6,7 +6,7 @@
+ Name: XvMC
+ Description: The XvMC Library
+ Version: @PACKAGE_VERSION@
+-Requires: xproto videoproto
+-Requires.private: x11 xext
++Requires: xproto videoproto xv
++Requires.private: x11 xext xv
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lXvMC