summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/nvidia-texture-tools')
-rw-r--r--media-gfx/nvidia-texture-tools/ChangeLog7
-rw-r--r--media-gfx/nvidia-texture-tools/Manifest19
-rw-r--r--media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cg.patch39
-rw-r--r--media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8.ebuild5
4 files changed, 59 insertions, 11 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/Manifest b/media-gfx/nvidia-texture-tools/Manifest
index d8c31f515c5c..e67918459a02 100644
--- a/media-gfx/nvidia-texture-tools/Manifest
+++ b/media-gfx/nvidia-texture-tools/Manifest
@@ -1,19 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX nvidia-texture-tools-2.0.8-cg.patch 1073 RMD160 a138f047a5e64fee965a7508edd84bb675162fe7 SHA1 1cca6eca1c49113dcc7f44a1c9c6f5559c113942 SHA256 9e2c683c82fa56ef57f6a568c447fdcb28a4a84e034fe6bc653d9ba6297ccb7c
DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 RMD160 dbb2a1ea4bef259af8520d881ab414d69ee0dea2 SHA1 3eaa578acc35159684748055aeb4bacdeaef12d1 SHA256 6b3c83500b420ee976f61eeae16e5727e2401e133f543baeac76c66c381eed2e
DIST nvidia-texture-tools-2.0.8-patchset-1.tar.xz 9688 RMD160 e20153a6e9692e828e0677fbe255361ff81dd75c SHA1 a3d4d1724685336a3eafa3863a4955547cc55343 SHA256 7cc8ba61cf0290984b31bdbe7b291ff75f2eeab8b07da908dfb5a1b421341516
-EBUILD nvidia-texture-tools-2.0.8.ebuild 1612 RMD160 a4359d7aeaf9fd634ee0eba6183a4d1fceba248a SHA1 550fd4f695be6f43a3dce376053b9669f44a5d09 SHA256 573b9eb850475cb58ff678d422ed669da2629a8a0ccf4feb1b435033bf656f87
-MISC ChangeLog 1179 RMD160 fc8731b91d4b606896ede0513ba8bed717bfeb12 SHA1 6acad1698bc88a2e24affa3347388c241f9b8acf SHA256 75b2ed91a74581ae82a249a5328d21191859d660b0c064d7f7a49b8499cc0fa2
+EBUILD nvidia-texture-tools-2.0.8.ebuild 1685 RMD160 6a6bfa6e694a8896e990c9f55e0870ac267f662a SHA1 5ab79c48eb062049cceb48cf68d9fabfb0e62736 SHA256 3a12d4b3b919eae1c4cc6033358c257992448343a4d59f3364fa996b4dd5d240
+MISC ChangeLog 1331 RMD160 e6bdef629e1de14c6c9390c0cc74dc311805dfc0 SHA1 4f4eaf4346fb5a66282963d5d1b30834d95ba1e5 SHA256 130b83853cc71deceea1019ae0c262bf9c790c36f7e77fc744b7152d8b6e0abe
MISC metadata.xml 597 RMD160 7b156a0efb17ef004ba146b74fa265528aca3715 SHA1 2e533ed568bb55ffced759d0808c47691632c3d2 SHA256 86c23f0bb1ed47aeebbc91e8d5bfacfccdc68d6406fc29daa952dd2ece2f4da5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBAgAGBQJPouGIAAoJEEdUh39IaPFNdy4H/3iIlLUDIxAOCt2iJGf3mNIc
-wNEGaY5vKl6rSyUkEoih8q2VYUJijS3WSOvQpzLjkx7N5E3O8oVrevdxMoftlg6F
-codIORPW6LsHtBI83tH9bY1qlSNQ9O1rp48pUXiVMDjbFUj7wRKqLKALXe1GM7Gx
-kYGHMXRUQkFfga9Zybg1BOnH4bqA0d4Ae6FAws/LPnXVAg3+G+L8vZN0o+QTv96a
-hEBP+Mfd0/rwd+y+/JqJIbjun/F8Mdtj21xIJKKSDVjwsvG60nuDuXltRmhXm9DB
-JdeuEOjG0uarxb4pzxnLO3B6EmMUfEEPhMOKfDpuvwQSWTkJiqwkG9hwrJKEM+o=
-=czr2
+iQEcBAEBAgAGBQJPougmAAoJEFpvPKfnPDWzi+oH/i6kSDBiE7Yjikx+NAS+aOf+
+gg5bB5sAB+C0Gd89n6yxLSCnhuiz0nDImBmk4tgrmmm/bLmgYSMcJ8okhV2ZSJn7
+3flIMdKoLKvsTuLbBuAQAM1S+jWXAE94AjfXyRm2mod7gV51jyViEG2vSHn9QdsR
+Jvy6aO/tfaYrqsbhlyGqDa/Vkm4OERjycF6Dnc7tlrdVeuQ06SKd4nQylDiDTE8P
+3negVid9zIbD2seVDZsxKYFbOkbKkxsPawBA4qCESjsVlKfHtU2YsgvXtExbM1Dy
+M9+3WSVW8YvZJSbeQcPUpvNOvZOf/F91lnoLQZCFMDf8fzx2VQp6bIflN0xAtzw=
+=wdYI
-----END PGP SIGNATURE-----
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() {