pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Update libfpx to version 1.3.1-5
Module Name: pkgsrc-wip
Committed By: Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By: nros
Date: Mon Dec 28 12:31:02 2015 +0100
Changeset: 9cc13841a8f8692e87255755af04c84a9cc62eee
Modified Files:
libfpx/Makefile
libfpx/TODO
libfpx/distinfo
Added Files:
libfpx/patches/patch-fpx_f__fpxvw.cpp
libfpx/patches/patch-fpx_fpxlibio.cpp
libfpx/patches/patch-ole_olecore.h
Removed Files:
libfpx/patches/patch-Makefile.am
libfpx/patches/patch-basics_filename.cpp
libfpx/patches/patch-configure.ac
libfpx/patches/patch-fpx_fpxutils.h
libfpx/patches/patch-jpeg_dllmain.c
libfpx/patches/patch-ole_gen__guid.cpp
libfpx/patches/patch-ole_olefiles.cpp
Log Message:
Update libfpx to version 1.3.1-5
Most of the patches have been applied upstream.
remove use of auto* since the fixes to MAkefile.am and configure.ac has been
applied upstream.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9cc13841a8f8692e87255755af04c84a9cc62eee
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
libfpx/Makefile | 8 ++---
libfpx/TODO | 1 -
libfpx/distinfo | 18 ++++------
libfpx/patches/patch-Makefile.am | 22 -------------
libfpx/patches/patch-basics_filename.cpp | 30 -----------------
libfpx/patches/patch-configure.ac | 13 --------
libfpx/patches/patch-fpx_f__fpxvw.cpp | 56 ++++++++++++++++++++++++++++++++
libfpx/patches/patch-fpx_fpxlibio.cpp | 13 ++++++++
libfpx/patches/patch-fpx_fpxutils.h | 13 --------
libfpx/patches/patch-jpeg_dllmain.c | 13 --------
libfpx/patches/patch-ole_gen__guid.cpp | 13 --------
libfpx/patches/patch-ole_olecore.h | 13 ++++++++
libfpx/patches/patch-ole_olefiles.cpp | 13 --------
13 files changed, 91 insertions(+), 135 deletions(-)
diffs:
diff --git a/libfpx/Makefile b/libfpx/Makefile
index 4750692..9b1a907 100644
--- a/libfpx/Makefile
+++ b/libfpx/Makefile
@@ -1,7 +1,8 @@
# $NetBSD$
libfpx_ver= 1.3.1
-DISTNAME= libfpx-${libfpx_ver}-4
+DISTNAME= libfpx-${libfpx_ver}-5
PKGNAME= libfpx-${libfpx_ver}
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/ \
ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ \
@@ -13,13 +14,8 @@ HOMEPAGE= http://www.imagemagick.org/
COMMENT= Library for reading FlashPix images
#LICENSE= # TODO: (see mk/license.mk)
-USE_TOOLS+= autoconf automake
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-pre-configure:
- cd ${WRKSRC}; aclocal; autoheader; \
- automake -a --foreign -i; autoconf
-
.include "../../mk/bsd.pkg.mk"
diff --git a/libfpx/TODO b/libfpx/TODO
index 727fc3b..cf5fdd3 100644
--- a/libfpx/TODO
+++ b/libfpx/TODO
@@ -1,3 +1,2 @@
LICENSE??
Better DESCR.
-test with clang and perhaps incororate freebsd ports patch.
diff --git a/libfpx/distinfo b/libfpx/distinfo
index b243efd..547d1a7 100644
--- a/libfpx/distinfo
+++ b/libfpx/distinfo
@@ -1,14 +1,10 @@
$NetBSD$
-SHA1 (libfpx-1.3.1-4.tar.xz) = ade847a583aff644d7f0441cf0404aa14bc049fd
-RMD160 (libfpx-1.3.1-4.tar.xz) = 808ec80b0127c62877685c2575779babe5af6c96
-SHA512 (libfpx-1.3.1-4.tar.xz) = 3f4510b6896d76a4f3d0aa1c6060b93e5e2783c8d7c801488f1593b20d8081fb5aa1b19475f863922a1f5c5aa22255aa70e435a2a7bace443efcae7c3e32ae3b
-Size (libfpx-1.3.1-4.tar.xz) = 1896560 bytes
-SHA1 (patch-Makefile.am) = 9be0f0c5dae161b3c42ebafa771b63bc5f2dcfad
-SHA1 (patch-basics_filename.cpp) = 705bb933b051437d0628809cfb1d76c66f0f2f43
-SHA1 (patch-configure.ac) = 1ca2374d5ec76ae5c351d3641926d419d5d55855
-SHA1 (patch-fpx_fpxutils.h) = 87890fdb96035808bca140b835c8c4b70346ecd5
+SHA1 (libfpx-1.3.1-5.tar.xz) = 2df0085b6d364d9cb2224b8cc14e308d7fad35ae
+RMD160 (libfpx-1.3.1-5.tar.xz) = ed63f57bdebd53bbf3fc6d01b4c5069800503283
+SHA512 (libfpx-1.3.1-5.tar.xz) = 23e2d27f1d6d132f3b12bc807fa68acbd211ba58b2c745a6f7735700329aa2973dd70d88811503eebd05f98812e84e8b977a837521b8749523864f3edb11d053
+Size (libfpx-1.3.1-5.tar.xz) = 1906544 bytes
+SHA1 (patch-fpx_f__fpxvw.cpp) = f096de5d72125b13e793210ca701c0c7e5ead0df
+SHA1 (patch-fpx_fpxlibio.cpp) = 5a8c52c07616b7623106eb54f5c47336451f53b3
SHA1 (patch-fpxlib.h) = 3ee9dde1db3eee5b901c8da752f5a4c19d2d95d4
-SHA1 (patch-jpeg_dllmain.c) = 31e33814feda2e78845e4a248f31d1f8196e0c58
-SHA1 (patch-ole_gen__guid.cpp) = 1a6f78f609038c5238e9d4c2fc26f5a93d655d1c
-SHA1 (patch-ole_olefiles.cpp) = 18b216766aa2920797dddb61122c05d8b183a8cc
+SHA1 (patch-ole_olecore.h) = d9625be22f2f895ff63e56e032bbd31d59ba71ab
diff --git a/libfpx/patches/patch-Makefile.am b/libfpx/patches/patch-Makefile.am
deleted file mode 100644
index 0247a92..0000000
--- a/libfpx/patches/patch-Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-* Don't install autoconf config file.
-* link using c++
---- Makefile.am.orig 2015-12-17 12:32:11.000000000 +0000
-+++ Makefile.am
-@@ -11,7 +11,7 @@ SUBDIRS = oless jpeg basics ole ri_image
- AM_CPPFLAGS = -I$(top_srcdir)
-
- # Headers which are installed
--include_HEADERS = fpxlib.h fpxlib-config.h
-+include_HEADERS = fpxlib.h
-
- # Shared libraries built in this directory
- lib_LTLIBRARIES = libfpx.la
-@@ -21,6 +21,7 @@ libfpx_la_LDFLAGS = -version-info $(MAJO
-
- # Sources
- libfpx_la_SOURCES =
-+nodist_EXTRA_libfpx_la_SOURCES = dummy.cpp
-
- # Convenience libraries
- libfpx_la_LIBADD = \
diff --git a/libfpx/patches/patch-basics_filename.cpp b/libfpx/patches/patch-basics_filename.cpp
deleted file mode 100644
index 2156e67..0000000
--- a/libfpx/patches/patch-basics_filename.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-* Add use statvfs since it's more portable than statfs.
- fixes build on NetBSD.
---- basics/filename.cpp.orig 2013-09-02 15:47:00.000000000 +0000
-+++ basics/filename.cpp
-@@ -38,6 +38,9 @@
- #ifdef _UNIX
- # include <sys/types.h>
- # include <sys/stat.h>
-+# if defined(HAVE_SYS_STATVFS_H)
-+# include <sys/statvfs.h>
-+# endif
- # if defined(HAVE_SYS_STATFS_H)
- # /* System V & Linux */
- # include <sys/statfs.h>
-@@ -428,6 +431,14 @@ long FicNom::PlaceDisponible() const
- return nFreeCluster * nSecPerCluster * nBytePerSec / 1024;
- else // Function failed, don't know why
- return 0;
-+#elif defined(HAVE_SYS_STATVFS_H)
-+ struct statvfs buf;
-+ int errNum;
-+ errNum = statvfs ( ".", &buf);
-+ if (errNum)
-+ perror("statvfs on current directory");
-+
-+ return (buf.f_bsize*buf.f_bfree)/kOneKilobyte;
- #else
- struct statfs buf;
- int errNum;
diff --git a/libfpx/patches/patch-configure.ac b/libfpx/patches/patch-configure.ac
deleted file mode 100644
index 162e869..0000000
--- a/libfpx/patches/patch-configure.ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-* check for statvfs, see patch-basics_filename.cpp
---- configure.ac.orig 2014-02-12 13:13:22.000000000 +0000
-+++ configure.ac
-@@ -70,7 +70,7 @@ AC_C_CONST
- AC_C_INLINE
- AC_C_BIGENDIAN
-
--AC_CHECK_HEADERS([wchar.h sys/statfs.h sys/time.h])
-+AC_CHECK_HEADERS([wchar.h sys/statfs.h sys/statvfs.h sys/time.h])
-
- # <sys/mount.h> depends on <sys/param.h>
- AC_CHECK_HEADERS([sys/param.h])
diff --git a/libfpx/patches/patch-fpx_f__fpxvw.cpp b/libfpx/patches/patch-fpx_f__fpxvw.cpp
new file mode 100644
index 0000000..0174315
--- /dev/null
+++ b/libfpx/patches/patch-fpx_f__fpxvw.cpp
@@ -0,0 +1,56 @@
+$NetBSD$
+
+--- fpx/f_fpxvw.cpp.orig 2015-12-28 09:55:50.000000000 +0000
++++ fpx/f_fpxvw.cpp
+@@ -664,7 +664,7 @@ Boolean PFileFlashPixView::CreateCompObj
+ lpszNew[0]=chZero;
+ }
+
+-#if defined(macintosh) || defined(__unix)
++#if defined(macintosh) || defined(_UNIX)
+ curCompObj->WriteVT_LPSTR_NoPad(lpszNew);
+ #elif _WINDOWS
+ char str[1024];
+@@ -675,7 +675,7 @@ Boolean PFileFlashPixView::CreateCompObj
+ // Get and write clsID string
+ LPOLESTR FAR clsIDStr;
+ StringFromCLSID(clsID, &clsIDStr);
+-#if defined(macintosh) || defined(__unix)
++#if defined(macintosh) || defined(_UNIX)
+ curCompObj->WriteVT_LPSTR_NoPad(clsIDStr);
+ #elif _WINDOWS
+ WideCharToMultiByte(CP_ACP, 0, clsIDStr, -1, str, 128, NULL, NULL);
+@@ -683,7 +683,7 @@ Boolean PFileFlashPixView::CreateCompObj
+ #endif
+
+ // Write prog id ( for now just write length = 0 )
+-#if defined(macintosh) || defined(__unix)
++#if defined(macintosh) || defined(_UNIX)
+ curCompObj->WriteVT_LPSTR_NoPad(&chZero);
+ #elif _WINDOWS
+ char progID = 0;
+@@ -695,21 +695,21 @@ Boolean PFileFlashPixView::CreateCompObj
+ curCompObj->WriteVT_I4(&temp);
+
+ // Write unicode user type ( for now just write length = 0 )
+-#if defined(macintosh) || defined(__unix)
++#if defined(macintosh) || defined(_UNIX)
+ curCompObj->WriteVT_LPWSTR_NoPad(MultiByteToWideChar(lpszNew));
+ #elif _WINDOWS
+ curCompObj->WriteVT_LPWSTR_NoPad(lpszNew);
+ #endif
+
+ // Write unicode clipboard format
+-#if defined(macintosh) || defined(__unix)
++#if defined(macintosh) || defined(_UNIX)
+ curCompObj->WriteVT_LPWSTR_NoPad(MultiByteToWideChar(&chZero));
+ #elif _WINDOWS
+ curCompObj->WriteVT_LPWSTR_NoPad(&chZero);
+ #endif
+
+ // Write unicode prog id ( for now just write length = 0 )
+-#if defined(macintosh) || defined(__unix)
++#if defined(macintosh) || defined(_UNIX)
+ curCompObj->WriteVT_LPWSTR_NoPad(MultiByteToWideChar(&chZero));
+ #elif _WINDOWS
+ curCompObj->WriteVT_LPWSTR_NoPad(&chZero);
diff --git a/libfpx/patches/patch-fpx_fpxlibio.cpp b/libfpx/patches/patch-fpx_fpxlibio.cpp
new file mode 100644
index 0000000..7ca73c3
--- /dev/null
+++ b/libfpx/patches/patch-fpx_fpxlibio.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- fpx/fpxlibio.cpp.orig 2015-12-28 09:48:01.000000000 +0000
++++ fpx/fpxlibio.cpp
+@@ -66,7 +66,7 @@
+ #ifndef FlashPixJPEG_h
+ #include "fpxjpeg.h"
+ #endif
+-#if defined(__unix) // for CoFileTimeNow
++#if defined(_UNIX) // for CoFileTimeNow
+ #include "time.hxx"
+ #endif
+
diff --git a/libfpx/patches/patch-fpx_fpxutils.h b/libfpx/patches/patch-fpx_fpxutils.h
deleted file mode 100644
index 8718cec..0000000
--- a/libfpx/patches/patch-fpx_fpxutils.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-* __unix is not defined on NetBSD, _UNIX is always defined by the build system
---- fpx/fpxutils.h.orig 2013-09-02 15:45:00.000000000 +0000
-+++ fpx/fpxutils.h
-@@ -471,7 +471,7 @@
- #define DefaultPaletteSize 256 // Default size of Palette
-
- // Define window DIB structures
--#if defined(macintosh) || defined(__unix)
-+#if defined(macintosh) || defined(_UNIX)
-
- // Bitmap information header
- typedef struct tagBITMAPINFOHEADER
diff --git a/libfpx/patches/patch-jpeg_dllmain.c b/libfpx/patches/patch-jpeg_dllmain.c
deleted file mode 100644
index ddb743d..0000000
--- a/libfpx/patches/patch-jpeg_dllmain.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-* __unix is not defined on NetBSD, _UNIX is always defined by the build system
---- jpeg/dllmain.c.orig 2013-09-02 15:45:00.000000000 +0000
-+++ jpeg/dllmain.c
-@@ -3,7 +3,7 @@ Description: Main module for dllJPEG li
- */
-
-
--#ifndef __unix
-+#ifndef _UNIX
- #include <windows.h>
- #include "jpegconf.h"
-
diff --git a/libfpx/patches/patch-ole_gen__guid.cpp b/libfpx/patches/patch-ole_gen__guid.cpp
deleted file mode 100644
index 7725258..0000000
--- a/libfpx/patches/patch-ole_gen__guid.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-* __unix is not defined on NetBSD, _UNIX is always defined by the build system
---- ole/gen_guid.cpp.orig 2013-09-02 15:45:00.000000000 +0000
-+++ ole/gen_guid.cpp
-@@ -65,7 +65,7 @@ typedef struct _timespec
- // Internal Functions
- // ----------------------------------------------------------------------------
-
--#if defined(macintosh) || defined(__unix)
-+#if defined(macintosh) || defined(_UNIX)
- static void GetENETAddress(unsigned char *ENETaddress)
- {
- // MPPParamBlock thePB;
diff --git a/libfpx/patches/patch-ole_olecore.h b/libfpx/patches/patch-ole_olecore.h
new file mode 100644
index 0000000..d816cf2
--- /dev/null
+++ b/libfpx/patches/patch-ole_olecore.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- ole/olecore.h.orig 2015-12-28 09:38:12.000000000 +0000
++++ ole/olecore.h
+@@ -55,7 +55,7 @@ const GUID BlankGUID = { 0, 0, 0, { 0, 0
+ #ifdef _WIN32
+ #define ORIGINATING_OS_VERSION 0x0002 // 32-bit Windows
+ #endif
+-#ifdef __unix
++#if defined(_UNIX)
+ #define ORIGINATING_OS_VERSION 0x0003 // generic UNIX identifier
+ #endif
+ #ifndef ORIGINATING_OS_VERSION
diff --git a/libfpx/patches/patch-ole_olefiles.cpp b/libfpx/patches/patch-ole_olefiles.cpp
deleted file mode 100644
index ecb1444..0000000
--- a/libfpx/patches/patch-ole_olefiles.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-* __unix is not defined on NetBSD, _UNIX is always defined by the build system
---- ole/olefiles.cpp.orig 2013-09-02 15:45:00.000000000 +0000
-+++ ole/olefiles.cpp
-@@ -387,7 +387,7 @@ static OLECHAR * AsciiToOLECHAR(const ch
- if (filename == NULL)
- return NULL;
-
--#if defined(macintosh) || defined(__unix)
-+#if defined(macintosh) || defined(_UNIX)
- // find the length of filename.
- size_t len = strlen(filename);
-
Home |
Main Index |
Thread Index |
Old Index