mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-25 00:51:21 +00:00
Code Issues Releases Activity

Upgrade graphics/libpano13 from 2.9.14 to 2.9.17.

Browse Source
This commit is contained in:
Vasil Dimov 2011-01-10 09:34:05 +00:00
parent 0abd694b7e
commit d514ad3c04
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=267580
5 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphics/libpano13/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= libpano13
PORTVERSION= 2.9.14
PORTREVISION= 5
PORTVERSION= 2.9.17
CATEGORIES= graphics java
MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION}

5
graphics/libpano13/distinfo
View File

@ -1,3 +1,2 @@
MD5 (libpano13-2.9.14.tar.gz) = fb011aead63974e630739ed55d75a4b0
SHA256 (libpano13-2.9.14.tar.gz) = 57949787a886de7d7198f4de1b6213e6b7a3099e7099fbf18950e9ab9fe2eeef
SIZE (libpano13-2.9.14.tar.gz) = 2501559
SHA256 (libpano13-2.9.17.tar.gz) = a22ab0c92f50a9de13858a8bd4e0e8dca9274c413941482b382104de019f99fd
SIZE (libpano13-2.9.17.tar.gz) = 2735157

20
graphics/libpano13/files/patch-Makefile.am
View File

@ -1,29 +1,29 @@
--- Makefile.am.orig 2006-12-21 12:14:09.000000000 +0200
+++ Makefile.am 2007-10-09 18:12:31.000000000 +0300
@@ -81,13 +81,23 @@
--- Makefile.am.orig 2011-01-09 21:47:05.000000000 +0200
+++ Makefile.am 2011-01-09 21:47:19.000000000 +0200
@@ -91,13 +91,23 @@
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)
+if HAVE_FREEBSD
+FBSD_SRC = sys_ansi.c ppm.c
+FBSD_DEFS = -D__Ansi__=1
+FBSD_LDFS = -version-info 0:0:0
+FBSD_LDFS = -version-info 2:0:0
+
+install-exec-hook:
+ @true
+
+endif
+
+AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(ENDIAN_FLAG) $(FBSD_DEFS)
+AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(ENDIAN_FLAG) $(FBSD_DEFS)
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) $(FBSD_SRC)
-libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC)
+libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC) $(FBSD_SRC)
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) $(FBSD_LDFS)
-libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(SOL_LDFS)
+libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(SOL_LDFS) $(FBSD_LDFS)
libpano13_la_DEPENDENCIES = @PANO_WIN32_RESOURCE@
pkginclude_HEADERS = $(STD_HDR) $(TOOL_HDR)

22
graphics/libpano13/files/patch-tools_Makefile.am
View File

@ -1,10 +1,10 @@
--- tools/Makefile.am.orig 2006-12-16 23:21:03.000000000 +0200
+++ tools/Makefile.am 2007-10-09 18:14:30.000000000 +0300
@@ -32,7 +32,15 @@
DAR_DEFS =
--- tools/Makefile.am.orig 2010-09-07 23:45:22.000000000 +0300
+++ tools/Makefile.am 2011-01-09 22:07:41.000000000 +0200
@@ -40,7 +40,15 @@
SOL_DEFS =
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)
+if HAVE_FREEBSD
+FBSD_SRC = panoinfo_unix.c
+FBSD_DEFS = -D__Ansi__=1
@ -13,16 +13,16 @@
+FBSD_DEFS =
+endif
+
+AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS) $(FBSD_DEFS)
+AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS) $(FBSD_DEFS)
AM_LDFLAGS = -L${top_builddir}
bin_PROGRAMS = panoinfo PToptimizer PTmender PTblender PTtiff2psd PTuncrop PTtiffdump PTroller PTcrop PTmasker PTinfo
@@ -69,7 +77,7 @@
# PTAInterpolate can only be compiled with ptpicker.h, which in turn depends on java
@@ -85,7 +93,7 @@
PToptimizer_SOURCES = PToptimizer.c
PToptimizer_LDADD = -l${PANOLIB}
-panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC)
+panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(FBSD_SRC)
-panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC)
+panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC) $(FBSD_SRC)
panoinfo_LDADD = -l${PANOLIB}
EXTRA_DIST = makefile.panoinfo.win32 makefile.ptoptimizer.win32 \
EXTRA_DIST = README.PTmender \

2
graphics/libpano13/pkg-plist
View File

@ -22,5 +22,5 @@ include/pano13/queryfeature.h
include/pano13/version.h
lib/libpano13.la
lib/libpano13.so
lib/libpano13.so.0
lib/libpano13.so.2
@dirrm include/pano13