[arch-commits] Commit in nvidia-settings/repos/extra-x86_64 (4 files)
Levente Polyak
anthraxx at archlinux.org
Mon Aug 5 15:05:14 UTC 2019
Date: Monday, August 5, 2019 @ 15:05:13
Author: anthraxx
Revision: 359188
archrelease: copy trunk to extra-x86_64
Added:
nvidia-settings/repos/extra-x86_64/PKGBUILD
(from rev 359187, nvidia-settings/trunk/PKGBUILD)
nvidia-settings/repos/extra-x86_64/libxnvctrl_so.patch
(from rev 359187, nvidia-settings/trunk/libxnvctrl_so.patch)
Deleted:
nvidia-settings/repos/extra-x86_64/PKGBUILD
nvidia-settings/repos/extra-x86_64/libxnvctrl_so.patch
---------------------+
PKGBUILD | 119 +++++++++++++++++++++++++-------------------------
libxnvctrl_so.patch | 103 +++++++++++++++----------------------------
2 files changed, 97 insertions(+), 125 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-08-05 15:05:01 UTC (rev 359187)
+++ PKGBUILD 2019-08-05 15:05:13 UTC (rev 359188)
@@ -1,58 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-
-pkgbase=nvidia-settings
-pkgname=('nvidia-settings' 'libxnvctrl')
-pkgver=430.40
-pkgrel=1
-pkgdesc='Tool for configuring the NVIDIA graphics driver'
-url='https://github.com/NVIDIA/nvidia-settings'
-arch=('x86_64')
-license=('GPL2')
-makedepends=('git' 'inetutils' 'gtk2' 'jansson' 'gtk3' 'libxv' 'libvdpau' 'nvidia-utils' 'libxext')
-options=('staticlibs')
-source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/NVIDIA/nvidia-settings/archive/${pkgver}.tar.gz
- libxnvctrl_so.patch)
-sha512sums=('b45591e2acd0cf35ef96d416727c7fc9c79d02177546084e0e2c939a5f6ad4a3a3c11db45131c2e2ca43c72f13f83c03f03a502a75e07aefaba208c137938c04'
- 'f69f5dc84fe624579a3c9ce877f4ae4e34c2184877576afbea07b8abdd7ff01e470517f2b77cd11a904518cbcb83fb388ca1d08888006f0ef2854723920c9cf8')
-
-prepare() {
- export PREFIX=/usr
- export NV_USE_BUNDLED_LIBJANSSON=0
- export OUTPUTDIR="out"
-}
-
-build() {
- cd ${pkgbase}-${pkgver}
- make
- make -C src/libXNVCtrl
-}
-
-package_nvidia-settings() {
- depends=('jansson' 'gtk3' 'libxv' 'libvdpau' 'nvidia-utils' 'libxnvctrl')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- install -D -m644 doc/nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop"
- install -D -m644 doc/nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png"
- sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop"
-
- rm "$pkgdir/usr/lib/libnvidia-gtk2.so.$pkgver"
-}
-
-package_libxnvctrl() {
- depends=('libxext')
- pkgdesc='NVIDIA NV-CONTROL X extension'
-
- cd ${pkgbase}-${pkgver}
- install -Dm 644 doc/{NV-CONTROL-API.txt,FRAMELOCK.txt} -t "${pkgdir}/usr/share/doc/${pkgname}"
- install -Dm 644 samples/{Makefile,README,*.c,*.h,*.mk} -t "${pkgdir}/usr/share/doc/${pkgname}/samples"
-
- cd src/libXNVCtrl
- install -Dm 644 *.h -t "${pkgdir}/usr/include/NVCtrl"
- install -Dm 644 out/libXNVCtrl.a -t "${pkgdir}/usr/lib"
-}
-
-# vim: ts=2 sw=2 et:
Copied: nvidia-settings/repos/extra-x86_64/PKGBUILD (from rev 359187, nvidia-settings/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-08-05 15:05:13 UTC (rev 359188)
@@ -0,0 +1,61 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+
+pkgbase=nvidia-settings
+pkgname=('nvidia-settings' 'libxnvctrl')
+pkgver=430.40
+pkgrel=2
+pkgdesc='Tool for configuring the NVIDIA graphics driver'
+url='https://github.com/NVIDIA/nvidia-settings'
+arch=('x86_64')
+license=('GPL2')
+makedepends=('git' 'inetutils' 'gtk2' 'jansson' 'gtk3' 'libxv' 'libvdpau' 'nvidia-utils' 'libxext')
+options=('staticlibs')
+source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/NVIDIA/nvidia-settings/archive/${pkgver}.tar.gz
+ libxnvctrl_so.patch)
+sha512sums=('b45591e2acd0cf35ef96d416727c7fc9c79d02177546084e0e2c939a5f6ad4a3a3c11db45131c2e2ca43c72f13f83c03f03a502a75e07aefaba208c137938c04'
+ '51c2d1360ef13758b4196031ac3fcff3a3b328831f32929e26a6ab72e29ebaacc776d23e9f3cc0813160774f6c3ead37950280883c899df24ad0e368fc54e5bc')
+
+prepare() {
+ export PREFIX=/usr
+ export NV_USE_BUNDLED_LIBJANSSON=0
+ export OUTPUTDIR=out
+ cd ${pkgbase}-${pkgver}
+ patch -p0 < "${srcdir}/libxnvctrl_so.patch"
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
+ make
+ make -C src/libXNVCtrl
+}
+
+package_nvidia-settings() {
+ depends=('jansson' 'gtk3' 'libxv' 'libvdpau' 'nvidia-utils' 'libxnvctrl')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ install -D -m644 doc/nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop"
+ install -D -m644 doc/nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png"
+ sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop"
+
+ rm "$pkgdir/usr/lib/libnvidia-gtk2.so.$pkgver"
+}
+
+package_libxnvctrl() {
+ depends=('libxext')
+ pkgdesc='NVIDIA NV-CONTROL X extension'
+ provides=('libXNVCtrl.so')
+
+ cd ${pkgbase}-${pkgver}
+ install -Dm 644 doc/{NV-CONTROL-API.txt,FRAMELOCK.txt} -t "${pkgdir}/usr/share/doc/${pkgname}"
+ install -Dm 644 samples/{Makefile,README,*.c,*.h,*.mk} -t "${pkgdir}/usr/share/doc/${pkgname}/samples"
+
+ cd src/libXNVCtrl
+ install -Dm 644 ./*.h -t "${pkgdir}/usr/include/NVCtrl"
+ install -Dm 755 out/libXNVCtrl.* -t "${pkgdir}/usr/lib"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: libxnvctrl_so.patch
===================================================================
--- libxnvctrl_so.patch 2019-08-05 15:05:01 UTC (rev 359187)
+++ libxnvctrl_so.patch 2019-08-05 15:05:13 UTC (rev 359188)
@@ -1,67 +0,0 @@
---- 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 $<)
-
-+$(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
-
- $(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) \
- $(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d
-+ rm -f libXNVCtrl.so libXNVCtrl.so.*
Copied: nvidia-settings/repos/extra-x86_64/libxnvctrl_so.patch (from rev 359187, nvidia-settings/trunk/libxnvctrl_so.patch)
===================================================================
--- libxnvctrl_so.patch (rev 0)
+++ libxnvctrl_so.patch 2019-08-05 15:05:13 UTC (rev 359188)
@@ -0,0 +1,36 @@
+--- 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 @@
+
+ .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 @@
+
+ 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) $(LDFALGS) -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)
More information about the arch-commits
mailing list