diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-06-29 08:26:26 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-06-29 08:26:26 +0000 |
| commit | 41fb1ba7824b11df8e1b6589421da00f7d5fbd5d (patch) | |
| tree | ff0959d74aa0d46d2ad779ac3f4d0b608cf066dc /media-gfx/nvidia-texture-tools | |
| parent | Version bump (thanks euscan), improve config-check in initd (diff) | |
| download | gentoo-2-41fb1ba7824b11df8e1b6589421da00f7d5fbd5d.tar.gz gentoo-2-41fb1ba7824b11df8e1b6589421da00f7d5fbd5d.tar.bz2 gentoo-2-41fb1ba7824b11df8e1b6589421da00f7d5fbd5d.zip | |
fix compilation on gcc-4.7 wrt bug #423965
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/nvidia-texture-tools')
3 files changed, 25 insertions, 2 deletions
diff --git a/media-gfx/nvidia-texture-tools/ChangeLog b/media-gfx/nvidia-texture-tools/ChangeLog index e92f7a723bda..5f06875130e5 100644 --- a/media-gfx/nvidia-texture-tools/ChangeLog +++ b/media-gfx/nvidia-texture-tools/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/nvidia-texture-tools # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-texture-tools/ChangeLog,v 1.6 2012/06/08 11:47:19 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-texture-tools/ChangeLog,v 1.7 2012/06/29 08:26:26 hasufell Exp $ + + 29 Jun 2012; Julian Ospald <hasufell@gentoo.org> + nvidia-texture-tools-2.0.8-r1.ebuild, + +files/nvidia-texture-tools-2.0.8-gcc-4.7.patch: + fix compilation on gcc-4.7 wrt bug #423965 08 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> nvidia-texture-tools-2.0.8-r1.ebuild: diff --git a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-gcc-4.7.patch b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-gcc-4.7.patch new file mode 100644 index 000000000000..62f33e905bfd --- /dev/null +++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-gcc-4.7.patch @@ -0,0 +1,16 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Fri Jun 29 08:15:12 UTC 2012 +Subject: fix compilation on gcc 4.7 + +https://bugs.gentoo.org/show_bug.cgi?id=423965 + +--- src/nvcore/nvcore.h ++++ src/nvcore/nvcore.h +@@ -158,6 +158,7 @@ + #elif NV_CC_GNUC + # if NV_OS_LINUX + # include "DefsGnucLinux.h" ++# include <unistd.h> // gcc 4.7 + # elif NV_OS_DARWIN + # include "DefsGnucDarwin.h" + # elif NV_OS_MINGW diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r1.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r1.ebuild index bd06cf2ab25c..15d68d88a67a 100644 --- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r1.ebuild +++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r1.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-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r1.ebuild,v 1.3 2012/06/08 11:47:19 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r1.ebuild,v 1.4 2012/06/29 08:26:26 hasufell Exp $ EAPI=4 inherit cmake-utils eutils multilib toolchain-funcs @@ -46,6 +46,8 @@ src_prepare() { EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patches # fix bug #414509 epatch "${FILESDIR}"/${P}-cg.patch + # fix bug #423965 + epatch "${FILESDIR}"/${P}-gcc-4.7.patch } src_configure() { |