[arch-commits] Commit in nvidia-settings/repos/extra-x86_64 (4 files)
Sven-Hendrik Haase
svenstaro at gemini.archlinux.org
Thu Mar 3 12:16:03 UTC 2022
Date: Thursday, March 3, 2022 @ 12:16:03
Author: svenstaro
Revision: 438582
archrelease: copy trunk to extra-x86_64
Added:
nvidia-settings/repos/extra-x86_64/PKGBUILD
(from rev 438581, nvidia-settings/trunk/PKGBUILD)
nvidia-settings/repos/extra-x86_64/libxnvctrl_so.patch
(from rev 438581, nvidia-settings/trunk/libxnvctrl_so.patch)
Deleted:
nvidia-settings/repos/extra-x86_64/PKGBUILD
nvidia-settings/repos/extra-x86_64/libxnvctrl_so.patch
---------------------+
PKGBUILD | 131 +++++++++++++++++++++++++-------------------------
libxnvctrl_so.patch | 72 +++++++++++++--------------
2 files changed, 104 insertions(+), 99 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-03 12:15:51 UTC (rev 438581)
+++ PKGBUILD 2022-03-03 12:16:03 UTC (rev 438582)
@@ -1,63 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-
-pkgbase=nvidia-settings
-pkgname=('nvidia-settings' 'libxnvctrl')
-pkgver=510.54
-pkgrel=1
-pkgdesc='Tool for configuring the NVIDIA graphics driver'
-url='https://github.com/NVIDIA/nvidia-settings'
-arch=('x86_64')
-license=('GPL2')
-makedepends=('inetutils' 'jansson' 'gtk2' '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=('b98ee2484cbfe4124d19391c2dd217dafb4e0057f870c2516ce6b2962674a708531b61f06910bc1e0d1be2ae1ab72cb2da4d9fd4b2671cea36a1a181e1f71e6b'
- '91ff94736063b911c83b8876fe3e3778db82e0ffe0102036d81a3a6e872ca44a585914646fcbbbe399cd63aa17685fc7f73263ec4f4084f48768ca4d704037fa')
-
-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}
- export CFLAGS+=" -ffat-lto-objects"
- 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:' -e 's/__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__/Settings;HardwareSettings;/' -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 -d "${pkgdir}/usr/lib"
- cp -Pr out/libXNVCtrl.* -t "${pkgdir}/usr/lib"
-}
-
-# vim: ts=2 sw=2 et:
Copied: nvidia-settings/repos/extra-x86_64/PKGBUILD (from rev 438581, nvidia-settings/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-03-03 12:16:03 UTC (rev 438582)
@@ -0,0 +1,68 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+
+pkgbase=nvidia-settings
+pkgname=('nvidia-settings' 'libxnvctrl')
+pkgver=510.54
+pkgrel=2
+pkgdesc='Tool for configuring the NVIDIA graphics driver'
+url='https://github.com/NVIDIA/nvidia-settings'
+arch=('x86_64')
+license=('GPL2')
+makedepends=('inetutils' 'jansson' 'gtk2' '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=('b98ee2484cbfe4124d19391c2dd217dafb4e0057f870c2516ce6b2962674a708531b61f06910bc1e0d1be2ae1ab72cb2da4d9fd4b2671cea36a1a181e1f71e6b'
+ '91ff94736063b911c83b8876fe3e3778db82e0ffe0102036d81a3a6e872ca44a585914646fcbbbe399cd63aa17685fc7f73263ec4f4084f48768ca4d704037fa')
+
+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}
+ export CFLAGS+=" -ffat-lto-objects"
+ 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:' \
+ -e 's/__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__/Settings;HardwareSettings;/' \
+ -e 's/Icon=.*/Icon=nvidia-settings/' \
+ -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 -d "${pkgdir}/usr/lib"
+ cp -Pr out/libXNVCtrl.* -t "${pkgdir}/usr/lib"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: libxnvctrl_so.patch
===================================================================
--- libxnvctrl_so.patch 2022-03-03 12:15:51 UTC (rev 438581)
+++ libxnvctrl_so.patch 2022-03-03 12:16:03 UTC (rev 438582)
@@ -1,36 +0,0 @@
---- 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) $(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)
Copied: nvidia-settings/repos/extra-x86_64/libxnvctrl_so.patch (from rev 438581, nvidia-settings/trunk/libxnvctrl_so.patch)
===================================================================
--- libxnvctrl_so.patch (rev 0)
+++ libxnvctrl_so.patch 2022-03-03 12:16:03 UTC (rev 438582)
@@ -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) $(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)
More information about the arch-commits
mailing list