source: packages/libs/vips/patches/001-no_cpp.patch @ 28064

Last change on this file since 28064 was 28064, checked in by florian, 5 years ago

[package] vips: update to 7.26.1 (#9666)

File size: 3.5 KB
  • configure.in

    diff -u --recursive vips-7.26.1-vanilla/configure.in vips-7.26.1/configure.in
    old new  
    142142AC_PROG_AWK 
    143143AC_PROG_CC 
    144144AC_PROG_CC_STDC 
    145 AC_PROG_CXX 
    146145AC_C_CONST 
    147146AC_C_RESTRICT 
    148147AC_PROG_RANLIB 
     
    604603# in AC_OUTPUT, but that seems to break for some combinations of sh/m4 
    605604AC_OUTPUT([ 
    606605        vips-7.26.pc 
    607         vipsCC-7.26.pc 
    608606        Makefile  
    609607        libvips/include/vips/version.h  
    610608        libvips/include/Makefile  
     
    612610        libvips/Makefile  
    613611        libvips/arithmetic/Makefile  
    614612        libvips/boolean/Makefile  
    615         libvips/cimg/Makefile  
    616613        libvips/colour/Makefile  
    617614        libvips/conversion/Makefile  
    618615        libvips/convolution/Makefile  
     
    629626        libvips/relational/Makefile  
    630627        libvips/resample/Makefile  
    631628        libvips/video/Makefile  
    632         libvipsCC/include/Makefile  
    633         libvipsCC/include/vips/Makefile  
    634         libvipsCC/Makefile  
    635629        tools/Makefile  
    636630        tools/batch_crop  
    637631        tools/batch_image_convert  
     
    639633        tools/light_correct  
    640634        tools/shrink_width  
    641635        swig/Makefile  
    642         swig/vipsCC/Makefile  
    643636        swig/python/setup.py  
    644637        man/Makefile 
    645638        doc/Makefile 
  • libvips/Makefile.am

    diff -u --recursive vips-7.26.1-vanilla/libvips/Makefile.am vips-7.26.1/libvips/Makefile.am
    old new  
    1 # only build in the cimg dir if C++ is enabled 
    2 if ENABLE_CXX 
    3 C_COMPILE_DIR = cimg 
    4 C_DIST_DIR = 
    5 C_LIB = cimg/libcimg.la 
    6 else 
    7 C_COMPILE_DIR = 
    8 C_DIST_DIR = cimg 
    9 C_LIB =  
    10 endif 
    11  
    121SUBDIRS = \ 
    132        include \ 
    143        arithmetic \ 
     
    187        conversion \ 
    198        deprecated \ 
    209        convolution \ 
    21         $(C_COMPILE_DIR) \ 
    2210        format \ 
    2311        freq_filt \ 
    2412        histograms_lut \ 
     
    3523lib_LTLIBRARIES = libvips.la 
    3624 
    3725libvips_la_SOURCES = dummy.c  
    38 if ENABLE_CXX 
    39 libvips_la_SOURCES += dummy2.cc 
    40 endif 
    4126 
    4227# DLLs need dependant libs there too ... put @VIPS_LIBS@ at the end 
    4328libvips_la_LIBADD = \ 
     
    4833        conversion/libconversion.la \ 
    4934        convolution/libconvolution.la \ 
    5035        deprecated/libdeprecated.la \ 
    51         $(C_LIB) \ 
    5236        format/libformat.la \ 
    5337        freq_filt/libfreq_filt.la \ 
    5438        histograms_lut/libhistograms_lut.la \ 
     
    6246        video/libvideo.la \ 
    6347        @VIPS_LIBS@ 
    6448 
    65 if ENABLE_CXX 
    66 libvips_la_LIBADD += @VIPS_CXX_LIBS@ 
    67 endif 
    68  
    6949libvips_la_LDFLAGS = \ 
    7050        -no-undefined \ 
    7151        -version-info @LIBRARY_CURRENT@:@LIBRARY_REVISION@:@LIBRARY_AGE@  
    72  
    73 EXTRA_DIST = \ 
    74         $(C_DIST_DIR) 
  • libvips/resample/Makefile.am

    diff -u --recursive vips-7.26.1-vanilla/libvips/resample/Makefile.am vips-7.26.1/libvips/resample/Makefile.am
    old new  
    22# you'd think we could just define a couple of variables, but that seems to 
    33# confuse libtool and make it link the library with g++ 
    44# instead, have two completely different paths 
    5 if ENABLE_CXX 
    6  
    7 libresample_la_SOURCES = \ 
    8         im_affine.c \ 
    9         interpolate.c \ 
    10         im_shrink.c \ 
    11         im_rightshift_size.c \ 
    12         transform.c \ 
    13         resample_dispatch.c \ 
    14         bicubic.cpp \ 
    15         lbb.cpp \ 
    16         nohalo.cpp \ 
    17         vsqbs.cpp \ 
    18         templates.h  
    19  
    20 else 
    215 
    226libresample_la_SOURCES = \ 
    237        im_affine.c \ 
     
    2711        transform.c \ 
    2812        resample_dispatch.c  
    2913 
    30 EXTRA_DIST = \ 
    31         bicubic.cpp \ 
    32         lbb.cpp \ 
    33         nohalo.cpp \ 
    34         vsqbs.cpp \ 
    35         templates.h  
    36  
    37 endif 
    38  
    3914noinst_LTLIBRARIES = libresample.la 
    4015 
    4116INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@  
Note: See TracBrowser for help on using the repository browser.