cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to libpano13-2.9.19, required by upcoming hugin update.

Browse Source 
ok sthen@, maintainer
This commit is contained in:
kirby 2015-10-10 08:32:04 +00:00
parent 9d70b545cb
commit 46acef9019
9 changed files with 26 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
graphics/libpano13/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.15 2015/03/16 18:07:48 naddy Exp $
# $OpenBSD: Makefile,v 1.16 2015/10/10 08:32:04 kirby Exp $
COMMENT = library for processing panoramic images
DISTNAME = libpano13-2.9.18
DISTNAME = libpano13-2.9.19
# the following are useful for rc/betas and don't hurt otherwise:
PKGNAME = ${DISTNAME:S/_//}
WRKDIST = ${WRKDIR}/${DISTNAME:C/_.*//}
REVISION = 0
SHARED_LIBS += pano13 2.1
SHARED_LIBS += pano13 3.0
CATEGORIES = graphics
HOMEPAGE = http://panotools.sourceforge.net/
@ -17,33 +16,14 @@ MAINTAINER = Stuart Henderson <sthen@openbsd.org>
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c jpeg m png tiff z
WANTLIB += c jpeg png tiff z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=panotools/}
CONFIGURE_STYLE = automake
# builds work with SEPARATE_BUILD, but tests don't.
#SEPARATE_BUILD = Yes
AUTOCONF_VERSION = 2.59
AUTOMAKE_VERSION = 1.9
MODULES = devel/cmake
# bootstrap needs libtoolize
BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \
devel/libtool
LIB_DEPENDS = graphics/jpeg \
graphics/png \
graphics/tiff
CPPFLAGS += -I${LOCALBASE}/include/ \
-I${LOCALBASE}/include/gtk-2.0
LDFLAGS += -L${LOCALBASE}/lib \
-L${LOCALBASE}/lib/gtk-2.0
CONFIGURE_ARGS += CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}" \
--without-java
pre-configure:
cd ${WRKSRC}; AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} /bin/sh ./bootstrap
.include <bsd.port.mk>

4
graphics/libpano13/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libpano13-2.9.18.tar.gz) = 3l1OQ/FcNDDpXA+qHFDJUDUW4bVw0OwFIvYQpXjKoXI=
SIZE (libpano13-2.9.18.tar.gz) = 2723032
SHA256 (libpano13-2.9.19.tar.gz) = A3NXODl4NB3qj1cqXSoIdsWrCoPf/aQxvTkzV+kdlag=
SIZE (libpano13-2.9.19.tar.gz) = 3527845

44
graphics/libpano13/patches/patch-Makefile_am
View File

@ -1,44 +0,0 @@
$OpenBSD: patch-Makefile_am,v 1.2 2010/09/16 07:52:54 sthen Exp $
--- Makefile.am.orig Sat Jul 24 22:16:56 2010
+++ Makefile.am Sat Sep 11 14:34:53 2010
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I m4
+beta2ACLOCAL_AMFLAGS = -I m4
STD_SRC = filter.c parser.c queryfeature.c correct.c perspect.c \
adjust.c remap.c lmdif.c file.c \
@@ -71,6 +71,16 @@ install-exec-hook:
endif
+if HAVE_OPENBSD
+OBSD_SRC = sys_ansi.c ppm.c
+OBSD_DEFS = -D__Ansi__=1
+OBSD_LDFS = -version-info 0:0:0
+
+install-exec-hook:
+ @true
+
+endif
+
if HAVE_DARWIN
DAR_SRC = sys_ansi.c ppm.c
DAR_DEFS = -D__Ansi__=1
@@ -91,13 +101,13 @@ install-exec-hook:
endif
-AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(ENDIAN_FLAG)
+AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(OBSD_DEFS) $(ENDIAN_FLAG)
lib_LTLIBRARIES = libpano13.la
-libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC)
-libpano13_la_LIBADD = $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB) @PANO_WIN32_RESOURCE@
-libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(SOL_LDFS)
+libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC) $(OBSD_SRC)
+libpano13_la_LIBADD = $(LIB_JPEG) $(PNG_LIBS) $(LIB_TIFF) $(LIB_ZLIB) @PANO_WIN32_RESOURCE@
+libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(SOL_LDFS) $(OBSD_LDFS)
libpano13_la_DEPENDENCIES = @PANO_WIN32_RESOURCE@
pkginclude_HEADERS = $(STD_HDR) $(TOOL_HDR)

11
graphics/libpano13/patches/patch-bootstrap
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-bootstrap,v 1.1.1.1 2009/04/19 11:14:34 sthen Exp $
--- bootstrap.orig Fri Apr 17 22:04:18 2009
+++ bootstrap Fri Apr 17 22:04:28 2009
@@ -96,6 +96,7 @@ $AUTOHEADER --force || exit $?
$AUTOMAKE --add-missing --copy || exit $?
$AUTOCONF || exit $?
+exit 0
cd $ORIGDIR || exit $?

43
graphics/libpano13/patches/patch-configure_ac
View File

@ -1,43 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.2 2010/09/16 07:52:54 sthen Exp $
--- configure.ac.orig Sat Jul 24 22:16:56 2010
+++ configure.ac Sat Sep 4 21:28:47 2010
@@ -45,6 +45,11 @@ case "${host_os}" in
;;
esac
;;
+ openbsd*)
+ PANO_WIN32_RESOURCE=
+ HSYS=openbsd
+ HCPU="${target_cpu}"
+ ;;
*darwin*)
PANO_WIN32_RESOURCE=
HSYS=darwin
@@ -79,6 +84,7 @@ esac
AM_CONDITIONAL(HAVE_DARWIN, test "${HSYS}" = "darwin")
AM_CONDITIONAL(HAVE_SOLARIS, test "${HSYS}" = "solaris")
AM_CONDITIONAL(HAVE_LINUX, test "${HSYS}" = "linux")
+AM_CONDITIONAL(HAVE_OPENBSD, test "${HSYS}" = "openbsd")
AM_CONDITIONAL(HAVE_MAC, test "${HSYS}" = "classic")
AM_CONDITIONAL(HAVE_MINGW, test "${HSYS}" = "mingw32")
AM_CONDITIONAL(HAVE_CYGWIN, test "${HSYS}" = "cygwin")
@@ -102,7 +108,7 @@ if test "x$have_zlib" != xyes; then
])
fi
-AX_CHECK_PNG
+PKG_CHECK_MODULES(PNG, libpng, have_png=yes, have_png=no)
if test "x$have_png" != xyes; then
AC_MSG_ERROR([
the png library must be installed on your system
@@ -183,8 +189,8 @@ echo " CXX = $CXX"
echo " CXXFLAGS = $CXXFLAGS"
echo " JPEG_FLAGS = $JPEG_FLAGS"
echo " LIB_JPEG = $LIB_JPEG"
-echo " PNG_FLAGS = $PNG_FLAGS"
-echo " LIB_PNG = $LIB_PNG"
+echo " PNG_FLAGS = $PNG_CFLAGS"
+echo " LIB_PNG = $PNG_LIBS"
echo " TIFF_FLAGS = $TIFF_FLAGS"
echo " LIB_TIFF = $LIB_TIFF"
echo " ZLIB_FLAGS = $ZLIB_FLAGS"

16
graphics/libpano13/patches/patch-filter_h
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-filter_h,v 1.1.1.1 2009/04/19 11:14:34 sthen Exp $
--- filter.h.orig Sat Apr 18 02:55:53 2009
+++ filter.h Sat Apr 18 02:56:28 2009
@@ -47,9 +47,9 @@
//---------------------- Types ---------------------------------------------
-#define UCHAR unsigned char
-#define USHORT unsigned short
-#define ULONG unsigned long
+typedef unsigned char UCHAR;
+typedef unsigned short USHORT;
+typedef unsigned long ULONG;
enum{
_UCHAR,

9
graphics/libpano13/patches/patch-man_CMakeLists_txt Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-man_CMakeLists_txt,v 1.1 2015/10/10 08:32:04 kirby Exp $
--- man/CMakeLists.txt.orig Wed Jun 17 08:12:09 2015
+++ man/CMakeLists.txt Wed Jun 17 08:12:26 2015
@@ -25,4 +25,4 @@ endforeach(_m)
add_custom_target(man ALL DEPENDS ${_manuals})
-install(FILES ${_manuals} DESTINATION "share/man/man1" COMPONENT doc)
+install(FILES ${_manuals} DESTINATION "man/man1" COMPONENT doc)

36
graphics/libpano13/patches/patch-tools_Makefile_am
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-tools_Makefile_am,v 1.2 2010/09/16 07:52:54 sthen Exp $
--- tools/Makefile.am.orig Sat Jul 24 22:16:56 2010
+++ tools/Makefile.am Sat Sep 4 21:32:14 2010
@@ -24,6 +24,14 @@ LIN_SRC =
LIN_DEFS =
endif
+if HAVE_OPENBSD
+OBSD_SRC = panoinfo_unix.c
+OBSD_DEFS = -D__Ansi__=1
+else
+OBSD_SRC =
+OBSD_DEFS =
+endif
+
if HAVE_DARWIN
DAR_SRC = panoinfo_unix.c
DAR_DEFS = -D__Ansi__=1
@@ -40,7 +48,7 @@ SOL_SRC =
SOL_DEFS =
endif
-AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS)
+AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS) $(OBSD_DEFS)
AM_LDFLAGS = -L${top_builddir}
# PTAInterpolate can only be compiled with ptpicker.h, which in turn depends on java
@@ -85,7 +93,7 @@ PTtiffdump_LDADD = -l${PANOLIB} -ljpeg -ltiff
PToptimizer_SOURCES = PToptimizer.c
PToptimizer_LDADD = -l${PANOLIB}
-panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC)
+panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC) $(OBSD_SRC)
panoinfo_LDADD = -l${PANOLIB}
EXTRA_DIST = README.PTmender \

12
graphics/libpano13/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2015/03/16 18:07:48 naddy Exp $
@comment $OpenBSD: PLIST,v 1.5 2015/10/10 08:32:04 kirby Exp $
@bin bin/PTblender
@bin bin/PTcrop
@bin bin/PTinfo
@ -22,7 +22,6 @@ include/pano13/ptutils.h
include/pano13/queryfeature.h
include/pano13/version.h
lib/libpano13.a
lib/libpano13.la
@lib lib/libpano13.so.${LIBpano13_VERSION}
lib/pkgconfig/libpano13.pc
@man man/man1/PTAInterpolate.1
@ -37,3 +36,12 @@ lib/pkgconfig/libpano13.pc
@man man/man1/PTtiffdump.1
@man man/man1/PTuncrop.1
@man man/man1/panoinfo.1
share/pano13/
share/pano13/doc/
share/pano13/doc/AUTHORS
share/pano13/doc/COPYING
share/pano13/doc/Optimize.txt
share/pano13/doc/PTblender.readme
share/pano13/doc/PTmender.readme
share/pano13/doc/README
share/pano13/doc/stitch.txt