From b922bb0cc6ea8aa89dffa29e377adb4040530962 Mon Sep 17 00:00:00 2001 From: flyn Date: Sun, 3 Apr 2011 00:33:57 +0000 Subject: [PATCH] Update to 7.24.1 Also: remove the dependency on imagemagick and libfreetype to keep the library small use --disable-debug and --disable-gtk-doc add a patch to fix --tag=CXX issue; autotools is being stubborn about compiling as C++ git-svn-id: svn://svn.openwrt.org/openwrt/packages@26420 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/vips/Makefile | 6 +- libs/vips/patches/001-embedded_build.patch | 49 ---------- libs/vips/patches/001-no_cpp.patch | 146 +++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+), 52 deletions(-) delete mode 100644 libs/vips/patches/001-embedded_build.patch create mode 100644 libs/vips/patches/001-no_cpp.patch diff --git a/libs/vips/Makefile b/libs/vips/Makefile index 0420e4b13..ec30c009a 100644 --- a/libs/vips/Makefile +++ b/libs/vips/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vips -PKG_VERSION:=7.22.4 +PKG_VERSION:=7.24.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.vips.ecs.soton.ac.uk/supported/7.22/ -PKG_MD5SUM:=852913223ce5dc115bc7088e7c9d1596 +PKG_SOURCE_URL:=http://www.vips.ecs.soton.ac.uk/supported/7.24/ +PKG_MD5SUM:=7e9d34960c3453f3b8d1d4300fe4b7a0 PKG_FIXUP = libtool include $(INCLUDE_DIR)/package.mk diff --git a/libs/vips/patches/001-embedded_build.patch b/libs/vips/patches/001-embedded_build.patch deleted file mode 100644 index cc4ccf6d9..000000000 --- a/libs/vips/patches/001-embedded_build.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -u --recursive --new-file vips-7.22.2-vanilla/configure.in vips-7.22.2/configure.in ---- vips-7.22.2-vanilla/configure.in 2010-09-13 16:03:33.945285002 -0500 -+++ vips-7.22.2/configure.in 2010-09-13 16:13:36.848285002 -0500 -@@ -142,6 +142,7 @@ - AC_PROG_AWK - AC_PROG_CC - AC_PROG_CC_STDC -+AC_PROG_CXX - AC_C_CONST - AC_C_RESTRICT - AC_PROG_RANLIB -@@ -157,7 +158,6 @@ - AS_HELP_STRING([--enable-cxx], [build C++ components (default: enabled)])) - - if test x"$enable_cxx" != "xno"; then -- AC_PROG_CXX - AC_DEFINE(ENABLE_CXX,1,[build C++ components]) - AM_CONDITIONAL(ENABLE_CXX, true) - enable_cxx=yes -@@ -273,9 +273,6 @@ - enable_threads=yes - fi - --# check for gtk-doc --GTK_DOC_CHECK(1.9) -- - # optional supporting libraries - - # we can wrap fftw3 and fftw2 ... but just look for fftw3, since we can do -@@ -633,9 +630,6 @@ - swig/vipsCC/Makefile - swig/python/setup.py - man/Makefile -- doc/Makefile -- doc/reference/Makefile -- doc/reference/libvips-docs.sgml - po/Makefile.in - ]) - -diff -u --recursive --new-file vips-7.22.2-vanilla/Makefile.am vips-7.22.2/Makefile.am ---- vips-7.22.2-vanilla/Makefile.am 2010-09-13 16:03:33.946285002 -0500 -+++ vips-7.22.2/Makefile.am 2010-09-13 16:10:27.306284973 -0500 -@@ -24,7 +24,6 @@ - tools \ - man \ - po \ -- doc \ - $(C_COMPILE_DIR) \ - $(P_COMPILE_DIR) diff --git a/libs/vips/patches/001-no_cpp.patch b/libs/vips/patches/001-no_cpp.patch new file mode 100644 index 000000000..1511add85 --- /dev/null +++ b/libs/vips/patches/001-no_cpp.patch @@ -0,0 +1,146 @@ +diff -u --recursive vips-7.24.1-vanilla/configure.in vips-7.24.1/configure.in +--- vips-7.24.1-vanilla/configure.in 2011-03-29 22:09:45.465282663 -0500 ++++ vips-7.24.1/configure.in 2011-03-29 22:18:40.786482911 -0500 +@@ -143,7 +143,6 @@ + AC_PROG_AWK + AC_PROG_CC + AC_PROG_CC_STDC +-AC_PROG_CXX + AC_C_CONST + AC_C_RESTRICT + AC_PROG_RANLIB +@@ -615,7 +614,6 @@ + # in AC_OUTPUT, but that seems to break for some combinations of sh/m4 + AC_OUTPUT([ + vips-7.24.pc +- vipsCC-7.24.pc + Makefile + libvips/include/vips/version.h + libvips/include/Makefile +@@ -624,7 +622,6 @@ + libvips/acquire/Makefile + libvips/arithmetic/Makefile + libvips/boolean/Makefile +- libvips/cimg/Makefile + libvips/colour/Makefile + libvips/conversion/Makefile + libvips/convolution/Makefile +@@ -641,9 +638,6 @@ + libvips/relational/Makefile + libvips/resample/Makefile + libvips/video/Makefile +- libvipsCC/include/Makefile +- libvipsCC/include/vips/Makefile +- libvipsCC/Makefile + tools/Makefile + tools/iofuncs/Makefile + tools/mosaicing/Makefile +@@ -655,7 +649,6 @@ + tools/scripts/light_correct + tools/scripts/shrink_width + swig/Makefile +- swig/vipsCC/Makefile + swig/python/setup.py + man/Makefile + doc/Makefile +diff -u --recursive vips-7.24.1-vanilla/libvips/Makefile.am vips-7.24.1/libvips/Makefile.am +--- vips-7.24.1-vanilla/libvips/Makefile.am 2011-03-29 22:09:45.525280200 -0500 ++++ vips-7.24.1/libvips/Makefile.am 2011-03-29 22:16:08.223081415 -0500 +@@ -1,14 +1,3 @@ +-# only build in the cimg dir if C++ is enabled +-if ENABLE_CXX +-C_COMPILE_DIR = cimg +-C_DIST_DIR = +-C_LIB = cimg/libcimg.la +-else +-C_COMPILE_DIR = +-C_DIST_DIR = cimg +-C_LIB = +-endif +- + SUBDIRS = \ + include \ + acquire \ +@@ -19,7 +8,6 @@ + conversion \ + deprecated \ + convolution \ +- $(C_COMPILE_DIR) \ + format \ + freq_filt \ + histograms_lut \ +@@ -36,9 +24,6 @@ + lib_LTLIBRARIES = libvips.la + + libvips_la_SOURCES = dummy.c +-if ENABLE_CXX +-libvips_la_SOURCES += dummy2.cc +-endif + + # DLLs need dependant libs there too ... put @VIPS_LIBS@ at the end + libvips_la_LIBADD = \ +@@ -50,7 +35,6 @@ + conversion/libconversion.la \ + convolution/libconvolution.la \ + deprecated/libdeprecated.la \ +- $(C_LIB) \ + format/libformat.la \ + freq_filt/libfreq_filt.la \ + histograms_lut/libhistograms_lut.la \ +@@ -64,13 +48,6 @@ + video/libvideo.la \ + @VIPS_LIBS@ + +-if ENABLE_CXX +-libvips_la_LIBADD += @VIPS_CXX_LIBS@ +-endif +- + libvips_la_LDFLAGS = \ + -no-undefined \ + -version-info @LIBRARY_CURRENT@:@LIBRARY_REVISION@:@LIBRARY_AGE@ +- +-EXTRA_DIST = \ +- $(C_DIST_DIR) +diff -u --recursive vips-7.24.1-vanilla/libvips/resample/Makefile.am vips-7.24.1/libvips/resample/Makefile.am +--- vips-7.24.1-vanilla/libvips/resample/Makefile.am 2011-03-29 22:09:45.546279339 -0500 ++++ vips-7.24.1/libvips/resample/Makefile.am 2011-03-29 22:16:28.918185323 -0500 +@@ -2,23 +2,6 @@ + # you'd think we could just define a couple of variables, but that seems to + # confuse libtool and make it link the library with g++ + # instead, have two completely different paths +-if ENABLE_CXX +- +-libresample_la_SOURCES = \ +- im_affine.c \ +- interpolate.c \ +- im_shrink.c \ +- im_stretch3.c \ +- im_rightshift_size.c \ +- transform.c \ +- resample_dispatch.c \ +- bicubic.cpp \ +- lbb.cpp \ +- nohalo.cpp \ +- vsqbs.cpp \ +- templates.h +- +-else + + libresample_la_SOURCES = \ + im_affine.c \ +@@ -29,15 +12,6 @@ + transform.c \ + resample_dispatch.c + +-EXTRA_DIST = \ +- bicubic.cpp \ +- lbb.cpp \ +- nohalo.cpp \ +- vsqbs.cpp \ +- templates.h +- +-endif +- + noinst_LTLIBRARIES = libresample.la + + INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ -- 2.11.0