From b00958907cdf2fe6e89d75e504c2e7c671f8c7ad Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Thu, 26 Sep 2019 19:18:19 +0000
Subject: Thu Sep 26 19:18:19 UTC 2019

a/kernel-firmware-20190926_c0590d8-noarch-1.txz:  Upgraded.
l/expat-2.2.9-x86_64-1.txz:  Upgraded.
l/python-urllib3-1.25.6-x86_64-1.txz:  Upgraded.
n/links-2.20.2-x86_64-1.txz:  Upgraded.
tcl/tclx-8.4.3-x86_64-1.txz:  Upgraded.
x/libglvnd-1.2.0-x86_64-1.txz:  Upgraded.
---
 source/x/libglvnd/libglvnd.SlackBuild | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'source')

diff --git a/source/x/libglvnd/libglvnd.SlackBuild b/source/x/libglvnd/libglvnd.SlackBuild
index eb2244cf9..1810de8d8 100755
--- a/source/x/libglvnd/libglvnd.SlackBuild
+++ b/source/x/libglvnd/libglvnd.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libglvnd
 VERSION=${VERSION:-$(echo libglvnd-*.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
@@ -81,6 +81,10 @@ if [ ! -r configure ]; then
   NOCONFIGURE=1 ./autogen.sh
 fi
 
+# We don't want libglvnd to include headers that stomp on the official ones
+# in the Mesa package:
+HEADERS=${HEADERS:-"--disable-headers"}
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -90,12 +94,24 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
+  $HEADERS \
   --disable-static \
   --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install-strip DESTDIR=$PKG || exit 1
 
+# If we didn't package the headers then we should not package the pkgconfig
+# files either:
+if [ "$HEADERS" = "--disable-headers" ]; then
+  # Move this one out of the way temporarily:
+  mv $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/libglvnd.pc $PKG/usr/lib${LIBDIRSUFFIX}
+  # Remove the redundant .pc files:
+  rm -f $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/*
+  # Put this one back:
+  mv $PKG/usr/lib${LIBDIRSUFFIX}/libglvnd.pc $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
+fi
+
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
-- 
cgit v1.2.3