diff options
11 files changed, 189 insertions, 113 deletions
diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog index c260db479d37..04e6c60e0955 100644 --- a/media-video/nvidia-settings/ChangeLog +++ b/media-video/nvidia-settings/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for media-video/nvidia-settings # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.112 2012/04/25 03:01:38 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.113 2012/04/25 04:27:06 idl0r Exp $ + +*nvidia-settings-173.14.31 (25 Apr 2012) + + 25 Apr 2012; Christian Ruppert <idl0r@gentoo.org> + -nvidia-settings-173.14.30.ebuild, +nvidia-settings-173.14.31.ebuild, + nvidia-settings-260.19.29.ebuild, nvidia-settings-290.10.ebuild, + nvidia-settings-295.20.ebuild, nvidia-settings-295.40.ebuild, + +files/nvidia-settings-173.14.31-Makefile.patch, + -files/nvidia-settings-190.53-xf86vidmodeproto.patch, + -files/icon/nvidia-settings.desktop, -files/icon/nvidia-settings.png: + Version bump and cleanup. Should also fix bug 321399 and bug 290432 25 Apr 2012; Christian Ruppert <idl0r@gentoo.org> -nvidia-settings-185.18.36.ebuild, -nvidia-settings-190.53.ebuild, diff --git a/media-video/nvidia-settings/files/icon/nvidia-settings.desktop b/media-video/nvidia-settings/files/icon/nvidia-settings.desktop deleted file mode 100644 index 65f2fd56b7f6..000000000000 --- a/media-video/nvidia-settings/files/icon/nvidia-settings.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=NVIDIA X Server Settings -Comment=Configure NVIDIA X Server Settings -Exec=nvidia-settings -Icon=nvidia-settings -Categories=Application;System; diff --git a/media-video/nvidia-settings/files/icon/nvidia-settings.png b/media-video/nvidia-settings/files/icon/nvidia-settings.png Binary files differdeleted file mode 100644 index 361c20050d59..000000000000 --- a/media-video/nvidia-settings/files/icon/nvidia-settings.png +++ /dev/null diff --git a/media-video/nvidia-settings/files/nvidia-settings-173.14.31-Makefile.patch b/media-video/nvidia-settings/files/nvidia-settings-173.14.31-Makefile.patch new file mode 100644 index 000000000000..8a9e0322cae4 --- /dev/null +++ b/media-video/nvidia-settings/files/nvidia-settings-173.14.31-Makefile.patch @@ -0,0 +1,100 @@ +diff --git a/Makefile b/Makefile +index 5df7ea5..c183e25 100644 +--- a/Makefile ++++ b/Makefile +@@ -102,10 +102,10 @@ LD_RUN_FLAG=-R/usr/X11R6/lib + else + ECHO=echo + define INSTALL_RULE ++ mkdir -p $(bindir) + $(INSTALL) -m 755 $(NVIDIA_SETTINGS) $(bindir)/$(NVIDIA_SETTINGS) + mkdir -p $(mandir) + $(INSTALL) -m 644 doc/$(MANPAGE) $(mandir) +- gzip -9f $(mandir)/$(MANPAGE) + endef + endif + +@@ -116,7 +116,7 @@ mandir = $(exec_prefix)/share/man/man1 + X11_CFLAGS = $(X11_INC_DIRS) + + GTK_CFLAGS := $(shell $(PKG_CONFIG) --cflags gtk+-2.0) +-GTK_LDFLAGS := $(shell $(PKG_CONFIG) --libs gtk+-2.0) ++GTK_LIBS := $(shell $(PKG_CONFIG) --libs gtk+-2.0) + + X11_LIBS := $(X11_LIB_DIRS) -Wl,-Bstatic -lXxf86vm -Wl,-Bdynamic -lX11 -lXext + +@@ -136,16 +136,16 @@ RELATIVE_SRCDIRS = \ + src/gtk+-2.x \ + src/libXNVCtrl \ + src/libXNVCtrlAttributes \ +- src/XF86Config-parser \ +- samples ++ src/XF86Config-parser + + + SRCDIRS := $(addprefix $(CURDIR)/, $(RELATIVE_SRCDIRS)) + + INC_FLAGS := $(addprefix -I , $(RELATIVE_SRCDIRS)) + +-ALL_CFLAGS = $(CFLAGS) $(LOCAL_CFLAGS) $(X11_CFLAGS) $(GTK_CFLAGS) $(INC_FLAGS) +-ALL_LDFLAGS = $(LD_RUN_FLAG) $(LDFLAGS) $(GTK_LDFLAGS) $(X11_LIBS) -lm ++ALL_CFLAGS = -fPIC $(CFLAGS) $(LOCAL_CFLAGS) $(X11_CFLAGS) $(GTK_CFLAGS) $(INC_FLAGS) ++ALL_LDFLAGS = -fPIC $(LD_RUN_FLAG) $(LDFLAGS) ++ALL_LIBS = $(X11_LIBS) $(GTK_LIBS) -lm + + CPPFLAGS = $(ALL_CFLAGS) + +@@ -236,10 +236,10 @@ $(XF86PARSER_LIB): + $(MAKE) NV_CFLAGS='$(NV_CFLAGS)' -C $(XF86PARSER_DIR) + + $(XNVCTRL_LIB): +- $(MAKE) CFLAGS='$(ALL_CFLAGS)' LDFLAGS='$(ALL_LDFLAGS)' -C $(XNVCTRL_DIR) ++ $(MAKE) CFLAGS='$(ALL_CFLAGS)' LDFLAGS='$(ALL_LDFLAGS)' LIBS='$(ALL_LIBS)' -C $(XNVCTRL_DIR) + + $(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_LIB) $(XF86PARSER_LIB) +- $(CC) $(OBJS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(XNVCTRL_LIB) $(XF86PARSER_LIB) -o $@ ++ $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(OBJS) $(XNVCTRL_LIB) $(XF86PARSER_LIB) $(ALL_LIBS) -o $@ + + .PHONY: $(XF86PARSER_LIB) dist clean clobber + +diff --git a/src/XF86Config-parser/Makefile b/src/XF86Config-parser/Makefile +index 721945d..49e4ac2 100644 +--- a/src/XF86Config-parser/Makefile ++++ b/src/XF86Config-parser/Makefile +@@ -27,7 +27,8 @@ ifndef CC + CC = gcc + endif + +-CFLAGS = -Wall -g ++CFLAGS += -Wall ++CFLAGS ?= -g + + ifdef NV_CFLAGS + CFLAGS += $(NV_CFLAGS) +diff --git a/src/libXNVCtrl/Makefile b/src/libXNVCtrl/Makefile +index 49ea8b2..b6eaf3f 100644 +--- a/src/libXNVCtrl/Makefile ++++ b/src/libXNVCtrl/Makefile +@@ -1,4 +1,5 @@ + RANLIB ?= ranlib ++CFLAGS += -fPIC + + libXNVCtrl.a : libXNVCtrl.a(NVCtrl.o) + $(RANLIB) $@ +diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c b/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c +index 633c078..a65a8b4 100644 +--- a/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c ++++ b/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c +@@ -211,10 +211,12 @@ NvCtrlInitVidModeAttributes(NvCtrlAttributePrivateHandle *h) + + /* restore the original error handler, if we overrode it */ + ++#if defined(X_XF86VidModeGetGammaRampSize) + if (prev_error_handler) { + XSetErrorHandler(prev_error_handler); + prev_error_handler = NULL; + } ++#endif + + return NULL; + diff --git a/media-video/nvidia-settings/files/nvidia-settings-190.53-xf86vidmodeproto.patch b/media-video/nvidia-settings/files/nvidia-settings-190.53-xf86vidmodeproto.patch deleted file mode 100644 index 77ce7d536011..000000000000 --- a/media-video/nvidia-settings/files/nvidia-settings-190.53-xf86vidmodeproto.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c -+++ nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c -@@ -210,11 +210,12 @@ - if (vm) free(vm); - - /* restore the original error handler, if we overrode it */ -- -+#if defined(X_XF86VidModeGetGammaRampSize) - if (prev_error_handler) { - XSetErrorHandler(prev_error_handler); - prev_error_handler = NULL; - } -+#endif - - return NULL; - diff --git a/media-video/nvidia-settings/nvidia-settings-173.14.30.ebuild b/media-video/nvidia-settings/nvidia-settings-173.14.30.ebuild deleted file mode 100644 index 593ef5927b2a..000000000000 --- a/media-video/nvidia-settings/nvidia-settings-173.14.30.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2011 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.30.ebuild,v 1.1 2011/05/11 23:49:56 xmw Exp $ - -EAPI="1" - -inherit eutils toolchain-funcs multilib flag-o-matic - -MY_P="${PN}-1.0" - -DESCRIPTION="NVIDIA Linux X11 Settings Utility" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.gz" - -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 - dev-util/pkgconfig - x11-base/xorg-server - x11-libs/libXt - x11-libs/libXv - x11-proto/xf86driproto - x11-proto/xf86vidmodeproto" - -RDEPEND="x11-libs/gtk+:2 - x11-base/xorg-server - x11-libs/libXt - x11-drivers/nvidia-drivers" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - einfo "Building libXNVCtrl..." - cd "${S}/src/libXNVCtrl" - make 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)" || die "Failed to build nvidia-settings" -} - -src_install() { - # Install the executable - exeinto /usr/bin - doexe nvidia-settings - - # 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" - - # Install manpage - doman doc/nvidia-settings.1 - - # Now install documentation - dodoc doc/*.txt -} diff --git a/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild b/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild new file mode 100644 index 000000000000..9efc66835d5c --- /dev/null +++ b/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild @@ -0,0 +1,71 @@ +# 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-173.14.31.ebuild,v 1.1 2012/04/25 04:27:06 idl0r Exp $ + +EAPI=4 + +inherit eutils multilib toolchain-funcs + +MY_P="${PN}-1.0" + +DESCRIPTION="NVIDIA Linux X11 Settings Utility" +HOMEPAGE="http://www.nvidia.com/" +SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" +IUSE="examples" + +COMMON_DEPEND="x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm[static-libs] + 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-173.14* + ${COMMON_DEPEND}" +DEPEND="${RDEPEND} + dev-util/pkgconfig + x11-proto/xproto" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + epatch "${FILESDIR}/${P}-Makefile.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 + + einfo "Building nvidia-settings..." + emake LOCAL_CFLAGS="" CC="$(tc-getCC)" LD="$(tc-getLD)" +} + +src_install() { + emake prefix="${D}/usr" STRIP="$(type -P true)" install + + insinto /usr/$(get_libdir) + doins src/libXNVCtrl/libXNVCtrl.a + + insinto /usr/include/NVCtrl + doins src/libXNVCtrl/*.h + +# doicon doc/${PN}.png + make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application + + 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-260.19.29.ebuild b/media-video/nvidia-settings/nvidia-settings-260.19.29.ebuild index ab1ba4364914..823f62b64d4b 100644 --- a/media-video/nvidia-settings/nvidia-settings-260.19.29.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-260.19.29.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.5 2011/05/11 23:40:21 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-260.19.29.ebuild,v 1.6 2012/04/25 04:27:06 idl0r Exp $ EAPI=2 @@ -33,7 +33,7 @@ RDEPEND="x11-libs/gtk+:2 x11-base/xorg-server x11-libs/libXt x11-libs/pango[X] - x11-drivers/nvidia-drivers" + =x11-drivers/nvidia-drivers-2*" src_prepare() { sed -i -e "s#prefix = .*#prefix = ${D}/usr#" utils.mk diff --git a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild index 056e1a2365dc..9dd91a7b2c88 100644 --- a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild @@ -1,6 +1,6 @@ # 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.7 2012/04/25 02:43:16 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.8 2012/04/25 04:27:06 idl0r Exp $ EAPI=4 @@ -52,21 +52,18 @@ src_compile() { 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 diff --git a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild index bbba30b5b268..54ddbc485233 100644 --- a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild @@ -1,6 +1,6 @@ # 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.6 2012/04/25 02:43:16 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v 1.7 2012/04/25 04:27:06 idl0r Exp $ EAPI=4 @@ -52,21 +52,18 @@ src_compile() { 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 diff --git a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild index 6ec38e8dcc3e..60f4763b8a91 100644 --- a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild @@ -1,6 +1,6 @@ # 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.5 2012/04/25 02:43:16 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.40.ebuild,v 1.6 2012/04/25 04:27:06 idl0r Exp $ EAPI=4 @@ -52,21 +52,18 @@ src_compile() { 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 |
