db-move: moved nvidia-settings from [testing] to [extra] (x86_64)

git-svn-id: file:///srv/repos/svn-packages/svn@369684 eb2447ed-0c53-47e4-bac8-5bc4a241df78

3 files changed, 2 insertions, 100 deletions

diff --git a/nvidia-settings/repos/extra-x86_64/PKGBUILD b/nvidia-settings/repos/extra-x86_64/PKGBUILD
index 80831a20f26..74d03af6456 100644
--- a/nvidia-settings/repos/extra-x86_64/PKGBUILD
+++ b/nvidia-settings/repos/extra-x86_64/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgbase=nvidia-settings
 pkgname=('nvidia-settings' 'libxnvctrl')
-pkgver=440.31
+pkgver=440.36
 pkgrel=1
 pkgdesc='Tool for configuring the NVIDIA graphics driver'
 url='https://github.com/NVIDIA/nvidia-settings'
@@ -14,7 +14,7 @@ makedepends=('git' 'inetutils' 'gtk2' 'jansson' 'gtk3' 'libxv' 'libvdpau' 'nvidi
 options=('staticlibs')
 source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/NVIDIA/nvidia-settings/archive/${pkgver}.tar.gz
         libxnvctrl_so.patch)
-sha512sums=('bf4447808b97fa7ca516f1a33da4d9ec63fa8381c5a393108da4ddf37e9b80f6d39a04f42ee387e196103f09f32f02a3cf214e79d33bfa7edcc260090f3d3cbf'
+sha512sums=('618a8d6e7785a5837a8ededfcb6f76f1eb1b54eb9cad823514475c73e92f917dcc57589e2020b24cef2f76f83a861499c3ff7d65cb427481ff794a8714aac366'
             '91ff94736063b911c83b8876fe3e3778db82e0ffe0102036d81a3a6e872ca44a585914646fcbbbe399cd63aa17685fc7f73263ec4f4084f48768ca4d704037fa')
 
 prepare() {
diff --git a/nvidia-settings/repos/testing-x86_64/PKGBUILD b/nvidia-settings/repos/testing-x86_64/PKGBUILD
deleted file mode 100644
index 74d03af6456..00000000000
--- a/nvidia-settings/repos/testing-x86_64/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro@gmail.com>
-# Maintainer: Felix Yan <felixonmars@archlinux.org>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-
-pkgbase=nvidia-settings
-pkgname=('nvidia-settings' 'libxnvctrl')
-pkgver=440.36
-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=('618a8d6e7785a5837a8ededfcb6f76f1eb1b54eb9cad823514475c73e92f917dcc57589e2020b24cef2f76f83a861499c3ff7d65cb427481ff794a8714aac366'
-            '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:' -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:
diff --git a/nvidia-settings/repos/testing-x86_64/libxnvctrl_so.patch b/nvidia-settings/repos/testing-x86_64/libxnvctrl_so.patch
deleted file mode 100644
index 664ab98225f..00000000000
--- a/nvidia-settings/repos/testing-x86_64/libxnvctrl_so.patch
+++ /dev/null
@@ -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)