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

update libpano13 to 2.9.17

Browse Source
This commit is contained in:
sthen 2010-09-16 07:52:54 +00:00
parent 8a584e9483
commit ff41cea8d8
6 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
graphics/libpano13/Makefile
View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.4 2010/06/23 16:53:20 landry Exp $ # $OpenBSD: Makefile,v 1.5 2010/09/16 07:52:54 sthen Exp $
COMMENT = library for processing panoramic images COMMENT = library for processing panoramic images
DISTNAME = libpano13-2.9.14 DISTNAME = libpano13-2.9.17
# the following are useful for rc/betas and don't hurt otherwise:
PKGNAME = ${DISTNAME:S/_//}
WRKDIST = ${WRKDIR}/${DISTNAME:C/_.*//}
SHARED_LIBS += pano13 1.0 SHARED_LIBS += pano13 2.0
CATEGORIES = graphics CATEGORIES = graphics
HOMEPAGE = http://panotools.sourceforge.net/ HOMEPAGE = http://panotools.sourceforge.net/
@ -16,7 +19,7 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes PERMIT_DISTFILES_FTP = Yes
WANTLIB += c m z WANTLIB += c jpeg m png tiff z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=panotools/} MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=panotools/}
@ -30,9 +33,9 @@ AUTOMAKE_VERSION = 1.9
# bootstrap needs libtoolize # bootstrap needs libtoolize
BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \ BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \
::devel/libtool ::devel/libtool
LIB_DEPENDS = jpeg::graphics/jpeg \ LIB_DEPENDS = ::graphics/jpeg \
png::graphics/png \ ::graphics/png \
tiff::graphics/tiff ::graphics/tiff
CPPFLAGS += -I${LOCALBASE}/include/ \ CPPFLAGS += -I${LOCALBASE}/include/ \
-I${LOCALBASE}/include/libpng \ -I${LOCALBASE}/include/libpng \

10
graphics/libpano13/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libpano13-2.9.14.tar.gz) = +wEa6tY5dOYwc57VXXWksA== MD5 (libpano13-2.9.17.tar.gz) = VOx8UFzzhSHy+7birNLEMw==
RMD160 (libpano13-2.9.14.tar.gz) = vEnIXoqxHq60iJj887nkrHXBIcQ= RMD160 (libpano13-2.9.17.tar.gz) = OlQpW/rbvTIAmoYoloxyPHAX8t8=
SHA1 (libpano13-2.9.14.tar.gz) = xudKzdpkzn1Bq+fZXykdxZ3nUaU= SHA1 (libpano13-2.9.17.tar.gz) = QYaJmF6mIrwjTNTszsQhgMEoIbI=
SHA256 (libpano13-2.9.14.tar.gz) = V5SXh6iG3n1xmPTeG2IT5rejCZ5wmfvxiVDpq5/i7u8= SHA256 (libpano13-2.9.17.tar.gz) = oiqwyS9Qqd4ThYqL1ODo3KknTEE5QUgrOCEE3gGfmf0=
SIZE (libpano13-2.9.14.tar.gz) = 2501559 SIZE (libpano13-2.9.17.tar.gz) = 2735157

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

@ -1,6 +1,12 @@
$OpenBSD: patch-Makefile_am,v 1.1.1.1 2009/04/19 11:14:34 sthen Exp $ $OpenBSD: patch-Makefile_am,v 1.2 2010/09/16 07:52:54 sthen Exp $
--- Makefile.am.orig Thu Feb 5 00:18:23 2009 --- Makefile.am.orig Sat Jul 24 22:16:56 2010
+++ Makefile.am Fri Apr 17 21:23:43 2009 +++ 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: @@ -71,6 +71,16 @@ install-exec-hook:
endif endif
@ -18,21 +24,21 @@ $OpenBSD: patch-Makefile_am,v 1.1.1.1 2009/04/19 11:14:34 sthen Exp $
if HAVE_DARWIN if HAVE_DARWIN
DAR_SRC = sys_ansi.c ppm.c DAR_SRC = sys_ansi.c ppm.c
DAR_DEFS = -D__Ansi__=1 DAR_DEFS = -D__Ansi__=1
@@ -81,13 +91,13 @@ install-exec-hook: @@ -91,13 +101,13 @@ install-exec-hook:
endif endif
-AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(ENDIAN_FLAG) -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_CFLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(ENDIAN_FLAG) $(OBSD_DEFS) +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 lib_LTLIBRARIES = libpano13.la
-libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC) -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_LIBADD = $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB) @PANO_WIN32_RESOURCE@
-libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) -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) $(OBSD_SRC) +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_LIBADD = $(LIB_JPEG) $(PNG_LIBS) $(LIB_TIFF) $(LIB_ZLIB) @PANO_WIN32_RESOURCE@
+libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(OBSD_LDFS) +libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(SOL_LDFS) $(OBSD_LDFS)
libpano13_la_DEPENDENCIES = @PANO_WIN32_RESOURCE@ libpano13_la_DEPENDENCIES = @PANO_WIN32_RESOURCE@
pkginclude_HEADERS = $(STD_HDR) $(TOOL_HDR) pkginclude_HEADERS = $(STD_HDR) $(TOOL_HDR)

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.1.1.1 2009/04/19 11:14:34 sthen Exp $ $OpenBSD: patch-configure_ac,v 1.2 2010/09/16 07:52:54 sthen Exp $
--- configure.ac.orig Thu Feb 5 00:35:32 2009 --- configure.ac.orig Sat Jul 24 22:16:56 2010
+++ configure.ac Fri Apr 17 21:23:37 2009 +++ configure.ac Sat Sep 4 21:28:47 2010
@@ -45,6 +45,11 @@ case "${host_os}" in @@ -45,6 +45,11 @@ case "${host_os}" in
;; ;;
esac esac
@ -13,15 +13,15 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2009/04/19 11:14:34 sthen Exp $
*darwin*) *darwin*)
PANO_WIN32_RESOURCE= PANO_WIN32_RESOURCE=
HSYS=darwin HSYS=darwin
@@ -73,6 +78,7 @@ esac @@ -79,6 +84,7 @@ esac
AM_CONDITIONAL(HAVE_DARWIN, test "${HSYS}" = "darwin") AM_CONDITIONAL(HAVE_DARWIN, test "${HSYS}" = "darwin")
AM_CONDITIONAL(HAVE_SOLARIS, test "${HSYS}" = "solaris")
AM_CONDITIONAL(HAVE_LINUX, test "${HSYS}" = "linux") AM_CONDITIONAL(HAVE_LINUX, test "${HSYS}" = "linux")
+AM_CONDITIONAL(HAVE_OPENBSD, test "${HSYS}" = "openbsd") +AM_CONDITIONAL(HAVE_OPENBSD, test "${HSYS}" = "openbsd")
AM_CONDITIONAL(HAVE_MAC, test "${HSYS}" = "classic") AM_CONDITIONAL(HAVE_MAC, test "${HSYS}" = "classic")
AM_CONDITIONAL(HAVE_MINGW, test "${HSYS}" = "mingw32") AM_CONDITIONAL(HAVE_MINGW, test "${HSYS}" = "mingw32")
AM_CONDITIONAL(HAVE_CYGWIN, test "${HSYS}" = "cygwin") AM_CONDITIONAL(HAVE_CYGWIN, test "${HSYS}" = "cygwin")
@@ -96,7 +102,7 @@ if test "x$have_zlib" != xyes; then @@ -102,7 +108,7 @@ if test "x$have_zlib" != xyes; then
]) ])
fi fi
@ -30,7 +30,7 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2009/04/19 11:14:34 sthen Exp $
if test "x$have_png" != xyes; then if test "x$have_png" != xyes; then
AC_MSG_ERROR([ AC_MSG_ERROR([
the png library must be installed on your system the png library must be installed on your system
@@ -177,8 +183,8 @@ echo " CXX = $CXX" @@ -183,8 +189,8 @@ echo " CXX = $CXX"
echo " CXXFLAGS = $CXXFLAGS" echo " CXXFLAGS = $CXXFLAGS"
echo " JPEG_FLAGS = $JPEG_FLAGS" echo " JPEG_FLAGS = $JPEG_FLAGS"
echo " LIB_JPEG = $LIB_JPEG" echo " LIB_JPEG = $LIB_JPEG"

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

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

4
graphics/libpano13/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2009/05/03 09:02:16 sthen Exp $ @comment $OpenBSD: PLIST,v 1.3 2010/09/16 07:52:54 sthen Exp $
%%SHARED%% %%SHARED%%
@bin bin/PTblender @bin bin/PTblender
@bin bin/PTcrop @bin bin/PTcrop
@ -24,6 +24,8 @@ include/pano13/queryfeature.h
include/pano13/version.h include/pano13/version.h
lib/libpano13.a lib/libpano13.a
lib/libpano13.la lib/libpano13.la
lib/pkgconfig/
lib/pkgconfig/libpano13.pc
@man man/man1/PTAInterpolate.1 @man man/man1/PTAInterpolate.1
@man man/man1/PTblender.1 @man man/man1/PTblender.1
@man man/man1/PTcrop.1 @man man/man1/PTcrop.1