Date: Tuesday, June 8, 2021 @ 15:21:31 Author: svenstaro Revision: 417461
archrelease: copy trunk to extra-x86_64 Added: nvidia-settings/repos/extra-x86_64/PKGBUILD (from rev 417460, nvidia-settings/trunk/PKGBUILD) nvidia-settings/repos/extra-x86_64/libxnvctrl_so.patch (from rev 417460, nvidia-settings/trunk/libxnvctrl_so.patch) Deleted: nvidia-settings/repos/extra-x86_64/PKGBUILD nvidia-settings/repos/extra-x86_64/libxnvctrl_so.patch ---------------------+ PKGBUILD | 124 +++++++++++++++++++++++++------------------------- libxnvctrl_so.patch | 72 ++++++++++++++--------------- 2 files changed, 98 insertions(+), 98 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-06-08 15:21:26 UTC (rev 417460) +++ PKGBUILD 2021-06-08 15:21:31 UTC (rev 417461) @@ -1,62 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com> -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> - -pkgbase=nvidia-settings -pkgname=('nvidia-settings' 'libxnvctrl') -pkgver=465.27 -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=('11c700bd3236f642ced900601efaaaab03a85c67016419c0a9a6719ce59b42bdf8c333f116029cf18dc97ebbc2c22c6b26b475e8d106a28fb088a04ed98d0350' - '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} - 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 417460, nvidia-settings/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-06-08 15:21:31 UTC (rev 417461) @@ -0,0 +1,62 @@ +# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> + +pkgbase=nvidia-settings +pkgname=('nvidia-settings' 'libxnvctrl') +pkgver=465.31 +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=('e178df78332e3c1051afc394ad0dc49ed572748ed739d1e21aab6c7e5b52c7470ba7ebe251780654509e46f05f6e86a1299c08ac1786958173ec449356106a92' + '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} + 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: Deleted: libxnvctrl_so.patch =================================================================== --- libxnvctrl_so.patch 2021-06-08 15:21:26 UTC (rev 417460) +++ libxnvctrl_so.patch 2021-06-08 15:21:31 UTC (rev 417461) @@ -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 417460, nvidia-settings/trunk/libxnvctrl_so.patch) =================================================================== --- libxnvctrl_so.patch (rev 0) +++ libxnvctrl_so.patch 2021-06-08 15:21:31 UTC (rev 417461) @@ -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)