initial upload

2 files changed, 11 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cfea54ff1463..e8697918f567 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,7 +16,7 @@ pkgbase = nvidia-settings-gtk2
 	makedepends = libxext
 	makedepends = libxnvctl
 	options = staticlibs
-	source = nvidia-settings-gtk2-450.66.tar.gz::https://github.com/NVIDIA/nvidia-settings/archive/450.66.tar.gz
+	source = nvidia-settings-450.66.tar.gz::https://github.com/NVIDIA/nvidia-settings/archive/450.66.tar.gz
 	source = libxnvctrl_so.patch
 	sha512sums = 2f01a7ac516e92f11e9dfe8f07a198f38bace4b9515824bdda3771b0482c6c540b03f614216814a74af2c35675ea5f8af7b62f74fa625cf628333d4636586bb1
 	sha512sums = 91ff94736063b911c83b8876fe3e3778db82e0ffe0102036d81a3a6e872ca44a585914646fcbbbe399cd63aa17685fc7f73263ec4f4084f48768ca4d704037fa
@@ -25,8 +25,9 @@ pkgname = nvidia-settings-gtk2
 	provides = nvidia-settings
 	conflicts = nvidia-settings
 
-pkgname = libxnvctrl
+pkgname = libxnvctrl-gtk2
 	pkgdesc = NVIDIA NV-CONTROL X extension
 	provides = libxnvctl
 	provides = libXNVCtrl.so
+	conflicts = libxnvctl
 
diff --git a/PKGBUILD b/PKGBUILD
index 2451e3cf7901..e94b04f06387 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,7 @@
 # Maintainer: Felix Yan <felixonmars@archlinux.org>
 # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
 
-pkgbase=nvidia-settings-gtk2
-pkgname=('nvidia-settings-gtk2' 'libxnvctrl')
+pkgname=('nvidia-settings-gtk2' 'libxnvctrl-gtk2')
 pkgver=450.66
 pkgrel=1
 pkgdesc='Tool for configuring the NVIDIA graphics driver'
@@ -12,7 +11,7 @@ arch=('x86_64')
 license=('GPL2')
 makedepends=('git' 'inetutils' 'gtk2' 'jansson' 'gtk3' 'libxv' 'libvdpau' 'nvidia-utils' 'libxext' 'libxnvctl')
 options=('staticlibs')
-source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/NVIDIA/nvidia-settings/archive/${pkgver}.tar.gz
+source=(nvidia-settings-${pkgver}.tar.gz::https://github.com/NVIDIA/nvidia-settings/archive/${pkgver}.tar.gz
         libxnvctrl_so.patch)
 sha512sums=('2f01a7ac516e92f11e9dfe8f07a198f38bace4b9515824bdda3771b0482c6c540b03f614216814a74af2c35675ea5f8af7b62f74fa625cf628333d4636586bb1'
             '91ff94736063b911c83b8876fe3e3778db82e0ffe0102036d81a3a6e872ca44a585914646fcbbbe399cd63aa17685fc7f73263ec4f4084f48768ca4d704037fa')
@@ -21,12 +20,12 @@ prepare() {
   export PREFIX=/usr
   export NV_USE_BUNDLED_LIBJANSSON=0
   export OUTPUTDIR=out
-  cd ${pkgbase}-${pkgver}
+  cd nvidia-settings-${pkgver}
   patch -p0 < "${srcdir}/libxnvctrl_so.patch"
 }
 
 build() {
-  cd ${pkgbase}-${pkgver}
+  cd nvidia-settings-${pkgver}
   make
   make -C src/libXNVCtrl
 }
@@ -34,7 +33,7 @@ build() {
 package_nvidia-settings-gtk2() {
   provides=(nvidia-settings)
   conflicts=(nvidia-settings)
-  cd ${pkgbase}-${pkgver}
+  cd nvidia-settings-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -D -m644 doc/nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop"
@@ -44,11 +43,12 @@ package_nvidia-settings-gtk2() {
   rm "$pkgdir/usr/lib/libnvidia-gtk3.so.$pkgver"
 }
 
-package_libxnvctrl() {
+package_libxnvctrl-gtk2() {
   pkgdesc='NVIDIA NV-CONTROL X extension'
   provides=('libxnvctl' 'libXNVCtrl.so')
+  conflicts=('libxnvctl')
 
-  cd ${pkgbase}-${pkgver}
+  cd nvidia-settings-${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"