* [Buildroot] [PATCH 1/8] package/cups: Un-deprecate, and update CUPS to 2.0.2
@ 2015-03-22 14:10 Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 2/8] package/hplip: Un-deprecate and bump version to 3.15.2 Olivier Schonken
` (7 more replies)
0 siblings, 8 replies; 10+ messages in thread
From: Olivier Schonken @ 2015-03-22 14:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
...01-Remove-building-html-from-man-makefile.patch | 27 +++++++++++
package/cups/0001-fix-static.patch | 28 ------------
package/cups/0002-Do-not-use-genstrings.patch | 27 +++++++++++
package/cups/0002-fix-stack-protector-check.patch | 25 -----------
package/cups/0003-mantohtml.patch | 11 -----
package/cups/Config.in | 17 ++++---
package/cups/cups.hash | 2 +
package/cups/cups.mk | 52 +++++++++++++++-------
8 files changed, 99 insertions(+), 90 deletions(-)
create mode 100644 package/cups/0001-Remove-building-html-from-man-makefile.patch
delete mode 100644 package/cups/0001-fix-static.patch
create mode 100644 package/cups/0002-Do-not-use-genstrings.patch
delete mode 100644 package/cups/0002-fix-stack-protector-check.patch
delete mode 100644 package/cups/0003-mantohtml.patch
create mode 100644 package/cups/cups.hash
diff --git a/package/cups/0001-Remove-building-html-from-man-makefile.patch b/package/cups/0001-Remove-building-html-from-man-makefile.patch
new file mode 100644
index 0000000..546e76b
--- /dev/null
+++ b/package/cups/0001-Remove-building-html-from-man-makefile.patch
@@ -0,0 +1,27 @@
+From da960a1384625d2550ffbf5765a10fe9b3aa5a51 Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <olivier.schonken@gmail.com>
+Date: Wed, 18 Mar 2015 20:30:39 +0200
+Subject: [PATCH 1/2] Remove building html from man makefile
+
+Building and using mantohtml causes problems for cross-compiling
+
+Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
+---
+ man/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/Makefile b/man/Makefile
+index dc1a8c0..0ad42a1 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -73,7 +73,7 @@ MAN8 = cupsaccept.$(MAN8EXT) \
+ # Make everything...
+ #
+
+-all: $(MAN1) $(MAN5) $(MAN7) $(MAN8) html
++all: $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+
+
+ #
+--
+1.9.1
diff --git a/package/cups/0001-fix-static.patch b/package/cups/0001-fix-static.patch
deleted file mode 100644
index 4c9d0d4..0000000
--- a/package/cups/0001-fix-static.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-cups: fix static linking
-
-Append -lz to the cups linking libs to fix a problem like this one:
-
-../cups/libcups.a(file.o): In function `cupsFileSeek':
-/home/test/test/1/output/build/cups-1.3.11/cups/file.c:1444: undefined
-reference to `inflateEnd'
-collect2: error: ld returned 1 exit status
-make[2]: *** [ipp] Error 1
-make[2]: *** Waiting for unfinished jobs....
-
-This solution is the same used upstream in newer versions.
-
-Fixes:
- http://autobuild.buildroot.net/results/f3d/f3d4f67ce7ee1d54f5bd4c87dfddb7417db614e5/
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---- cups-1.3.11/Makedefs.in.orig 2014-03-05 13:28:10.175437880 +0000
-+++ cups-1.3.11/Makedefs.in 2014-03-05 13:28:35.398845162 +0000
-@@ -132,7 +132,7 @@ LDFLAGS = -L../cups -L../filter @LDARCH
- LEGACY_BACKENDS = @LEGACY_BACKENDS@
- LIBCUPSORDER = @LIBCUPSORDER@
- LIBCUPSIMAGEORDER = @LIBCUPSIMAGEORDER@
--LINKCUPS = @LINKCUPS@ $(SSLLIBS)
-+LINKCUPS = @LINKCUPS@ $(SSLLIBS) $(LIBZ)
- LINKCUPSIMAGE = @LINKCUPSIMAGE@
- LIBS = $(LINKCUPS) $(COMMONLIBS)
- OPTIM = @OPTIM@
diff --git a/package/cups/0002-Do-not-use-genstrings.patch b/package/cups/0002-Do-not-use-genstrings.patch
new file mode 100644
index 0000000..eef3409
--- /dev/null
+++ b/package/cups/0002-Do-not-use-genstrings.patch
@@ -0,0 +1,27 @@
+From 8a5666a586e752b6c513bc8a7467c8a00085f069 Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <olivier.schonken@gmail.com>
+Date: Wed, 18 Mar 2015 20:33:41 +0200
+Subject: [PATCH 2/2] Do not use genstrings
+
+Using cross compiled genstrings while cross-compiling will break compilation.
+
+Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
+---
+ ppdc/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ppdc/Makefile b/ppdc/Makefile
+index bc8bb64..f6bae25 100644
+--- a/ppdc/Makefile
++++ b/ppdc/Makefile
+@@ -243,7 +243,7 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
+ libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
+ $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+ echo Generating localization strings...
+- ./genstrings >sample.c
++ #./genstrings >sample.c
+
+
+ #
+--
+1.9.1
diff --git a/package/cups/0002-fix-stack-protector-check.patch b/package/cups/0002-fix-stack-protector-check.patch
deleted file mode 100644
index 1db35ff..0000000
--- a/package/cups/0002-fix-stack-protector-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-[PATCH]: use AC_TRY_LINK for stack protector check
-
-Actually try to link an executable to test for stack protector support,
-as gcc seems to accept the -fstack-protector argument even when it's
-compiled with --disable-libssp (but linking fails with a error
-finding -lssp_nonshared).
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- config-scripts/cups-compiler.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: cups-1.3.9/config-scripts/cups-compiler.m4
-===================================================================
---- cups-1.3.9.orig/config-scripts/cups-compiler.m4
-+++ cups-1.3.9/config-scripts/cups-compiler.m4
-@@ -109,7 +109,7 @@ if test -n "$GCC"; then
- AC_MSG_CHECKING(if GCC supports -fstack-protector)
- OLDCFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -fstack-protector"
-- AC_TRY_COMPILE(,,
-+ AC_TRY_LINK(,,
- OPTIM="$OPTIM -fstack-protector"
- AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no))
diff --git a/package/cups/0003-mantohtml.patch b/package/cups/0003-mantohtml.patch
deleted file mode 100644
index e6a10b0..0000000
--- a/package/cups/0003-mantohtml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cups-1.3.5/man/Makefile 2007-07-12 21:01:14.000000000 -0400
-+++ cups-1.3.5/man/Makefile 2008-02-11 08:55:24.000000000 -0500
-@@ -173,7 +173,7 @@ html: $(MAN1) $(MAN5) $(MAN7) $(MAN8) ma
- done
-
- mantohtml: mantohtml.o
-- $(CC) $(LDFLAGS) -o $@ mantohtml.o
-+ gcc -I/usr/include -I../ -L/usr/lib mantohtml.c -o mantohtml
-
-
- #
diff --git a/package/cups/Config.in b/package/cups/Config.in
index 8e60221..a161818 100644
--- a/package/cups/Config.in
+++ b/package/cups/Config.in
@@ -1,8 +1,7 @@
config BR2_PACKAGE_CUPS
bool "cups"
- # serious security issues, needs upgrading
- depends on BR2_DEPRECATED_SINCE_2015_05
# needs fork()
+ depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_MMU
help
The Common Unix Printing System
@@ -11,13 +10,13 @@ config BR2_PACKAGE_CUPS
if BR2_PACKAGE_CUPS
-config BR2_PACKAGE_CUPS_PDFTOPS
- bool "pdftops support"
- depends on BR2_INSTALL_LIBSTDCPP
+config BR2_PACKAGE_CUPS_AVAHI
+ bool "avahi support"
+ depends on !BR2_STATIC_LIBS # avahi
+ select BR2_PACKAGE_AVAHI
+ select BR2_PACKAGE_AVAHI_DAEMON
help
- Enable pdftops support
-
-comment "pdftops support needs a toolchain w/ C++"
- depends on !BR2_INSTALL_LIBSTDCPP
+ Enable Avahi support.
+ Select this if you want cups to support Bonjour protocol.
endif
diff --git a/package/cups/cups.hash b/package/cups/cups.hash
new file mode 100644
index 0000000..8e99ea8
--- /dev/null
+++ b/package/cups/cups.hash
@@ -0,0 +1,2 @@
+# From https://www.cups.org/
+md5 6e0ea72dbafcf5baaa1cf4178e71096d cups-2.0.2-source.tar.bz2
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index b6a0663..ade491b 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -4,7 +4,7 @@
#
################################################################################
-CUPS_VERSION = 1.3.11
+CUPS_VERSION = 2.0.2
CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.bz2
CUPS_SITE = http://www.cups.org/software/$(CUPS_VERSION)
CUPS_LICENSE = GPLv2 LGPLv2
@@ -16,16 +16,24 @@ CUPS_CONF_OPTS = \
--without-perl \
--without-java \
--without-php \
- --disable-gnutls \
--disable-gssapi \
--libdir=/usr/lib
CUPS_CONFIG_SCRIPTS = cups-config
CUPS_DEPENDENCIES = \
- $(if $(BR2_PACKAGE_ZLIB),zlib) \
- $(if $(BR2_PACKAGE_LIBPNG),libpng) \
- $(if $(BR2_PACKAGE_JPEG),jpeg) \
- $(if $(BR2_PACKAGE_TIFF),tiff)
+ cups-filters
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+ CUPS_CONF_OPTS += --with-systemdunitdir=/usr/lib/systemd/system
+ CUPS_DEPENDENCIES += systemd
+endif
+
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ CUPS_CONF_OPTS += --enable-static \
+ --disable-shared
+else
+ CUPS_CONF_OPTS += --enable-shared
+endif
ifeq ($(BR2_PACKAGE_DBUS),y)
CUPS_CONF_OPTS += --enable-dbus
@@ -34,8 +42,11 @@ else
CUPS_CONF_OPTS += --disable-dbus
endif
-ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
- CUPS_DEPENDENCIES += xlib_libX11
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+ CUPS_CONF_OPTS += --enable-gnutls
+ CUPS_DEPENDENCIES += gnutls
+else
+ CUPS_CONF_OPTS += --disable-gnutls
endif
ifeq ($(BR2_PACKAGE_PYTHON),y)
@@ -45,18 +56,25 @@ else
CUPS_CONF_OPTS += --without-python
endif
-ifeq ($(BR2_PACKAGE_CUPS_PDFTOPS),y)
- CUPS_CONF_OPTS += --enable-pdftops
+ifeq ($(BR2_PACKAGE_LIBUSB),y)
+ CUPS_CONF_OPTS += --enable-libusb
+ CUPS_DEPENDENCIES += libusb
else
- CUPS_CONF_OPTS += --disable-pdftops
+ CUPS_CONF_OPTS += --disable-libusb
endif
-# standard autoreconf fails with autoheader failures
-define CUPS_FIXUP_AUTOCONF
- cd $(@D) && $(AUTOCONF)
-endef
-CUPS_DEPENDENCIES += host-autoconf
+ifeq ($(BR2_PACKAGE_LIBPAPER),y)
+ CUPS_CONF_OPTS += --enable-libpaper
+ CUPS_DEPENDENCIES += libpaper
+else
+ CUPS_CONF_OPTS += --disable-libpaper
+endif
-CUPS_PRE_CONFIGURE_HOOKS += CUPS_FIXUP_AUTOCONF
+ifeq ($(BR2_PACKAGE_CUPS_FILTERS_AVAHI),y)
+ CUPS_DEPENDENCIES += avahi
+ CUPS_CONF_OPTS += --enable-avahi
+else
+ CUPS_CONF_OPTS += --disable-avahi
+endif
$(eval $(autotools-package))
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/8] package/hplip: Un-deprecate and bump version to 3.15.2
2015-03-22 14:10 [Buildroot] [PATCH 1/8] package/cups: Un-deprecate, and update CUPS to 2.0.2 Olivier Schonken
@ 2015-03-22 14:10 ` Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 3/8] package/gutenprint: Un-deprecate and bump version to 5.2.10 Olivier Schonken
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Olivier Schonken @ 2015-03-22 14:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
package/hplip/Config.in | 1 -
package/hplip/hplip.hash | 2 +-
package/hplip/hplip.mk | 4 +++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/package/hplip/Config.in b/package/hplip/Config.in
index a8a5f69..780c69e 100644
--- a/package/hplip/Config.in
+++ b/package/hplip/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_HPLIP
bool "hplip"
# because of cups security issues
- depends on BR2_DEPRECATED_SINCE_2015_05
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_CUPS
depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
diff --git a/package/hplip/hplip.hash b/package/hplip/hplip.hash
index fb7d4e7..a179b1d 100644
--- a/package/hplip/hplip.hash
+++ b/package/hplip/hplip.hash
@@ -1,2 +1,2 @@
# Locally computed:
-sha256 a8122cd824398ac6374154f86152e24fdf5c0100b5c1d6518e853308362e627d hplip-3.13.10.tar.gz
+sha256 5f02eca743d85240db07ed2fc6551e1dce0dedc85ad4a0e90417e4d5b630f67c hplip-3.15.2.tar.gz
diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk
index 99c5930..e78eb8f 100644
--- a/package/hplip/hplip.mk
+++ b/package/hplip/hplip.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HPLIP_VERSION = 3.13.10
+HPLIP_VERSION = 3.15.2
HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip
HPLIP_AUTORECONF = YES
HPLIP_DEPENDENCIES = cups libusb jpeg
@@ -29,6 +29,8 @@ HPLIP_CONF_OPTS = \
--with-sysroot=$(STAGING_DIR) \
--includedir=$(STAGING_DIR)/usr/include
+HPLIP_MAKE_OPTS += LDFLAGS+=-lpthread
+
ifeq ($(BR2_PACKAGE_DBUS),y)
HPLIP_CONF_OPTS += --enable-dbus-build
HPLIP_DEPENDENCIES += dbus
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 3/8] package/gutenprint: Un-deprecate and bump version to 5.2.10
2015-03-22 14:10 [Buildroot] [PATCH 1/8] package/cups: Un-deprecate, and update CUPS to 2.0.2 Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 2/8] package/hplip: Un-deprecate and bump version to 3.15.2 Olivier Schonken
@ 2015-03-22 14:10 ` Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 4/8] package/poppler: bump version to 0.32.0 Olivier Schonken
` (5 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Olivier Schonken @ 2015-03-22 14:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
package/gutenprint/Config.in | 1 -
package/gutenprint/gutenprint.hash | 2 +-
package/gutenprint/gutenprint.mk | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/package/gutenprint/Config.in b/package/gutenprint/Config.in
index 686dbce..2826594 100644
--- a/package/gutenprint/Config.in
+++ b/package/gutenprint/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_GUTENPRINT
bool "gutenprint"
# because of cups security issues
- depends on BR2_DEPRECATED_SINCE_2015_05
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_CUPS
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
diff --git a/package/gutenprint/gutenprint.hash b/package/gutenprint/gutenprint.hash
index 3cfe0e1..36c12cc 100644
--- a/package/gutenprint/gutenprint.hash
+++ b/package/gutenprint/gutenprint.hash
@@ -1,2 +1,2 @@
# Locally computed:
-sha256 4b27e4f06f32d30271df89ecb6089bb11bcf2caec5f60b0909e083095354bca0 gutenprint-5.2.9.tar.bz2
+sha256 431f352b412dfb9809d126a85a37a1fcd1c1826275ace8cdcd4fd9a6ee360e59 gutenprint-5.2.10.tar.bz2
diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
index 3ff05b6..0bdc3bc 100644
--- a/package/gutenprint/gutenprint.mk
+++ b/package/gutenprint/gutenprint.mk
@@ -5,7 +5,7 @@
################################################################################
GUTENPRINT_VERSION_MAJOR = 5.2
-GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).9
+GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).10
GUTENPRINT_SITE = http://downloads.sourceforge.net/project/gimp-print/gutenprint-$(GUTENPRINT_VERSION_MAJOR)/$(GUTENPRINT_VERSION)
GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2
GUTENPRINT_LICENSE = GPLv2+
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 4/8] package/poppler: bump version to 0.32.0
2015-03-22 14:10 [Buildroot] [PATCH 1/8] package/cups: Un-deprecate, and update CUPS to 2.0.2 Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 2/8] package/hplip: Un-deprecate and bump version to 3.15.2 Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 3/8] package/gutenprint: Un-deprecate and bump version to 5.2.10 Olivier Schonken
@ 2015-03-22 14:10 ` Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 5/8] package/openjpeg: New package openjpeg 1.5.2 Olivier Schonken
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Olivier Schonken @ 2015-03-22 14:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
package/poppler/poppler.hash | 2 +-
package/poppler/poppler.mk | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/package/poppler/poppler.hash b/package/poppler/poppler.hash
index f3225bc..c4c7f66 100644
--- a/package/poppler/poppler.hash
+++ b/package/poppler/poppler.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84 poppler-0.24.5.tar.xz
+sha256 4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98 poppler-0.32.0.tar.xz
diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index 2ac7e64..bb18a0b 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk
@@ -4,14 +4,15 @@
#
################################################################################
-POPPLER_VERSION = 0.24.5
+POPPLER_VERSION = 0.32.0
POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
POPPLER_SITE = http://poppler.freedesktop.org
-POPPLER_DEPENDENCIES = fontconfig
+POPPLER_DEPENDENCIES = fontconfig openjpeg
POPPLER_LICENSE = GPLv2+
POPPLER_LICENSE_FILES = COPYING
POPPLER_INSTALL_STAGING = YES
-POPPLER_CONF_OPTS = --with-font-configuration=fontconfig
+POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \
+ --enable-xpdf-headers
ifeq ($(BR2_PACKAGE_LCMS2),y)
POPPLER_CONF_OPTS += --enable-cms=lcms2
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 5/8] package/openjpeg: New package openjpeg 1.5.2
2015-03-22 14:10 [Buildroot] [PATCH 1/8] package/cups: Un-deprecate, and update CUPS to 2.0.2 Olivier Schonken
` (2 preceding siblings ...)
2015-03-22 14:10 ` [Buildroot] [PATCH 4/8] package/poppler: bump version to 0.32.0 Olivier Schonken
@ 2015-03-22 14:10 ` Olivier Schonken
2015-03-22 15:01 ` Arnout Vandecappelle
2015-03-22 14:10 ` [Buildroot] [PATCH 6/8] package/qpdf: New package qpdf 5.1.2 Olivier Schonken
` (3 subsequent siblings)
7 siblings, 1 reply; 10+ messages in thread
From: Olivier Schonken @ 2015-03-22 14:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
package/Config.in | 1 +
package/openjpeg/Config.in | 6 ++++++
package/openjpeg/openjpeg.hash | 2 ++
package/openjpeg/openjpeg.mk | 17 +++++++++++++++++
4 files changed, 26 insertions(+)
create mode 100644 package/openjpeg/Config.in
create mode 100644 package/openjpeg/openjpeg.hash
create mode 100644 package/openjpeg/openjpeg.mk
diff --git a/package/Config.in b/package/Config.in
index 93fde92..e9f362d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -739,6 +739,7 @@ menu "Graphics"
source "package/libvips/Config.in"
source "package/opencv/Config.in"
source "package/opengl/Config.in"
+ source "package/openjpeg/Config.in"
source "package/pango/Config.in"
source "package/pixman/Config.in"
source "package/poppler/Config.in"
diff --git a/package/openjpeg/Config.in b/package/openjpeg/Config.in
new file mode 100644
index 0000000..3fa7553
--- /dev/null
+++ b/package/openjpeg/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_OPENJPEG
+ bool "openjpeg"
+ help
+ The OpenJPEG library is an open-source JPEG 2000 codec written in C
+
+ http://www.openjpeg.org
diff --git a/package/openjpeg/openjpeg.hash b/package/openjpeg/openjpeg.hash
new file mode 100644
index 0000000..5ac8a00
--- /dev/null
+++ b/package/openjpeg/openjpeg.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+md5 c41772c30fb1c272358b3707233134a1 openjpeg-1.5.2.tar.gz
diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk
new file mode 100644
index 0000000..8cb3c80
--- /dev/null
+++ b/package/openjpeg/openjpeg.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# openjpeg
+#
+################################################################################
+
+OPENJPEG_VERSION = 1.5.2
+OPENJPEG_SITE = http://downloads.sourceforge.net/project/openjpeg
+OPENJPEG_LICENSE = MIT
+OPENJPEG_LICENSE_FILES = COPYING
+OPENJPEG_AUTORECONF = YES
+OPENJPEG_SOURCE = openjpeg-$(OPENJPEG_VERSION).tar.gz
+OPENJPEG_INSTALL_STAGING = YES
+
+OPENJPEG_CONF_OPTS = \
+
+$(eval $(autotools-package))
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 6/8] package/qpdf: New package qpdf 5.1.2
2015-03-22 14:10 [Buildroot] [PATCH 1/8] package/cups: Un-deprecate, and update CUPS to 2.0.2 Olivier Schonken
` (3 preceding siblings ...)
2015-03-22 14:10 ` [Buildroot] [PATCH 5/8] package/openjpeg: New package openjpeg 1.5.2 Olivier Schonken
@ 2015-03-22 14:10 ` Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 7/8] package/ijs: New package ijs 0.35 Olivier Schonken
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Olivier Schonken @ 2015-03-22 14:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
package/Config.in | 1 +
package/qpdf/Config.in | 16 ++++++++++++++++
package/qpdf/qpdf.hash | 2 ++
package/qpdf/qpdf.mk | 14 ++++++++++++++
4 files changed, 33 insertions(+)
create mode 100644 package/qpdf/Config.in
create mode 100644 package/qpdf/qpdf.hash
create mode 100644 package/qpdf/qpdf.mk
diff --git a/package/Config.in b/package/Config.in
index e9f362d..c12a098 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1059,6 +1059,7 @@ menu "Miscellaneous"
source "package/haveged/Config.in"
source "package/mcrypt/Config.in"
source "package/mobile-broadband-provider-info/Config.in"
+ source "package/qpdf/Config.in"
source "package/qemu/Config.in"
source "package/shared-mime-info/Config.in"
source "package/snowball-init/Config.in"
diff --git a/package/qpdf/Config.in b/package/qpdf/Config.in
new file mode 100644
index 0000000..3002c06
--- /dev/null
+++ b/package/qpdf/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_QPDF
+ bool "qpdf"
+ depends on BR2_INSTALL_LIBSTDCPP
+ select BR2_PACKAGE_PCRE
+ help
+ QPDF is a command-line program that does structural, content-
+ preserving transformations on PDF files. It could have been called
+ something like pdf-to-pdf. It also provides many useful capabilities
+ to developers of PDF-producing software or for people who just want
+ to look at the innards of a PDF file to learn more about how they
+ work.
+
+ http://qpdf.sourceforge.net/
+
+comment "qpdf requires a toolchain with C++ support enabled"
+ depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/qpdf/qpdf.hash b/package/qpdf/qpdf.hash
new file mode 100644
index 0000000..c6c6ebe
--- /dev/null
+++ b/package/qpdf/qpdf.hash
@@ -0,0 +1,2 @@
+# Downloaded from http://sourceforge.net/projects/qpdf/files/qpdf/5.1.2/
+md5 0bd15ef5eea5f628951ab456c84e78ec qpdf-5.1.2.tar.gz
diff --git a/package/qpdf/qpdf.mk b/package/qpdf/qpdf.mk
new file mode 100644
index 0000000..d0fe679
--- /dev/null
+++ b/package/qpdf/qpdf.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# qpdf
+#
+#############################################################
+
+QPDF_VERSION = 5.1.2
+QPDF_SITE = http://downloads.sourceforge.net/project/qpdf/qpdf/$(QPDF_VERSION)
+QPDF_INSTALL_STAGING = YES
+QPDF_DEPENDENCIES = pcre
+
+QPDF_CONF_OPTS = --without-random
+
+$(eval $(autotools-package))
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 7/8] package/ijs: New package ijs 0.35
2015-03-22 14:10 [Buildroot] [PATCH 1/8] package/cups: Un-deprecate, and update CUPS to 2.0.2 Olivier Schonken
` (4 preceding siblings ...)
2015-03-22 14:10 ` [Buildroot] [PATCH 6/8] package/qpdf: New package qpdf 5.1.2 Olivier Schonken
@ 2015-03-22 14:10 ` Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 8/8] package/cups-filters: Add new package cups-filters 1.0.67 Olivier Schonken
2015-03-22 14:57 ` [Buildroot] [PATCH 1/8] package/cups: Un-deprecate, and update CUPS to 2.0.2 Arnout Vandecappelle
7 siblings, 0 replies; 10+ messages in thread
From: Olivier Schonken @ 2015-03-22 14:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
package/Config.in | 1 +
package/ijs/Config.in | 7 +++++++
package/ijs/ijs.hash | 2 ++
package/ijs/ijs.mk | 18 ++++++++++++++++++
4 files changed, 28 insertions(+)
create mode 100644 package/ijs/Config.in
create mode 100644 package/ijs/ijs.hash
create mode 100644 package/ijs/ijs.mk
diff --git a/package/Config.in b/package/Config.in
index c12a098..64a7655 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1126,6 +1126,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
endif
source "package/igh-ethercat/Config.in"
source "package/igmpproxy/Config.in"
+ source "package/ijs/Config.in"
source "package/inadyn/Config.in"
source "package/iodine/Config.in"
source "package/iperf/Config.in"
diff --git a/package/ijs/Config.in b/package/ijs/Config.in
new file mode 100644
index 0000000..924fc08
--- /dev/null
+++ b/package/ijs/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_IJS
+ bool "ijs"
+ help
+ The IJS package contains a library which implements a protocol for
+ transmission of raster page images.
+
+ http://www.openprinting.org/
diff --git a/package/ijs/ijs.hash b/package/ijs/ijs.hash
new file mode 100644
index 0000000..eb15a29
--- /dev/null
+++ b/package/ijs/ijs.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+md5 896fdcb7a01c586ba6eb81398ea3f6e9 ijs-0.35.tar.bz2
diff --git a/package/ijs/ijs.mk b/package/ijs/ijs.mk
new file mode 100644
index 0000000..2efd2c0
--- /dev/null
+++ b/package/ijs/ijs.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# ijs
+#
+################################################################################
+
+IJS_VERSION = 0.35
+IJS_SITE = http://www.openprinting.org/download/ijs/download
+IJS_LICENSE = MIT
+IJS_LICENSE_FILES = COPYING
+IJS_AUTORECONF = YES
+IJS_SOURCE = ijs-$(IJS_VERSION).tar.bz2
+IJS_INSTALL_STAGING = YES
+IJS_DEPENDENCIES = qpdf dbus
+
+IJS_CONF_OPTS = \
+
+$(eval $(autotools-package))
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 8/8] package/cups-filters: Add new package cups-filters 1.0.67
2015-03-22 14:10 [Buildroot] [PATCH 1/8] package/cups: Un-deprecate, and update CUPS to 2.0.2 Olivier Schonken
` (5 preceding siblings ...)
2015-03-22 14:10 ` [Buildroot] [PATCH 7/8] package/ijs: New package ijs 0.35 Olivier Schonken
@ 2015-03-22 14:10 ` Olivier Schonken
2015-03-22 14:57 ` [Buildroot] [PATCH 1/8] package/cups: Un-deprecate, and update CUPS to 2.0.2 Arnout Vandecappelle
7 siblings, 0 replies; 10+ messages in thread
From: Olivier Schonken @ 2015-03-22 14:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
package/Config.in | 1 +
package/cups-filters/Config.in | 44 ++++++++++++++++++++++
package/cups-filters/cups-filters.hash | 2 +
package/cups-filters/cups-filters.mk | 67 ++++++++++++++++++++++++++++++++++
4 files changed, 114 insertions(+)
create mode 100644 package/cups-filters/Config.in
create mode 100644 package/cups-filters/cups-filters.hash
create mode 100644 package/cups-filters/cups-filters.mk
diff --git a/package/Config.in b/package/Config.in
index 64a7655..7ec6c9b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1096,6 +1096,7 @@ menu "Networking applications"
source "package/crda/Config.in"
source "package/ctorrent/Config.in"
source "package/cups/Config.in"
+ source "package/cups-filters/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/dhcp/Config.in"
endif
diff --git a/package/cups-filters/Config.in b/package/cups-filters/Config.in
new file mode 100644
index 0000000..730abe7
--- /dev/null
+++ b/package/cups-filters/Config.in
@@ -0,0 +1,44 @@
+config BR2_PACKAGE_CUPS_FILTERS
+ bool "cups-filters"
+ depends on BR2_PACKAGE_CUPS
+ select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_IJS
+ select BR2_PACKAGE_LCMS2
+ select BR2_PACKAGE_POPPLER
+ select BR2_PACKAGE_QPDF
+ help
+ This project provides backends, filters, and other software that was
+ once part of the core CUPS distribution but is no longer maintained
+ by Apple Inc. In addition it contains additional filters and software
+ developed independently of Apple, especially filters for the PDF-
+ centric printing workflow introduced by OpenPrinting and a daemon
+ to browse Bonjour broadcasts of remote CUPS printers to make these
+ printers available locally and to provide backward compatibility to
+ the old CUPS broadcasting and browsing of CUPS 1.5.x and older.
+ From CUPS 1.6.0 on, this package is required for using printer drivers
+ with CUPS under Linux. With CUPS 1.5.x and earlier this package can be
+ used optionally to switch over to PDF-based printing.
+
+ http://hplipopensource.com/
+
+if BR2_PACKAGE_CUPS_FILTERS
+
+config BR2_PACKAGE_CUPS_FILTERS_PDFTOPS
+ bool "pdftops support"
+ depends on BR2_INSTALL_LIBSTDCPP
+ help
+ Enable pdftops support
+
+comment "pdftops support needs a toolchain w/ C++"
+ depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_CUPS_FILTERS_AVAHI
+ bool "avahi support"
+ depends on !BR2_STATIC_LIBS # avahi
+ select BR2_PACKAGE_AVAHI
+ select BR2_PACKAGE_AVAHI_DAEMON
+ help
+ Enable Avahi support.
+ Select this if you want cups to support Bonjour protocol.
+
+endif
diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash
new file mode 100644
index 0000000..be80cf0
--- /dev/null
+++ b/package/cups-filters/cups-filters.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+md5 d3b0522e176b99889778162c26c7e476 cups-filters-1.0.67.tar.gz
diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk
new file mode 100644
index 0000000..3fa94e3
--- /dev/null
+++ b/package/cups-filters/cups-filters.mk
@@ -0,0 +1,67 @@
+#############################################################
+#
+# cups-filters
+#
+#############################################################
+CUPS_FILTERS_VERSION = 1.0.67
+CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters/
+CUPS_FILTERS_SOURCE = cups-filters-$(CUPS_FILTERS_VERSION).tar.gz
+CUPS_FILTERS_INSTALL_STAGING = NO
+CUPS_FILTERS_LIBTOOL_PATCH = YES
+CUPS_FILTERS_AUTORECONF = NO
+
+CUPS_FILTERS_CONF_OPTS = --disable-avahi \
+ --disable-imagefilters \
+ --with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \
+ --without-png \
+ --with-sysroot=$(STAGING_DIR)
+
+CUPS_FILTERS_DEPENDENCIES = cups libglib2 ijs lcms2 poppler qpdf
+
+ifeq ($(BR2_PACKAGE_CUPS_FILTERS_PDFTOPS),y)
+ CUPS_FILTERS_CONF_OPTS += --with-pdftops=pdftops
+endif
+
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ CUPS_FILTERS_CONF_OPTS += --disable-shared \
+ --enable-static
+else
+ CUPS_FILTERS_CONF_OPTS += --enable-shared
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+ CUPS_FILTERS_CONF_OPTS += --with-jpeg
+ CUPS_FILTERS_DEPENDENCIES += jpeg
+else
+ CUPS_FILTERS_CONF_OPTS += --without-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+ CUPS_FILTERS_CONF_OPTS += --with-png
+ CUPS_FILTERS_DEPENDENCIES += libpng
+else
+ CUPS_FILTERS_CONF_OPTS += --without-png
+endif
+
+ifeq ($(BR2_PACKAGE_TIFF),y)
+ CUPS_FILTERS_CONF_OPTS += --with-tiff
+ CUPS_FILTERS_DEPENDENCIES += tiff
+else
+ CUPS_FILTERS_CONF_OPTS += --without-tiff
+endif
+
+ifeq ($(BR2_PACKAGE_DBUS),y)
+ CUPS_FILTERS_CONF_OPTS += --enable-dbus
+ CUPS_FILTERS_DEPENDENCIES += dbus
+else
+ CUPS_FILTERS_CONF_OPTS += --disable-dbus
+endif
+
+ifeq ($(BR2_PACKAGE_CUPS_FILTERS_AVAHI),y)
+ CUPS_FILTERS_DEPENDENCIES += avahi
+ CUPS_FILTERS_CONF_OPTS += --enable-avahi
+else
+ CUPS_FILTERS_CONF_OPTS += --disable-avahi
+endif
+
+$(eval $(autotools-package))
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/8] package/cups: Un-deprecate, and update CUPS to 2.0.2
2015-03-22 14:10 [Buildroot] [PATCH 1/8] package/cups: Un-deprecate, and update CUPS to 2.0.2 Olivier Schonken
` (6 preceding siblings ...)
2015-03-22 14:10 ` [Buildroot] [PATCH 8/8] package/cups-filters: Add new package cups-filters 1.0.67 Olivier Schonken
@ 2015-03-22 14:57 ` Arnout Vandecappelle
7 siblings, 0 replies; 10+ messages in thread
From: Arnout Vandecappelle @ 2015-03-22 14:57 UTC (permalink / raw)
To: buildroot
Hi Olivier,
On 22/03/15 15:10, Olivier Schonken wrote:
Please add a short explanation why the removed patches are no longer necessary.
> Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
> ---
> ...01-Remove-building-html-from-man-makefile.patch | 27 +++++++++++
> package/cups/0001-fix-static.patch | 28 ------------
> package/cups/0002-Do-not-use-genstrings.patch | 27 +++++++++++
> package/cups/0002-fix-stack-protector-check.patch | 25 -----------
> package/cups/0003-mantohtml.patch | 11 -----
> package/cups/Config.in | 17 ++++---
> package/cups/cups.hash | 2 +
> package/cups/cups.mk | 52 +++++++++++++++-------
> 8 files changed, 99 insertions(+), 90 deletions(-)
> create mode 100644 package/cups/0001-Remove-building-html-from-man-makefile.patch
> delete mode 100644 package/cups/0001-fix-static.patch
> create mode 100644 package/cups/0002-Do-not-use-genstrings.patch
> delete mode 100644 package/cups/0002-fix-stack-protector-check.patch
> delete mode 100644 package/cups/0003-mantohtml.patch
> create mode 100644 package/cups/cups.hash
>
> diff --git a/package/cups/0001-Remove-building-html-from-man-makefile.patch b/package/cups/0001-Remove-building-html-from-man-makefile.patch
> new file mode 100644
> index 0000000..546e76b
> --- /dev/null
> +++ b/package/cups/0001-Remove-building-html-from-man-makefile.patch
> @@ -0,0 +1,27 @@
> +From da960a1384625d2550ffbf5765a10fe9b3aa5a51 Mon Sep 17 00:00:00 2001
> +From: Olivier Schonken <olivier.schonken@gmail.com>
> +Date: Wed, 18 Mar 2015 20:30:39 +0200
> +Subject: [PATCH 1/2] Remove building html from man makefile
> +
> +Building and using mantohtml causes problems for cross-compiling
Wouldn't it be better to remove the entire man directory from the build?
And even better of course would be an upstreamable patch that makes the
documentation build optional. Or alternatively, and probably easier to upstream,
a patch that uses $(CC_FOR_BUILD) for host tools.
> +
> +Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
> +---
> + man/Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/man/Makefile b/man/Makefile
> +index dc1a8c0..0ad42a1 100644
> +--- a/man/Makefile
> ++++ b/man/Makefile
> +@@ -73,7 +73,7 @@ MAN8 = cupsaccept.$(MAN8EXT) \
> + # Make everything...
> + #
> +
> +-all: $(MAN1) $(MAN5) $(MAN7) $(MAN8) html
> ++all: $(MAN1) $(MAN5) $(MAN7) $(MAN8)
> +
> +
> + #
> +--
> +1.9.1
[snip]
> diff --git a/package/cups/0002-Do-not-use-genstrings.patch b/package/cups/0002-Do-not-use-genstrings.patch
> new file mode 100644
> index 0000000..eef3409
> --- /dev/null
> +++ b/package/cups/0002-Do-not-use-genstrings.patch
> @@ -0,0 +1,27 @@
> +From 8a5666a586e752b6c513bc8a7467c8a00085f069 Mon Sep 17 00:00:00 2001
> +From: Olivier Schonken <olivier.schonken@gmail.com>
> +Date: Wed, 18 Mar 2015 20:33:41 +0200
> +Subject: [PATCH 2/2] Do not use genstrings
> +
> +Using cross compiled genstrings while cross-compiling will break compilation.
> +
> +Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
> +---
> + ppdc/Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/ppdc/Makefile b/ppdc/Makefile
> +index bc8bb64..f6bae25 100644
> +--- a/ppdc/Makefile
> ++++ b/ppdc/Makefile
> +@@ -243,7 +243,7 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
> + libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
> + $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
> + echo Generating localization strings...
This is also one that could be solved by using CC_FOR_BUILD.
> +- ./genstrings >sample.c
> ++ #./genstrings >sample.c
> +
> +
> + #
> +--
> +1.9.1
[snip]
> diff --git a/package/cups/Config.in b/package/cups/Config.in
> index 8e60221..a161818 100644
> --- a/package/cups/Config.in
> +++ b/package/cups/Config.in
> @@ -1,8 +1,7 @@
> config BR2_PACKAGE_CUPS
> bool "cups"
> - # serious security issues, needs upgrading
> - depends on BR2_DEPRECATED_SINCE_2015_05
> # needs fork()
> + depends on BR2_INSTALL_LIBSTDCPP
The fork() comment is no longer in the right place.
> depends on BR2_USE_MMU
> help
> The Common Unix Printing System
> @@ -11,13 +10,13 @@ config BR2_PACKAGE_CUPS
>
> if BR2_PACKAGE_CUPS
>
> -config BR2_PACKAGE_CUPS_PDFTOPS
> - bool "pdftops support"
> - depends on BR2_INSTALL_LIBSTDCPP
> +config BR2_PACKAGE_CUPS_AVAHI
> + bool "avahi support"
> + depends on !BR2_STATIC_LIBS # avahi
> + select BR2_PACKAGE_AVAHI
depends on threads, dynamic library.
> + select BR2_PACKAGE_AVAHI_DAEMON
> help
> - Enable pdftops support
> -
> -comment "pdftops support needs a toolchain w/ C++"
> - depends on !BR2_INSTALL_LIBSTDCPP
> + Enable Avahi support.
> + Select this if you want cups to support Bonjour protocol.
>
> endif
> diff --git a/package/cups/cups.hash b/package/cups/cups.hash
> new file mode 100644
> index 0000000..8e99ea8
> --- /dev/null
> +++ b/package/cups/cups.hash
> @@ -0,0 +1,2 @@
> +# From https://www.cups.org/
> +md5 6e0ea72dbafcf5baaa1cf4178e71096d cups-2.0.2-source.tar.bz2
If it's just md5 we typically add a locally-calculated sha256.
> diff --git a/package/cups/cups.mk b/package/cups/cups.mk
> index b6a0663..ade491b 100644
> --- a/package/cups/cups.mk
> +++ b/package/cups/cups.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -CUPS_VERSION = 1.3.11
> +CUPS_VERSION = 2.0.2
> CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.bz2
> CUPS_SITE = http://www.cups.org/software/$(CUPS_VERSION)
> CUPS_LICENSE = GPLv2 LGPLv2
> @@ -16,16 +16,24 @@ CUPS_CONF_OPTS = \
> --without-perl \
> --without-java \
> --without-php \
> - --disable-gnutls \
> --disable-gssapi \
> --libdir=/usr/lib
> CUPS_CONFIG_SCRIPTS = cups-config
>
> CUPS_DEPENDENCIES = \
> - $(if $(BR2_PACKAGE_ZLIB),zlib) \
> - $(if $(BR2_PACKAGE_LIBPNG),libpng) \
> - $(if $(BR2_PACKAGE_JPEG),jpeg) \
> - $(if $(BR2_PACKAGE_TIFF),tiff)
> + cups-filters
> +
> +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> + CUPS_CONF_OPTS += --with-systemdunitdir=/usr/lib/systemd/system
> + CUPS_DEPENDENCIES += systemd
We don't indent within conditions.
But in this case, the rest of the file already does that, so either clean up
indentation first or keep this unusual indentation.
> +endif
> +
> +ifeq ($(BR2_PREFER_STATIC_LIB),y)
> + CUPS_CONF_OPTS += --enable-static \
> + --disable-shared
We indent continuation lines with a single tab, we don't try to align (because
that can go wrong very easily when you have a different tab size).
Regards,
Arnout
> +else
> + CUPS_CONF_OPTS += --enable-shared
> +endif
>
> ifeq ($(BR2_PACKAGE_DBUS),y)
> CUPS_CONF_OPTS += --enable-dbus
> @@ -34,8 +42,11 @@ else
> CUPS_CONF_OPTS += --disable-dbus
> endif
>
> -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
> - CUPS_DEPENDENCIES += xlib_libX11
> +ifeq ($(BR2_PACKAGE_GNUTLS),y)
> + CUPS_CONF_OPTS += --enable-gnutls
> + CUPS_DEPENDENCIES += gnutls
> +else
> + CUPS_CONF_OPTS += --disable-gnutls
> endif
>
> ifeq ($(BR2_PACKAGE_PYTHON),y)
> @@ -45,18 +56,25 @@ else
> CUPS_CONF_OPTS += --without-python
> endif
>
> -ifeq ($(BR2_PACKAGE_CUPS_PDFTOPS),y)
> - CUPS_CONF_OPTS += --enable-pdftops
> +ifeq ($(BR2_PACKAGE_LIBUSB),y)
> + CUPS_CONF_OPTS += --enable-libusb
> + CUPS_DEPENDENCIES += libusb
> else
> - CUPS_CONF_OPTS += --disable-pdftops
> + CUPS_CONF_OPTS += --disable-libusb
> endif
>
> -# standard autoreconf fails with autoheader failures
> -define CUPS_FIXUP_AUTOCONF
> - cd $(@D) && $(AUTOCONF)
> -endef
> -CUPS_DEPENDENCIES += host-autoconf
> +ifeq ($(BR2_PACKAGE_LIBPAPER),y)
> + CUPS_CONF_OPTS += --enable-libpaper
> + CUPS_DEPENDENCIES += libpaper
> +else
> + CUPS_CONF_OPTS += --disable-libpaper
> +endif
>
> -CUPS_PRE_CONFIGURE_HOOKS += CUPS_FIXUP_AUTOCONF
> +ifeq ($(BR2_PACKAGE_CUPS_FILTERS_AVAHI),y)
> + CUPS_DEPENDENCIES += avahi
> + CUPS_CONF_OPTS += --enable-avahi
> +else
> + CUPS_CONF_OPTS += --disable-avahi
> +endif
>
> $(eval $(autotools-package))
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 5/8] package/openjpeg: New package openjpeg 1.5.2
2015-03-22 14:10 ` [Buildroot] [PATCH 5/8] package/openjpeg: New package openjpeg 1.5.2 Olivier Schonken
@ 2015-03-22 15:01 ` Arnout Vandecappelle
0 siblings, 0 replies; 10+ messages in thread
From: Arnout Vandecappelle @ 2015-03-22 15:01 UTC (permalink / raw)
To: buildroot
On 22/03/15 15:10, Olivier Schonken wrote:
> Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
> ---
> package/Config.in | 1 +
> package/openjpeg/Config.in | 6 ++++++
> package/openjpeg/openjpeg.hash | 2 ++
> package/openjpeg/openjpeg.mk | 17 +++++++++++++++++
> 4 files changed, 26 insertions(+)
> create mode 100644 package/openjpeg/Config.in
> create mode 100644 package/openjpeg/openjpeg.hash
> create mode 100644 package/openjpeg/openjpeg.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 93fde92..e9f362d 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -739,6 +739,7 @@ menu "Graphics"
> source "package/libvips/Config.in"
> source "package/opencv/Config.in"
> source "package/opengl/Config.in"
> + source "package/openjpeg/Config.in"
> source "package/pango/Config.in"
> source "package/pixman/Config.in"
> source "package/poppler/Config.in"
> diff --git a/package/openjpeg/Config.in b/package/openjpeg/Config.in
> new file mode 100644
> index 0000000..3fa7553
> --- /dev/null
> +++ b/package/openjpeg/Config.in
> @@ -0,0 +1,6 @@
> +config BR2_PACKAGE_OPENJPEG
> + bool "openjpeg"
> + help
> + The OpenJPEG library is an open-source JPEG 2000 codec written in C
> +
> + http://www.openjpeg.org
> diff --git a/package/openjpeg/openjpeg.hash b/package/openjpeg/openjpeg.hash
> new file mode 100644
> index 0000000..5ac8a00
> --- /dev/null
> +++ b/package/openjpeg/openjpeg.hash
> @@ -0,0 +1,2 @@
> +# Locally computed:
> +md5 c41772c30fb1c272358b3707233134a1 openjpeg-1.5.2.tar.gz
When locally computed, use sha256.
> diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk
> new file mode 100644
> index 0000000..8cb3c80
> --- /dev/null
> +++ b/package/openjpeg/openjpeg.mk
> @@ -0,0 +1,17 @@
> +################################################################################
> +#
> +# openjpeg
> +#
> +################################################################################
> +
> +OPENJPEG_VERSION = 1.5.2
> +OPENJPEG_SITE = http://downloads.sourceforge.net/project/openjpeg
> +OPENJPEG_LICENSE = MIT
> +OPENJPEG_LICENSE_FILES = COPYING
> +OPENJPEG_AUTORECONF = YES
Add a comment why autoreconf is necessary.
> +OPENJPEG_SOURCE = openjpeg-$(OPENJPEG_VERSION).tar.gz
We typically put this jusb below _VERSION. But in this case it's redundant
since this is the default.
> +OPENJPEG_INSTALL_STAGING = YES
> +
> +OPENJPEG_CONF_OPTS = \
Remove this.
Regards,
Arnout
> +
> +$(eval $(autotools-package))
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-03-22 15:01 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-22 14:10 [Buildroot] [PATCH 1/8] package/cups: Un-deprecate, and update CUPS to 2.0.2 Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 2/8] package/hplip: Un-deprecate and bump version to 3.15.2 Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 3/8] package/gutenprint: Un-deprecate and bump version to 5.2.10 Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 4/8] package/poppler: bump version to 0.32.0 Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 5/8] package/openjpeg: New package openjpeg 1.5.2 Olivier Schonken
2015-03-22 15:01 ` Arnout Vandecappelle
2015-03-22 14:10 ` [Buildroot] [PATCH 6/8] package/qpdf: New package qpdf 5.1.2 Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 7/8] package/ijs: New package ijs 0.35 Olivier Schonken
2015-03-22 14:10 ` [Buildroot] [PATCH 8/8] package/cups-filters: Add new package cups-filters 1.0.67 Olivier Schonken
2015-03-22 14:57 ` [Buildroot] [PATCH 1/8] package/cups: Un-deprecate, and update CUPS to 2.0.2 Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.