From 0857ff7f632e57090e5dcb764eb1837e34181fcf Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 30 Sep 2019 21:08:32 +0000
Subject: Mon Sep 30 21:08:32 UTC 2019

d/llvm-9.0.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
  Thanks to orbea for getting this working and cleaning up the build script.
d/vala-0.46.2-x86_64-1.txz:  Upgraded.
l/imagemagick-6.9.10_67-x86_64-1.txz:  Upgraded.
  Fixed --disable-opencl configure option. Thanks to Markus Wiesner for the
  bug report and to upstream for the quick fix.
n/NetworkManager-1.20.4-x86_64-1.txz:  Upgraded.
n/gnutls-3.6.10-x86_64-1.txz:  Upgraded.
x/freeglut-3.2.1-x86_64-1.txz:  Upgraded.
x/libglvnd-1.1.1-x86_64-2.txz:  Upgraded.
  Reverted to this version since I'm seeing some errors linking with Mesa
  libraries with the newer one. Thanks to nobodino for the bug report.
x/mesa-19.2.0-x86_64-2.txz:  Rebuilt.
  Recompiled against llvm-9.0.0 and libglvnd-1.1.1.
x/xf86-video-vmware-13.3.0-x86_64-3.txz:  Rebuilt.
  Recompiled against llvm-9.0.0.
---
 source/x/libglvnd/libglvnd.SlackBuild | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'source/x/libglvnd')

diff --git a/source/x/libglvnd/libglvnd.SlackBuild b/source/x/libglvnd/libglvnd.SlackBuild
index 1810de8d..eb2244cf 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:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -81,10 +81,6 @@ 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 \
@@ -94,24 +90,12 @@ 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