summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--libxnvctrl_so.patch39
3 files changed, 35 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4ad7dd445f8c..c169490e4ab9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = nvidia-340xx-settings
pkgdesc = Tool for configuring the NVIDIA graphics driver, 340xx legacy branch
pkgver = 340.108
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/NVIDIA/nvidia-settings
arch = x86_64
license = GPL2
@@ -18,7 +18,7 @@ pkgbase = nvidia-340xx-settings
source = nvidia-settings-340.108.tar.gz::https://github.com/NVIDIA/nvidia-settings/archive/340.108.tar.gz
source = libxnvctrl_so.patch
sha512sums = 9b940382eeea6658bb9adcf8cc9abc7cfe73a69644092cd2c48e1443e2ab95ec65b53623bf7baf09a1193edd50ec25dc7ccdc5e74f0bb4b1beb4ab49ed936cb1
- sha512sums = 4d39721610adc54d272b0bbb4e9cd5edd29c0c1250c2ccb6c19927703bb3bc95fd826ffb24f3134af3ba0428f6fb400afeb9e3e1cb9b33f1ce59ea64885e5ddf
+ sha512sums = 606346c3f24affb0a0b115999b4187e4149c19b249527d20cc76bd5db82048e357e996495a5f38683cc90e6f8058452980ff378d5fa0b3d1b5546101240df57c
pkgname = nvidia-340xx-settings
depends = jansson
diff --git a/PKGBUILD b/PKGBUILD
index 5e3860a2e584..0f4bb91a1946 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=nvidia-340xx-settings
pkgname=('nvidia-340xx-settings' 'libxnvctrl-340xx')
pkgver=340.108
-pkgrel=1
+pkgrel=2
pkgdesc='Tool for configuring the NVIDIA graphics driver, 340xx legacy branch'
url='https://github.com/NVIDIA/nvidia-settings'
arch=('x86_64')
@@ -13,7 +13,7 @@ options=('staticlibs')
source=(nvidia-settings-${pkgver}.tar.gz::https://github.com/NVIDIA/nvidia-settings/archive/${pkgver}.tar.gz
libxnvctrl_so.patch)
sha512sums=('9b940382eeea6658bb9adcf8cc9abc7cfe73a69644092cd2c48e1443e2ab95ec65b53623bf7baf09a1193edd50ec25dc7ccdc5e74f0bb4b1beb4ab49ed936cb1'
- '4d39721610adc54d272b0bbb4e9cd5edd29c0c1250c2ccb6c19927703bb3bc95fd826ffb24f3134af3ba0428f6fb400afeb9e3e1cb9b33f1ce59ea64885e5ddf')
+ '606346c3f24affb0a0b115999b4187e4149c19b249527d20cc76bd5db82048e357e996495a5f38683cc90e6f8058452980ff378d5fa0b3d1b5546101240df57c')
prepare() {
export PREFIX=/usr
diff --git a/libxnvctrl_so.patch b/libxnvctrl_so.patch
index b09ab0159142..27d508e4f054 100644
--- a/libxnvctrl_so.patch
+++ b/libxnvctrl_so.patch
@@ -1,6 +1,6 @@
-diff -ru nvidia-settings-340.104/src/libXNVCtrl/Makefile nvidia-settings-340.104-patched/src/libXNVCtrl/Makefile
---- nvidia-settings-340.104/src/libXNVCtrl/Makefile 2017-09-19 18:35:55.000000000 +0200
-+++ nvidia-settings-340.104-patched/src/libXNVCtrl/Makefile 2018-06-09 08:12:48.643147441 +0200
+diff -ru a/src/libXNVCtrl/Makefile b/src/libXNVCtrl/Makefile
+--- a/src/libXNVCtrl/Makefile 2017-09-19 18:35:55.000000000 +0200
++++ b/src/libXNVCtrl/Makefile 2018-06-09 08:12:48.643147441 +0200
@@ -55,10 +55,17 @@
.PHONY: clean
@@ -19,10 +19,9 @@ diff -ru nvidia-settings-340.104/src/libXNVCtrl/Makefile nvidia-settings-340.104
# define the rule to build each object file
$(foreach src,$(SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
-Only in nvidia-settings-340.104-patched/src/libXNVCtrl: _out
-diff -ru nvidia-settings-340.104/src/Makefile nvidia-settings-340.104-patched/src/Makefile
---- nvidia-settings-340.104/src/Makefile 2017-09-19 18:35:55.000000000 +0200
-+++ nvidia-settings-340.104-patched/src/Makefile 2018-06-09 08:16:48.837588597 +0200
+diff -ru a/src/Makefile b/src/Makefile
+--- a/src/Makefile 2017-09-19 18:35:55.000000000 +0200
++++ b/src/Makefile 2018-06-09 08:16:48.837588597 +0200
@@ -84,6 +84,8 @@
XNVCTRL_DIR ?= libXNVCtrl
XNVCTRL_MAKEFILE ?= Makefile
@@ -53,4 +52,28 @@ diff -ru nvidia-settings-340.104/src/Makefile nvidia-settings-340.104-patched/sr
build-xnvctrl:
@$(MAKE) -C $(XNVCTRL_DIR) -f $(XNVCTRL_MAKEFILE)
-Only in nvidia-settings-340.104-patched/src: _out
+
+diff -ru a/src/gtk+-2.x/ctkvdpau.c b/src/gtk+-2.x/ctkvdpau.c
+--- a/src/gtk+-2.x/ctkvdpau.c
++++ b/src/gtk+-2.x/ctkvdpau.c
+@@ -103,6 +103,8 @@
+ const gchar* __video_mixer_attribute_help =
+ "This shows the video mixer attributes and any applicable ranges.";
+
++struct VDPAUDeviceImpl VDPAUDeviceFunctions;
++
+ static int queryOutputSurface(CtkVDPAU *ctk_vdpau, VdpDevice device,
+ VdpGetProcAddress *getProcAddress);
+
+diff -ru a/src/gtk+-2.x/ctkvdpau.h b/src/gtk+-2.x/ctkvdpau.h
+--- a/src/gtk+-2.x/ctkvdpau.h
++++ b/src/gtk+-2.x/ctkvdpau.h
+@@ -46,7 +46,7 @@
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), CTK_TYPE_VDPAU, CtkVDPAUClass))
+
+
+-struct VDPAUDeviceImpl {
++extern struct VDPAUDeviceImpl {
+
+ VdpGetErrorString *GetErrorString;
+ VdpGetProcAddress *GetProcAddress;