From 52bc2c04d29df363121d1bd74249485b69c39976 Mon Sep 17 00:00:00 2001 From: hasufell Date: Mon, 23 Apr 2012 02:47:09 +0200 Subject: dev-util/nvidia-texture-tools: revbump fixes not installed headers, add check for gcc-version --- dev-util/nvidia-texture-tools/ChangeLog | 8 + dev-util/nvidia-texture-tools/Manifest | 6 +- .../files/nvidia-texture-tools-2.0.8-cmake.patch | 176 ------------------- .../nvidia-texture-tools-2.0.8-r1-cmake.patch | 192 +++++++++++++++++++++ .../nvidia-texture-tools-2.0.8-r1.ebuild | 71 ++++++++ .../nvidia-texture-tools-2.0.8.ebuild | 62 ------- 6 files changed, 274 insertions(+), 241 deletions(-) delete mode 100644 dev-util/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cmake.patch create mode 100644 dev-util/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-r1-cmake.patch create mode 100644 dev-util/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r1.ebuild delete mode 100644 dev-util/nvidia-texture-tools/nvidia-texture-tools-2.0.8.ebuild (limited to 'dev-util') diff --git a/dev-util/nvidia-texture-tools/ChangeLog b/dev-util/nvidia-texture-tools/ChangeLog index 940d0cedf..95527cbfe 100644 --- a/dev-util/nvidia-texture-tools/ChangeLog +++ b/dev-util/nvidia-texture-tools/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*nvidia-texture-tools-2.0.8-r1 (23 Apr 2012) + + 23 Apr 2012; hasufell + -nvidia-texture-tools-2.0.8.ebuild, +nvidia-texture-tools-2.0.8-r1.ebuild, + -files/nvidia-texture-tools-2.0.8-cmake.patch, + +files/nvidia-texture-tools-2.0.8-r1-cmake.patch: + revbump fixes not installed headers, add check for gcc-version + 15 Apr 2012; hasufell nvidia-texture-tools-2.0.8.ebuild: correct static to static-libs diff --git a/dev-util/nvidia-texture-tools/Manifest b/dev-util/nvidia-texture-tools/Manifest index c6759f30c..4abf2df71 100644 --- a/dev-util/nvidia-texture-tools/Manifest +++ b/dev-util/nvidia-texture-tools/Manifest @@ -2,9 +2,9 @@ AUX cuda.patch 722 RMD160 e76a003405e7fcfbe60023a1de3da659879e62bf SHA1 83dff56c AUX gcc4.4.4-aliasing.patch 1553 RMD160 18525e0eb8d3b8a0212e670243f01099e41ef97a SHA1 73272c8e6661c56dcaa9bf96d971cb7df77cec54 SHA256 12df5dab88246e239ff9c96bd87ccb86ea3769b6f817fee08d7613d1ae6b3a0c AUX libpng1.5-build.patch 591 RMD160 89c68d37852bcd4d333a34efc2d5b7daa3b5a663 SHA1 9df903aff0253e99448efd446232f3109bc382ba SHA256 30aa82b877926e91e95139b89277ae3e73bc1c3c14e4abbc90378e42deacd8c3 AUX libtiff4.patch 2897 RMD160 16485b0934b934139e33de995f39317de161384f SHA1 cff6768bf053606c0b4032b02b7f7f5538a2a41e SHA256 86ca76aacd4219d10326e54fce887943aea8cb55662bfbd4ffe7a9695f223448 -AUX nvidia-texture-tools-2.0.8-cmake.patch 4773 RMD160 9e819bf5c1104653db6a70aabc2315910b985cdf SHA1 b313d81da904023b25b431eb5df3ae0eabbb4116 SHA256 dde709ed016a60e82563992f6c5dfc41969432cbd83c4253a90248ab998c6649 +AUX nvidia-texture-tools-2.0.8-r1-cmake.patch 5412 RMD160 f5ed6ea64b55cded3fda6261d3eb75454b9ce82c SHA1 a3dcf923e982bf5d86e023a9226c0246fdeb25fa SHA256 bab9c3228ce6fd04351c338fcb8c16d899b476ad3840f9fa4686ebaf72a74de9 AUX valgrind.patch 26286 RMD160 d2b438833024c1448d0aef7221668e8853f2ad68 SHA1 e46eff41188629c831d53ce0b045e0b939b0e34d SHA256 2ee618e7d9ddfe11bc3f304e7045832bc0e1e3a79b70924996830cdd46676539 DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 RMD160 dbb2a1ea4bef259af8520d881ab414d69ee0dea2 SHA1 3eaa578acc35159684748055aeb4bacdeaef12d1 SHA256 6b3c83500b420ee976f61eeae16e5727e2401e133f543baeac76c66c381eed2e -EBUILD nvidia-texture-tools-2.0.8.ebuild 1385 RMD160 567db4ed83349928b6c08a6dd82f16765a63b8a6 SHA1 b78b71930ee61ed2e308f6cda70b89b0009f9b81 SHA256 5ff914f6b24437109a9ee0121c1ade424fcc5a123fee50247e77cc6fd8db1b35 -MISC ChangeLog 642 RMD160 f482669a1e9d5af2ad64e097aed61dd87aca839b SHA1 b2817028e5321004494e676bafd1c4ccdfbf81a8 SHA256 b086b463a8dcf85941887970239ce98a3a67a2fe7674338aa5d137189ab7d429 +EBUILD nvidia-texture-tools-2.0.8-r1.ebuild 1651 RMD160 1d717d8c7d7dec880852a2c949897aa0b7198c38 SHA1 764ef88b45b352c8991ef46b10a5657d7367915a SHA256 d8f57d3badc247c3b85018fa93bb06297e666b49444816b17b4b0def4e592b94 +MISC ChangeLog 987 RMD160 2b4297007129704d53648915821d27b14172db26 SHA1 b56e378945013b3a5989a59ffbdde84772f68638 SHA256 fe7b99fb61a0ae37b35c5aabb8f196a4379c656790d6c798a8c7a9752899de01 MISC metadata.xml 382 RMD160 39b31924c1369a0478cd0ec709e01fd623178cba SHA1 566d696883a5795251bcadce39a4771dd535db17 SHA256 2f2e19993374f1de97db1723f09d4839997b76707510efce20dfb3123ba6a8ef diff --git a/dev-util/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cmake.patch b/dev-util/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cmake.patch deleted file mode 100644 index f2cadfc61..000000000 --- a/dev-util/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cmake.patch +++ /dev/null @@ -1,176 +0,0 @@ -From: hasufell -Date: Wed Apr 11 21:49:58 UTC 2012 -Subject: various cmake fixes - -fix hardcoded install paths for BINDIR and LIBDIR -make cg, cuda, glew, glut and openexr controllable and not automagic - ---- src/nvcore/CMakeLists.txt -+++ src/nvcore/CMakeLists.txt -@@ -42,6 +42,6 @@ - TARGET_LINK_LIBRARIES(nvcore ${LIBS}) - - INSTALL(TARGETS nvcore -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib/static) -+ RUNTIME DESTINATION ${BINDIR} -+ LIBRARY DESTINATION ${LIBDIR} -+ ARCHIVE DESTINATION ${LIBDIR}) ---- src/nvimage/CMakeLists.txt -+++ src/nvimage/CMakeLists.txt -@@ -62,7 +62,7 @@ - TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath posh) - - INSTALL(TARGETS nvimage -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib/static) -+ RUNTIME DESTINATION ${BINDIR} -+ LIBRARY DESTINATION ${LIBDIR} -+ ARCHIVE DESTINATION ${LIBDIR}) - ---- src/nvmath/CMakeLists.txt -+++ src/nvmath/CMakeLists.txt -@@ -28,6 +28,6 @@ - TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore) - - INSTALL(TARGETS nvmath -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib/static) -+ RUNTIME DESTINATION ${BINDIR} -+ LIBRARY DESTINATION ${LIBDIR} -+ ARCHIVE DESTINATION ${LIBDIR}) ---- src/nvtt/CMakeLists.txt -+++ src/nvtt/CMakeLists.txt -@@ -53,9 +53,9 @@ - TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvmath nvimage squish) - - INSTALL(TARGETS nvtt -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib/static) -+ RUNTIME DESTINATION ${BINDIR} -+ LIBRARY DESTINATION ${LIBDIR} -+ ARCHIVE DESTINATION ${LIBDIR}) - - INSTALL(FILES nvtt.h DESTINATION include/nvtt) - ---- src/CMakeLists.txt -+++ src/CMakeLists.txt -@@ -5,6 +5,13 @@ - SUBDIRS(nvtt) - - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -+ -+# initial variables -+SET(GLUT TRUE CACHE BOOL "") -+SET(GLEW TRUE CACHE BOOL "") -+SET(CG TRUE CACHE BOOL "") -+SET(CUDA TRUE CACHE BOOL "") -+SET(OPENEXR TRUE CACHE BOOL "") - - # OpenGL - INCLUDE(FindOpenGL) -@@ -15,13 +22,15 @@ - ENDIF(OPENGL_FOUND) - - # GLUT --INCLUDE(${NV_CMAKE_DIR}/FindGLUT.cmake) --#INCLUDE(FindGLUT) --IF(GLUT_FOUND) -- MESSAGE(STATUS "Looking for GLUT - found") --ELSE(GLUT_FOUND) -- MESSAGE(STATUS "Looking for GLUT - not found") --ENDIF(GLUT_FOUND) -+IF(GLUT) -+ INCLUDE(${NV_CMAKE_DIR}/FindGLUT.cmake) -+ #INCLUDE(FindGLUT) -+ IF(GLUT_FOUND) -+ MESSAGE(STATUS "Looking for GLUT - found") -+ ELSE(GLUT_FOUND) -+ MESSAGE(STATUS "Looking for GLUT - not found") -+ ENDIF(GLUT_FOUND) -+ENDIF(GLUT) - - # DirectX - INCLUDE(${NV_CMAKE_DIR}/FindDirectX.cmake) -@@ -32,29 +41,35 @@ - ENDIF(DX10_FOUND) - - # GLEW --INCLUDE(${NV_CMAKE_DIR}/FindGLEW.cmake) --IF(GLEW_FOUND) -- MESSAGE(STATUS "Looking for GLEW - found") --ELSE(GLEW_FOUND) -- MESSAGE(STATUS "Looking for GLEW - not found") --ENDIF(GLEW_FOUND) -+IF(GLEW) -+ INCLUDE(${NV_CMAKE_DIR}/FindGLEW.cmake) -+ IF(GLEW_FOUND) -+ MESSAGE(STATUS "Looking for GLEW - found") -+ ELSE(GLEW_FOUND) -+ MESSAGE(STATUS "Looking for GLEW - not found") -+ ENDIF(GLEW_FOUND) -+ENDIF(GLEW) - - # Cg --INCLUDE(${NV_CMAKE_DIR}/FindCg.cmake) --IF(CG_FOUND) -- MESSAGE(STATUS "Looking for Cg - found") --ELSE(CG_FOUND) -- MESSAGE(STATUS "Looking for Cg - not found") --ENDIF(CG_FOUND) -+IF(CG) -+ INCLUDE(${NV_CMAKE_DIR}/FindCg.cmake) -+ IF(CG_FOUND) -+ MESSAGE(STATUS "Looking for Cg - found") -+ ELSE(CG_FOUND) -+ MESSAGE(STATUS "Looking for Cg - not found") -+ ENDIF(CG_FOUND) -+ENDIF(CG) - - # CUDA --INCLUDE(${NV_CMAKE_DIR}/FindCUDA.cmake) --IF(CUDA_FOUND) -- SET(HAVE_CUDA ${CUDA_FOUND} CACHE BOOL "Set to TRUE if CUDA is found, FALSE otherwise") -- MESSAGE(STATUS "Looking for CUDA - found") --ELSE(CUDA_FOUND) -- MESSAGE(STATUS "Looking for CUDA - not found") --ENDIF(CUDA_FOUND) -+IF(CUDA) -+ INCLUDE(${NV_CMAKE_DIR}/FindCUDA.cmake) -+ IF(CUDA_FOUND) -+ SET(HAVE_CUDA ${CUDA_FOUND} CACHE BOOL "Set to TRUE if CUDA is found, FALSE otherwise") -+ MESSAGE(STATUS "Looking for CUDA - found") -+ ELSE(CUDA_FOUND) -+ MESSAGE(STATUS "Looking for CUDA - not found") -+ ENDIF(CUDA_FOUND) -+ENDIF(CUDA) - - # Maya - INCLUDE(${NV_CMAKE_DIR}/FindMaya.cmake) -@@ -93,13 +108,15 @@ - ENDIF(TIFF_FOUND) - - # OpenEXR --INCLUDE(${NV_CMAKE_DIR}/FindOpenEXR.cmake) --IF(OPENEXR_FOUND) -- SET(HAVE_OPENEXR ${OPENEXR_FOUND} CACHE BOOL "Set to TRUE if OpenEXR is found, FALSE otherwise") -- MESSAGE(STATUS "Looking for OpenEXR - found") --ELSE(OPENEXR_FOUND) -- MESSAGE(STATUS "Looking for OpenEXR - not found") --ENDIF(OPENEXR_FOUND) -+IF(OPENEXR) -+ INCLUDE(${NV_CMAKE_DIR}/FindOpenEXR.cmake) -+ IF(OPENEXR_FOUND) -+ SET(HAVE_OPENEXR ${OPENEXR_FOUND} CACHE BOOL "Set to TRUE if OpenEXR is found, FALSE otherwise") -+ MESSAGE(STATUS "Looking for OpenEXR - found") -+ ELSE(OPENEXR_FOUND) -+ MESSAGE(STATUS "Looking for OpenEXR - not found") -+ ENDIF(OPENEXR_FOUND) -+ENDIF(OPENEXR) - - # Qt - FIND_PACKAGE(Qt4) diff --git a/dev-util/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-r1-cmake.patch b/dev-util/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-r1-cmake.patch new file mode 100644 index 000000000..cee6fb5aa --- /dev/null +++ b/dev-util/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-r1-cmake.patch @@ -0,0 +1,192 @@ +From: hasufell +Date: Sun Apr 22 19:08:52 UTC 2012 +Subject: various cmake fixes + +fix hardcoded install paths for BINDIR and LIBDIR +make cg, cuda, glew, glut and openexr controllable and not automagic +add install-rules for headers (used by media-libs/devil) + +--- src/CMakeLists.txt ++++ src/CMakeLists.txt +@@ -6,6 +6,13 @@ + + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) + ++# initial variables ++SET(GLUT TRUE CACHE BOOL "") ++SET(GLEW TRUE CACHE BOOL "") ++SET(CG TRUE CACHE BOOL "") ++SET(CUDA TRUE CACHE BOOL "") ++SET(OPENEXR TRUE CACHE BOOL "") ++ + # OpenGL + INCLUDE(FindOpenGL) + IF(OPENGL_FOUND) +@@ -15,13 +22,15 @@ + ENDIF(OPENGL_FOUND) + + # GLUT +-INCLUDE(${NV_CMAKE_DIR}/FindGLUT.cmake) +-#INCLUDE(FindGLUT) +-IF(GLUT_FOUND) +- MESSAGE(STATUS "Looking for GLUT - found") +-ELSE(GLUT_FOUND) +- MESSAGE(STATUS "Looking for GLUT - not found") +-ENDIF(GLUT_FOUND) ++IF(GLUT) ++ INCLUDE(${NV_CMAKE_DIR}/FindGLUT.cmake) ++ #INCLUDE(FindGLUT) ++ IF(GLUT_FOUND) ++ MESSAGE(STATUS "Looking for GLUT - found") ++ ELSE(GLUT_FOUND) ++ MESSAGE(STATUS "Looking for GLUT - not found") ++ ENDIF(GLUT_FOUND) ++ENDIF(GLUT) + + # DirectX + INCLUDE(${NV_CMAKE_DIR}/FindDirectX.cmake) +@@ -32,29 +41,35 @@ + ENDIF(DX10_FOUND) + + # GLEW +-INCLUDE(${NV_CMAKE_DIR}/FindGLEW.cmake) +-IF(GLEW_FOUND) +- MESSAGE(STATUS "Looking for GLEW - found") +-ELSE(GLEW_FOUND) +- MESSAGE(STATUS "Looking for GLEW - not found") +-ENDIF(GLEW_FOUND) ++IF(GLEW) ++ INCLUDE(${NV_CMAKE_DIR}/FindGLEW.cmake) ++ IF(GLEW_FOUND) ++ MESSAGE(STATUS "Looking for GLEW - found") ++ ELSE(GLEW_FOUND) ++ MESSAGE(STATUS "Looking for GLEW - not found") ++ ENDIF(GLEW_FOUND) ++ENDIF(GLEW) + + # Cg +-INCLUDE(${NV_CMAKE_DIR}/FindCg.cmake) +-IF(CG_FOUND) +- MESSAGE(STATUS "Looking for Cg - found") +-ELSE(CG_FOUND) +- MESSAGE(STATUS "Looking for Cg - not found") +-ENDIF(CG_FOUND) ++IF(CG) ++ INCLUDE(${NV_CMAKE_DIR}/FindCg.cmake) ++ IF(CG_FOUND) ++ MESSAGE(STATUS "Looking for Cg - found") ++ ELSE(CG_FOUND) ++ MESSAGE(STATUS "Looking for Cg - not found") ++ ENDIF(CG_FOUND) ++ENDIF(CG) + + # CUDA +-INCLUDE(${NV_CMAKE_DIR}/FindCUDA.cmake) +-IF(CUDA_FOUND) +- SET(HAVE_CUDA ${CUDA_FOUND} CACHE BOOL "Set to TRUE if CUDA is found, FALSE otherwise") +- MESSAGE(STATUS "Looking for CUDA - found") +-ELSE(CUDA_FOUND) +- MESSAGE(STATUS "Looking for CUDA - not found") +-ENDIF(CUDA_FOUND) ++IF(CUDA) ++ INCLUDE(${NV_CMAKE_DIR}/FindCUDA.cmake) ++ IF(CUDA_FOUND) ++ SET(HAVE_CUDA ${CUDA_FOUND} CACHE BOOL "Set to TRUE if CUDA is found, FALSE otherwise") ++ MESSAGE(STATUS "Looking for CUDA - found") ++ ELSE(CUDA_FOUND) ++ MESSAGE(STATUS "Looking for CUDA - not found") ++ ENDIF(CUDA_FOUND) ++ENDIF(CUDA) + + # Maya + INCLUDE(${NV_CMAKE_DIR}/FindMaya.cmake) +@@ -93,13 +108,15 @@ + ENDIF(TIFF_FOUND) + + # OpenEXR +-INCLUDE(${NV_CMAKE_DIR}/FindOpenEXR.cmake) +-IF(OPENEXR_FOUND) +- SET(HAVE_OPENEXR ${OPENEXR_FOUND} CACHE BOOL "Set to TRUE if OpenEXR is found, FALSE otherwise") +- MESSAGE(STATUS "Looking for OpenEXR - found") +-ELSE(OPENEXR_FOUND) +- MESSAGE(STATUS "Looking for OpenEXR - not found") +-ENDIF(OPENEXR_FOUND) ++IF(OPENEXR) ++ INCLUDE(${NV_CMAKE_DIR}/FindOpenEXR.cmake) ++ IF(OPENEXR_FOUND) ++ SET(HAVE_OPENEXR ${OPENEXR_FOUND} CACHE BOOL "Set to TRUE if OpenEXR is found, FALSE otherwise") ++ MESSAGE(STATUS "Looking for OpenEXR - found") ++ ELSE(OPENEXR_FOUND) ++ MESSAGE(STATUS "Looking for OpenEXR - not found") ++ ENDIF(OPENEXR_FOUND) ++ENDIF(OPENEXR) + + # Qt + FIND_PACKAGE(Qt4) +@@ -121,3 +138,4 @@ + + #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/nvconfig.h DESTINATION include) + ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/nvconfig.h DESTINATION include) +--- src/nvtt/CMakeLists.txt ++++ src/nvtt/CMakeLists.txt +@@ -53,13 +53,11 @@ + TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvmath nvimage squish) + + INSTALL(TARGETS nvtt +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib/static) +- +-INSTALL(FILES nvtt.h DESTINATION include/nvtt) +- ++ RUNTIME DESTINATION ${BINDIR} ++ LIBRARY DESTINATION ${LIBDIR} ++ ARCHIVE DESTINATION ${LIBDIR}) + ++INSTALL(DIRECTORY . DESTINATION include/nvtt FILES_MATCHING PATTERN "*.h") + + # test executables + ADD_EXECUTABLE(nvcompress tools/compress.cpp tools/cmdline.h) +--- src/nvmath/CMakeLists.txt ++++ src/nvmath/CMakeLists.txt +@@ -28,6 +28,8 @@ + TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore) + + INSTALL(TARGETS nvmath +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib/static) ++ RUNTIME DESTINATION ${BINDIR} ++ LIBRARY DESTINATION ${LIBDIR} ++ ARCHIVE DESTINATION ${LIBDIR}) ++ ++INSTALL(DIRECTORY . DESTINATION include/nvmath FILES_MATCHING PATTERN "*.h") +--- src/nvimage/CMakeLists.txt ++++ src/nvimage/CMakeLists.txt +@@ -62,7 +62,8 @@ + TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath posh) + + INSTALL(TARGETS nvimage +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib/static) ++ RUNTIME DESTINATION ${BINDIR} ++ LIBRARY DESTINATION ${LIBDIR} ++ ARCHIVE DESTINATION ${LIBDIR}) + ++INSTALL(DIRECTORY . DESTINATION include/nvimage FILES_MATCHING PATTERN "*.h") +--- src/nvcore/CMakeLists.txt ++++ src/nvcore/CMakeLists.txt +@@ -42,6 +42,8 @@ + TARGET_LINK_LIBRARIES(nvcore ${LIBS}) + + INSTALL(TARGETS nvcore +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib/static) ++ RUNTIME DESTINATION ${BINDIR} ++ LIBRARY DESTINATION ${LIBDIR} ++ ARCHIVE DESTINATION ${LIBDIR}) ++ ++INSTALL(DIRECTORY . DESTINATION include/nvcore FILES_MATCHING PATTERN "*.h") diff --git a/dev-util/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r1.ebuild b/dev-util/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r1.ebuild new file mode 100644 index 000000000..d0924faa7 --- /dev/null +++ b/dev-util/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit cmake-utils eutils multilib toolchain-funcs + +DESCRIPTION="A set of cuda-enabled texture tools and compressors" +HOMEPAGE="http://developer.nvidia.com/object/texture_tools.html" +SRC_URI="http://${PN}.googlecode.com/files/${P}-1.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cg cuda glew glut openexr static-libs" + +DEPEND="media-libs/libpng:0 + media-libs/ilmbase + media-libs/tiff + sys-libs/zlib + virtual/jpeg + virtual/opengl + x11-libs/libX11 + cg? ( media-gfx/nvidia-cg-toolkit ) + cuda? ( dev-util/nvidia-cuda-toolkit ) + glew? ( media-libs/glew ) + glut? ( media-libs/freeglut ) + openexr? ( media-libs/openexr ) + " +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${PN} + +pkg_setup() { + if use cuda; then + if [[ $(( $(gcc-major-version) * 10 + $(gcc-minor-version) )) -gt 44 ]] ; then + eerror "gcc 4.5 and up are not supported for useflag cuda!" + die "gcc 4.5 and up are not supported for useflag cuda!" + fi + fi +} + +src_prepare() { + epatch "${FILESDIR}"/gcc4.4.4-aliasing.patch \ + "${FILESDIR}"/libpng1.5-build.patch \ + "${FILESDIR}"/valgrind.patch \ + "${FILESDIR}"/cuda.patch \ + "${FILESDIR}"/libtiff4.patch \ + "${FILESDIR}"/${PF}-cmake.patch +} + +src_configure() { + local mycmakeargs=( + -DLIBDIR=$(get_libdir) + $(cmake-utils_use cg CG) + $(cmake-utils_use cuda CUDA) + $(cmake-utils_use glew GLEW) + $(cmake-utils_use glut GLUT) + $(cmake-utils_use openexr OPENEXR) + $(cmake-utils_use !static-libs NVTT_SHARED) + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + dodoc ChangeLog +} diff --git a/dev-util/nvidia-texture-tools/nvidia-texture-tools-2.0.8.ebuild b/dev-util/nvidia-texture-tools/nvidia-texture-tools-2.0.8.ebuild deleted file mode 100644 index 47b5213e3..000000000 --- a/dev-util/nvidia-texture-tools/nvidia-texture-tools-2.0.8.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit cmake-utils eutils multilib - -DESCRIPTION="A set of cuda-enabled texture tools and compressors" -HOMEPAGE="http://developer.nvidia.com/object/texture_tools.html" -SRC_URI="http://${PN}.googlecode.com/files/${P}-1.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cg cuda glew glut openexr static-libs" - -DEPEND="media-libs/libpng:0 - media-libs/ilmbase - media-libs/tiff - sys-libs/zlib - virtual/jpeg - virtual/opengl - x11-libs/libX11 - cg? ( media-gfx/nvidia-cg-toolkit ) - cuda? ( dev-util/nvidia-cuda-toolkit ) - glew? ( media-libs/glew ) - glut? ( media-libs/freeglut ) - openexr? ( media-libs/openexr ) - " -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}"/gcc4.4.4-aliasing.patch \ - "${FILESDIR}"/libpng1.5-build.patch \ - "${FILESDIR}"/valgrind.patch \ - "${FILESDIR}"/cuda.patch \ - "${FILESDIR}"/libtiff4.patch \ - "${FILESDIR}"/${P}-cmake.patch -} - -src_configure() { - local mycmakeargs=( - -DLIBDIR=$(get_libdir) - $(cmake-utils_use cg CG) - $(cmake-utils_use cuda CUDA) - $(cmake-utils_use glew GLEW) - $(cmake-utils_use glut GLUT) - $(cmake-utils_use openexr OPENEXR) - $(cmake-utils_use !static-libs NVTT_SHARED) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - dodoc ChangeLog -} -- cgit v1.2.3-65-gdbad