summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-12-25 14:00:30 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-12-25 14:00:30 +0000
commitd35737261d875094e80203fa627ea5ed3273d05e (patch)
tree4bf59a1e73d13d77d4ecdb14f0ca124b4050cf99 /graphics
parentProperly support png 1.5 (diff)
Was added just for hugin which now support libpano13
Does not properly support modern png
Diffstat (limited to 'graphics')
-rw-r--r--graphics/Makefile1
-rw-r--r--graphics/libpano12/Makefile47
-rw-r--r--graphics/libpano12/distinfo2
-rw-r--r--graphics/libpano12/files/patch-Makefile.am36
-rw-r--r--graphics/libpano12/files/patch-configure.ac22
-rw-r--r--graphics/libpano12/files/patch-m4_ax_check_graphics.m474
-rw-r--r--graphics/libpano12/files/patch-m4_ax_check_java.m421
-rw-r--r--graphics/libpano12/files/patch-png.c27
-rw-r--r--graphics/libpano12/files/patch-tools_Makefile.am31
-rw-r--r--graphics/libpano12/pkg-descr4
-rw-r--r--graphics/libpano12/pkg-plist14
11 files changed, 0 insertions, 279 deletions
diff --git a/graphics/Makefile b/graphics/Makefile
index efb67e181a95..1246cbe71c9c 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -511,7 +511,6 @@
SUBDIR += libmorph
SUBDIR += libopenraw
SUBDIR += libosmesa
- SUBDIR += libpano12
SUBDIR += libpano13
SUBDIR += libpcd
SUBDIR += libpgf
diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile
deleted file mode 100644
index 13dfbb24de97..000000000000
--- a/graphics/libpano12/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Created by: cartola (Carlos E. G. Carvalho)
-# $FreeBSD$
-
-# This port has been made as a building and running dependence for the
-# hugin port.
-# The hugin port is a gui interface to interact with this and other
-# tools.
-
-PORTNAME= libpano12
-PORTVERSION= 2.8.6
-PORTREVISION= 9
-CATEGORIES= graphics java
-MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-
-MAINTAINER= vd@FreeBSD.org
-COMMENT= Panorama Tools to make panorama pictures
-
-LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \
- libpng15.so:${PORTSDIR}/graphics/png \
- libjpeg.so:${PORTSDIR}/graphics/jpeg
-
-USE_GNOME= gtk20 glib20 pango atk
-
-USES= autoreconf libtool
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include/gtk-2.0 \
- -I${LOCALBASE}/include/glib-2.0 \
- -I${LOCALBASE}/include/libpng15 \
- -I${LOCALBASE}/include/pango-1.0 \
- -I${LOCALBASE}/include/atk-1.0
-CONFIGURE_ARGS= --with-png=${LOCALBASE} \
- --with-jpeg=${LOCALBASE} \
- --with-tiff=${LOCALBASE}
-INSTALL_TARGET= install-strip
-
-USE_LDCONFIG= yes
-
-.if !defined(WITHOUT_JAVA)
-USE_JAVA= yes
-JAVA_VERSION= 1.6+
-JAVA_OS= native
-CONFIGURE_ARGS+= --with-java=${JAVA_HOME}
-.else
-CONFIGURE_ARGS+= --without-java
-.endif
-
-.include <bsd.port.mk>
diff --git a/graphics/libpano12/distinfo b/graphics/libpano12/distinfo
deleted file mode 100644
index 57812acfd693..000000000000
--- a/graphics/libpano12/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (libpano12-2.8.6.tar.gz) = ea6b6117dc2deee488f5363afd446360819f92ca473948a1ec88e665deb70c9a
-SIZE (libpano12-2.8.6.tar.gz) = 2513899
diff --git a/graphics/libpano12/files/patch-Makefile.am b/graphics/libpano12/files/patch-Makefile.am
deleted file mode 100644
index 82f52860258e..000000000000
--- a/graphics/libpano12/files/patch-Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.am.orig Fri Jun 16 13:30:53 2006
-+++ Makefile.am Wed Jan 17 11:45:13 2007
-@@ -70,6 +70,16 @@
-
- endif
-
-+if HAVE_FREEBSD
-+FBSD_SRC = sys_ansi.c ppm.c
-+FBSD_DEFS = -D__Ansi__=1
-+FBSD_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
-@@ -80,13 +90,13 @@
-
- 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) $(FBSD_DEFS) $(DAR_DEFS) $(ENDIAN_FLAG)
-
- lib_LTLIBRARIES = libpano12.la
-
--libpano12_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC)
-+libpano12_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(FBSD_SRC) $(DAR_SRC)
- libpano12_la_LIBADD = $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB) @PANO_WIN32_RESOURCE@
--libpano12_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS)
-+libpano12_la_LDFLAGS = $(LIN_LDFS) $(FBSD_LDFS) $(WIN_LDFS) $(DAR_LDFS)
- libpano12_la_DEPENDENCIES = @PANO_WIN32_RESOURCE@
-
- pkginclude_HEADERS = $(STD_HDR) $(TOOL_HDR)
diff --git a/graphics/libpano12/files/patch-configure.ac b/graphics/libpano12/files/patch-configure.ac
deleted file mode 100644
index 723bdcd5657a..000000000000
--- a/graphics/libpano12/files/patch-configure.ac
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.ac.orig Fri Jun 16 13:30:54 2006
-+++ configure.ac Wed Jan 17 10:40:32 2007
-@@ -45,6 +45,11 @@
- ;;
- esac
- ;;
-+ *freebsd*)
-+ PANO_WIN32_RESOURCE=
-+ HSYS=freebsd
-+ HCPU="${target_cpu}"
-+ ;;
- *darwin*)
- PANO_WIN32_RESOURCE=
- HSYS=darwin
-@@ -73,6 +78,7 @@
-
- AM_CONDITIONAL(HAVE_DARWIN, test "${HSYS}" = "darwin")
- AM_CONDITIONAL(HAVE_LINUX, test "${HSYS}" = "linux")
-+AM_CONDITIONAL(HAVE_FREEBSD, test "${HSYS}" = "freebsd")
- AM_CONDITIONAL(HAVE_MAC, test "${HSYS}" = "classic")
- AM_CONDITIONAL(HAVE_MINGW, test "${HSYS}" = "mingw32")
- AM_CONDITIONAL(HAVE_CYGWIN, test "${HSYS}" = "cygwin")
diff --git a/graphics/libpano12/files/patch-m4_ax_check_graphics.m4 b/graphics/libpano12/files/patch-m4_ax_check_graphics.m4
deleted file mode 100644
index 78414f3a0965..000000000000
--- a/graphics/libpano12/files/patch-m4_ax_check_graphics.m4
+++ /dev/null
@@ -1,74 +0,0 @@
---- m4/ax_check_graphics.m4.orig Wed Jan 17 11:09:58 2007
-+++ m4/ax_check_graphics.m4 Wed Jan 17 11:11:53 2007
-@@ -44,7 +44,7 @@
- ZLIB_OLD_LDFLAGS=$LDFLAGS
- ZLIB_OLD_CPPFLAGS=$CPPFLAGS
- if test "x$ZLIB_HOME" != 'x' ; then
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib64"
- else
- LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
-@@ -69,7 +69,7 @@
- LIB_ZLIB="-lz"
- ZLIB_FLAGS="-DHasZLIB"
- else
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LIB_ZLIB="-L$ZLIB_HOME/lib64 -lz"
- else
- LIB_ZLIB="-L$ZLIB_HOME/lib -lz"
-@@ -133,7 +133,7 @@
- PNG_OLD_LDFLAGS=$LDFLAGS
- PNG_OLD_CPPFLAGS=$CPPFLAGS
- if test "x$PNG_HOME" != 'x' ; then
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LDFLAGS="$LDFLAGS -L$PNG_HOME/lib64"
- else
- LDFLAGS="$LDFLAGS -L$PNG_HOME/lib"
-@@ -158,7 +158,7 @@
- LIB_PNG="-lpng"
- PNG_FLAGS="-DHasPNG"
- else
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LIB_PNG="-L$PNG_HOME/lib64 -lpng"
- else
- LIB_PNG="-L$PNG_HOME/lib -lpng"
-@@ -224,7 +224,7 @@
- JPEG_OLD_LDFLAGS=$LDFLAGS
- JPEG_OLD_CPPFLAGS=$CPPFLAGS
- if test "x$JPEG_HOME" != 'x' ; then
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LDFLAGS="$LDFLAGS -L$JPEG_HOME/lib64"
- else
- LDFLAGS="$LDFLAGS -L$JPEG_HOME/lib"
-@@ -274,7 +274,7 @@
- LIB_JPEG="-ljpeg"
- JPEG_FLAGS="-DHasJPEG"
- else
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LIB_JPEG="-L$JPEG_HOME/lib64 -ljpeg"
- else
- LIB_JPEG="-L$JPEG_HOME/lib -ljpeg"
-@@ -339,7 +339,7 @@
- TIFF_OLD_LDFLAGS=$LDFLAGS
- TIFF_OLD_CPPFLAGS=$CPPFLAGS
- if test "x$TIFF_HOME" != 'x' ; then
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LDFLAGS="$LDFLAGS -L$TIFF_HOME/lib64"
- else
- LDFLAGS="$LDFLAGS -L$TIFF_HOME/lib"
-@@ -364,7 +364,7 @@
- LIB_TIFF="-ltiff"
- TIFF_FLAGS="-DHasTIFF"
- else
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LIB_TIFF="-L$TIFF_HOME/lib64 -ltiff"
- else
- LIB_TIFF="-L$TIFF_HOME/lib -ltiff"
diff --git a/graphics/libpano12/files/patch-m4_ax_check_java.m4 b/graphics/libpano12/files/patch-m4_ax_check_java.m4
deleted file mode 100644
index 658cdeb472a2..000000000000
--- a/graphics/libpano12/files/patch-m4_ax_check_java.m4
+++ /dev/null
@@ -1,21 +0,0 @@
---- m4/ax_check_java.m4.orig Wed Jan 17 11:23:05 2007
-+++ m4/ax_check_java.m4 Wed Jan 17 11:25:08 2007
-@@ -2,7 +2,7 @@
- dnl Usage:
- dnl AX_CHECK_JAVA
- dnl Test for java, and defines
--dnl - JAVA_CFLAGS (compiler flags)
-+dnl - JAVA_FLAGS (compiler flags)
- dnl - LIB_JAVA (linker flags, stripping and path)
- dnl prerequisites:
-
-@@ -78,6 +78,9 @@
- case "${target_os}" in
- linux*)
- java_extra_inc=linux
-+ ;;
-+ *freebsd*)
-+ java_extra_inc=freebsd
- ;;
- darwin*)
- java_extra_inc=darwin
diff --git a/graphics/libpano12/files/patch-png.c b/graphics/libpano12/files/patch-png.c
deleted file mode 100644
index 0bd2e46b40d9..000000000000
--- a/graphics/libpano12/files/patch-png.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- png.c.orig 2006-08-20 23:04:06.000000000 +0200
-+++ png.c 2012-05-04 13:03:57.000000000 +0200
-@@ -1,5 +1,6 @@
- #include "filter.h"
- #include "png.h"
-+#include "pngpriv.h"
-
-
-
-@@ -56,7 +57,7 @@
- }
-
- /* set error handling */
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- /* If we get here, we had a problem reading the file */
- fclose(outfile);
-@@ -165,7 +166,7 @@
- }
-
- /* set error handling if you are using the setjmp/longjmp method */
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- /* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
diff --git a/graphics/libpano12/files/patch-tools_Makefile.am b/graphics/libpano12/files/patch-tools_Makefile.am
deleted file mode 100644
index 3e0ab5a65d5c..000000000000
--- a/graphics/libpano12/files/patch-tools_Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
---- tools/Makefile.am.orig 2007-07-02 00:16:15.000000000 +0300
-+++ tools/Makefile.am 2007-10-09 19:10:41.000000000 +0300
-@@ -20,15 +20,23 @@
- DAR_DEFS =
- endif
-
--AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS)
-+if HAVE_FREEBSD
-+FBSD_SRC = pano12info_unix.c
-+FBSD_DEFS = -D__Ansi__=1
-+else
-+FBSD_SRC =
-+FBSD_DEFS =
-+endif
-+
-+AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS) $(FBSD_DEFS)
- AM_LDFLAGS = -L${top_builddir}
-
--bin_PROGRAMS = pano12info PTOptimizer
-+bin_PROGRAMS = pano12info PTOptimizer12
-
--PTOptimizer_SOURCES = PTOptimizer.c
--PTOptimizer_LDADD = -lpano12
-+PTOptimizer12_SOURCES = PTOptimizer.c
-+PTOptimizer12_LDADD = -lpano12
-
--pano12info_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC)
-+pano12info_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(FBSD_SRC)
- pano12info_LDADD = -lpano12
-
- EXTRA_DIST = makefile.ptoptimizer.win32 PTOptimizer.vcproj \
diff --git a/graphics/libpano12/pkg-descr b/graphics/libpano12/pkg-descr
deleted file mode 100644
index 5bc4cba4761d..000000000000
--- a/graphics/libpano12/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a port of panorama-tools, a set of tools to make panoramic
-images from independent pictures.
-
-WWW: http://panotools.sourceforge.net/
diff --git a/graphics/libpano12/pkg-plist b/graphics/libpano12/pkg-plist
deleted file mode 100644
index 228da03b239b..000000000000
--- a/graphics/libpano12/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-bin/PTOptimizer12
-bin/pano12info
-include/pano12/PTcommon.h
-include/pano12/filter.h
-include/pano12/panorama.h
-include/pano12/panotypes.h
-include/pano12/pt_stdint.h
-include/pano12/pteditor.h
-include/pano12/ptutils.h
-include/pano12/queryfeature.h
-include/pano12/version.h
-lib/libpano12.so
-lib/libpano12.so.0
-lib/libpano12.so.0.0.0