Date: Thursday, February 16, 2017 @ 22:32:50 Author: anthraxx Revision: 289082
archrelease: copy trunk to extra-i686, extra-x86_64 Added: nvidia-settings/repos/extra-i686/PKGBUILD (from rev 289081, nvidia-settings/trunk/PKGBUILD) nvidia-settings/repos/extra-i686/libxnvctrl_so.patch (from rev 289081, nvidia-settings/trunk/libxnvctrl_so.patch) nvidia-settings/repos/extra-x86_64/PKGBUILD (from rev 289081, nvidia-settings/trunk/PKGBUILD) nvidia-settings/repos/extra-x86_64/libxnvctrl_so.patch (from rev 289081, nvidia-settings/trunk/libxnvctrl_so.patch) Deleted: nvidia-settings/repos/extra-i686/PKGBUILD nvidia-settings/repos/extra-i686/libxnvctrl_so.patch nvidia-settings/repos/extra-x86_64/PKGBUILD nvidia-settings/repos/extra-x86_64/libxnvctrl_so.patch ----------------------------------+ /PKGBUILD | 122 +++++++++++++++++++++++++++++++++ /libxnvctrl_so.patch | 134 +++++++++++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 61 ---------------- extra-i686/libxnvctrl_so.patch | 67 ------------------ extra-x86_64/PKGBUILD | 61 ---------------- extra-x86_64/libxnvctrl_so.patch | 67 ------------------ 6 files changed, 256 insertions(+), 256 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-02-16 22:32:41 UTC (rev 289081) +++ extra-i686/PKGBUILD 2017-02-16 22:32:50 UTC (rev 289082) @@ -1,61 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> - -pkgbase=nvidia-settings -pkgname=('nvidia-settings' 'libxnvctrl') -pkgver=375.26 -pkgrel=1 -pkgdesc="Tool for configuring the NVIDIA graphics driver" -arch=('i686' 'x86_64') -url="https://github.com/NVIDIA/nvidia-settings" -license=('GPL2') -makedepends=('git' 'inetutils' 'gtk2' 'jansson' 'gtk3' 'libxv' 'libvdpau' 'nvidia-utils' 'libxext') -options=('staticlibs') -source=(ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${pkgver}.tar.bz2 - libxnvctrl_so.patch) -sha512sums=('e575670ccf7e3ef0089ee6a969f107f6f43d742a60cc325c6d95efc4773f34a6e013fd2c4e38b5f90054e24146a05c2300c0cf6a9b7013b556bacc1402956f49' - 'ed4b609de9691fbb4421eea340399331e7a5c5f47b9de8eade40ca8f78ac39a6f76cc106928cd0d79825f248a3a0eb563a10f68b7b6991cf3e28db0dde2a0f8d') - -prepare() { - export PREFIX=/usr - export NV_USE_BUNDLED_LIBJANSSON=0 - cd ${pkgbase}-${pkgver} - patch -p1 < "${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' - - 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 libXNVCtrl.a -t "${pkgdir}/usr/lib" - install -Dm 755 libXNVCtrl.so.0.0.0 -t "${pkgdir}/usr/lib" - ln -s libXNVCtrl.so.0.0.0 "${pkgdir}/usr/lib/libXNVCtrl.so.0" - ln -s libXNVCtrl.so.0 "${pkgdir}/usr/lib/libXNVCtrl.so" -} - -# vim: ts=2 sw=2 et: Copied: nvidia-settings/repos/extra-i686/PKGBUILD (from rev 289081, nvidia-settings/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-02-16 22:32:50 UTC (rev 289082) @@ -0,0 +1,61 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> + +pkgbase=nvidia-settings +pkgname=('nvidia-settings' 'libxnvctrl') +pkgver=378.13 +pkgrel=1 +pkgdesc="Tool for configuring the NVIDIA graphics driver" +arch=('i686' 'x86_64') +url="https://github.com/NVIDIA/nvidia-settings" +license=('GPL2') +makedepends=('git' 'inetutils' 'gtk2' 'jansson' 'gtk3' 'libxv' 'libvdpau' 'nvidia-utils' 'libxext') +options=('staticlibs') +source=(ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${pkgver}.tar.bz2 + libxnvctrl_so.patch) +sha512sums=('a12352c92fd4f56002bda2b07e8cddd5573af98521ec3495cd428b784eb368c9f2cb40f9b4372400ba1ea67c9349c6a9b4f7c218ede2d0d5dabb08325eda9844' + 'ed4b609de9691fbb4421eea340399331e7a5c5f47b9de8eade40ca8f78ac39a6f76cc106928cd0d79825f248a3a0eb563a10f68b7b6991cf3e28db0dde2a0f8d') + +prepare() { + export PREFIX=/usr + export NV_USE_BUNDLED_LIBJANSSON=0 + cd ${pkgbase}-${pkgver} + patch -p1 < "${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' + + 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 libXNVCtrl.a -t "${pkgdir}/usr/lib" + install -Dm 755 libXNVCtrl.so.0.0.0 -t "${pkgdir}/usr/lib" + ln -s libXNVCtrl.so.0.0.0 "${pkgdir}/usr/lib/libXNVCtrl.so.0" + ln -s libXNVCtrl.so.0 "${pkgdir}/usr/lib/libXNVCtrl.so" +} + +# vim: ts=2 sw=2 et: Deleted: extra-i686/libxnvctrl_so.patch =================================================================== --- extra-i686/libxnvctrl_so.patch 2017-02-16 22:32:41 UTC (rev 289081) +++ extra-i686/libxnvctrl_so.patch 2017-02-16 22:32:50 UTC (rev 289082) @@ -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) $(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-i686/libxnvctrl_so.patch (from rev 289081, nvidia-settings/trunk/libxnvctrl_so.patch) =================================================================== --- extra-i686/libxnvctrl_so.patch (rev 0) +++ extra-i686/libxnvctrl_so.patch 2017-02-16 22:32:50 UTC (rev 289082) @@ -0,0 +1,67 @@ +--- 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) $(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.* Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2017-02-16 22:32:41 UTC (rev 289081) +++ extra-x86_64/PKGBUILD 2017-02-16 22:32:50 UTC (rev 289082) @@ -1,61 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> - -pkgbase=nvidia-settings -pkgname=('nvidia-settings' 'libxnvctrl') -pkgver=375.26 -pkgrel=1 -pkgdesc="Tool for configuring the NVIDIA graphics driver" -arch=('i686' 'x86_64') -url="https://github.com/NVIDIA/nvidia-settings" -license=('GPL2') -makedepends=('git' 'inetutils' 'gtk2' 'jansson' 'gtk3' 'libxv' 'libvdpau' 'nvidia-utils' 'libxext') -options=('staticlibs') -source=(ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${pkgver}.tar.bz2 - libxnvctrl_so.patch) -sha512sums=('e575670ccf7e3ef0089ee6a969f107f6f43d742a60cc325c6d95efc4773f34a6e013fd2c4e38b5f90054e24146a05c2300c0cf6a9b7013b556bacc1402956f49' - 'ed4b609de9691fbb4421eea340399331e7a5c5f47b9de8eade40ca8f78ac39a6f76cc106928cd0d79825f248a3a0eb563a10f68b7b6991cf3e28db0dde2a0f8d') - -prepare() { - export PREFIX=/usr - export NV_USE_BUNDLED_LIBJANSSON=0 - cd ${pkgbase}-${pkgver} - patch -p1 < "${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' - - 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 libXNVCtrl.a -t "${pkgdir}/usr/lib" - install -Dm 755 libXNVCtrl.so.0.0.0 -t "${pkgdir}/usr/lib" - ln -s libXNVCtrl.so.0.0.0 "${pkgdir}/usr/lib/libXNVCtrl.so.0" - ln -s libXNVCtrl.so.0 "${pkgdir}/usr/lib/libXNVCtrl.so" -} - -# vim: ts=2 sw=2 et: Copied: nvidia-settings/repos/extra-x86_64/PKGBUILD (from rev 289081, nvidia-settings/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-02-16 22:32:50 UTC (rev 289082) @@ -0,0 +1,61 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> + +pkgbase=nvidia-settings +pkgname=('nvidia-settings' 'libxnvctrl') +pkgver=378.13 +pkgrel=1 +pkgdesc="Tool for configuring the NVIDIA graphics driver" +arch=('i686' 'x86_64') +url="https://github.com/NVIDIA/nvidia-settings" +license=('GPL2') +makedepends=('git' 'inetutils' 'gtk2' 'jansson' 'gtk3' 'libxv' 'libvdpau' 'nvidia-utils' 'libxext') +options=('staticlibs') +source=(ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${pkgver}.tar.bz2 + libxnvctrl_so.patch) +sha512sums=('a12352c92fd4f56002bda2b07e8cddd5573af98521ec3495cd428b784eb368c9f2cb40f9b4372400ba1ea67c9349c6a9b4f7c218ede2d0d5dabb08325eda9844' + 'ed4b609de9691fbb4421eea340399331e7a5c5f47b9de8eade40ca8f78ac39a6f76cc106928cd0d79825f248a3a0eb563a10f68b7b6991cf3e28db0dde2a0f8d') + +prepare() { + export PREFIX=/usr + export NV_USE_BUNDLED_LIBJANSSON=0 + cd ${pkgbase}-${pkgver} + patch -p1 < "${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' + + 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 libXNVCtrl.a -t "${pkgdir}/usr/lib" + install -Dm 755 libXNVCtrl.so.0.0.0 -t "${pkgdir}/usr/lib" + ln -s libXNVCtrl.so.0.0.0 "${pkgdir}/usr/lib/libXNVCtrl.so.0" + ln -s libXNVCtrl.so.0 "${pkgdir}/usr/lib/libXNVCtrl.so" +} + +# vim: ts=2 sw=2 et: Deleted: extra-x86_64/libxnvctrl_so.patch =================================================================== --- extra-x86_64/libxnvctrl_so.patch 2017-02-16 22:32:41 UTC (rev 289081) +++ extra-x86_64/libxnvctrl_so.patch 2017-02-16 22:32:50 UTC (rev 289082) @@ -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) $(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 289081, nvidia-settings/trunk/libxnvctrl_so.patch) =================================================================== --- extra-x86_64/libxnvctrl_so.patch (rev 0) +++ extra-x86_64/libxnvctrl_so.patch 2017-02-16 22:32:50 UTC (rev 289082) @@ -0,0 +1,67 @@ +--- 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) $(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.*