3 files changed, 43 insertions, 33 deletions
diff --git a/libraries/libxnvctrl/libxnvctrl.SlackBuild b/libraries/libxnvctrl/libxnvctrl.SlackBuild
index c618e444c4..e105fb7568 100644
--- a/libraries/libxnvctrl/libxnvctrl.SlackBuild
+++ b/libraries/libxnvctrl/libxnvctrl.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for libxnvctrl
 
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220421 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - strip shared library.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=libxnvctrl
-VERSION=${VERSION:-460.39}
+VERSION=${VERSION:-535.146.02}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,24 +75,22 @@ cd nvidia-settings-$VERSION
 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 {} \+
 
 #patch source to build static and shared library
-patch -p0 < $CWD/libxnvctrl_so.patch
+patch -p1 < $CWD/libxnvctrl_so.patch
 
-cd src/libXNVCtrl
+#cd src/libXNVCtrl
 make clean
 CFLAGS="$SLKCFLAGS" \
 make
 
 #install shared and static libraries and headers
-install -Dm 644 *.h -t $PKG/usr/include/NVCtrl
-install -Dm 644 _out/*/libXNVCtrl.a -t $PKG/usr/lib$LIBDIRSUFFIX
-install -Dm 755 _out/*/libXNVCtrl.so.0.0.0 -t $PKG/usr/lib$LIBDIRSUFFIX
-ln -s libXNVCtrl.so.0.0.0 $PKG/usr/lib$LIBDIRSUFFIX/libXNVCtrl.so.0
-ln -s libXNVCtrl.so.0 $PKG/usr/lib$LIBDIRSUFFIX/libXNVCtrl.so
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX
+install -Dm 644 src/libXNVCtrl/*.h -t $PKG/usr/include/NVCtrl
+cp -Pr src/_out/*/libXNVCtrl.* -t $PKG/usr/lib$LIBDIRSUFFIX
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -91,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/libraries/libxnvctrl/libxnvctrl.info b/libraries/libxnvctrl/libxnvctrl.info
index 47f61d3579..6993b8ec48 100644
--- a/libraries/libxnvctrl/libxnvctrl.info
+++ b/libraries/libxnvctrl/libxnvctrl.info
@@ -1,10 +1,10 @@
 PRGNAM="libxnvctrl"
-VERSION="460.39"
+VERSION="535.146.02"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-460.39.tar.bz2"
-MD5SUM="fdcdc9d1322c91aef187e1239238b319"
+DOWNLOAD="https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-535.146.02.tar.bz2"
+MD5SUM="025bbc42a1615d83e2b6cce76b43cc2a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nvidia-driver"
 MAINTAINER="M.Dinslage"
-EMAIL="daedra1980@gmail.com"
+EMAIL="matthewdinslage@gmail.com"
diff --git a/libraries/libxnvctrl/libxnvctrl_so.patch b/libraries/libxnvctrl/libxnvctrl_so.patch
index 664ab98225..70043f0c21 100644
--- a/libraries/libxnvctrl/libxnvctrl_so.patch
+++ b/libraries/libxnvctrl/libxnvctrl_so.patch
@@ -1,19 +1,21 @@
---- src/libXNVCtrl/Makefile	2019-07-30 00:26:56.000000000 +0200
-+++ src/libXNVCtrl/Makefile	2019-08-02 14:08:56.963744238 +0200
-@@ -50,8 +50,8 @@
+diff --git a/src/Makefile b/src/Makefile
+index 68eb140..6d0aab8 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -345,7 +345,7 @@ endif
  
- .PHONY: clean
- 
--all: $(LIBXNVCTRL)
-+all: $(LIBXNVCTRL) $(LIBXNVCTRL_SHARED)
- 
- clean:
--	rm -rf $(LIBXNVCTRL) *~ \
-+	rm -rf $(LIBXNVCTRL) $(LIBXNVCTRL_SHARED)* *~ \
- 		$(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d
---- src/libXNVCtrl/xnvctrl.mk	2019-08-02 17:04:08.216230565 +0200
-+++ src/libXNVCtrl/xnvctrl.mk	2019-08-02 17:08:02.563660632 +0200
-@@ -39,6 +39,11 @@
+ ifdef BUILD_GTK3LIB
+ $(eval $(call DEBUG_INFO_RULES, $(GTK3LIB)))
+-$(GTK3LIB).unstripped: $(LIBXNVCTRL) $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
++$(GTK3LIB).unstripped: $(LIBXNVCTRL) $(LIBXNVCTRL_SHARED) $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
+ 	$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS)  $(BIN_LDFLAGS) \
+ 	    $(LIBXNVCTRL) $(LIBS) $(GTK3_LIBS) \
+ 	    -Wl,--unresolved-symbols=ignore-all -o $@ \
+diff --git a/src/libXNVCtrl/xnvctrl.mk b/src/libXNVCtrl/xnvctrl.mk
+index e6be2ef..c0921c4 100644
+--- a/src/libXNVCtrl/xnvctrl.mk
++++ b/src/libXNVCtrl/xnvctrl.mk
+@@ -39,6 +39,11 @@ XNVCTRL_CFLAGS ?=
  
  LIBXNVCTRL = $(OUTPUTDIR)/libXNVCtrl.a
  
@@ -25,7 +27,7 @@
  LIBXNVCTRL_SRC = $(XNVCTRL_DIR)/NVCtrl.c
  
  LIBXNVCTRL_OBJ = $(call BUILD_OBJECT_LIST,$(LIBXNVCTRL_SRC))
-@@ -47,3 +52,8 @@
+@@ -47,3 +52,8 @@ $(eval $(call DEFINE_OBJECT_RULE,TARGET,$(LIBXNVCTRL_SRC)))
  
  $(LIBXNVCTRL) : $(LIBXNVCTRL_OBJ)
  	$(call quiet_cmd,AR) ru $@ $(LIBXNVCTRL_OBJ)