summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-video/nvidia-settings
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-video/nvidia-settings')
-rw-r--r--media-video/nvidia-settings/Manifest3
-rw-r--r--media-video/nvidia-settings/files/nvidia-settings-319.12-jansson.patch94
-rw-r--r--media-video/nvidia-settings/metadata.xml8
-rw-r--r--media-video/nvidia-settings/nvidia-settings-331.20.ebuild82
-rw-r--r--media-video/nvidia-settings/nvidia-settings-340.58.ebuild77
-rw-r--r--media-video/nvidia-settings/nvidia-settings-343.22.ebuild77
6 files changed, 341 insertions, 0 deletions
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
new file mode 100644
index 000000000000..2a5e32c36e8e
--- /dev/null
+++ b/media-video/nvidia-settings/Manifest
@@ -0,0 +1,3 @@
+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
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/metadata.xml b/media-video/nvidia-settings/metadata.xml
new file mode 100644
index 000000000000..a78c793a48d0
--- /dev/null
+++ b/media-video/nvidia-settings/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>idl0r@gentoo.org</email>
+ <name>Christian Ruppert</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/media-video/nvidia-settings/nvidia-settings-331.20.ebuild b/media-video/nvidia-settings/nvidia-settings-331.20.ebuild
new file mode 100644
index 000000000000..10fd13d60bc2
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-331.20.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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_prepare() {
+ epatch "${FILESDIR}"/${PN}-319.12-jansson.patch
+}
+
+src_compile() {
+ einfo "Building libXNVCtrl..."
+ emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
+ 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 \
+ USE_EXTERNAL_JANSSON=1
+}
+
+src_install() {
+ emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 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-340.58.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
new file mode 100644
index 000000000000..02860c371d31
--- /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
+# $Id$
+
+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..02860c371d31
--- /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
+# $Id$
+
+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
+}