From a4f1d672312c29b642dc0e63cd8c5e1f2d068f8f Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Sat, 15 Nov 2014 16:56:00 +0000 Subject: [PATCH] Version bumps Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xB427ABC8 --- media-video/nvidia-settings/ChangeLog | 10 +- media-video/nvidia-settings/Manifest | 19 ++-- .../nvidia-settings-173.14.31-Makefile.patch | 100 ------------------ .../nvidia-settings-340.58.ebuild | 77 ++++++++++++++ .../nvidia-settings-343.22.ebuild | 77 ++++++++++++++ 5 files changed, 176 insertions(+), 107 deletions(-) delete mode 100644 media-video/nvidia-settings/files/nvidia-settings-173.14.31-Makefile.patch create mode 100644 media-video/nvidia-settings/nvidia-settings-340.58.ebuild create mode 100644 media-video/nvidia-settings/nvidia-settings-343.22.ebuild diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog index 82ad1427755e..ee045b4795ea 100644 --- a/media-video/nvidia-settings/ChangeLog +++ b/media-video/nvidia-settings/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-video/nvidia-settings # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.138 2014/01/15 15:29:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.139 2014/11/15 16:55:54 idl0r Exp $ + +*nvidia-settings-343.22 (15 Nov 2014) +*nvidia-settings-340.58 (15 Nov 2014) + + 15 Nov 2014; Christian Ruppert + +nvidia-settings-340.58.ebuild, +nvidia-settings-343.22.ebuild, + -files/nvidia-settings-173.14.31-Makefile.patch: + Version bumps 15 Jan 2014; Jeroen Roovers nvidia-settings-331.20.ebuild: Revert USE dependency change (bug #498176). diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest index a9ca93c59159..d5b3791bcf14 100644 --- a/media-video/nvidia-settings/Manifest +++ b/media-video/nvidia-settings/Manifest @@ -1,16 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX nvidia-settings-173.14.31-Makefile.patch 3138 SHA256 05ed03a0fce667a9245dfa31953d37779f32874cbbe6089c2417a997cdc3f2f9 SHA512 e6d6717f602d3a040ae25cb48051a0877c4adb46632db2225461b471a8900c224d43f95359ff6518068acc412111564b7ab3a21e871dd65e463807173805d976 WHIRLPOOL da4e036304b42d45ea6a9597f33739b01641ea45b3d5f5eba19e368bc69c759361eefaca55e8fc9cf5292fbd68bbf1fe5725c78293b7340f6d8be90b080a3e95 AUX nvidia-settings-319.12-jansson.patch 2661 SHA256 88032d99bbe40630a7f202be5a4b0dd1274ef483a2dc152526219af2bf29e0b8 SHA512 c510f88fc5646a7dd03f480d8df812d679cbb6fd114e1e8451f8e3e29b3ec1ee11902541bd7fce12799b035898b793f7dca567f5b762f1f20d786a8e5e83a444 WHIRLPOOL c161e1d045820af31e340d4969b04e51abacab2bfda6dc89f9939e21dac726803f1e6644ff173b9e20e4695866faa1953360dca4e40dc13318eaace4c40b2047 DIST nvidia-settings-331.20.tar.bz2 1544551 SHA256 229ead42dfc43627797bd0317ac3320aeaf97426a975325986aa91d28fa7a7f0 SHA512 e2a4f4171a6b989ddd89ec606d7a9de20ada84116e004e8febf6feec683ecf5f2a02d47505336ca6224bcb235b9aa38053e8998ea02e15ee6ee930e518e197e6 WHIRLPOOL c3d4e73cb9892ecb49d1d802b9178d4636a02bc2eace93ec202041c6c798d74199ab565608e7fc99f4be122843dcd4532397ab0b53059818daf1ae78922c925f +DIST nvidia-settings-340.58.tar.bz2 1549850 SHA256 21cd29fea50e62766d1985c84f6d6de8efa911e32abcbff8e7ccf0e43ebe25c0 SHA512 4c581a940c99fac28564ab6154f47cae496ebfda6339b7f10c5decf8fea52b6c12e5b63dfcf78f8365909e49539560a50338edb17117881b6a03c196bd51836c WHIRLPOOL b486032339c4f8c4767239e3a4b001667bceb2c3ef5f3e94f08d1c54c60a958e1c76456415769ce9ff0503b6eb3d903aa89599a0234e08447c33671c598e66c8 +DIST nvidia-settings-343.22.tar.bz2 1554803 SHA256 979936ba474ab8f14deb5f0d74fc486e862216270b4d870a4386131696ac80e1 SHA512 147b6133928082d99d9639a5c3dd587e59fcb3925f4434dba4ddff61f5493a3291fad1f9e5bb3ec996c5692b71d60c45b5ea1f9ca882390d46f068ce4773b347 WHIRLPOOL 42802c9459d95aa41d48e99c489285c821361e635442e20e08563a4f7c6b3f0617673bf101343495239212267a1973fd1bfb740ff9986916593ce6657adf3e42 EBUILD nvidia-settings-331.20.ebuild 1866 SHA256 ec568ed896aca0771e870cd8cc73394f9ebeb85f18890c446c5a74bb9658240f SHA512 7975f8b246b7795040ff9aef647df053a394ebd9ab367dae7118944a1297d9d7303acaa6c91c402d3d6fbc54358599b4831c6e8ee5300b940dc58cd7a4e63e60 WHIRLPOOL 0ad0ea8e5574dfbf76a5575cf9fa2f965a38f7216926c4f54de386fe2ea3a7acf75aebeedfe733379edafa9703224aab66ee95228ccbf25ca024d5981330a6bc -MISC ChangeLog 27544 SHA256 bf4fbc4da9e34f57ea33ab92162a53122321626d07dafe300973a9b14c82e6c7 SHA512 fedc2f9686dc923c804ff416a77bd329f9d22f24fe256b4bc780be5f0485c1fe9edfb07c16924a5f4d6a915b863223856e3beebe2c055a9b4727b85b24d0d30a WHIRLPOOL 67fbf29f836224136306ebd34f0e0a7d416592b229f7ba04e32560282f0a4d2a32880eb2b9812c91e62948d91313f072d27f58924cd04b717eb64a898b4fa1d2 +EBUILD nvidia-settings-340.58.ebuild 1733 SHA256 71b95bbfd25d1e5675e129d33a9c64cae68f033e29c01290fe99819c199c107a SHA512 852e225518279f4ae113965302c292d338abeaf1107c698fb41b8e9f4711ac79d2a2356e3612039b979735474523c6773511b787b7285c958959480c4c76f76d WHIRLPOOL 4a16de894d51493fbccfc181c66e59cfffb50ea5beafb7ed157e428c1a054c6bab526196a6f0b74a9095781072c950508259a63dd980a9d39e04f692d13ef52e +EBUILD nvidia-settings-343.22.ebuild 1733 SHA256 d586414d71107362870ec61a185ffb08c8f0ff9df3c4f416c902eacb8f57fb44 SHA512 526c15db88a59cc51e7d9281ecfc96f9f59d066642900801f848a10392d014fae9293971f6b758384fb19a55c97f4d99fc3ff3bcbfce1732b3bfa4fb474a48a1 WHIRLPOOL ce9ec98734977eb0e3714a1517d4d80390ee206f1b4b30d0ee4dfb704e01dc0a2a289d9516a3a5b4969d7a1141899860a7ec9ea2261484d8eeb0bbd52305b7ca +MISC ChangeLog 27809 SHA256 dd45aeda30049f4c7e58d59949610f999aed3e49484ee2fe9a548abe0870c812 SHA512 1573955fd1c2c490c2eef8b2587fd861c0849bdde4d27a5386fcc865e178b307f19a759997a584199d0a64e215ad9a4f02d568425430abba0fd8ed4ff6cec77c WHIRLPOOL c103dcc23e02e78466eb78dc4df2fc1f138129ff04c8c67a0ee9ecb1eb5579504350be706ee05cd236fc2d6fa6fefae8f7c142f138728abf47c77819901836cc MISC metadata.xml 241 SHA256 40516de140d37e4b5ed969c05c8f3962815dcaf2d978895c048002c4f22a99ff SHA512 5134f0355f9a240a9e9a67dfb5ec458a8a275148f1aa665810975768c02e3829df17b03e018f803b81efd2608d5b72dead197fd852aed048aae278a463e6662f WHIRLPOOL ab4ced369f6e8ddbbf6a45ea86de30e3e8878414fab137b65da0479a15b0e72e9988defa83f7a65efd95e34a772b8367dccc38d4399e903d416e49d9154ce2aa -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlLWqUwACgkQVWmRsqeSphOaOwCfVeOthKWXfLSoqnzW1XW6BGLe -XTgAmwY/L1BU+wDDj6gcQR5OCXp2mKB0 -=dlCk +iQEcBAEBCAAGBQJUZ4WfAAoJEMOx0zmdw4Z1W1UH/iG7NRmxLDdFVAREzfDcnDS6 +rXxEdJuLgB5mBAqWMueb2j7mY/9HkbV2L18yk8pFERFvbBDIbShpGkQrn7VEUDGr +Leo3bUC/2oQwYTQkPc/rdy9VKPSYKgFg8DFOIYqKRv3FBR4ANPzLWrNFIpI+cYpO +Hj1lNw+b7023aQGIFuKphBB+PvgmSHXlzQlei4zSQYs4PBXvEdhf8uj9SvgriaKh +UzuCyQDcexCtiG7lbB0I9Ke5Srq0ABXISgdwPoe1ylTYXsC35410hGjqoHrXZtbO +fVwN8F4EmgeoRwxRDTJitmLWPa4QBHMwwjhsLpcY6bKgBhte4r4iiDe8glWhiHc= +=YA+x -----END PGP SIGNATURE----- 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 deleted file mode 100644 index 8a9e0322cae4..000000000000 --- a/media-video/nvidia-settings/files/nvidia-settings-173.14.31-Makefile.patch +++ /dev/null @@ -1,100 +0,0 @@ -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/nvidia-settings-340.58.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild new file mode 100644 index 000000000000..010bd65b6882 --- /dev/null +++ b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-340.58.ebuild,v 1.1 2014/11/15 16:55:54 idl0r Exp $ + +EAPI=5 + +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 + dev-libs/jansson" + +RDEPEND=" + =x11-drivers/nvidia-drivers-3* + ${COMMON_DEPEND} + x11-libs/libvdpau" +DEPEND="${RDEPEND} + virtual/pkgconfig + x11-proto/xproto" + +src_compile() { + einfo "Building libXNVCtrl..." + emake -C src/ \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" \ + build-xnvctrl + + einfo "Building nvidia-settings..." + emake -C src/ \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + STRIP_CMD="$(type -P true)" \ + NV_VERBOSE=1 \ + NV_USE_BUNDLED_LIBJANSSON=0 +} + +src_install() { + emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 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-343.22.ebuild b/media-video/nvidia-settings/nvidia-settings-343.22.ebuild new file mode 100644 index 000000000000..ca6deafa8427 --- /dev/null +++ b/media-video/nvidia-settings/nvidia-settings-343.22.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-343.22.ebuild,v 1.1 2014/11/15 16:55:54 idl0r Exp $ + +EAPI=5 + +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 + dev-libs/jansson" + +RDEPEND=" + =x11-drivers/nvidia-drivers-3* + ${COMMON_DEPEND} + x11-libs/libvdpau" +DEPEND="${RDEPEND} + virtual/pkgconfig + x11-proto/xproto" + +src_compile() { + einfo "Building libXNVCtrl..." + emake -C src/ \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" \ + build-xnvctrl + + einfo "Building nvidia-settings..." + emake -C src/ \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + STRIP_CMD="$(type -P true)" \ + NV_VERBOSE=1 \ + NV_USE_BUNDLED_LIBJANSSON=0 +} + +src_install() { + emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 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 +} -- 2.26.2