summaryrefslogtreecommitdiff
path: root/graphics/nvidia-texture-tools/files
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/nvidia-texture-tools/files')
-rw-r--r--graphics/nvidia-texture-tools/files/patch-src-nvcore-Debug.cpp6
-rw-r--r--graphics/nvidia-texture-tools/files/patch-src-nvcore-Memory.h8
-rw-r--r--graphics/nvidia-texture-tools/files/patch-src-nvcore-nvcore.h4
-rw-r--r--graphics/nvidia-texture-tools/files/patch-src-nvcore-poshlib-posh.h6
-rw-r--r--graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp2
-rw-r--r--graphics/nvidia-texture-tools/files/patch-src-nvmath-nvmath.h8
-rw-r--r--graphics/nvidia-texture-tools/files/patch-src-nvtt-CMakeLists.txt6
7 files changed, 20 insertions, 20 deletions
diff --git a/graphics/nvidia-texture-tools/files/patch-src-nvcore-Debug.cpp b/graphics/nvidia-texture-tools/files/patch-src-nvcore-Debug.cpp
index ee6d6c863f7b..71f75cc9b6f6 100644
--- a/graphics/nvidia-texture-tools/files/patch-src-nvcore-Debug.cpp
+++ b/graphics/nvidia-texture-tools/files/patch-src-nvcore-Debug.cpp
@@ -1,5 +1,5 @@
---- src/nvcore/Debug.cpp.orig 2008-12-01 11:04:27.000000000 +0300
-+++ src/nvcore/Debug.cpp 2009-03-06 22:45:48.000000000 +0300
+--- src/nvcore/Debug.cpp.orig 2010-05-15 09:12:05 UTC
++++ src/nvcore/Debug.cpp
@@ -34,7 +34,7 @@
# endif
#endif
@@ -9,7 +9,7 @@
# include <unistd.h> // getpid
# include <sys/types.h>
# include <sys/sysctl.h> // sysctl
-@@ -195,6 +195,14 @@
+@@ -199,6 +199,14 @@ namespace
return (void *) ucp->uc_mcontext->ss.eip;
# endif
# endif
diff --git a/graphics/nvidia-texture-tools/files/patch-src-nvcore-Memory.h b/graphics/nvidia-texture-tools/files/patch-src-nvcore-Memory.h
index 93de8c198b09..0e75d65d1391 100644
--- a/graphics/nvidia-texture-tools/files/patch-src-nvcore-Memory.h
+++ b/graphics/nvidia-texture-tools/files/patch-src-nvcore-Memory.h
@@ -1,6 +1,6 @@
---- src/nvcore/Memory.h.orig 2010-05-14 21:59:28.000000000 +0400
-+++ src/nvcore/Memory.h 2013-03-13 11:44:40.704932899 +0400
-@@ -28,7 +28,7 @@
+--- src/nvcore/Memory.h.orig 2010-05-15 09:12:05 UTC
++++ src/nvcore/Memory.h
+@@ -28,7 +28,7 @@ namespace nv
// Override new/delete
@@ -9,7 +9,7 @@
{
return nv::mem::malloc(size);
}
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ inline void operator delete (void *p) th
nv::mem::free(p);
}
diff --git a/graphics/nvidia-texture-tools/files/patch-src-nvcore-nvcore.h b/graphics/nvidia-texture-tools/files/patch-src-nvcore-nvcore.h
index b77ddcc0d055..7722a0894d52 100644
--- a/graphics/nvidia-texture-tools/files/patch-src-nvcore-nvcore.h
+++ b/graphics/nvidia-texture-tools/files/patch-src-nvcore-nvcore.h
@@ -1,5 +1,5 @@
---- src/nvcore/nvcore.h.orig 2008-12-01 11:04:27.000000000 +0300
-+++ src/nvcore/nvcore.h 2009-03-06 22:45:11.000000000 +0300
+--- src/nvcore/nvcore.h.orig 2010-05-15 09:12:05 UTC
++++ src/nvcore/nvcore.h
@@ -38,6 +38,9 @@
#if defined POSH_OS_LINUX
# define NV_OS_LINUX 1
diff --git a/graphics/nvidia-texture-tools/files/patch-src-nvcore-poshlib-posh.h b/graphics/nvidia-texture-tools/files/patch-src-nvcore-poshlib-posh.h
index 640ebb7f8fdc..3346645b1446 100644
--- a/graphics/nvidia-texture-tools/files/patch-src-nvcore-poshlib-posh.h
+++ b/graphics/nvidia-texture-tools/files/patch-src-nvcore-poshlib-posh.h
@@ -1,6 +1,6 @@
---- src/nvcore/poshlib/posh.h.orig 2008-12-01 11:04:27.000000000 +0300
-+++ src/nvcore/poshlib/posh.h 2009-03-06 22:36:38.000000000 +0300
-@@ -293,6 +293,11 @@
+--- src/nvcore/poshlib/posh.h.orig 2010-05-15 09:12:05 UTC
++++ src/nvcore/poshlib/posh.h
+@@ -293,6 +293,11 @@ Metrowerks:
# define POSH_OS_STRING "Linux"
#endif
diff --git a/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp b/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp
index b0cdde632d6a..88eb50da1612 100644
--- a/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp
+++ b/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp
@@ -1,4 +1,4 @@
---- src/nvimage/ImageIO.cpp.orig 2010-05-14 17:59:28 UTC
+--- src/nvimage/ImageIO.cpp.orig 2010-05-15 09:12:05 UTC
+++ src/nvimage/ImageIO.cpp
@@ -603,7 +603,7 @@ static void user_read_data(png_structp p
{
diff --git a/graphics/nvidia-texture-tools/files/patch-src-nvmath-nvmath.h b/graphics/nvidia-texture-tools/files/patch-src-nvmath-nvmath.h
index 6230ee1a5c8a..43b5e1b15b1c 100644
--- a/graphics/nvidia-texture-tools/files/patch-src-nvmath-nvmath.h
+++ b/graphics/nvidia-texture-tools/files/patch-src-nvmath-nvmath.h
@@ -1,6 +1,6 @@
---- src/nvmath/nvmath.h.orig 2008-12-01 11:04:28.000000000 +0300
-+++ src/nvmath/nvmath.h 2009-03-06 22:38:28.000000000 +0300
-@@ -97,7 +97,7 @@
+--- src/nvmath/nvmath.h.orig 2010-05-15 09:12:05 UTC
++++ src/nvmath/nvmath.h
+@@ -115,7 +115,7 @@ inline bool isFinite(const float f)
{
#if NV_OS_WIN32
return _finite(f) != 0;
@@ -9,7 +9,7 @@
return isfinite(f);
#elif NV_OS_LINUX
return finitef(f);
-@@ -112,7 +112,7 @@
+@@ -130,7 +130,7 @@ inline bool isNan(const float f)
{
#if NV_OS_WIN32
return _isnan(f) != 0;
diff --git a/graphics/nvidia-texture-tools/files/patch-src-nvtt-CMakeLists.txt b/graphics/nvidia-texture-tools/files/patch-src-nvtt-CMakeLists.txt
index 4b78d2b32e0c..8066228e5985 100644
--- a/graphics/nvidia-texture-tools/files/patch-src-nvtt-CMakeLists.txt
+++ b/graphics/nvidia-texture-tools/files/patch-src-nvtt-CMakeLists.txt
@@ -1,6 +1,6 @@
---- src/nvtt/CMakeLists.txt.orig 2008-12-01 11:04:29.000000000 +0300
-+++ src/nvtt/CMakeLists.txt 2009-03-06 22:58:45.000000000 +0300
-@@ -105,9 +105,11 @@
+--- src/nvtt/CMakeLists.txt.orig 2010-05-15 09:12:05 UTC
++++ src/nvtt/CMakeLists.txt
+@@ -105,9 +105,11 @@ IF(QT4_FOUND AND NOT MSVC)
QT4_WRAP_CPP(MOCS tools/configdialog.h)
#QT4_ADD_RESOURCES(RCCS tools/configdialog.rc)