Changeset 30066


Ignore:
Timestamp:
2012-02-04T19:51:54+01:00 (6 years ago)
Author:
jow
Message:

[packages_10.03.2] vips: merge r28062, r28064, r28533, r29057

Location:
branches/packages_10.03.2/libs/vips
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/libs/vips/Makefile

    r26420 r30066  
    11# 
    2 # Copyright (C) 2010 OpenWrt.org 
     2# Copyright (C) 2010-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=vips 
    11 PKG_VERSION:=7.24.1 
    12 PKG_RELEASE:=1 
     11PKG_VERSION:=7.26.3 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    15 PKG_SOURCE_URL:=http://www.vips.ecs.soton.ac.uk/supported/7.24/ 
    16 PKG_MD5SUM:=7e9d34960c3453f3b8d1d4300fe4b7a0 
     15PKG_SOURCE_URL:=http://www.vips.ecs.soton.ac.uk/supported/7.26/ 
     16PKG_MD5SUM:=1fbf164ef0da8e835a036c56ff659e8e 
    1717PKG_FIXUP = libtool 
    1818 
     
    2222PKG_INSTALL=1 
    2323 
    24 define Package/vips/Default 
    25   TITLE:=vips 
    26   URL:=http://www.vips.ecs.soton.ac.uk/ 
    27 endef 
    28  
    2924define Package/vips 
    3025  $(call Package/vips/Default) 
    3126  SECTION:=multimedia 
    3227  CATEGORY:=Multimedia 
    33   DEPENDS:=+libjpeg +glib2 +libxml2 +imagemagick +libfreetype $(INTL_DEPENDS) 
    34 endef 
    35  
    36 define Package/vips/description 
    37   An image manipulation library. 
     28  TITLE:=An image manipulation library 
     29  URL:=http://www.vips.ecs.soton.ac.uk/ 
     30  DEPENDS:=+glib2 +libexif +libjpeg +libpng +libxml2 $(INTL_DEPENDS) 
    3831endef 
    3932 
     
    4437        --disable-cxx \ 
    4538        --disable-threads \ 
    46         --without-liboil 
     39        --without-cfitsio \ 
     40        --without-fftw3 \ 
     41        --without-lcms \ 
     42        --without-magick \ 
     43        --without-matio \ 
     44        --without-OpenEXR \ 
     45        --without-orc \ 
     46        --without-pangoft2 \ 
     47        --without-python \ 
     48        --without-tiff \ 
     49        --without-v4l \ 
     50        --without-x \ 
     51        --without-zip \ 
     52        --with-jpeg \ 
     53        --with-libexif \ 
     54        --with-png \ 
    4755 
    4856define Build/InstallDev 
  • branches/packages_10.03.2/libs/vips/patches/001-no_cpp.patch

    r26420 r30066  
    1 diff -u --recursive vips-7.24.1-vanilla/configure.in vips-7.24.1/configure.in 
    2 --- vips-7.24.1-vanilla/configure.in    2011-03-29 22:09:45.465282663 -0500 
    3 +++ vips-7.24.1/configure.in    2011-03-29 22:18:40.786482911 -0500 
    4 @@ -143,7 +143,6 @@ 
     1diff -u --recursive vips-7.26.3-vanilla/configure.in vips-7.26.3/configure.in 
     2--- vips-7.26.3-vanilla/configure.in    2011-10-07 20:43:26.474844552 -0500 
     3+++ vips-7.26.3/configure.in    2011-10-07 21:00:33.633107256 -0500 
     4@@ -142,7 +142,6 @@ 
    55 AC_PROG_AWK 
    66 AC_PROG_CC 
     
    1010 AC_C_RESTRICT 
    1111 AC_PROG_RANLIB 
    12 @@ -615,7 +614,6 @@ 
     12@@ -150,45 +149,6 @@ 
     13 AC_PROG_LN_S 
     14 AM_WITH_DMALLOC 
     15  
     16-# vips_PROG_CXX_WORKS 
     17-# Check whether the C++ compiler works. 
     18-AC_DEFUN([vips_PROG_CXX_WORKS], 
     19-  [AC_REQUIRE([AC_PROG_CXX])dnl 
     20-   AC_CACHE_CHECK([whether the C++ compiler works], 
     21-   [vips_cv_prog_cxx_works], 
     22-   [AC_LANG_PUSH([C++]) 
     23-    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], 
     24-                   [vips_cv_prog_cxx_works=yes], 
     25-                   [vips_cv_prog_cxx_works=no]) 
     26-    AC_LANG_POP([C++])]) 
     27-]) 
     28- 
     29-# option to build without C++ 
     30-# handy for some embedded applications 
     31-# also, including C++ source causes link problems on some 
     32-# platforms, so have an option to disable it 
     33-AC_ARG_ENABLE(cxx,  
     34-  AS_HELP_STRING([--enable-cxx], [build C++ components (default: test)])) 
     35- 
     36-if test x"$enable_cxx" != x"no"; then 
     37-  vips_PROG_CXX_WORKS 
     38-  if test x"$vips_cv_prog_cxx_works" = x"yes"; then  
     39-    AC_DEFINE(ENABLE_CXX,1,[build C++ components]) 
     40-    AM_CONDITIONAL(ENABLE_CXX, true) 
     41-    # need -lstdc++ for (eg.) the C++ format loaders 
     42-    # this gets added to vips-7.xx.pc to help mingw and friends link programs 
     43-    # using libvips 
     44-    VIPS_CXX_LIBS="-lstdc++" 
     45-    enable_cxx=yes 
     46-  fi 
     47-fi 
     48- 
     49-if test x"$enable_cxx" != x"yes"; then 
     50-  AM_CONDITIONAL(ENABLE_CXX, false) 
     51-  VIPS_CXX_LIBS="" 
     52-  enable_cxx=no 
     53-fi 
     54- 
     55 # we need a fully expanded version of $libdir 
     56 # without this we get something like 
     57 #    define VIPS_LIBDIR ${exec_prefix}/lib 
     58@@ -614,7 +574,6 @@ 
     59 AC_SUBST(VIPS_CFLAGS) 
     60 AC_SUBST(VIPS_INCLUDES) 
     61 AC_SUBST(VIPS_LIBS) 
     62-AC_SUBST(VIPS_CXX_LIBS) 
     63 AC_SUBST(PACKAGES_USED) 
     64  
     65 # you'd think we could have  
     66@@ -622,7 +581,6 @@ 
    1367 # in AC_OUTPUT, but that seems to break for some combinations of sh/m4 
    1468 AC_OUTPUT([ 
    15         vips-7.24.pc 
    16 -       vipsCC-7.24.pc 
     69        vips-7.26.pc 
     70-       vipsCC-7.26.pc 
    1771        Makefile  
    1872        libvips/include/vips/version.h  
    1973        libvips/include/Makefile  
    20 @@ -624,7 +622,6 @@ 
    21         libvips/acquire/Makefile  
     74@@ -630,7 +588,6 @@ 
     75        libvips/Makefile  
    2276        libvips/arithmetic/Makefile  
    2377        libvips/boolean/Makefile  
     
    2680        libvips/conversion/Makefile  
    2781        libvips/convolution/Makefile  
    28 @@ -641,9 +638,6 @@ 
     82@@ -647,9 +604,6 @@ 
    2983        libvips/relational/Makefile  
    3084        libvips/resample/Makefile  
     
    3488-       libvipsCC/Makefile  
    3589        tools/Makefile  
    36         tools/iofuncs/Makefile  
    37         tools/mosaicing/Makefile  
    38 @@ -655,7 +649,6 @@ 
    39         tools/scripts/light_correct  
    40         tools/scripts/shrink_width  
     90        tools/batch_crop  
     91        tools/batch_image_convert  
     92@@ -657,7 +611,6 @@ 
     93        tools/light_correct  
     94        tools/shrink_width  
    4195        swig/Makefile  
    4296-       swig/vipsCC/Makefile  
     
    4498        man/Makefile 
    4599        doc/Makefile 
    46 diff -u --recursive vips-7.24.1-vanilla/libvips/Makefile.am vips-7.24.1/libvips/Makefile.am 
    47 --- vips-7.24.1-vanilla/libvips/Makefile.am     2011-03-29 22:09:45.525280200 -0500 
    48 +++ vips-7.24.1/libvips/Makefile.am     2011-03-29 22:16:08.223081415 -0500 
     100diff -u --recursive vips-7.26.3-vanilla/libvips/Makefile.am vips-7.26.3/libvips/Makefile.am 
     101--- vips-7.26.3-vanilla/libvips/Makefile.am     2011-10-07 20:43:26.909839013 -0500 
     102+++ vips-7.26.3/libvips/Makefile.am     2011-10-07 20:45:25.074274823 -0500 
    49103@@ -1,14 +1,3 @@ 
    50104-# only build in the cimg dir if C++ is enabled 
     
    61115 SUBDIRS = \ 
    62116        include \ 
    63         acquire \ 
    64 @@ -19,7 +8,6 @@ 
     117        arithmetic \ 
     118@@ -18,7 +7,6 @@ 
    65119        conversion \ 
    66120        deprecated \ 
     
    70124        freq_filt \ 
    71125        histograms_lut \ 
    72 @@ -36,9 +24,6 @@ 
    73  lib_LTLIBRARIES = libvips.la 
    74   
    75  libvips_la_SOURCES = dummy.c  
    76 -if ENABLE_CXX 
    77 -libvips_la_SOURCES += dummy2.cc 
    78 -endif 
    79   
     126@@ -37,14 +25,6 @@ 
     127 # empty means default to C linking 
     128 libvips_la_SOURCES =  
     129  
     130-# if we have C++ components enabled, make sure we link the top-level with c++ 
     131-# 
     132-# sadly the if/enndif isn't enough to stop automake detecting a c++ link even 
     133-# when c++ is disabled ... comment out this line if you have linking problems 
     134-if ENABLE_CXX 
     135-nodist_EXTRA_libvips_la_SOURCES = cimg/dummy2.cxx 
     136-endif 
     137- 
    80138 # DLLs need dependant libs there too ... put @VIPS_LIBS@ at the end 
    81139 libvips_la_LIBADD = \ 
    82 @@ -50,7 +35,6 @@ 
     140        resample/libresample.la \ 
     141@@ -54,7 +34,6 @@ 
    83142        conversion/libconversion.la \ 
    84143        convolution/libconvolution.la \ 
     
    88147        freq_filt/libfreq_filt.la \ 
    89148        histograms_lut/libhistograms_lut.la \ 
    90 @@ -64,13 +48,6 @@ 
     149@@ -68,13 +47,6 @@ 
    91150        video/libvideo.la \ 
    92151        @VIPS_LIBS@ 
     
    102161-EXTRA_DIST = \ 
    103162-       $(C_DIST_DIR) 
    104 diff -u --recursive vips-7.24.1-vanilla/libvips/resample/Makefile.am vips-7.24.1/libvips/resample/Makefile.am 
    105 --- vips-7.24.1-vanilla/libvips/resample/Makefile.am    2011-03-29 22:09:45.546279339 -0500 
    106 +++ vips-7.24.1/libvips/resample/Makefile.am    2011-03-29 22:16:28.918185323 -0500 
    107 @@ -2,23 +2,6 @@ 
     163diff -u --recursive vips-7.26.3-vanilla/libvips/resample/Makefile.am vips-7.26.3/libvips/resample/Makefile.am 
     164--- vips-7.26.3-vanilla/libvips/resample/Makefile.am    2011-10-07 20:43:27.173835707 -0500 
     165+++ vips-7.26.3/libvips/resample/Makefile.am    2011-10-07 20:45:49.360933471 -0500 
     166@@ -2,22 +2,6 @@ 
    108167 # you'd think we could just define a couple of variables, but that seems to 
    109168 # confuse libtool and make it link the library with g++ 
     
    115174-       interpolate.c \ 
    116175-       im_shrink.c \ 
    117 -       im_stretch3.c \ 
    118176-       im_rightshift_size.c \ 
    119177-       transform.c \ 
     
    129187 libresample_la_SOURCES = \ 
    130188        im_affine.c \ 
    131 @@ -29,15 +12,6 @@ 
     189@@ -27,15 +11,6 @@ 
    132190        transform.c \ 
    133191        resample_dispatch.c  
     
    145203  
    146204 INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@  
     205diff -u --recursive vips-7.26.3-vanilla/Makefile.am vips-7.26.3/Makefile.am 
     206--- vips-7.26.3-vanilla/Makefile.am     2011-10-07 20:43:26.476844503 -0500 
     207+++ vips-7.26.3/Makefile.am     2011-10-07 22:31:54.034586656 -0500 
     208@@ -1,43 +1,17 @@ 
     209- 
     210-# turn off libvipsCC if C++ is disabled 
     211-if ENABLE_CXX 
     212-C_COMPILE_DIR = libvipsCC 
     213-C_DIST_DIR = 
     214-C_PKGCONFIG = vipsCC-7.${VIPS_MINOR_VERSION}.pc 
     215- 
     216-# turn on Python if we can (requires C++) 
     217-if HAVE_PYTHON 
     218-P_COMPILE_DIR = swig 
     219-P_DIST_DIR = 
     220-endif 
     221- 
     222-else 
     223-C_COMPILE_DIR = 
     224-C_DIST_DIR = libvipsCC  
     225-C_PKGCONFIG = 
     226-P_COMPILE_DIR = 
     227-P_DIST_DIR = swig 
     228-endif 
     229- 
     230 SUBDIRS = \ 
     231        libvips \ 
     232        tools \ 
     233        po \ 
     234        man \ 
     235-       doc \ 
     236-       $(C_COMPILE_DIR) \ 
     237-       $(P_COMPILE_DIR)  
     238+       doc 
     239  
     240 EXTRA_DIST = \ 
     241        m4 \ 
     242        benchmark \ 
     243        bootstrap.sh \ 
     244        vips-7.${VIPS_MINOR_VERSION}.pc.in \ 
     245-       vipsCC-7.${VIPS_MINOR_VERSION}.pc.in \ 
     246        acinclude.m4 \ 
     247-       depcomp \ 
     248-       $(C_DIST_DIR) \ 
     249-       $(P_DIST_DIR) 
     250+       depcomp 
     251  
     252 pkgconfigdir = $(libdir)/pkgconfig 
     253 pkgconfig_DATA = vips-7.${VIPS_MINOR_VERSION}.pc $(C_PKGCONFIG) 
     254diff -u --recursive vips-7.26.3-vanilla/Makefile.in vips-7.26.3/Makefile.in 
     255--- vips-7.26.3-vanilla/Makefile.in     2011-10-07 20:43:26.766840803 -0500 
     256+++ vips-7.26.3/Makefile.in     2011-10-07 22:30:18.980820947 -0500 
     257@@ -37,7 +37,6 @@ 
     258 subdir = . 
     259 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ 
     260        $(srcdir)/Makefile.in $(srcdir)/config.h.in \ 
     261-       $(srcdir)/vips-7.26.pc.in $(srcdir)/vipsCC-7.26.pc.in \ 
     262        $(top_srcdir)/configure $(top_srcdir)/swig/python/setup.py.in \ 
     263        AUTHORS COPYING ChangeLog INSTALL NEWS THANKS TODO \ 
     264        config.guess config.sub depcomp install-sh ltmain.sh missing \ 
     265@@ -51,7 +50,7 @@ 
     266  configure.lineno config.status.lineno 
     267 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs 
     268 CONFIG_HEADER = config.h 
     269-CONFIG_CLEAN_FILES = vips-7.26.pc vipsCC-7.26.pc swig/python/setup.py 
     270+CONFIG_CLEAN_FILES = vips-7.26.pc swig/python/setup.py 
     271 CONFIG_CLEAN_VPATH_FILES = 
     272 SOURCES = 
     273 DIST_SOURCES = 
     274@@ -92,7 +91,7 @@ 
     275        distdir dist dist-all distcheck 
     276 ETAGS = etags 
     277 CTAGS = ctags 
     278-DIST_SUBDIRS = libvips tools po man doc libvipsCC swig 
     279+DIST_SUBDIRS = libvips tools po man doc swig 
     280 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
     281 distdir = $(PACKAGE)-$(VERSION) 
     282 top_distdir = $(distdir) 
     283@@ -146,10 +145,6 @@ 
     284 CFLAGS = @CFLAGS@ 
     285 CPP = @CPP@ 
     286 CPPFLAGS = @CPPFLAGS@ 
     287-CXX = @CXX@ 
     288-CXXCPP = @CXXCPP@ 
     289-CXXDEPMODE = @CXXDEPMODE@ 
     290-CXXFLAGS = @CXXFLAGS@ 
     291 CYGPATH_W = @CYGPATH_W@ 
     292 DATADIRNAME = @DATADIRNAME@ 
     293 DEFS = @DEFS@ 
     294@@ -262,7 +257,6 @@ 
     295 USE_NLS = @USE_NLS@ 
     296 VERSION = @VERSION@ 
     297 VIPS_CFLAGS = @VIPS_CFLAGS@ 
     298-VIPS_CXX_LIBS = @VIPS_CXX_LIBS@ 
     299 VIPS_EXEEXT = @VIPS_EXEEXT@ 
     300 VIPS_INCLUDES = @VIPS_INCLUDES@ 
     301 VIPS_LIBDIR = @VIPS_LIBDIR@ 
     302@@ -285,7 +279,6 @@ 
     303 abs_top_builddir = @abs_top_builddir@ 
     304 abs_top_srcdir = @abs_top_srcdir@ 
     305 ac_ct_CC = @ac_ct_CC@ 
     306-ac_ct_CXX = @ac_ct_CXX@ 
     307 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ 
     308 am__include = @am__include@ 
     309 am__leading_dot = @am__leading_dot@ 
     310@@ -337,39 +330,21 @@ 
     311 top_build_prefix = @top_build_prefix@ 
     312 top_builddir = @top_builddir@ 
     313 top_srcdir = @top_srcdir@ 
     314-@ENABLE_CXX_FALSE@C_COMPILE_DIR =  
     315  
     316-# turn off libvipsCC if C++ is disabled 
     317-@ENABLE_CXX_TRUE@C_COMPILE_DIR = libvipsCC 
     318-@ENABLE_CXX_FALSE@C_DIST_DIR = libvipsCC  
     319-@ENABLE_CXX_TRUE@C_DIST_DIR =  
     320-@ENABLE_CXX_FALSE@C_PKGCONFIG =  
     321-@ENABLE_CXX_TRUE@C_PKGCONFIG = vipsCC-7.${VIPS_MINOR_VERSION}.pc 
     322-@ENABLE_CXX_FALSE@P_COMPILE_DIR =  
     323- 
     324-# turn on Python if we can (requires C++) 
     325-@ENABLE_CXX_TRUE@@HAVE_PYTHON_TRUE@P_COMPILE_DIR = swig 
     326-@ENABLE_CXX_FALSE@P_DIST_DIR = swig 
     327-@ENABLE_CXX_TRUE@@HAVE_PYTHON_TRUE@P_DIST_DIR =  
     328 SUBDIRS = \ 
     329        libvips \ 
     330        tools \ 
     331        po \ 
     332        man \ 
     333        doc \ 
     334-       $(C_COMPILE_DIR) \ 
     335-       $(P_COMPILE_DIR)  
     336  
     337 EXTRA_DIST = \ 
     338        m4 \ 
     339        benchmark \ 
     340        bootstrap.sh \ 
     341        vips-7.${VIPS_MINOR_VERSION}.pc.in \ 
     342-       vipsCC-7.${VIPS_MINOR_VERSION}.pc.in \ 
     343        acinclude.m4 \ 
     344        depcomp \ 
     345-       $(C_DIST_DIR) \ 
     346-       $(P_DIST_DIR) 
     347  
     348 pkgconfigdir = $(libdir)/pkgconfig 
     349 pkgconfig_DATA = vips-7.${VIPS_MINOR_VERSION}.pc $(C_PKGCONFIG) 
     350@@ -431,8 +406,6 @@ 
     351        -rm -f config.h stamp-h1 
     352 vips-7.26.pc: $(top_builddir)/config.status $(srcdir)/vips-7.26.pc.in 
     353        cd $(top_builddir) && $(SHELL) ./config.status $@ 
     354-vipsCC-7.26.pc: $(top_builddir)/config.status $(srcdir)/vipsCC-7.26.pc.in 
     355-       cd $(top_builddir) && $(SHELL) ./config.status $@ 
     356 swig/python/setup.py: $(top_builddir)/config.status $(top_srcdir)/swig/python/setup.py.in 
     357        cd $(top_builddir) && $(SHELL) ./config.status $@ 
     358  
     359diff -u --recursive vips-7.26.3-vanilla/tools/Makefile.am vips-7.26.3/tools/Makefile.am 
     360--- vips-7.26.3-vanilla/tools/Makefile.am       2011-10-07 20:43:26.495844193 -0500 
     361+++ vips-7.26.3/tools/Makefile.am       2011-10-07 22:34:56.215304397 -0500 
     362@@ -16,9 +16,6 @@ 
     363 INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 
     364 AM_LDFLAGS = @LDFLAGS@  
     365 LDADD = @VIPS_CFLAGS@ ${top_builddir}/libvips/libvips.la @VIPS_LIBS@ 
     366-if ENABLE_CXX 
     367-LDADD += @VIPS_CXX_LIBS@ 
     368-endif 
     369  
     370 bin_SCRIPTS = \ 
     371        light_correct \ 
     372diff -u --recursive vips-7.26.3-vanilla/vips-7.26.pc.in vips-7.26.3/vips-7.26.pc.in 
     373--- vips-7.26.3-vanilla/vips-7.26.pc.in 2011-10-07 20:43:26.769840766 -0500 
     374+++ vips-7.26.3/vips-7.26.pc.in 2011-10-07 22:25:21.633810254 -0500 
     375@@ -7,5 +7,5 @@ 
     376 Description: Image processing library 
     377 Version: @VERSION@ 
     378 Requires: @PACKAGES_USED@ 
     379-Libs: -L${libdir} -lvips @VIPS_LIBS@ @VIPS_CXX_LIBS@ 
     380+Libs: -L${libdir} -lvips @VIPS_LIBS@ 
     381 Cflags: -I${includedir}  
Note: See TracChangeset for help on using the changeset viewer.