Skip to contentSkip to conversation

libvips: new package

PATCH New Pieter De Gendt 2 participants 2 messages Feb 2, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 libvips: new package

---
Changes v1 -> v2 (suggested by Thomas Petazzoni)
- select glib2 dependency
- inherit glib2 dependencies (MMU, wchar, threads)
- Fixed comments
- Newline at end of files
- Changed <pkg>_CONF_OPT to <pkg>_CONF_OPTS
- Removed gtk-doc options
- Fixed autotools dependencies
- Check BR2_INSTALL_LIBSTDCPP fir c++ support
- Use automatic dependencies instead of separate options

---
 package/Config.in                               |  1 +
 package/libvips/Config.in                       | 17 +++++++
 package/libvips/libvips-01-fix-no-gtk-doc.patch | 35 +++++++++++++++
 package/libvips/libvips.mk                      | 60 +++++++++++++++++++++++++
 4 files changed, 113 insertions(+)
 create mode 100644 package/libvips/Config.in
 create mode 100644 package/libvips/libvips-01-fix-no-gtk-doc.patch
 create mode 100644 package/libvips/libvips.mk
package/Config.in +1 -0
index 3117474..34a061f 100644
@@ -695,6 +695,7 @@ menu "Graphics"
 	source "package/libungif/Config.in"
 	source "package/libva/Config.in"
 	source "package/libva-intel-driver/Config.in"
+	source "package/libvips/Config.in"
 	source "package/opencv/Config.in"
 	source "package/opengl/Config.in"
 	source "package/pango/Config.in"
package/libvips/Config.in new file +17 -0
new file mode 100644
index 0000000..cd8f1b8
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_LIBVIPS
+	bool "libvips"
+	depends on BR2_USE_WCHAR # gettext
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	help
+	  libvips is a 2D image processing library. Compared to similar 
+	  libraries, libvips runs quickly and uses little memory.
+
+	  http://www.vips.ecs.soton.ac.uk/
+
+comment "libvips needs a toolchain w/ wchar, threads"
+        depends on BR2_USE_MMU
+        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
package/libvips/libvips-01-fix-no-gtk-doc.patch new file +35 -0
new file mode 100644
index 0000000..bfaf7c3
@@ -0,0 +1,35 @@
+From a3d47be3b6bed845af5e1aa87ca2da2b1e840cbb Mon Sep 17 00:00:00 2001
+From: Pieter De Gendt <[email protected]>
+Date: Thu, 29 Jan 2015 12:25:35 +0100
+Subject: [PATCH] Same patch as for systemd in commit
+ http://git.buildroot.net/buildroot/commit/?id=7144f2f04b70553
+
+Fix deactivation of gtk-doc
+
+The tarball contains the Makefile for building documentation with gtk-doc,
+Unfortunately the AM_CONDITIONAL variable is not the correct one, which
+results in an error when running autoreconf.
+
+This patch fixes this issue.
+
+Signed-off-by: Pieter De Gendt <[email protected]>
+---
+ doc/reference/gtk-doc.make | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/reference/gtk-doc.make b/doc/reference/gtk-doc.make
+index e791656..786803e 100644
+--- a/doc/reference/gtk-doc.make
++++ b/doc/reference/gtk-doc.make
+@@ -267,7 +267,7 @@ uninstall-local:
+ #
+ # Require gtk-doc when making dist
+ #
+-if HAVE_GTK_DOC
++if ENABLE_GTK_DOC
+ dist-check-gtkdoc: docs
+ else
+ dist-check-gtkdoc:
+-- 
+2.2.2
+
package/libvips/libvips.mk new file +60 -0

60 lines not on this page · raw message

Signature · 1 line
2.2.2
#1 lore raw

PATCH v2 1/1 libvips: new package

Dear Pieter De Gendt,

Quoted 13 lines · Pieter De Gendt

---
Changes v1 -> v2 (suggested by Thomas Petazzoni)
- select glib2 dependency
- inherit glib2 dependencies (MMU, wchar, threads)
- Fixed comments
- Newline at end of files
- Changed <pkg>_CONF_OPT to <pkg>_CONF_OPTS
- Removed gtk-doc options
- Fixed autotools dependencies
- Check BR2_INSTALL_LIBSTDCPP fir c++ support
- Use automatic dependencies instead of separate options

Thanks, applied, after doing a number of changes:

[Thomas:
- Fix variable name: LIBVIPS_CONF_OPTSS -> LIBVIPS_CONF_OPTS
- Add a lot of --without-<foo> options to make sure we explicitly disable optional features that are not handled by the .mk file.
- Remove the host-swig dependency, which was probably thought of being needed by Pieter due to --without-python not being passed explicitly.
- Remove trailing spaces in Config.in.
- Rename patch to the new naming convention.]

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com