From: Steven Barth Date: Fri, 8 Aug 2014 05:03:02 +0000 (+0000) Subject: vips: moved to github X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5c543c1f5ab4f5b08e05db452be7bf66c1eacb62;p=openwrt%2Fsvn-archive%2Fpackages.git vips: moved to github SVN-Revision: 42057 --- diff --git a/libs/vips/Makefile b/libs/vips/Makefile deleted file mode 100644 index 69239ab25..000000000 --- a/libs/vips/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -# -# Copyright (C) 2010-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=vips -PKG_VERSION:=7.34.0 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.vips.ecs.soton.ac.uk/supported/7.34/ -PKG_MD5SUM:=520658fb5890103e446df629fb832795 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -PKG_INSTALL=1 - -define Package/vips - $(call Package/vips/Default) - SECTION:=multimedia - CATEGORY:=Multimedia - TITLE:=An image manipulation library - URL:=http://www.vips.ecs.soton.ac.uk/ - DEPENDS:=+glib2 +libexif +libjpeg +libpng +libxml2 $(INTL_DEPENDS) -endef - -TARGET_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -CONFIGURE_ARGS += \ - --disable-cxx \ - --disable-threads \ - --without-cfitsio \ - --without-fftw \ - --without-lcms \ - --without-magick \ - --without-matio \ - --without-OpenEXR \ - --without-orc \ - --without-pangoft2 \ - --without-python \ - --without-tiff \ - --without-v4l \ - --without-x \ - --without-zip \ - --with-jpeg \ - --with-libexif \ - --with-png \ - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/vips - $(CP) \ - $(PKG_INSTALL_DIR)/usr/include/* \ - $(1)/usr/include/ - - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ - - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ - $(1)/usr/lib/pkgconfig/ -endef - -define Package/vips/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,vips)) diff --git a/libs/vips/patches/001-no_cpp.patch b/libs/vips/patches/001-no_cpp.patch deleted file mode 100644 index 0f60e9768..000000000 --- a/libs/vips/patches/001-no_cpp.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -u --recursive vips-7.34.0-vanilla/libvips/Makefile.in vips-7.34.0/libvips/Makefile.in ---- vips-7.34.0-vanilla/libvips/Makefile.in 2013-06-18 12:41:41.166821516 -0500 -+++ vips-7.34.0/libvips/Makefile.in 2013-06-18 12:45:16.591314640 -0500 -@@ -109,7 +109,7 @@ - video/libvideo.la $(am__DEPENDENCIES_2) - am_libvips_la_OBJECTS = - libvips_la_OBJECTS = $(am_libvips_la_OBJECTS) --libvips_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+libvips_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libvips_la_LDFLAGS) $(LDFLAGS) -o $@ - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -@@ -118,11 +118,11 @@ - am__mv = mv -f - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+LTCXXCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+CXXLINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ - SOURCES = $(libvips_la_SOURCES) $(nodist_EXTRA_libvips_la_SOURCES) -@@ -583,11 +583,11 @@ - @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - - dummy2.lo: cimg/dummy2.cc --@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dummy2.lo -MD -MP -MF $(DEPDIR)/dummy2.Tpo -c -o dummy2.lo `test -f 'cimg/dummy2.cc' || echo '$(srcdir)/'`cimg/dummy2.cc -+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dummy2.lo -MD -MP -MF $(DEPDIR)/dummy2.Tpo -c -o dummy2.lo `test -f 'cimg/dummy2.cc' || echo '$(srcdir)/'`cimg/dummy2.cc - @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/dummy2.Tpo $(DEPDIR)/dummy2.Plo - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cimg/dummy2.cc' object='dummy2.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dummy2.lo `test -f 'cimg/dummy2.cc' || echo '$(srcdir)/'`cimg/dummy2.cc -+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dummy2.lo `test -f 'cimg/dummy2.cc' || echo '$(srcdir)/'`cimg/dummy2.cc - - mostlyclean-libtool: - -rm -f *.lo -diff -u --recursive vips-7.34.0-vanilla/libvips/resample/Makefile.in vips-7.34.0/libvips/resample/Makefile.in ---- vips-7.34.0-vanilla/libvips/resample/Makefile.in 2013-06-18 12:41:41.170821358 -0500 -+++ vips-7.34.0/libvips/resample/Makefile.in 2013-06-18 12:42:06.869807374 -0500 -@@ -415,7 +415,7 @@ - rm -f "$${dir}/so_locations"; \ - done - libresample.la: $(libresample_la_OBJECTS) $(libresample_la_DEPENDENCIES) $(EXTRA_libresample_la_DEPENDENCIES) -- $(CXXLINK) $(libresample_la_OBJECTS) $(libresample_la_LIBADD) $(LIBS) -+ $(LINK) $(libresample_la_OBJECTS) $(libresample_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT)