pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/nvidia-texture-tools Update to nvidia-texture...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1610bb84a0e1
branches: trunk
changeset: 352909:1610bb84a0e1
user: kamil <kamil%pkgsrc.org@localhost>
date: Mon Sep 19 23:28:01 2016 +0000
description:
Update to nvidia-texture-tools to 2.1.0
pkgsrc changes:
Drop all local patches as merged
Depend on upstreamed support for NetBSD
There is no particular upstream changelog, it's a first tag in 5 years
with all the patches applied. The major benefit is to unload software
from bundling a custom patched (without NetBSD support) version of nvtt.
diffstat:
graphics/nvidia-texture-tools/Makefile | 4 +-
graphics/nvidia-texture-tools/PLIST | 9 +-
graphics/nvidia-texture-tools/distinfo | 16 +-
graphics/nvidia-texture-tools/patches/patch-src_nvcore_Debug.cpp | 56 -------
graphics/nvidia-texture-tools/patches/patch-src_nvcore_DefsGnucNetBSD.h | 72 ---------
graphics/nvidia-texture-tools/patches/patch-src_nvcore_nvcore.h | 25 ---
graphics/nvidia-texture-tools/patches/patch-src_nvcore_poshlib_posh.h | 24 ---
graphics/nvidia-texture-tools/patches/patch-src_nvimage_ImageIO.cpp | 75 ----------
graphics/nvidia-texture-tools/patches/patch-src_nvmath_nvmath.h | 24 ---
9 files changed, 14 insertions(+), 291 deletions(-)
diffs (truncated from 356 to 300 lines):
diff -r 45a6a812265e -r 1610bb84a0e1 graphics/nvidia-texture-tools/Makefile
--- a/graphics/nvidia-texture-tools/Makefile Mon Sep 19 22:39:21 2016 +0000
+++ b/graphics/nvidia-texture-tools/Makefile Mon Sep 19 23:28:01 2016 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2016/09/18 17:08:20 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2016/09/19 23:28:01 kamil Exp $
-DISTNAME= nvidia-texture-tools-2.0.8
+DISTNAME= nvidia-texture-tools-2.1.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GITHUB:=castano/}
diff -r 45a6a812265e -r 1610bb84a0e1 graphics/nvidia-texture-tools/PLIST
--- a/graphics/nvidia-texture-tools/PLIST Mon Sep 19 22:39:21 2016 +0000
+++ b/graphics/nvidia-texture-tools/PLIST Mon Sep 19 23:28:01 2016 +0000
@@ -1,12 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 2016/09/18 17:08:20 kamil Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/09/19 23:28:01 kamil Exp $
+bin/nv-gnome-thumbnailer
bin/nvassemble
bin/nvcompress
bin/nvddsinfo
bin/nvdecompress
-bin/nvimgdiff
+bin/nvhdrtest
+bin/nvtestsuite
bin/nvzoom
include/nvtt/nvtt.h
lib/libnvcore.so
lib/libnvimage.so
lib/libnvmath.so
lib/libnvtt.so
+lib/static/libnvthread.a
+share/doc/nvtt/LICENSE
+share/doc/nvtt/README.md
diff -r 45a6a812265e -r 1610bb84a0e1 graphics/nvidia-texture-tools/distinfo
--- a/graphics/nvidia-texture-tools/distinfo Mon Sep 19 22:39:21 2016 +0000
+++ b/graphics/nvidia-texture-tools/distinfo Mon Sep 19 23:28:01 2016 +0000
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.1 2016/09/18 17:08:20 kamil Exp $
+$NetBSD: distinfo,v 1.2 2016/09/19 23:28:01 kamil Exp $
-SHA1 (nvidia-texture-tools-2.0.8.tar.gz) = 5e032be01a17feef3f78fd0aa35aaf1eec81b620
-RMD160 (nvidia-texture-tools-2.0.8.tar.gz) = 86fc38c77cf0529bd0b1746322a7923cc3deecaf
-SHA512 (nvidia-texture-tools-2.0.8.tar.gz) = 342b9e14a1bdeeee8fae4a3b0446b25b01e13915cc5bd29396e6ca01bb1262c64e759008a7d7debf8a811c7cf16c54d44c22f31557e626cd0bafea07724bab01
-Size (nvidia-texture-tools-2.0.8.tar.gz) = 939218 bytes
-SHA1 (patch-src_nvcore_Debug.cpp) = 17499d48fca6d19a0adc4118e4e64a22913ca64f
-SHA1 (patch-src_nvcore_DefsGnucNetBSD.h) = b5497bad0aac0cfbc8c10da70b0918621935a919
-SHA1 (patch-src_nvcore_nvcore.h) = c769e4d3a4bfe02054df7c7529554e21c3108e3c
-SHA1 (patch-src_nvcore_poshlib_posh.h) = 0641af0a61d0f5cc158623b204136c0e383586a3
-SHA1 (patch-src_nvimage_ImageIO.cpp) = 0863e3d4f6dfcd2d1b94c0e9e7592a17c85caafd
-SHA1 (patch-src_nvmath_nvmath.h) = c6a06d8043f5f80dc936b26f1cae41e7b2f4d804
+SHA1 (nvidia-texture-tools-2.1.0.tar.gz) = e4af0b4a7503c79ffa2c442c0eb1d6565fce7912
+RMD160 (nvidia-texture-tools-2.1.0.tar.gz) = e17be1052efbfb45956759a0479a4bf00e3988c3
+SHA512 (nvidia-texture-tools-2.1.0.tar.gz) = 6c5c9588af57023fc384de080cbe5c5ccd8707d04a9533384c606efd09730d780cb21bcf2d3576102a3facd2f281cacb2625958d74575e71550fd98da92e38b6
+Size (nvidia-texture-tools-2.1.0.tar.gz) = 43385028 bytes
diff -r 45a6a812265e -r 1610bb84a0e1 graphics/nvidia-texture-tools/patches/patch-src_nvcore_Debug.cpp
--- a/graphics/nvidia-texture-tools/patches/patch-src_nvcore_Debug.cpp Mon Sep 19 22:39:21 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-$NetBSD: patch-src_nvcore_Debug.cpp,v 1.1 2016/09/18 17:08:20 kamil Exp $
-
-Add NetBSD support.
-
---- src/nvcore/Debug.cpp.orig 2010-05-15 09:12:05.000000000 +0000
-+++ src/nvcore/Debug.cpp
-@@ -34,7 +34,7 @@
- # endif
- #endif
-
--#if NV_OS_DARWIN
-+#if NV_OS_DARWIN || NV_OS_NETBSD
- # include <unistd.h> // getpid
- # include <sys/types.h>
- # include <sys/sysctl.h> // sysctl
-@@ -133,7 +133,7 @@ namespace
-
- #elif !NV_OS_WIN32 && defined(HAVE_SIGNAL_H) // NV_OS_LINUX || NV_OS_DARWIN
-
--#if defined(HAVE_EXECINFO_H) // NV_OS_LINUX
-+#if defined(HAVE_EXECINFO_H) // NV_OS_LINUX || NV_OS_NETBSD
-
- static bool nvHasStackTrace() {
- #if NV_OS_DARWIN
-@@ -199,6 +199,17 @@ namespace
- return (void *) ucp->uc_mcontext->ss.eip;
- # endif
- # endif
-+# elif NV_OS_NETBSD
-+# if NV_CPU_X86_64
-+ ucontext_t * ucp = (ucontext_t *)secret;
-+ return (void *)ucp->uc_mcontext.__gregs[_REG_RIP];
-+# elif NV_CPU_X86
-+ ucontext_t * ucp = (ucontext_t *)secret;
-+ return (void *)ucp->uc_mcontext.__gregs[_REG_EIP];
-+# elif NV_CPU_PPC
-+ ucontext_t * ucp = (ucontext_t *)secret;
-+ return (void *)ucp->uc_mcontext.__gregs[_REG_PC];
-+# endif
- # else
- # if NV_CPU_X86_64
- // #define REG_RIP REG_INDEX(rip) // seems to be 16
-@@ -215,7 +226,7 @@ namespace
-
- // How to obtain the instruction pointers in different platforms, from mlton's source code.
- // http://mlton.org/
-- // OpenBSD && NetBSD
-+ // OpenBSD
- // ucp->sc_eip
- // FreeBSD:
- // ucp->uc_mcontext.mc_eip
-@@ -534,4 +545,3 @@ void debug::disableSigHandler()
-
- #endif
- }
--
diff -r 45a6a812265e -r 1610bb84a0e1 graphics/nvidia-texture-tools/patches/patch-src_nvcore_DefsGnucNetBSD.h
--- a/graphics/nvidia-texture-tools/patches/patch-src_nvcore_DefsGnucNetBSD.h Mon Sep 19 22:39:21 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-$NetBSD: patch-src_nvcore_DefsGnucNetBSD.h,v 1.1 2016/09/18 17:08:20 kamil Exp $
-
-Add NetBSD support.
-
---- src/nvcore/DefsGnucNetBSD.h.orig 2016-07-29 23:19:05.554359582 +0000
-+++ src/nvcore/DefsGnucNetBSD.h
-@@ -0,0 +1,65 @@
-+#ifndef NV_CORE_H
-+#error "Do not include this file directly."
-+#endif
-+
-+#include <stdint.h> // uint8_t, int8_t, ...
-+
-+// Function linkage
-+#define DLL_IMPORT
-+#if __GNUC__ >= 4
-+# define DLL_EXPORT __attribute__((visibility("default")))
-+# define DLL_EXPORT_CLASS DLL_EXPORT
-+#else
-+# define DLL_EXPORT
-+# define DLL_EXPORT_CLASS
-+#endif
-+
-+// Function calling modes
-+#if NV_CPU_X86
-+# define NV_CDECL __attribute__((cdecl))
-+# define NV_STDCALL __attribute__((stdcall))
-+#else
-+# define NV_CDECL
-+# define NV_STDCALL
-+#endif
-+
-+#define NV_FASTCALL __attribute__((fastcall))
-+#define NV_FORCEINLINE __attribute__((always_inline))
-+#define NV_DEPRECATED __attribute__((deprecated))
-+
-+#if __GNUC__ > 2
-+#define NV_PURE __attribute__((pure))
-+#define NV_CONST __attribute__((const))
-+#else
-+#define NV_PURE
-+#define NV_CONST
-+#endif
-+
-+// Define __FUNC__ properly.
-+#if __STDC_VERSION__ < 199901L
-+# if __GNUC__ >= 2
-+# define __FUNC__ __PRETTY_FUNCTION__ // __FUNCTION__
-+# else
-+# define __FUNC__ "<unknown>"
-+# endif
-+#else
-+# define __FUNC__ __PRETTY_FUNCTION__
-+#endif
-+
-+#define restrict __restrict__
-+
-+// Type definitions
-+typedef uint8_t uint8;
-+typedef int8_t int8;
-+
-+typedef uint16_t uint16;
-+typedef int16_t int16;
-+
-+typedef uint32_t uint32;
-+typedef int32_t int32;
-+
-+typedef unsigned long long uint64;
-+typedef int64_t int64;
-+
-+// Aliases
-+typedef uint32 uint;
diff -r 45a6a812265e -r 1610bb84a0e1 graphics/nvidia-texture-tools/patches/patch-src_nvcore_nvcore.h
--- a/graphics/nvidia-texture-tools/patches/patch-src_nvcore_nvcore.h Mon Sep 19 22:39:21 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_nvcore_nvcore.h,v 1.1 2016/09/18 17:08:20 kamil Exp $
-
-Add NetBSD support.
-
---- src/nvcore/nvcore.h.orig 2010-05-15 09:12:05.000000000 +0000
-+++ src/nvcore/nvcore.h
-@@ -43,6 +43,9 @@
- #elif defined POSH_OS_MINGW
- # define NV_OS_MINGW 1
- # define NV_OS_WIN32 1
-+#elif defined POSH_OS_NETBSD
-+# define NV_OS_NETBSD 1
-+# define NV_OS_UNIX 1
- #elif defined POSH_OS_OSX
- # define NV_OS_DARWIN 1
- # define NV_OS_UNIX 1
-@@ -160,6 +163,8 @@
- # include "DefsGnucLinux.h"
- # elif NV_OS_DARWIN
- # include "DefsGnucDarwin.h"
-+# elif NV_OS_NETBSD
-+# include "DefsGnucNetBSD.h"
- # elif NV_OS_MINGW
- # include "DefsGnucWin32.h"
- # elif NV_OS_CYGWIN
diff -r 45a6a812265e -r 1610bb84a0e1 graphics/nvidia-texture-tools/patches/patch-src_nvcore_poshlib_posh.h
--- a/graphics/nvidia-texture-tools/patches/patch-src_nvcore_poshlib_posh.h Mon Sep 19 22:39:21 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_nvcore_poshlib_posh.h,v 1.1 2016/09/18 17:08:20 kamil Exp $
-
-Add NetBSD support.
-
---- src/nvcore/poshlib/posh.h.orig 2010-05-15 09:12:05.000000000 +0000
-+++ src/nvcore/poshlib/posh.h
-@@ -372,6 +372,11 @@ Metrowerks:
- # define POSH_OS_STRING "Amiga"
- #endif
-
-+#if defined __NetBSD__
-+# define POSH_OS_NETBSD 1
-+# define POSH_OS_STRING "NetBSD"
-+#endif
-+
- #if defined __unix__
- # define POSH_OS_UNIX 1
- # if !defined POSH_OS_STRING
-@@ -1003,5 +1008,3 @@ extern posh_i64_t POSH_ReadI64FromBig(
- #ifdef __cplusplus
- }
- #endif
--
--
diff -r 45a6a812265e -r 1610bb84a0e1 graphics/nvidia-texture-tools/patches/patch-src_nvimage_ImageIO.cpp
--- a/graphics/nvidia-texture-tools/patches/patch-src_nvimage_ImageIO.cpp Mon Sep 19 22:39:21 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-$NetBSD: patch-src_nvimage_ImageIO.cpp,v 1.1 2016/09/18 17:08:20 kamil Exp $
-
-Add NetBSD support.
-Adapt for new libpng API.
-Fix false->NULL conversion warnings.
-
---- src/nvimage/ImageIO.cpp.orig 2010-05-15 09:12:05.000000000 +0000
-+++ src/nvimage/ImageIO.cpp
-@@ -135,7 +135,7 @@ FloatImage * nv::ImageIO::loadFloat(cons
- StdInputStream stream(fileName);
-
- if (stream.isError()) {
-- return false;
-+ return NULL;
- }
-
- return loadFloat(fileName, stream);
-@@ -233,7 +233,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
- 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 @@ Image * nv::ImageIO::loadTGA(Stream & s)
-
- default:
- nvDebug( "*** ImageIO::loadTGA: Error, unsupported image type.\n" );
-- return false;
-+ return NULL;
- }
-
- const uint pixel_size = (tga.pixel_size/8);
-@@ -603,7 +603,7 @@ static void user_read_data(png_structp p
- {
- nvDebugCheck(png_ptr != NULL);
-
-- Stream * s = (Stream *)png_ptr->io_ptr;
-+ Stream * s = (Stream *)png_get_io_ptr(png_ptr);
- s->serialize(data, (int)length);
-
- if (s->isError()) {
-@@ -621,7 +621,7 @@ Image * nv::ImageIO::loadPNG(Stream & s)
- png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- if (png_ptr == NULL) {
Home |
Main Index |
Thread Index |
Old Index