summaryrefslogtreecommitdiffstats
path: root/libraries/libxnvctrl
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/libxnvctrl')
-rw-r--r--libraries/libxnvctrl/README13
-rw-r--r--libraries/libxnvctrl/libxnvctrl.SlackBuild32
-rw-r--r--libraries/libxnvctrl/libxnvctrl.info8
-rw-r--r--libraries/libxnvctrl/libxnvctrl_so.patch86
4 files changed, 59 insertions, 80 deletions
diff --git a/libraries/libxnvctrl/README b/libraries/libxnvctrl/README
index a2add064f9..eaf307278b 100644
--- a/libraries/libxnvctrl/README
+++ b/libraries/libxnvctrl/README
@@ -1,13 +1,14 @@
libxnvctrl (NVIDIA NV-CONTROL X extension)
The NV-CONTROL X extension provides a mechanism for X clients to query
-and set configuration parameters of the NVIDIA X driver. State set by the
-NV-CONTROL X extension is assumed to be persistent only for the current
-server generation. This can be useful for programs such as conky,
-mate-sensors-applet, and xfce4-sensors-plugin to allow for realtime
-monitoring of your NVIDIA cards temperature, fan speed, memory, etc.
+and set configuration parameters of the NVIDIA X driver. State set by
+the NV-CONTROL X extension is assumed to be persistent only for the
+current server generation. This can be useful for programs such as
+conky, mate-sensors-applet, and xfce4-sensors-plugin to allow for
+realtime monitoring of your NVIDIA cards temperature, fan speed, memory,
+etc.
This package is version independent. It does not have to match
the nvidia-driver or nvidia-legacy packages. I try to keep it
-in line with SBO packages, however it is not requried that this package
+in line with SBO packages, however it is not required that this package
is the same version as the binary drivers.
diff --git a/libraries/libxnvctrl/libxnvctrl.SlackBuild b/libraries/libxnvctrl/libxnvctrl.SlackBuild
index ba8aeeb335..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:-418.43}
+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 -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 libXNVCtrl.a -t $PKG/usr/lib$LIBDIRSUFFIX
-install -Dm 755 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 ccef787408..6993b8ec48 100644
--- a/libraries/libxnvctrl/libxnvctrl.info
+++ b/libraries/libxnvctrl/libxnvctrl.info
@@ -1,10 +1,10 @@
PRGNAM="libxnvctrl"
-VERSION="418.43"
+VERSION="535.146.02"
HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-418.43.tar.bz2"
-MD5SUM="3076423b9ac51e6e9de6cd52a88bfa35"
+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 e6b6497325..70043f0c21 100644
--- a/libraries/libxnvctrl/libxnvctrl_so.patch
+++ b/libraries/libxnvctrl/libxnvctrl_so.patch
@@ -1,68 +1,38 @@
+diff --git a/src/Makefile b/src/Makefile
+index 68eb140..6d0aab8 100644
--- a/src/Makefile
+++ b/src/Makefile
-@@ -106,6 +106,8 @@
- XNVCTRL_DIR ?= libXNVCtrl
- XNVCTRL_MAKEFILE ?= Makefile
- XNVCTRL_ARCHIVE ?= $(XNVCTRL_DIR)/libXNVCtrl.a
-+XNVCTRL_SHARED ?= $(XNVCTRL_DIR)/libXNVCtrl.so.0
-+XNVCTRL_LIB ?= $(XNVCTRL_SHARED)
- XCONFIG_PARSER_DIR ?= XF86Config-parser
- COMMON_UTILS_DIR ?= common-utils
- COMMON_UNIX_DIR ?= common-unix
-@@ -280,15 +282,18 @@
- $(MKDIR) $(BINDIR)
- $(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
+@@ -345,7 +345,7 @@ endif
-+$(XNVCTRL_ARCHIVE) $(XNVCTRL_SHARED):
-+ $(MAKE) -C $(XNVCTRL_DIR)
-+
- $(eval $(call DEBUG_INFO_RULES, $(NVIDIA_SETTINGS)))
--$(NVIDIA_SETTINGS).unstripped: $(OBJS) $(XNVCTRL_ARCHIVE)
-+$(NVIDIA_SETTINGS).unstripped: $(OBJS) $(XNVCTRL_LIB)
- $(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
-- -rdynamic -o $@ $(OBJS) $(XNVCTRL_ARCHIVE) $(LIBS)
-+ -rdynamic -o $@ $(OBJS) $(XNVCTRL_LIB) $(LIBS)
-
- $(eval $(call DEBUG_INFO_RULES, $(GTK2LIB)))
- $(GTK2LIB).unstripped: $(GTK2_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
- $(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
-- $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK2_LIBS) \
-+ $(XNVCTRL_LIB) $(LIBS) $(GTK2_LIBS) \
- -Wl,--unresolved-symbols=ignore-all -o $@ \
- -Wl,-soname -Wl,$(GTK2LIB_SONAME) \
- $(GTK2_OBJS) $(XCP_OBJS)
-@@ -297,7 +302,7 @@
+ ifdef BUILD_GTK3LIB
$(eval $(call DEBUG_INFO_RULES, $(GTK3LIB)))
- $(GTK3LIB).unstripped: $(GTK3_OBJS) $(XCP_OBJS) $(VERSION_MK)
+-$(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) \
-- $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK3_LIBS) \
-+ $(XNVCTRL_LIB) $(LIBS) $(GTK3_LIBS) \
+ $(LIBXNVCTRL) $(LIBS) $(GTK3_LIBS) \
-Wl,--unresolved-symbols=ignore-all -o $@ \
- -Wl,-soname -Wl,$(GTK3LIB_SONAME) \
- $(GTK3_OBJS) $(XCP_OBJS)
---- a/src/libXNVCtrl/Makefile
-+++ b/src/libXNVCtrl/Makefile
-@@ -55,10 +55,17 @@
- .PHONY: clean
+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 ?=
- all: $(LIBXNVCTRL)
-+all: libXNVCtrl.so
+ LIBXNVCTRL = $(OUTPUTDIR)/libXNVCtrl.a
- $(LIBXNVCTRL) : $(OBJS)
- $(AR) ru $@ $(OBJS)
-
-+libXNVCtrl.so: $(OBJS)
-+ $(RM) $@ $@.*
-+ $(CC) -shared -Wl,-soname=$@.0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11
-+ ln -s $@.0.0.0 $@.0
-+ ln -s $@.0 $@
++LIBXNVCTRL_SHARED = $(OUTPUTDIR)/libXNVCtrl.so
++LIBXNVCTRL_ABI_VERSION_MAJOR = 0
++LIBXNVCTRL_ABI_VERSION_MINOR = 0
++LIBXNVCTRL_LIBS += -lXext -lX11
+
- # define the rule to build each object file
- $(foreach src,$(SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
+ LIBXNVCTRL_SRC = $(XNVCTRL_DIR)/NVCtrl.c
+
+ LIBXNVCTRL_OBJ = $(call BUILD_OBJECT_LIST,$(LIBXNVCTRL_SRC))
+@@ -47,3 +52,8 @@ $(eval $(call DEFINE_OBJECT_RULE,TARGET,$(LIBXNVCTRL_SRC)))
-@@ -68,3 +75,4 @@
- clean:
- rm -rf $(LIBXNVCTRL) *~ $(STAMP_C) \
- $(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d
-+ rm -f libXNVCtrl.so libXNVCtrl.so.*
-
+ $(LIBXNVCTRL) : $(LIBXNVCTRL_OBJ)
+ $(call quiet_cmd,AR) ru $@ $(LIBXNVCTRL_OBJ)
++
++$(LIBXNVCTRL_SHARED) : $(LIBXNVCTRL_OBJ)
++ $(CC) -shared $(CFLAGS) $(LDFLAGS) -Wl,-soname=$(notdir $@).${LIBXNVCTRL_ABI_VERSION_MAJOR} -o $@.$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $^ $(LIBXNVCTRL_LIBS)
++ ln -s $(notdir $@).$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $@
++ ln -s $(notdir $@).$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $@.$(LIBXNVCTRL_ABI_VERSION_MAJOR)
generated by cgit v1.2.3 (git 2.32.0) at 2024-04-28 15:49:23 +0200