From 594b120f8d02b7fcbfccee964ee4f9dedf6ae4bb Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Fri, 25 Feb 2022 16:09:38 -0500
Subject: graphics/nvidia-texture-tools: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 .../nvidia-texture-tools.SlackBuild                     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'graphics')

diff --git a/graphics/nvidia-texture-tools/nvidia-texture-tools.SlackBuild b/graphics/nvidia-texture-tools/nvidia-texture-tools.SlackBuild
index 4858752befa09..6157b313e3574 100644
--- a/graphics/nvidia-texture-tools/nvidia-texture-tools.SlackBuild
+++ b/graphics/nvidia-texture-tools/nvidia-texture-tools.SlackBuild
@@ -22,6 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nvidia-texture-tools
@@ -38,9 +40,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -78,9 +77,12 @@ done
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220225 bkw: header doesn't exist on 15.0, turns out we didn't need it.
+sed -i '/include.*<sys\/sysctl.h>/d' src/{nvcore/Debug.cpp,nvthread/nvthread.cpp}
 
 mkdir -p build
 cd build
@@ -91,12 +93,9 @@ cd build
     -DNVTT_SHARED=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 [ -e $PKG/usr/share/doc/nvtt ] && rm -rf $PKG/usr/share
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog LICENSE README.md VERSION \
-- 
cgit v1.2.3