libraries/libxnvctrl: Updated for version 440.82.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
M.Dinslage 2020-05-15 21:53:26 +07:00 committed by Willy Sudiarto Raharjo
parent f62ed0a22c
commit c499130428
3 changed files with 37 additions and 69 deletions

View file

@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libxnvctrl
VERSION=${VERSION:-418.43}
VERSION=${VERSION:-440.82}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -70,7 +70,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
#patch source to build static and shared library
patch -p1 < $CWD/libxnvctrl_so.patch
patch -p0 < $CWD/libxnvctrl_so.patch
cd src/libXNVCtrl
make clean
@ -79,8 +79,8 @@ 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
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

View file

@ -1,8 +1,8 @@
PRGNAM="libxnvctrl"
VERSION="418.43"
VERSION="440.82"
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-440.82.tar.bz2"
MD5SUM="cb2f2ae00e623399961a1f9ab276fea0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="nvidia-driver"

View file

@ -1,68 +1,36 @@
--- 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 $<)
--- 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 @@
+$(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 @@
$(eval $(call DEBUG_INFO_RULES, $(GTK3LIB)))
$(GTK3LIB).unstripped: $(GTK3_OBJS) $(XCP_OBJS) $(VERSION_MK)
$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
- $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK3_LIBS) \
+ $(XNVCTRL_LIB) $(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
all: $(LIBXNVCTRL)
+all: libXNVCtrl.so
-all: $(LIBXNVCTRL)
+all: $(LIBXNVCTRL) $(LIBXNVCTRL_SHARED)
$(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 $@
+
# define the rule to build each object file
$(foreach src,$(SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
@@ -68,3 +75,4 @@
clean:
rm -rf $(LIBXNVCTRL) *~ $(STAMP_C) \
- rm -rf $(LIBXNVCTRL) *~ \
+ rm -rf $(LIBXNVCTRL) $(LIBXNVCTRL_SHARED)* *~ \
$(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d
+ rm -f libXNVCtrl.so libXNVCtrl.so.*
--- 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 @@
LIBXNVCTRL = $(OUTPUTDIR)/libXNVCtrl.a
+LIBXNVCTRL_SHARED = $(OUTPUTDIR)/libXNVCtrl.so
+LIBXNVCTRL_ABI_VERSION_MAJOR = 0
+LIBXNVCTRL_ABI_VERSION_MINOR = 0
+LIBXNVCTRL_LIBS += -lXext -lX11
+
LIBXNVCTRL_SRC = $(XNVCTRL_DIR)/NVCtrl.c
LIBXNVCTRL_OBJ = $(call BUILD_OBJECT_LIST,$(LIBXNVCTRL_SRC))
@@ -47,3 +52,8 @@
$(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)