Changeset 32744


Ignore:
Timestamp:
2012-07-16T14:22:53+02:00 (6 years ago)
Author:
acinonyx
Message:

[packages] vips: Bump to 7.28.9

Update VIPS to 7.28.9; fixes https://dev.archive.openwrt.org/ticket/11866.html.

Signed-off-by: W. Michael Petullo <mike@…>
Signed-off-by: Vasilis Tsiligiannis <b_tsiligiannis@…>

Location:
packages/libs/vips
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/libs/vips/Makefile

    r32206 r32744  
    99 
    1010PKG_NAME:=vips 
    11 PKG_VERSION:=7.26.3 
    12 PKG_RELEASE:=2 
     11PKG_VERSION:=7.28.9 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    15 PKG_SOURCE_URL:=http://www.vips.ecs.soton.ac.uk/supported/7.26/ 
    16 PKG_MD5SUM:=1fbf164ef0da8e835a036c56ff659e8e 
     15PKG_SOURCE_URL:=http://www.vips.ecs.soton.ac.uk/supported/7.28/ 
     16PKG_MD5SUM:=c34e4c6367078c6d50893927aa5924bd 
    1717PKG_FIXUP:=autoreconf 
    1818 
  • packages/libs/vips/patches/001-no_cpp.patch

    r28533 r32744  
    1 diff -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 @@ 
     1diff -u --recursive vips-7.28.9-vanilla/configure.in vips-7.28.9/configure.in 
     2--- vips-7.28.9-vanilla/configure.in    2012-07-14 22:35:08.209029299 -0500 
     3+++ vips-7.28.9/configure.in    2012-07-14 22:36:25.634927858 -0500 
     4@@ -182,7 +182,6 @@ 
    55 AC_PROG_AWK 
    66 AC_PROG_CC 
     
    1010 AC_C_RESTRICT 
    1111 AC_PROG_RANLIB 
    12 @@ -150,45 +149,6 @@ 
     12@@ -190,45 +189,6 @@ 
    1313 AC_PROG_LN_S 
    1414 AM_WITH_DMALLOC 
     
    5656 # without this we get something like 
    5757 #    define VIPS_LIBDIR ${exec_prefix}/lib 
    58 @@ -614,7 +574,6 @@ 
     58@@ -681,7 +641,6 @@ 
    5959 AC_SUBST(VIPS_CFLAGS) 
    6060 AC_SUBST(VIPS_INCLUDES) 
     
    6464  
    6565 # you'd think we could have  
    66 @@ -622,7 +581,6 @@ 
     66@@ -689,14 +648,12 @@ 
    6767 # in AC_OUTPUT, but that seems to break for some combinations of sh/m4 
    6868 AC_OUTPUT([ 
    69         vips-7.26.pc 
    70 -       vipsCC-7.26.pc 
     69        vips-7.28.pc 
     70-       vipsCC-7.28.pc 
    7171        Makefile  
    7272        libvips/include/vips/version.h  
    7373        libvips/include/Makefile  
    74 @@ -630,7 +588,6 @@ 
     74        libvips/include/vips/Makefile  
    7575        libvips/Makefile  
    7676        libvips/arithmetic/Makefile  
    77         libvips/boolean/Makefile  
    7877-       libvips/cimg/Makefile  
    7978        libvips/colour/Makefile  
    8079        libvips/conversion/Makefile  
    8180        libvips/convolution/Makefile  
    82 @@ -647,9 +604,6 @@ 
    83         libvips/relational/Makefile  
     81@@ -711,9 +668,6 @@ 
     82        libvips/other/Makefile  
    8483        libvips/resample/Makefile  
    8584        libvips/video/Makefile  
     
    9089        tools/batch_crop  
    9190        tools/batch_image_convert  
    92 @@ -657,7 +611,6 @@ 
     91@@ -721,7 +675,6 @@ 
    9392        tools/light_correct  
    9493        tools/shrink_width  
     
    9897        man/Makefile 
    9998        doc/Makefile 
    100 diff -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 
    103 @@ -1,14 +1,3 @@ 
    104 -# only build in the cimg dir if C++ is enabled 
     99diff -u --recursive vips-7.28.9-vanilla/libvips/Makefile.am vips-7.28.9/libvips/Makefile.am 
     100--- vips-7.28.9-vanilla/libvips/Makefile.am     2012-07-14 22:35:08.206029420 -0500 
     101+++ vips-7.28.9/libvips/Makefile.am     2012-07-14 22:37:24.446571912 -0500 
     102@@ -1,14 +1,4 @@ 
     103 # only build in the cimg dir if C++ is enabled 
    105104-if ENABLE_CXX 
    106105-C_COMPILE_DIR = cimg 
     
    115114 SUBDIRS = \ 
    116115        include \ 
    117         arithmetic \ 
    118 @@ -18,7 +7,6 @@ 
     116        foreign \ 
     117@@ -18,7 +8,6 @@ 
    119118        conversion \ 
    120119        deprecated \ 
    121120        convolution \ 
    122121-       $(C_COMPILE_DIR) \ 
    123         format \ 
    124122        freq_filt \ 
    125123        histograms_lut \ 
    126 @@ -37,14 +25,6 @@ 
     124        inplace \ 
     125@@ -34,14 +23,6 @@ 
    127126 # empty means default to C linking 
    128127 libvips_la_SOURCES =  
     
    130129-# if we have C++ components enabled, make sure we link the top-level with c++ 
    131130-# 
    132 -# sadly the if/enndif isn't enough to stop automake detecting a c++ link even 
     131-# sadly the if/endif isn't enough to stop automake detecting a c++ link even 
    133132-# when c++ is disabled ... comment out this line if you have linking problems 
    134133-if ENABLE_CXX 
    135 -nodist_EXTRA_libvips_la_SOURCES = cimg/dummy2.cxx 
     134-nodist_EXTRA_libvips_la_SOURCES = cimg/dummy2.cc 
    136135-endif 
    137136- 
     
    139138 libvips_la_LIBADD = \ 
    140139        resample/libresample.la \ 
    141 @@ -54,7 +34,6 @@ 
     140@@ -50,7 +31,6 @@ 
    142141        conversion/libconversion.la \ 
    143142        convolution/libconvolution.la \ 
    144143        deprecated/libdeprecated.la \ 
    145144-       $(C_LIB) \ 
    146         format/libformat.la \ 
     145        foreign/libforeign.la \ 
    147146        freq_filt/libfreq_filt.la \ 
    148147        histograms_lut/libhistograms_lut.la \ 
    149 @@ -68,13 +47,6 @@ 
     148@@ -62,17 +42,10 @@ 
    150149        video/libvideo.la \ 
    151150        @VIPS_LIBS@ 
     
    158157        -no-undefined \ 
    159158        -version-info @LIBRARY_CURRENT@:@LIBRARY_REVISION@:@LIBRARY_AGE@  
    160 - 
     159  
    161160-EXTRA_DIST = \ 
    162161-       $(C_DIST_DIR) 
    163 diff -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 
     162- 
     163 CLEANFILES =  
     164  
     165 -include $(INTROSPECTION_MAKEFILE) 
     166diff -u --recursive vips-7.28.9-vanilla/libvips/resample/Makefile.am vips-7.28.9/libvips/resample/Makefile.am 
     167--- vips-7.28.9-vanilla/libvips/resample/Makefile.am    2012-07-14 22:35:08.191030020 -0500 
     168+++ vips-7.28.9/libvips/resample/Makefile.am    2012-07-14 22:37:49.470569578 -0500 
    166169@@ -2,22 +2,6 @@ 
    167170 # you'd think we could just define a couple of variables, but that seems to 
     
    203206  
    204207 INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@  
    205 diff -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 
     208diff -u --recursive vips-7.28.9-vanilla/Makefile.am vips-7.28.9/Makefile.am 
     209--- vips-7.28.9-vanilla/Makefile.am     2012-07-14 22:35:08.220028859 -0500 
     210+++ vips-7.28.9/Makefile.am     2012-07-14 22:38:43.217417048 -0500 
    208211@@ -1,43 +1,17 @@ 
    209212- 
     
    252255 pkgconfigdir = $(libdir)/pkgconfig 
    253256 pkgconfig_DATA = vips-7.${VIPS_MINOR_VERSION}.pc $(C_PKGCONFIG) 
    254 diff -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   
    359 diff -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 
     257diff -u --recursive vips-7.28.9-vanilla/tools/Makefile.am vips-7.28.9/tools/Makefile.am 
     258--- vips-7.28.9-vanilla/tools/Makefile.am       2012-07-14 22:35:08.221028819 -0500 
     259+++ vips-7.28.9/tools/Makefile.am       2012-07-14 22:40:51.397283833 -0500 
    362260@@ -16,9 +16,6 @@ 
    363261 INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 
     
    370268 bin_SCRIPTS = \ 
    371269        light_correct \ 
    372 diff -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 
     270diff -u --recursive vips-7.28.9-vanilla/vips-7.28.pc.in vips-7.28.9/vips-7.28.pc.in 
     271--- vips-7.28.9-vanilla/vips-7.28.pc.in 2012-07-14 22:35:08.208029340 -0500 
     272+++ vips-7.28.9/vips-7.28.pc.in 2012-07-14 22:41:03.591795535 -0500 
    375273@@ -7,5 +7,5 @@ 
    376274 Description: Image processing library 
Note: See TracChangeset for help on using the changeset viewer.