diff options
12 files changed, 135 insertions, 635 deletions
diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog index 0a237d1b658d..b0d44b1cb77d 100644 --- a/media-video/nvidia-settings/ChangeLog +++ b/media-video/nvidia-settings/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for media-video/nvidia-settings # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.124 2013/04/15 08:50:07 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.125 2013/04/20 20:43:55 idl0r Exp $ + +*nvidia-settings-319.12 (20 Apr 2013) +*nvidia-settings-173.14.37 (20 Apr 2013) + + 20 Apr 2013; Christian Ruppert <idl0r@gentoo.org> + -nvidia-settings-173.14.31.ebuild, +nvidia-settings-173.14.37.ebuild, + -nvidia-settings-260.19.29.ebuild, -nvidia-settings-275.43.ebuild, + -nvidia-settings-290.10.ebuild, -nvidia-settings-295.20.ebuild, + -nvidia-settings-295.40.ebuild, -nvidia-settings-302.11.ebuild, + -nvidia-settings-310.19.ebuild, +nvidia-settings-319.12.ebuild, + -files/0001-Makefile-improvements.patch, + +files/nvidia-settings-319.12-jansson.patch, + -files/0002-Build-libNVCtrl-with-PIC.patch: + Remove old 2xx series ebuilds. Version bumps. 15 Apr 2013; Agostino Sarubbo <ago@gentoo.org> nvidia-settings-304.60.ebuild: Stable for x86, wrt bug #443594 diff --git a/media-video/nvidia-settings/files/0001-Makefile-improvements.patch b/media-video/nvidia-settings/files/0001-Makefile-improvements.patch deleted file mode 100644 index 66ba5e2eec8a..000000000000 --- a/media-video/nvidia-settings/files/0001-Makefile-improvements.patch +++ /dev/null @@ -1,160 +0,0 @@ -From a396eaa80e13c0397c7802ce628715d8daa581f4 Mon Sep 17 00:00:00 2001 -From: Christian Ruppert <idl0r@gentoo.org> -Date: Fri, 17 Feb 2012 05:40:53 +0100 -Subject: [PATCH] Makefile improvements - -Do not abuse LDFLAGS. -Fix *FLAGS order, *FLAGS before objects and LIBS behind objects. -Capitalize MANDIR, BINDIR and PREFIX. ---- - Makefile | 29 ++++++++++++++++------------- - samples/Makefile | 4 ++-- - utils.mk | 18 ++++++++---------- - 3 files changed, 26 insertions(+), 25 deletions(-) - -diff --git a/Makefile b/Makefile -index a1f5235..60314f0 100644 ---- a/Makefile -+++ b/Makefile -@@ -49,7 +49,11 @@ ifndef GTK_CFLAGS - endif - - ifndef GTK_LDFLAGS -- GTK_LDFLAGS := $(shell $(PKG_CONFIG) --libs gtk+-2.0) -+ GTK_LDFLAGS := $(shell $(PKG_CONFIG) --libs-only-L gtk+-2.0) -+endif -+ -+ifndef GTK_LIBS -+ GTK_LIBS := $(shell $(PKG_CONFIG) --libs-only-l gtk+-2.0) - endif - - -@@ -93,14 +97,13 @@ LDFLAGS += $(X_LDFLAGS) - # when building nvidia-settings within the NVIDIA driver build, but - # dynamically link against libXxf86vm in the public builds. - ifdef NV_LINK_LIBXXF86VM_STATICALLY -- LDFLAGS += -Wl,-Bstatic -lXxf86vm -Wl,-Bdynamic -+ LIBS += -Wl,-Bstatic -lXxf86vm -Wl,-Bdynamic - else -- LDFLAGS += -lXxf86vm -+ LIBS += -lXxf86vm - endif - --LDFLAGS += -lX11 -lXext -lm -+LIBS += -lX11 -lXext -lm $(GTK_LIBS) $(LIBDL_LIBS) - LDFLAGS += $(GTK_LDFLAGS) --LDFLAGS += $(LIBDL_LDFLAGS) - - MANPAGE_GZIP ?= 1 - -@@ -152,16 +155,16 @@ all: $(NVIDIA_SETTINGS) $(MANPAGE) - install: NVIDIA_SETTINGS_install MANPAGE_install - - NVIDIA_SETTINGS_install: $(NVIDIA_SETTINGS) -- $(MKDIR) $(bindir) -- $(INSTALL) $(INSTALL_BIN_ARGS) $< $(bindir)/$(notdir $<) -+ $(MKDIR) $(BINDIR) -+ $(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<) - - MANPAGE_install: $(MANPAGE) -- $(MKDIR) $(mandir) -- $(INSTALL) $(INSTALL_BIN_ARGS) $< $(mandir)/$(notdir $<) -+ $(MKDIR) $(MANDIR) -+ $(INSTALL) $(INSTALL_BIN_ARGS) $< $(MANDIR)/$(notdir $<) - - $(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE) -- $(call quiet_cmd,LINK) -o $@ $(OBJS) $(XNVCTRL_ARCHIVE) \ -- $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) -+ $(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) -o $@ $(OBJS) \ -+ $(XNVCTRL_ARCHIVE) $(LIBS) - $(call quiet_cmd,STRIP_CMD) $@ - - # define the rule to build each object file -@@ -193,8 +196,8 @@ GEN_MANPAGE_OPTS_OBJS = \ - $(call BUILD_MANPAGE_OBJECT_LIST,$(GEN_MANPAGE_OPTS_SRC)) - - $(GEN_MANPAGE_OPTS): $(GEN_MANPAGE_OPTS_OBJS) -- $(call quiet_cmd,HOST_LINK) $(GEN_MANPAGE_OPTS_OBJS) -o $@ \ -- $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_BIN_LDFLAGS) -+ $(call quiet_cmd,HOST_LINK) $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_BIN_LDFLAGS) \ -+ $(GEN_MANPAGE_OPTS_OBJS) -o $@ - - # define a rule to build each GEN_MANPAGE_OPTS object file - $(foreach src,$(GEN_MANPAGE_OPTS_SRC),\ -diff --git a/samples/Makefile b/samples/Makefile -index 35be348..ea67106 100644 ---- a/samples/Makefile -+++ b/samples/Makefile -@@ -55,7 +55,7 @@ CFLAGS += -I $(LIBXNVCTRL_DIR) - - LDFLAGS += $(X_LDFLAGS) - LDFLAGS += -L $(LIBXNVCTRL_DIR) --LDFLAGS += -lXNVCtrl -lXext -lX11 -+LIBS += -lXNVCtrl -lXext -lX11 - - - ############################################################################## -@@ -84,7 +84,7 @@ $(foreach src, $(SAMPLE_SOURCES), $(eval $(call DEFINE_OBJECT_RULE,CC,$(src)))) - # define the rule to link each sample app from its corresponding object file - define link_sample_from_object - $$(OUTPUTDIR)/$(1:.c=): $$(call BUILD_OBJECT_LIST,$(1)) -- $$(call quiet_cmd,LINK) $$(CFLAGS) -o $$@ $$< $$(LDFLAGS) $$(BIN_LDFLAGS) -+ $$(call quiet_cmd,LINK) $$(CFLAGS) $$(LDFLAGS) $$(BIN_LDFLAGS) -o $$@ $$< $$(LIBS) - all:: $$(OUTPUTDIR)/$(1:.c=) - SAMPLES += $$(OUTPUTDIR)/$(1:.c=) - endef -diff --git a/utils.mk b/utils.mk -index 32014a3..4c13b6a 100644 ---- a/utils.mk -+++ b/utils.mk -@@ -28,9 +28,8 @@ - - CC ?= gcc - LD ?= ld --CFLAGS ?= --CFLAGS += -Wall -fno-strict-aliasing -Wno-unused-parameter --CFLAGS += -O2 -fno-omit-frame-pointer -+CFLAGS ?= -Wall -Wno-unused-parameter -O2 -+CFLAGS += -fno-strict-aliasing -fno-omit-frame-pointer - CC_ONLY_CFLAGS ?= - LDFLAGS ?= - BIN_LDFLAGS ?= -@@ -93,9 +92,9 @@ ifndef TARGET_ARCH - endif - - ifeq ($(TARGET_OS),Linux) -- LIBDL_LDFLAGS = -ldl -+ LIBDL_LIBS = -ldl - else -- LIBDL_LDFLAGS = -+ LIBDL_LIBS = - endif - - OUTPUTDIR ?= _out/$(TARGET_OS)_$(TARGET_ARCH) -@@ -124,11 +123,10 @@ endif - # the source tarball - ############################################################################## - --prefix = /usr/local -+PREFIX ?= /usr/local - --exec_prefix = $(prefix) --bindir = $(exec_prefix)/bin --mandir = $(exec_prefix)/share/man/man1 -+BINDIR = $(DESTDIR)$(PREFIX)/bin -+MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1 - - - ############################################################################## -@@ -260,7 +258,7 @@ BUILD_DEPENDENCY_LIST = \ - define DEFINE_OBJECT_RULE_WITH_OBJECT_NAME - $(3): $(2) - @$(MKDIR) $(OUTPUTDIR) -- $$(call quiet_cmd,$(1)) -c $$< -o $$@ $$(CFLAGS) \ -+ $$(call quiet_cmd,$(1)) $$(CFLAGS) -c $$< -o $$@ \ - $(call AUTO_DEP_CMD,$(1),$(2),$(3)) - - -include $$(call BUILD_DEPENDENCY_LIST,$(3)) --- -1.7.3.4 - diff --git a/media-video/nvidia-settings/files/0002-Build-libNVCtrl-with-PIC.patch b/media-video/nvidia-settings/files/0002-Build-libNVCtrl-with-PIC.patch deleted file mode 100644 index b62ddf9f5a48..000000000000 --- a/media-video/nvidia-settings/files/0002-Build-libNVCtrl-with-PIC.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c307d4878e17be16c1dcc1a6e15231d8e984b259 Mon Sep 17 00:00:00 2001 -From: Christian Ruppert <idl0r@gentoo.org> -Date: Fri, 17 Feb 2012 18:01:43 +0100 -Subject: [PATCH 2/2] Build libNVCtrl with PIC - ---- - src/libXNVCtrl/Makefile | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/src/libXNVCtrl/Makefile b/src/libXNVCtrl/Makefile -index 15b03cc..d40ec01 100644 ---- a/src/libXNVCtrl/Makefile -+++ b/src/libXNVCtrl/Makefile -@@ -20,6 +20,7 @@ - # SOFTWARE. - - RANLIB ?= ranlib -+CFLAGS += -fPIC - - libXNVCtrl.a : libXNVCtrl.a(NVCtrl.o) - $(RANLIB) $@ --- -1.7.3.4 - diff --git a/media-video/nvidia-settings/files/nvidia-settings-319.12-jansson.patch b/media-video/nvidia-settings/files/nvidia-settings-319.12-jansson.patch new file mode 100644 index 000000000000..586da92bc93e --- /dev/null +++ b/media-video/nvidia-settings/files/nvidia-settings-319.12-jansson.patch @@ -0,0 +1,94 @@ +From af5353c68481d64ebe56e4d10f8ab8502ffcd172 Mon Sep 17 00:00:00 2001 +From: Christian Ruppert <idl0r@gentoo.org> +Date: Sat, 20 Apr 2013 22:40:28 +0200 +Subject: [PATCH] Make Jansson optional + + +Signed-off-by: Christian Ruppert <idl0r@gentoo.org> +--- + src/Makefile | 17 ++++++++++++----- + src/src.mk | 2 ++ + utils.mk | 2 ++ + 3 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index c5da53a..cb9d173 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -59,11 +59,15 @@ ifndef VDPAU_CFLAGS + endif + endif + +-ifndef JANSSON_CFLAGS +- JANSSON_CFLAGS = -Wno-cast-qual +- ifeq ($(TARGET_ARCH),armv7l) +- JANSSON_CFLAGS += -Wno-unused-but-set-variable ++ifeq ($(USE_EXTERNAL_JANSSON),0) ++ ifndef JANSSON_CFLAGS ++ JANSSON_CFLAGS = -Wno-cast-qual ++ ifeq ($(TARGET_ARCH),armv7l) ++ JANSSON_CFLAGS += -Wno-unused-but-set-variable ++ endif + endif ++else ++ LIBS += -ljansson + endif + + ############################################################################## +@@ -153,7 +157,9 @@ CFLAGS += -I $(XCONFIG_PARSER_DIR)/.. + CFLAGS += -I libXNVCtrlAttributes + CFLAGS += -I xpm_data + CFLAGS += -I gtk+-2.x ++ifeq ($(USE_EXTERNAL_JANSSON),0) + CFLAGS += -I jansson ++endif + CFLAGS += -I $(COMMON_UTILS_DIR) + CFLAGS += -I $(VIRTUAL_RESOLUTIONS_DIR) + CFLAGS += -I $(OUTPUTDIR) +@@ -162,8 +168,9 @@ CFLAGS += -DPROGRAM_NAME=\"nvidia-setttings\" + + $(call BUILD_OBJECT_LIST,$(GTK_SRC)): CFLAGS += $(GTK_CFLAGS) + ++ifeq ($(USE_EXTERNAL_JANSSON),0) + $(call BUILD_OBJECT_LIST,$(JANSSON_SRC)): CFLAGS += $(JANSSON_CFLAGS) +- ++endif + + ############################################################################## + # build rules +diff --git a/src/src.mk b/src/src.mk +index 327b41b..0ffd7d6 100644 +--- a/src/src.mk ++++ b/src/src.mk +@@ -276,6 +276,7 @@ NVIDIA_SETTINGS_EXTRA_DIST += $(GTK_EXTRA_DIST) + # + # files in the src/jansson directory of nvidia-settings + # ++ifeq ($(USE_EXTERNAL_JANSSON),0) + JANSSON_SRC += jansson/load.c + JANSSON_SRC += jansson/value.c + JANSSON_SRC += jansson/pack_unpack.c +@@ -297,6 +298,7 @@ JANSSON_EXTRA_DIST += jansson/hashtable.h + JANSSON_EXTRA_DIST += jansson/jansson_private.h + + NVIDIA_SETTINGS_EXTRA_DIST += $(JANSSON_EXTRA_DIST) ++endif + + NVIDIA_SETTINGS_DIST_FILES += $(NVIDIA_SETTINGS_SRC) + NVIDIA_SETTINGS_DIST_FILES += $(NVIDIA_SETTINGS_EXTRA_DIST) +diff --git a/utils.mk b/utils.mk +index 54b76d6..29e06a9 100644 +--- a/utils.mk ++++ b/utils.mk +@@ -74,6 +74,8 @@ CHMOD ?= chmod + NV_AUTO_DEPEND ?= 1 + NV_VERBOSE ?= 0 + ++USE_EXTERNAL_JANSSON ?= 0 ++ + ifndef TARGET_OS + TARGET_OS := $(shell uname) + endif +-- +1.8.1.5 + diff --git a/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild b/media-video/nvidia-settings/nvidia-settings-173.14.37.ebuild index fe6d78390333..103c8abb282c 100644 --- a/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-173.14.37.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild,v 1.4 2012/07/24 17:54:10 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-173.14.37.ebuild,v 1.1 2013/04/20 20:43:55 idl0r Exp $ EAPI=4 @@ -37,7 +37,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" src_prepare() { - epatch "${FILESDIR}/${P}-Makefile.patch" + epatch "${FILESDIR}/${PN}-173.14.31-Makefile.patch" } src_compile() { diff --git a/media-video/nvidia-settings/nvidia-settings-260.19.29.ebuild b/media-video/nvidia-settings/nvidia-settings-260.19.29.ebuild deleted file mode 100644 index 9272f10e729a..000000000000 --- a/media-video/nvidia-settings/nvidia-settings-260.19.29.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-260.19.29.ebuild,v 1.7 2012/05/05 08:58:51 jdhore Exp $ - -EAPI=2 - -inherit eutils toolchain-funcs multilib flag-o-matic - -DESCRIPTION="NVIDIA Linux X11 Settings Utility" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* amd64 x86 ~x86-fbsd" -IUSE="" - -# xorg-server is used in the depends as nvidia-settings builds against some -# headers in /usr/include/xorg/. -# This also allows us to optimize out a lot of the other dependancies, as -# between gtk and xorg-server, almost all libraries and headers are accounted -# for. -DEPEND="x11-libs/gtk+:2 - virtual/pkgconfig - x11-base/xorg-server - x11-libs/libXt - x11-libs/libXv - x11-libs/pango[X] - x11-proto/xf86driproto - x11-proto/xf86vidmodeproto" - -RDEPEND="x11-libs/gtk+:2 - x11-base/xorg-server - x11-libs/libXt - x11-libs/pango[X] - =x11-drivers/nvidia-drivers-2*" - -src_prepare() { - sed -i -e "s#prefix = .*#prefix = ${D}/usr#" utils.mk -} - -src_compile() { - einfo "Building libXNVCtrl..." - cd "${S}/src/libXNVCtrl" - emake clean || die "Cleaning old libXNVCtrl failed" - append-flags -fPIC - emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!" - filter-flags -fPIC - - # cd "${S}" - #einfo "Building nVidia-Settings..." - #emake CC="$(tc-getCC)" STRIP_CMD=/bin/true || die "Failed to build nvidia-settings" -} - -src_install() { - #emake STRIP_CMD=/bin/true install || die - - # Install libXNVCtrl and headers - insinto "/usr/$(get_libdir)" - doins src/libXNVCtrl/libXNVCtrl.a - insinto /usr/include/NVCtrl - doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h - - # Install icon and .desktop entry - #doicon "${FILESDIR}/icon/${PN}.png" - #domenu "${FILESDIR}/icon/${PN}.desktop" - - # Now install documentation - dodoc doc/*.txt -} diff --git a/media-video/nvidia-settings/nvidia-settings-275.43.ebuild b/media-video/nvidia-settings/nvidia-settings-275.43.ebuild deleted file mode 100644 index 9ae8bc950207..000000000000 --- a/media-video/nvidia-settings/nvidia-settings-275.43.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.43.ebuild,v 1.8 2012/05/05 14:37:26 idl0r Exp $ - -EAPI=4 - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="NVIDIA Linux X11 Settings Utility" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="examples" - -COMMON_DEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/gtk+:2 - x11-libs/gdk-pixbuf[X] - media-libs/mesa - x11-libs/pango[X] - x11-libs/libXv - x11-libs/libXrandr - dev-libs/glib:2" - -RDEPEND="=x11-drivers/nvidia-drivers-2* - || ( >=x11-drivers/nvidia-drivers-295.33 <x11-drivers/nvidia-drivers-295.33[-gtk] ) - ${COMMON_DEPEND}" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-proto/xproto" - -src_prepare() { - epatch "${FILESDIR}/0001-Makefile-improvements.patch" - epatch "${FILESDIR}/0002-Build-libNVCtrl-with-PIC.patch" - - # The PM does it for us - sed -i -e 's:^\(MANPAGE_GZIP ?=\) 1:\1 0:' Makefile || die -} - -src_compile() { - einfo "Building libXNVCtrl..." - emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :( - emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a - - einfo "Building nvidia-settings..." - emake CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1 -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - - # Install libXNVCtrl and headers - insinto /usr/$(get_libdir) - doins src/libXNVCtrl/libXNVCtrl.a - - insinto /usr/include/NVCtrl - doins src/libXNVCtrl/*.h - - # Install icon and .desktop entry -# doicon doc/${PN}.png # Installed through nvidia-drivers - make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application - - # bug 412569 - Installed through nvidia-drivers - rm -rf "${D}"/usr/share/man - - # Now install documentation - dodoc doc/*.txt - - if use examples; then - docinto examples/ - dodoc samples/*.c - dodoc samples/README - fi -} diff --git a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild deleted file mode 100644 index 8431d5faaa3c..000000000000 --- a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.10 2012/05/05 14:37:26 idl0r Exp $ - -EAPI=4 - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="NVIDIA Linux X11 Settings Utility" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="examples" - -COMMON_DEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/gtk+:2 - x11-libs/gdk-pixbuf[X] - media-libs/mesa - x11-libs/pango[X] - x11-libs/libXv - x11-libs/libXrandr - dev-libs/glib:2" - -RDEPEND="=x11-drivers/nvidia-drivers-2* - || ( >=x11-drivers/nvidia-drivers-295.33 <x11-drivers/nvidia-drivers-295.33[-gtk] ) - ${COMMON_DEPEND}" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-proto/xproto" - -src_prepare() { - epatch "${FILESDIR}/0001-Makefile-improvements.patch" - epatch "${FILESDIR}/0002-Build-libNVCtrl-with-PIC.patch" - - # The PM does it for us - sed -i -e 's:^\(MANPAGE_GZIP ?=\) 1:\1 0:' Makefile || die -} - -src_compile() { - einfo "Building libXNVCtrl..." - emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :( - emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a - - einfo "Building nvidia-settings..." - emake CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1 -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - - insinto /usr/$(get_libdir) - doins src/libXNVCtrl/libXNVCtrl.a - - insinto /usr/include/NVCtrl - doins src/libXNVCtrl/*.h - -# doicon doc/${PN}.png # Installed through nvidia-drivers - make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application - - # bug 412569 - Installed through nvidia-drivers - rm -rf "${D}"/usr/share/man - - dodoc doc/*.txt - - if use examples; then - docinto examples/ - dodoc samples/*.c - dodoc samples/README - fi -} diff --git a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild deleted file mode 100644 index 45ed2941d47b..000000000000 --- a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v 1.11 2012/05/21 09:59:16 phajdan.jr Exp $ - -EAPI=4 - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="NVIDIA Linux X11 Settings Utility" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* amd64 x86 ~x86-fbsd" -IUSE="examples" - -COMMON_DEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/gtk+:2 - x11-libs/gdk-pixbuf[X] - media-libs/mesa - x11-libs/pango[X] - x11-libs/libXv - x11-libs/libXrandr - dev-libs/glib:2" - -RDEPEND="=x11-drivers/nvidia-drivers-2* - || ( >=x11-drivers/nvidia-drivers-295.33 <x11-drivers/nvidia-drivers-295.33[-gtk] ) - ${COMMON_DEPEND}" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-proto/xproto" - -src_prepare() { - epatch "${FILESDIR}/0001-Makefile-improvements.patch" - epatch "${FILESDIR}/0002-Build-libNVCtrl-with-PIC.patch" - - # The PM does it for us - sed -i -e 's:^\(MANPAGE_GZIP ?=\) 1:\1 0:' Makefile || die -} - -src_compile() { - einfo "Building libXNVCtrl..." - emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :( - emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a - - einfo "Building nvidia-settings..." - emake CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1 -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - - insinto /usr/$(get_libdir) - doins src/libXNVCtrl/libXNVCtrl.a - - insinto /usr/include/NVCtrl - doins src/libXNVCtrl/*.h - -# doicon doc/${PN}.png # Installed through nvidia-drivers - make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application - - # bug 412569 - Installed through nvidia-drivers - rm -rf "${D}"/usr/share/man - - dodoc doc/*.txt - - if use examples; then - docinto examples/ - dodoc samples/*.c - dodoc samples/README - fi -} diff --git a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild deleted file mode 100644 index 5cf0eed07a44..000000000000 --- a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.40.ebuild,v 1.8 2012/05/05 14:37:26 idl0r Exp $ - -EAPI=4 - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="NVIDIA Linux X11 Settings Utility" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="examples" - -COMMON_DEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/gtk+:2 - x11-libs/gdk-pixbuf[X] - media-libs/mesa - x11-libs/pango[X] - x11-libs/libXv - x11-libs/libXrandr - dev-libs/glib:2" - -RDEPEND="=x11-drivers/nvidia-drivers-2* - || ( >=x11-drivers/nvidia-drivers-295.33 <x11-drivers/nvidia-drivers-295.33[-gtk] ) - ${COMMON_DEPEND}" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-proto/xproto" - -src_prepare() { - epatch "${FILESDIR}/0001-Makefile-improvements.patch" - epatch "${FILESDIR}/0002-Build-libNVCtrl-with-PIC.patch" - - # The PM does it for us - sed -i -e 's:^\(MANPAGE_GZIP ?=\) 1:\1 0:' Makefile || die -} - -src_compile() { - einfo "Building libXNVCtrl..." - emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :( - emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a - - einfo "Building nvidia-settings..." - emake CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1 -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - - insinto /usr/$(get_libdir) - doins src/libXNVCtrl/libXNVCtrl.a - - insinto /usr/include/NVCtrl - doins src/libXNVCtrl/*.h - -# doicon doc/${PN}.png # Installed through nvidia-drivers - make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application - - # bug 412569 - Installed through nvidia-drivers - rm -rf "${D}"/usr/share/man - - dodoc doc/*.txt - - if use examples; then - docinto examples/ - dodoc samples/*.c - dodoc samples/README - fi -} diff --git a/media-video/nvidia-settings/nvidia-settings-310.19.ebuild b/media-video/nvidia-settings/nvidia-settings-310.19.ebuild deleted file mode 100644 index 349a7274173b..000000000000 --- a/media-video/nvidia-settings/nvidia-settings-310.19.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-310.19.ebuild,v 1.1 2012/11/24 00:25:59 idl0r Exp $ - -EAPI=4 - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="NVIDIA Linux X11 Settings Utility" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="examples" - -COMMON_DEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/gtk+:2 - x11-libs/gdk-pixbuf[X] - media-libs/mesa - x11-libs/pango[X] - x11-libs/libXv - x11-libs/libXrandr - dev-libs/glib:2" - -RDEPEND="=x11-drivers/nvidia-drivers-3* - ${COMMON_DEPEND}" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-proto/xproto" - -src_compile() { - einfo "Building libXNVCtrl..." - emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :( - emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a - - einfo "Building nvidia-settings..." - emake -C src/ CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1 -} - -src_install() { - emake -C src/ DESTDIR="${D}" PREFIX=/usr install - - insinto /usr/$(get_libdir) - doins src/libXNVCtrl/libXNVCtrl.a - - insinto /usr/include/NVCtrl - doins src/libXNVCtrl/*.h - -# doicon doc/${PN}.png # Installed through nvidia-drivers - make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings - - # bug 412569 - Installed through nvidia-drivers -# rm -rf "${D}"/usr/share/man - - dodoc doc/*.txt - - if use examples; then - docinto examples/ - dodoc samples/*.c - dodoc samples/README - fi -} diff --git a/media-video/nvidia-settings/nvidia-settings-302.11.ebuild b/media-video/nvidia-settings/nvidia-settings-319.12.ebuild index 4a76c82d4fdc..7bdceea9d815 100644 --- a/media-video/nvidia-settings/nvidia-settings-302.11.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-319.12.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-302.11.ebuild,v 1.1 2012/06/17 20:21:28 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-319.12.ebuild,v 1.1 2013/04/20 20:43:55 idl0r Exp $ -EAPI=4 +EAPI=5 inherit eutils multilib toolchain-funcs @@ -24,25 +24,40 @@ COMMON_DEPEND="x11-libs/libX11 x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr - dev-libs/glib:2" + dev-libs/glib:2 + dev-libs/jansson" RDEPEND="=x11-drivers/nvidia-drivers-3* - ${COMMON_DEPEND}" + ${COMMON_DEPEND} + x11-libs/libvdpau" DEPEND="${RDEPEND} virtual/pkgconfig x11-proto/xproto" +src_prepare() { + epatch "${FILESDIR}/${P}-jansson.patch" +} + src_compile() { einfo "Building libXNVCtrl..." emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :( - emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a + emake -C src/libXNVCtrl/ \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" \ + libXNVCtrl.a einfo "Building nvidia-settings..." - emake -C src/ CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1 + emake -C src/ \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + STRIP_CMD="$(type -P true)" \ + NV_VERBOSE=1 \ + USE_EXTERNAL_JANSSON=1 } src_install() { - emake -C src/ DESTDIR="${D}" PREFIX=/usr install + emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install insinto /usr/$(get_libdir) doins src/libXNVCtrl/libXNVCtrl.a |