reinit the tree, so we can have metadata

5 files changed, 224 insertions, 0 deletions

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..79d38f576316
--- /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
+
+--- a/cmake/FindCg.cmake
++++ b/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/files/nvidia-texture-tools-2.0.8-clang.patch b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-clang.patch
new file mode 100644
index 000000000000..373c87e4171b
--- /dev/null
+++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-clang.patch
@@ -0,0 +1,18 @@
+Index: src/src/nvtt/squish/CMakeLists.txt
+===================================================================
+--- src/src/nvtt/squish/CMakeLists.txt	(revision 13060)
++++ src/src/nvtt/squish/CMakeLists.txt	(working copy)
+@@ -22,7 +22,11 @@

+ 
+ ADD_LIBRARY(squish STATIC ${SQUISH_SRCS})
+ 
+-IF(CMAKE_COMPILER_IS_GNUCXX)
++IF("${CMAKE_CXX_COMPILER}" MATCHES "clang(\\+\\+)?$" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
++	SET(CMAKE_COMPILER_IS_CLANGXX 1)
++ENDIF()
++
++IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
+ 	SET_TARGET_PROPERTIES(squish PROPERTIES COMPILE_FLAGS -fPIC)
+-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
++ENDIF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
+ 
diff --git a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cpp14.patch b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cpp14.patch
new file mode 100644
index 000000000000..3130d2c60bb1
--- /dev/null
+++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cpp14.patch
@@ -0,0 +1,58 @@
+This patch fixes cpp14 compilation errors.
+Gentoo-bug: 594938
+
+--- a/src/nvimage/ImageIO.cpp
++++ b/src/nvimage/ImageIO.cpp
+@@ -135,7 +135,7 @@
+ 	StdInputStream stream(fileName);
+ 	
+ 	if (stream.isError()) {
+-		return false;
++		return NULL;
+ 	}
+ 	
+ 	return loadFloat(fileName, stream);
+@@ -233,7 +233,7 @@
+ 		case TGA_TYPE_INDEXED:
+ 			if( tga.colormap_type!=1 || tga.colormap_size!=24 || tga.colormap_length>256 ) {
+ 				nvDebug( "*** ImageIO::loadTGA: Error, only 24bit paletted images are supported.\n" );
+-				return false;
++				return NULL;
+ 			}
+ 			pal = true;
+ 			break;
+@@ -254,7 +254,7 @@
+ 
+ 		default:
+ 			nvDebug( "*** ImageIO::loadTGA: Error, unsupported image type.\n" );
+-			return false;
++			return NULL;
+ 	}
+ 
+ 	const uint pixel_size = (tga.pixel_size/8);
+@@ -621,7 +621,7 @@
+ 	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ 	if (png_ptr == NULL) {
+ 	//	nvDebug( "*** LoadPNG: Error allocating read buffer in file '%s'.\n", name );
+-		return false;
++		return NULL;
+ 	}
+ 
+ 	// Allocate/initialize a memory block for the image information
+@@ -629,14 +629,14 @@
+ 	if (info_ptr == NULL) {
+ 		png_destroy_read_struct(&png_ptr, NULL, NULL);
+ 	//	nvDebug( "*** LoadPNG: Error allocating image information for '%s'.\n", name );
+-		return false;
++		return NULL;
+ 	}
+ 
+ 	// Set up the error handling
+ 	if (setjmp(png_jmpbuf(png_ptr))) {
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 	//	nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name );
+-		return false;
++		return NULL;
+ 	}
+ 
+ 	// Set up the I/O functions.
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..aaba26227411
--- /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
+
+--- a/src/nvcore/nvcore.h
++++ b/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/files/nvidia-texture-tools-2.0.8-openexr.patch b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-openexr.patch
new file mode 100644
index 000000000000..b49abf9e5c32
--- /dev/null
+++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-openexr.patch
@@ -0,0 +1,93 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Mar 20 22:10:22 UTC 2013
+Subject: add pkgconfig checks
+
+https://bugs.gentoo.org/show_bug.cgi?id=462494
+
+--- nvidia-texture-tools/cmake/FindOpenEXR.cmake
++++ nvidia-texture-tools/cmake/FindOpenEXR.cmake
+@@ -7,11 +7,15 @@
+ # OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR.
+ # 
+ 
+-INCLUDE(FindZLIB)
++IF(UNIX)
++	INCLUDE(FindPkgConfig)
++	pkg_check_modules(_PKG_OPENEXR OpenEXR)
++ENDIF(UNIX)
+ 
++find_package(ZLIB REQUIRED)
+ 
+-IF(ZLIB_FOUND)
+-
++IF(NOT _PKG_OPENEXR_FOUND)
++	
+ 	SET(LIBRARY_PATHS 
+ 		/usr/lib
+ 		/usr/local/lib
+@@ -46,10 +50,20 @@
+ 		NAMES IlmThread
+ 		PATHS ${LIBRARY_PATHS})
+ 
+-ENDIF(ZLIB_FOUND)
++ENDIF(NOT _PKG_OPENEXR_FOUND)
+ 
+ #MESSAGE(STATUS ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ZLIB_LIBRARY})
+ 
++IF(_PKG_OPENEXR_FOUND)
++	SET(OPENEXR_FOUND TRUE)
++	foreach(i ${_PKG_OPENEXR_CFLAGS})
++		SET(OPENEXR_CFLAGS "${OPENEXR_CFLAGS} ${i}")
++	endforeach(i)
++	foreach(p ${_PKG_OPENEXR_LDFLAGS})
++		SET(OPENEXR_LDFLAGS "${OPENEXR_LDFLAGS} ${p}")
++	endforeach(p)
++	SET(OPENEXR_LDFLAGS "${OPENEXR_LDFLAGS} ${ZLIB_LIBRARY}")
++ELSE(_PKG_OPENEXR_FOUND)
+ IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
+ 	SET(OPENEXR_FOUND TRUE)
+ 	SET(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR")
+@@ -65,6 +79,8 @@
+ 		MESSAGE(FATAL_ERROR "Could not find OpenEXR library")
+ 	ENDIF(OPENEXR_FIND_REQUIRED)
+ ENDIF(OPENEXR_FOUND)
++ENDIF(_PKG_OPENEXR_FOUND)
++
+ 
+ MARK_AS_ADVANCED(
+ 	OPENEXR_INCLUDE_PATHS
+@@ -73,3 +89,4 @@
+ 	OPENEXR_IMATH_LIBRARY
+ 	OPENEXR_IEX_LIBRARY
+ 	OPENEXR_HALF_LIBRARY)
++
+--- nvidia-texture-tools/src/nvimage/CMakeLists.txt
++++ nvidia-texture-tools/src/nvimage/CMakeLists.txt
+@@ -44,10 +44,10 @@
+ 	INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
+ ENDIF(TIFF_FOUND)
+ 
+-IF(OPENEXR_FOUND)
++IF(OPENEXR_FOUND AND NOT _PKG_OPENEXR_FOUND)
+ 	SET(LIBS ${LIBS} ${OPENEXR_LIBRARIES})
+ 	INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_PATHS})
+-ENDIF(OPENEXR_FOUND)
++ENDIF(OPENEXR_FOUND AND NOT _PKG_OPENEXR_FOUND)
+ 
+ # targets
+ ADD_DEFINITIONS(-DNVIMAGE_EXPORTS)
+@@ -61,6 +61,14 @@
+ 
+ TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath posh)
+ 
++IF(_PKG_OPENEXR_FOUND)
++	SET_TARGET_PROPERTIES(nvimage
++		PROPERTIES
++		COMPILE_FLAGS "${OPENEXR_CFLAGS}"
++		LINK_FLAGS "${OPENEXR_LDFLAGS}"
++	)
++ENDIF(_PKG_OPENEXR_FOUND)
++
+ INSTALL(TARGETS nvimage
+ 	RUNTIME DESTINATION bin
+ 	LIBRARY DESTINATION lib