CVS commit: pkgsrc/graphics/libfpx

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Sun Jan 19 11:07:56 UTC 2020

Modified Files:
        pkgsrc/graphics/libfpx: Makefile distinfo
Added Files:
        pkgsrc/graphics/libfpx/patches: patch-configure.ac
            patch-fpxlib-config.h.in patch-ole_olecomm.h
Removed Files:
        pkgsrc/graphics/libfpx/patches: patch-fpx_f__fpxvw.cpp
            patch-oless_dir.cxx patch-oless_docfile.cxx

Log Message:
Update distfile and fix build on illumos

Update distfile for libfpx, difference from the old one:
our patches are applied in it and it is available at the mastersite.
Fix build on illumos and perhaps other platforms by using autoconf
to look for the endian headers instead of using __sun
(solaris.h is not available on illumos).
bump pkgrevision.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/libfpx/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/libfpx/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/libfpx/patches/patch-configure.ac \
    pkgsrc/graphics/libfpx/patches/patch-fpxlib-config.h.in \
    pkgsrc/graphics/libfpx/patches/patch-ole_olecomm.h
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/libfpx/patches/patch-fpx_f__fpxvw.cpp \
    pkgsrc/graphics/libfpx/patches/patch-oless_dir.cxx \
    pkgsrc/graphics/libfpx/patches/patch-oless_docfile.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/libfpx/Makefile
diff -u pkgsrc/graphics/libfpx/Makefile:1.4 pkgsrc/graphics/libfpx/Makefile:1.5
--- pkgsrc/graphics/libfpx/Makefile:1.4 Sun Dec  3 11:09:46 2017
+++ pkgsrc/graphics/libfpx/Makefile     Sun Jan 19 11:07:56 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2017/12/03 11:09:46 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2020/01/19 11:07:56 nros Exp $
 
 libfpx_ver=    1.3.1
-DISTNAME=      libfpx-${libfpx_ver}-9
+DISTNAME=      libfpx-${libfpx_ver}-10
 PKGNAME=       libfpx-${libfpx_ver}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/
 MASTER_SITES+= http://www.imagemagick.org/download/delegates/
@@ -17,9 +17,14 @@ LICENSE=     flashpix-license
 GNU_CONFIGURE= yes
 USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
+USE_TOOLS+=    autoconf
 
 docdir=                 share/doc/${PKGBASE}
 INSTALLATION_DIRS+=${docdir}
+
+pre-configure:
+       cd ${WRKSRC} && autoconf
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/flashpix.h \
                ${DESTDIR}${PREFIX}/${docdir}/copyright-notice

Index: pkgsrc/graphics/libfpx/distinfo
diff -u pkgsrc/graphics/libfpx/distinfo:1.2 pkgsrc/graphics/libfpx/distinfo:1.3
--- pkgsrc/graphics/libfpx/distinfo:1.2 Wed Oct  4 17:19:33 2017
+++ pkgsrc/graphics/libfpx/distinfo     Sun Jan 19 11:07:56 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2017/10/04 17:19:33 nros Exp $
+$NetBSD: distinfo,v 1.3 2020/01/19 11:07:56 nros Exp $
 
-SHA1 (libfpx-1.3.1-9.tar.xz) = d3aba5f74134feb4c3be40c9a864ce28edf1a7f9
-RMD160 (libfpx-1.3.1-9.tar.xz) = 7ea9bff48fa15dc243e17c4f1a4a59c1b45c09dc
-SHA512 (libfpx-1.3.1-9.tar.xz) = 218e7e0cd0512a1620f219802bc694591c90d494940fc7492076dee56c3707e50f5af50eb3dff9d562a5c0431e05ec9e696e6bdd8735b5b26db0cd3f929ad5f8
-Size (libfpx-1.3.1-9.tar.xz) = 1906072 bytes
-SHA1 (patch-fpx_f__fpxvw.cpp) = b2c91920029b66e74154a9f6ccd9dc494df927be
-SHA1 (patch-oless_dir.cxx) = 23218d4dfcf3c57db6234f4ac0c972bf13267290
-SHA1 (patch-oless_docfile.cxx) = 58f45c75a71d3cfcd7946a366d3d4e191fc2f769
+SHA1 (libfpx-1.3.1-10.tar.xz) = 5e456727fabc04c64f63d72a54d6f6cac77871d4
+RMD160 (libfpx-1.3.1-10.tar.xz) = 3ec68b6e88c41bb62aa67cbb44c5574645355a29
+SHA512 (libfpx-1.3.1-10.tar.xz) = b0e7356510fbf436265f6d03236979e68bd1b1483cde006460588387ad3ee97adef4536e827f7ee6ba9d19f3b75cc8b772e025d13cbe69b36ec84c8bd0d470eb
+Size (libfpx-1.3.1-10.tar.xz) = 1907580 bytes
+SHA1 (patch-configure.ac) = 3bbab2e051783ddff951ac2e325e1ea89b77b5db
+SHA1 (patch-fpxlib-config.h.in) = fba6a9b7f136f0acb0510d0ab74dab1696c6ebad
+SHA1 (patch-ole_olecomm.h) = 489b63289c533abd4f192752e0bdab74603d8880

Added files:

Index: pkgsrc/graphics/libfpx/patches/patch-configure.ac
diff -u /dev/null pkgsrc/graphics/libfpx/patches/patch-configure.ac:1.1
--- /dev/null   Sun Jan 19 11:07:56 2020
+++ pkgsrc/graphics/libfpx/patches/patch-configure.ac   Sun Jan 19 11:07:56 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.1 2020/01/19 11:07:56 nros Exp $
+
+* search for endian headers to make tis package build 
+  on more platforms (illumos)
+ 
+--- configure.ac.orig  2020-01-19 10:26:49.799775110 +0000
++++ configure.ac
+@@ -71,6 +71,7 @@ AC_C_INLINE
+ AC_C_BIGENDIAN
+ 
+ AC_CHECK_HEADERS([wchar.h sys/statfs.h sys/statvfs.h sys/time.h])
++AC_CHECK_HEADERS([endian.h sys/endian.h solaris.h])
+ 
+ # <sys/mount.h> depends on <sys/param.h>
+ AC_CHECK_HEADERS([sys/param.h])
Index: pkgsrc/graphics/libfpx/patches/patch-fpxlib-config.h.in
diff -u /dev/null pkgsrc/graphics/libfpx/patches/patch-fpxlib-config.h.in:1.1
--- /dev/null   Sun Jan 19 11:07:56 2020
+++ pkgsrc/graphics/libfpx/patches/patch-fpxlib-config.h.in     Sun Jan 19 11:07:56 2020
@@ -0,0 +1,36 @@
+$NetBSD: patch-fpxlib-config.h.in,v 1.1 2020/01/19 11:07:56 nros Exp $
+
+* search for endian headers to make this package build
+  on more platforms (illumos)
+
+--- fpxlib-config.h.in.orig    2020-01-19 10:29:13.655460121 +0000
++++ fpxlib-config.h.in
+@@ -6,12 +6,18 @@
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+ #undef HAVE_DLFCN_H
+ 
++/* Define to 1 if you have the <endian.h> header file. */
++#undef HAVE_ENDIAN_H
++
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+ 
++/* Define to 1 if you have the <solaris.h> header file. */
++#undef HAVE_SOLARIS_H
++
+ /* Define to 1 if you have the <stdint.h> header file. */
+ #undef HAVE_STDINT_H
+ 
+@@ -24,6 +30,9 @@
+ /* Define to 1 if you have the <string.h> header file. */
+ #undef HAVE_STRING_H
+ 
++/* Define to 1 if you have the <sys/endian.h> header file. */
++#undef HAVE_SYS_ENDIAN_H
++
+ /* Define to 1 if you have the <sys/mount.h> header file. */
+ #undef HAVE_SYS_MOUNT_H
+ 
Index: pkgsrc/graphics/libfpx/patches/patch-ole_olecomm.h
diff -u /dev/null pkgsrc/graphics/libfpx/patches/patch-ole_olecomm.h:1.1
--- /dev/null   Sun Jan 19 11:07:56 2020
+++ pkgsrc/graphics/libfpx/patches/patch-ole_olecomm.h  Sun Jan 19 11:07:56 2020
@@ -0,0 +1,21 @@
+$NetBSD: patch-ole_olecomm.h,v 1.1 2020/01/19 11:07:56 nros Exp $
+
+* use autoconf to select endian header to make the package build on more
+  platforms (illumos)
+
+--- ole/olecomm.h.orig 2020-01-19 10:31:16.620919697 +0000
++++ ole/olecomm.h
+@@ -65,9 +65,11 @@
+ 
+ // value to define if the file is to be read/written in Intel mode or not
+ # if defined(_UNIX)
+-#  ifdef __linux__
++#  ifdef HAVE_ENDIAN_H
+ #   include <endian.h>
+-#  elif defined(__sun)
++#  elif defined(HAVE_SYS_ENDIAN_H)
++#   include <sys/endian.h>
++#  elif defined(HAVE_SOLARIS_H)
+ #   include <solaris.h>
+ #  else
+ #   include <machine/endian.h>