summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/ap/man-pages/man-pages.SlackBuild15
-rwxr-xr-xsource/d/oprofile/oprofile.SlackBuild2
-rw-r--r--source/x/FTBFSlog3
-rw-r--r--source/x/x11/patch/xorg-server.patch6
-rw-r--r--source/x/x11/patch/xorg-server/c7486613b0dc586f93f6ba293d9b55c69995b05c.patch23
-rw-r--r--source/x/x11/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch61
6 files changed, 104 insertions, 6 deletions
diff --git a/source/ap/man-pages/man-pages.SlackBuild b/source/ap/man-pages/man-pages.SlackBuild
index 643be615..09bf90cb 100755
--- a/source/ap/man-pages/man-pages.SlackBuild
+++ b/source/ap/man-pages/man-pages.SlackBuild
@@ -85,13 +85,18 @@ gzip -9 $PKG/usr/man/man*/*.*
# If a man page exists in some other package, assume that's the
# newer, better version:
echo "Pruning manpages found in other packages..."
+TEMPDIR=$(mktemp -d)
+chmod 700 $TEMPDIR
+( cd $PKG ; /bin/ls usr/man/man*/*.gz | sort > $TEMPDIR/man-pages-pages )
+( cd /var/log/packages
+ GLOBIGNORE="$(/bin/ls man-pages-*)"
+ cat * | grep usr/man | sort | uniq > $TEMPDIR/other-packages-pages
+ unset GLOBIGNORE
+)
( cd $PKG
- for file in usr/man/man*/*.gz ; do
- if grep -l $file /var/log/packages/* | grep -v var/log/packages/man-pages ; then
- rm -f --verbose $file
- fi
- done
+ comm -12 $TEMPDIR/man-pages-pages $TEMPDIR/other-packages-pages | xargs rm --verbose
)
+rm -r $TEMPDIR
# Some of the posix pages don't display correctly without this
( cd $PKG/usr/man ; ln -s man3 man3p )
diff --git a/source/d/oprofile/oprofile.SlackBuild b/source/d/oprofile/oprofile.SlackBuild
index 67ea7e5a..fe842d93 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:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/x/FTBFSlog b/source/x/FTBFSlog
index f95335d7..98419e30 100644
--- a/source/x/FTBFSlog
+++ b/source/x/FTBFSlog
@@ -1,3 +1,6 @@
+Sat Oct 12 17:04:36 UTC 2019
+ xorg-server: patched to build with libglvnd >= 1.2.0. Thanks to bartgymnast.
++--------------------------+
Sun May 26 19:04:04 UTC 2019
igt-gpu-tools: Added -Wno-error=array-bounds to CFLAGS.
Thanks to ponce and nobodino.
diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
index 2f47985b..6ce93ee9 100644
--- a/source/x/x11/patch/xorg-server.patch
+++ b/source/x/x11/patch/xorg-server.patch
@@ -22,3 +22,9 @@ zcat $CWD/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch.gz | patch -p
# Reference: https://bugs.freedesktop.org/show_bug.cgi?id=94844
# Added here 2018/7.
zcat $CWD/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Patch to build with libglvnd-1.2.0:
+zcat $CWD/patch/xorg-server/c7486613b0dc586f93f6ba293d9b55c69995b05c.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ;
+}
+zcat $CWD/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ;
+}
diff --git a/source/x/x11/patch/xorg-server/c7486613b0dc586f93f6ba293d9b55c69995b05c.patch b/source/x/x11/patch/xorg-server/c7486613b0dc586f93f6ba293d9b55c69995b05c.patch
new file mode 100644
index 00000000..f1c2e7aa
--- /dev/null
+++ b/source/x/x11/patch/xorg-server/c7486613b0dc586f93f6ba293d9b55c69995b05c.patch
@@ -0,0 +1,23 @@
+From c7486613b0dc586f93f6ba293d9b55c69995b05c Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 9 Oct 2019 15:17:47 -0400
+Subject: [PATCH] meson: Fix another reference to "gl" 9.2.0
+
+Previous commit e6ef2b12 missed a spot.
+---
+ glx/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glx/meson.build b/glx/meson.build
+index 745814336..d7a2aa468 100644
+--- a/glx/meson.build
++++ b/glx/meson.build
+@@ -74,7 +74,7 @@ if build_glx
+ common_dep,
+ dl_dep,
+ dependency('glproto', version: '>= 1.4.17'),
+- dependency('gl', version: '>= 9.2.0'),
++ dependency('gl', version: '>= 1.2.0'),
+ ],
+ )
+
diff --git a/source/x/x11/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch b/source/x/x11/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch
new file mode 100644
index 00000000..cd9213ee
--- /dev/null
+++ b/source/x/x11/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch
@@ -0,0 +1,61 @@
+From e6ef2b12404dfec7f23592a3524d2a63d9d25802 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Tue, 24 Sep 2019 09:58:43 +0200
+Subject: [PATCH] build: glx: Lower gl version to work with libglvnd
+
+When using mesa with libglvnd support, mesa will no longer install the
+gl, glx, egl pkg-config files but instead let libglvnd provide them.
+libglvnd maintainers decided to change the versioning as it was
+mesa-specific previously. Now the libraries have versions of the API
+they expose[1].
+This causes problems when building the X server:
+
+ checking for glproto >= 1.4.17 gl >= 9.2.0... no
+ configure: error: Package requirements (glproto >= 1.4.17 gl >= 9.2.0) were not met:
+
+ Requested 'gl >= 9.2.0' but version of gl is 1.2
+
+Lower the version requirement to 1.2 to allow building against libglvnd
+provided libraries
+
+[1] https://github.com/NVIDIA/libglvnd/commit/0dfaea2bcb7cdcc785f95e244223bd004a2d7fba
+---
+ configure.ac | 4 ++--
+ glx/meson.build | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 03c2e367c..969090b94 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -760,7 +760,7 @@ LIBDRI="dri >= 7.8.0"
+ LIBDRM="libdrm >= 2.4.89"
+ LIBEGL="egl"
+ LIBGBM="gbm >= 10.2.0"
+-LIBGL="gl >= 7.1.0"
++LIBGL="gl >= 1.2"
+ LIBXEXT="xext >= 1.0.99.4"
+ LIBXFONT="xfont2 >= 2.0.0"
+ LIBXI="xi >= 1.2.99.1"
+@@ -1115,7 +1115,7 @@ case "$DRI2,$HAVE_DRI2PROTO" in
+ yes,yes | auto,yes)
+ AC_DEFINE(DRI2, 1, [Build DRI2 extension])
+ DRI2=yes
+- LIBGL="gl >= 9.2.0"
++ LIBGL="gl >= 1.2"
+ SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO"
+ ;;
+ esac
+diff --git a/glx/meson.build b/glx/meson.build
+index 7f9e549f0..745814336 100644
+--- a/glx/meson.build
++++ b/glx/meson.build
+@@ -39,7 +39,7 @@ if build_glx
+ common_dep,
+ dl_dep,
+ dependency('glproto', version: '>= 1.4.17'),
+- dependency('gl', version: '>= 9.2.0'),
++ dependency('gl', version: '>= 1.2'),
+ ],
+ c_args: [
+ glx_align64,