libraries/libxnvctrl: Updated for version 525.60.11.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 28 insertions, 28 deletions

diff --git a/libraries/libxnvctrl/libxnvctrl.SlackBuild b/libraries/libxnvctrl/libxnvctrl.SlackBuild
index 4a31d82c9d01..20319a4f62a8 100644
--- a/libraries/libxnvctrl/libxnvctrl.SlackBuild
+++ b/libraries/libxnvctrl/libxnvctrl.SlackBuild
@@ -28,8 +28,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=libxnvctrl
-VERSION=${VERSION:-520.56.06}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-525.60.11}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -80,19 +80,17 @@ find -L . \
   -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 -s -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
diff --git a/libraries/libxnvctrl/libxnvctrl.info b/libraries/libxnvctrl/libxnvctrl.info
index 9bdfea4acf8d..ff5533f59d0f 100644
--- a/libraries/libxnvctrl/libxnvctrl.info
+++ b/libraries/libxnvctrl/libxnvctrl.info
@@ -1,8 +1,8 @@
 PRGNAM="libxnvctrl"
-VERSION="520.56.06"
+VERSION="525.60.11"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-520.56.06.tar.bz2"
-MD5SUM="c2a3d9a8e24e278317a93b09c022aaa2"
+DOWNLOAD="https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.60.11.tar.bz2"
+MD5SUM="952676b8735cf6af9eaf6dd827354c97"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nvidia-driver"
diff --git a/libraries/libxnvctrl/libxnvctrl_so.patch b/libraries/libxnvctrl/libxnvctrl_so.patch
index 664ab98225f4..70043f0c2125 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)