[arch-commits] Commit in libxnvctrl/repos (6 files)
Martin Wimpress
flexiondotorg at nymeria.archlinux.org
Tue Apr 29 12:32:52 UTC 2014
Date: Tuesday, April 29, 2014 @ 14:32:52
Author: flexiondotorg
Revision: 110422
archrelease: copy trunk to community-i686, community-x86_64
Added:
libxnvctrl/repos/community-i686/PKGBUILD
(from rev 110421, libxnvctrl/trunk/PKGBUILD)
libxnvctrl/repos/community-x86_64/PKGBUILD
(from rev 110421, libxnvctrl/trunk/PKGBUILD)
Deleted:
libxnvctrl/repos/community-i686/10_libxnvctrl_so_0.diff
libxnvctrl/repos/community-i686/PKGBUILD
libxnvctrl/repos/community-x86_64/10_libxnvctrl_so_0.diff
libxnvctrl/repos/community-x86_64/PKGBUILD
------------------------------------------+
/PKGBUILD | 56 +++++++++++++++++++++++++++++
community-i686/10_libxnvctrl_so_0.diff | 55 ----------------------------
community-i686/PKGBUILD | 37 -------------------
community-x86_64/10_libxnvctrl_so_0.diff | 55 ----------------------------
community-x86_64/PKGBUILD | 37 -------------------
5 files changed, 56 insertions(+), 184 deletions(-)
Deleted: community-i686/10_libxnvctrl_so_0.diff
===================================================================
--- community-i686/10_libxnvctrl_so_0.diff 2014-04-29 12:32:44 UTC (rev 110421)
+++ community-i686/10_libxnvctrl_so_0.diff 2014-04-29 12:32:52 UTC (rev 110422)
@@ -1,55 +0,0 @@
-Author: Andreas Beckmann <debian at abeckmann.de>
-Description: build a shared library for libXNVCtrl
-Bug-Debian: http://bugs.debian.org/666909
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -79,6 +79,9 @@
-
- XNVCTRL_DIR ?= libXNVCtrl
- XNVCTRL_ARCHIVE ?= $(XNVCTRL_DIR)/libXNVCtrl.a
-+XNVCTRL_SHARED ?= $(XNVCTRL_DIR)/libXNVCtrl.so.0
-+#XNVCTRL_LIB ?= $(XNVCTRL_ARCHIVE)
-+XNVCTRL_LIB ?= $(XNVCTRL_SHARED)
- XCONFIG_PARSER_DIR ?= XF86Config-parser
- COMMON_UTILS_DIR ?= common-utils
- COMMON_UNIX_DIR ?= common-unix
-@@ -179,9 +182,12 @@
- $(MKDIR) $(BINDIR)
- $(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
-
--$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE)
-+$(XNVCTRL_ARCHIVE) $(XNVCTRL_SHARED):
-+ $(MAKE) -C $(XNVCTRL_DIR)
-+
-+$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_LIB)
- $(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) -o $@ $(OBJS) \
-- $(XNVCTRL_ARCHIVE) $(LIBS)
-+ $(XNVCTRL_LIB) $(LIBS)
- $(call quiet_cmd,STRIP_CMD) $@
-
- # define the rule to build each object file
---- a/src/libXNVCtrl/Makefile
-+++ b/src/libXNVCtrl/Makefile
-@@ -22,12 +22,21 @@
- RANLIB ?= ranlib
- CFLAGS += -fPIC
-
-+all: libXNVCtrl.a libXNVCtrl.so
-+
- libXNVCtrl.a : libXNVCtrl.a(NVCtrl.o)
- $(RANLIB) $@
-
-+libXNVCtrl.so: NVCtrl.o
-+ $(RM) $@ $@.*
-+ $(CC) -shared -Wl,-soname=$@.0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11
-+ ln -s $@.0.0.0 $@.0
-+ ln -s $@.0 $@
-+
- NVCtrl.o : NVCtrl.h nv_control.h NVCtrlLib.h
- .INTERMEDIATE: NVCtrl.o
-
- clean ::
- rm -f libXNVCtrl.a *.o
-+ rm -f libXNVCtrl.so libXNVCtrl.so.*
- .PHONY: clean
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-04-29 12:32:44 UTC (rev 110421)
+++ community-i686/PKGBUILD 2014-04-29 12:32:52 UTC (rev 110422)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Martin Wimpress <code at flexion.org>
-
-pkgname=libxnvctrl
-pkgver=334.21
-pkgrel=1
-pkgdesc="NVIDIA X Ctrl library"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-license=('GPL2')
-depends=('libxext')
-source=("http://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${pkgver}.tar.bz2"
- "10_libxnvctrl_so_0.diff")
-sha1sums=('eb2ec2257a0401c3c6494f31160d0fa378f638d8'
- '84146494a08d4b691e2cff84d1551210eee584dd')
-
-prepare() {
- cd "nvidia-settings-$pkgver"
- patch -Np1 -i "${srcdir}/10_libxnvctrl_so_0.diff"
-}
-
-build() {
- cd "nvidia-settings-$pkgver/src/libXNVCtrl"
- make clean
- make
-}
-
-package() {
- cd "nvidia-settings-$pkgver/src/libXNVCtrl"
- # install libXNVCtrl and headers
- install -d -m 755 "$pkgdir"/usr/{include/NVCtrl,lib}
- install -m 644 nv_control.h NVCtrl{,Lib}.h "$pkgdir"/usr/include/NVCtrl/
- install -m 644 libXNVCtrl.so.0.0.0 "$pkgdir"/usr/lib/
- cd "$pkgdir"/usr/lib/
- ln -s libXNVCtrl.so.0.0.0 libXNVCtrl.so.0
- ln -s libXNVCtrl.so.0 libXNVCtrl.so
-}
Copied: libxnvctrl/repos/community-i686/PKGBUILD (from rev 110421, libxnvctrl/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-04-29 12:32:52 UTC (rev 110422)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Martin Wimpress <code at flexion.org>
+
+pkgname=libxnvctrl
+pkgver=337.12
+pkgrel=1
+pkgdesc="NVIDIA X Ctrl library"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+license=('GPL2')
+makedepends=('libxext')
+options=('staticlibs')
+source=("http://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${pkgver}.tar.bz2")
+sha1sums=('d416d8f629576a821f4829d592eda84304e4f743')
+
+build() {
+ cd "nvidia-settings-$pkgver/src/libXNVCtrl"
+ make clean
+ make
+}
+
+package() {
+ cd "nvidia-settings-$pkgver/src/libXNVCtrl"
+ # install libXNVCtrl and headers
+ install -d -m 755 "$pkgdir"/usr/{include/NVCtrl,lib}
+ install -m 644 nv_control.h NVCtrl{,Lib}.h "$pkgdir"/usr/include/NVCtrl/
+ install -m 644 libXNVCtrl.a "$pkgdir"/usr/lib/libXNVCtrl.a
+}
Deleted: community-x86_64/10_libxnvctrl_so_0.diff
===================================================================
--- community-x86_64/10_libxnvctrl_so_0.diff 2014-04-29 12:32:44 UTC (rev 110421)
+++ community-x86_64/10_libxnvctrl_so_0.diff 2014-04-29 12:32:52 UTC (rev 110422)
@@ -1,55 +0,0 @@
-Author: Andreas Beckmann <debian at abeckmann.de>
-Description: build a shared library for libXNVCtrl
-Bug-Debian: http://bugs.debian.org/666909
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -79,6 +79,9 @@
-
- XNVCTRL_DIR ?= libXNVCtrl
- XNVCTRL_ARCHIVE ?= $(XNVCTRL_DIR)/libXNVCtrl.a
-+XNVCTRL_SHARED ?= $(XNVCTRL_DIR)/libXNVCtrl.so.0
-+#XNVCTRL_LIB ?= $(XNVCTRL_ARCHIVE)
-+XNVCTRL_LIB ?= $(XNVCTRL_SHARED)
- XCONFIG_PARSER_DIR ?= XF86Config-parser
- COMMON_UTILS_DIR ?= common-utils
- COMMON_UNIX_DIR ?= common-unix
-@@ -179,9 +182,12 @@
- $(MKDIR) $(BINDIR)
- $(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
-
--$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE)
-+$(XNVCTRL_ARCHIVE) $(XNVCTRL_SHARED):
-+ $(MAKE) -C $(XNVCTRL_DIR)
-+
-+$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_LIB)
- $(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) -o $@ $(OBJS) \
-- $(XNVCTRL_ARCHIVE) $(LIBS)
-+ $(XNVCTRL_LIB) $(LIBS)
- $(call quiet_cmd,STRIP_CMD) $@
-
- # define the rule to build each object file
---- a/src/libXNVCtrl/Makefile
-+++ b/src/libXNVCtrl/Makefile
-@@ -22,12 +22,21 @@
- RANLIB ?= ranlib
- CFLAGS += -fPIC
-
-+all: libXNVCtrl.a libXNVCtrl.so
-+
- libXNVCtrl.a : libXNVCtrl.a(NVCtrl.o)
- $(RANLIB) $@
-
-+libXNVCtrl.so: NVCtrl.o
-+ $(RM) $@ $@.*
-+ $(CC) -shared -Wl,-soname=$@.0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11
-+ ln -s $@.0.0.0 $@.0
-+ ln -s $@.0 $@
-+
- NVCtrl.o : NVCtrl.h nv_control.h NVCtrlLib.h
- .INTERMEDIATE: NVCtrl.o
-
- clean ::
- rm -f libXNVCtrl.a *.o
-+ rm -f libXNVCtrl.so libXNVCtrl.so.*
- .PHONY: clean
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-04-29 12:32:44 UTC (rev 110421)
+++ community-x86_64/PKGBUILD 2014-04-29 12:32:52 UTC (rev 110422)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Martin Wimpress <code at flexion.org>
-
-pkgname=libxnvctrl
-pkgver=334.21
-pkgrel=1
-pkgdesc="NVIDIA X Ctrl library"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-license=('GPL2')
-depends=('libxext')
-source=("http://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${pkgver}.tar.bz2"
- "10_libxnvctrl_so_0.diff")
-sha1sums=('eb2ec2257a0401c3c6494f31160d0fa378f638d8'
- '84146494a08d4b691e2cff84d1551210eee584dd')
-
-prepare() {
- cd "nvidia-settings-$pkgver"
- patch -Np1 -i "${srcdir}/10_libxnvctrl_so_0.diff"
-}
-
-build() {
- cd "nvidia-settings-$pkgver/src/libXNVCtrl"
- make clean
- make
-}
-
-package() {
- cd "nvidia-settings-$pkgver/src/libXNVCtrl"
- # install libXNVCtrl and headers
- install -d -m 755 "$pkgdir"/usr/{include/NVCtrl,lib}
- install -m 644 nv_control.h NVCtrl{,Lib}.h "$pkgdir"/usr/include/NVCtrl/
- install -m 644 libXNVCtrl.so.0.0.0 "$pkgdir"/usr/lib/
- cd "$pkgdir"/usr/lib/
- ln -s libXNVCtrl.so.0.0.0 libXNVCtrl.so.0
- ln -s libXNVCtrl.so.0 libXNVCtrl.so
-}
Copied: libxnvctrl/repos/community-x86_64/PKGBUILD (from rev 110421, libxnvctrl/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-04-29 12:32:52 UTC (rev 110422)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Martin Wimpress <code at flexion.org>
+
+pkgname=libxnvctrl
+pkgver=337.12
+pkgrel=1
+pkgdesc="NVIDIA X Ctrl library"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+license=('GPL2')
+makedepends=('libxext')
+options=('staticlibs')
+source=("http://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${pkgver}.tar.bz2")
+sha1sums=('d416d8f629576a821f4829d592eda84304e4f743')
+
+build() {
+ cd "nvidia-settings-$pkgver/src/libXNVCtrl"
+ make clean
+ make
+}
+
+package() {
+ cd "nvidia-settings-$pkgver/src/libXNVCtrl"
+ # install libXNVCtrl and headers
+ install -d -m 755 "$pkgdir"/usr/{include/NVCtrl,lib}
+ install -m 644 nv_control.h NVCtrl{,Lib}.h "$pkgdir"/usr/include/NVCtrl/
+ install -m 644 libXNVCtrl.a "$pkgdir"/usr/lib/libXNVCtrl.a
+}
More information about the arch-commits
mailing list