diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-05-03 20:18:47 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-05-03 20:18:47 +0000 |
| commit | bf64229c163ee5f01ea9f065e651317307490823 (patch) | |
| tree | 4dc264808648993d6d72959759c02b2e4f5960da /media-gfx/nvidia-texture-tools | |
| parent | Version bump. Fixes recently found security issue with the CGI SAPI (diff) | |
| download | gentoo-2-bf64229c163ee5f01ea9f065e651317307490823.tar.gz gentoo-2-bf64229c163ee5f01ea9f065e651317307490823.tar.bz2 gentoo-2-bf64229c163ee5f01ea9f065e651317307490823.zip | |
fix bug #414509
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/nvidia-texture-tools')
3 files changed, 49 insertions, 2 deletions
diff --git a/media-gfx/nvidia-texture-tools/ChangeLog b/media-gfx/nvidia-texture-tools/ChangeLog index 0c6c56a1faaf..f756917c5ade 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.2 2012/05/03 19:52:52 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-texture-tools/ChangeLog,v 1.3 2012/05/03 20:18:47 hasufell Exp $ + + 03 May 2012; Julian Ospald <hasufell@gentoo.org> + nvidia-texture-tools-2.0.8.ebuild, + +files/nvidia-texture-tools-2.0.8-cg.patch: + fix bug #414509 03 May 2012; Samuli Suominen <ssuominen@gentoo.org> nvidia-texture-tools-2.0.8.ebuild, diff --git a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cg.patch b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cg.patch new file mode 100644 index 000000000000..6dcb1b466944 --- /dev/null +++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cg.patch @@ -0,0 +1,39 @@ +From: hasufell <hasufell@gentoo.org> +Date: Thu May 3 20:06:31 UTC 2012 + +fix compilation for cg useflag + +--- cmake/FindCg.cmake ++++ cmake/FindCg.cmake +@@ -86,6 +86,7 @@ + FIND_PROGRAM( CG_COMPILER cgc + /usr/bin + /usr/local/bin ++ /opt/nvidia-cg-toolkit/bin + DOC "The Cg Compiler" + ) + GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH) +@@ -93,6 +94,7 @@ + FIND_PATH( CG_INCLUDE_PATH Cg/cg.h + /usr/include + /usr/local/include ++ /opt/nvidia-cg-toolkit/include + ${CG_COMPILER_SUPER_DIR}/include + DOC "The directory where Cg/cg.h resides" + ) +@@ -102,6 +104,7 @@ + /usr/lib + /usr/local/lib64 + /usr/local/lib ++ /opt/nvidia-cg-toolkit/lib + ${CG_COMPILER_SUPER_DIR}/lib64 + ${CG_COMPILER_SUPER_DIR}/lib + DOC "The Cg runtime library" +@@ -113,6 +116,7 @@ + /usr/lib + /usr/local/lib64 + /usr/local/lib ++ /opt/nvidia-cg-toolkit/lib + ${CG_COMPILER_SUPER_DIR}/lib64 + ${CG_COMPILER_SUPER_DIR}/lib + DOC "The Cg runtime library" diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8.ebuild index 089ea73fede4..a76b5fea8dea 100644 --- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8.ebuild +++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8.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.ebuild,v 1.2 2012/05/03 19:52:52 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8.ebuild,v 1.3 2012/05/03 20:18:47 hasufell Exp $ EAPI=4 inherit cmake-utils eutils multilib toolchain-funcs @@ -42,7 +42,10 @@ pkg_setup() { } src_prepare() { + edos2unix cmake/* EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patches + # fix bug #414509 + epatch "${FILESDIR}"/${P}-cg.patch } src_configure() { |