summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-12-12 17:29:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-28 23:25:42 +0000
commit53e3605eae85116a0ad7ebe0de608ad2c82d8b35 (patch)
tree310d4c19ad1ca73ca54ffd2617d9bab46ebd1b45
parent098b39dc40e71a370ddd73e6f6707e537a012958 (diff)
downloadpoky-53e3605eae85116a0ad7ebe0de608ad2c82d8b35.tar.gz
cups: update to 2.3.1
License-Update: license changed to Apache 2.0 Remove no longer recognized configure options. Refresh all patches. (From OE-Core rev: 7ed28276e9fa6fc9b572bdf1ad566967964d9623) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-extended/cups/cups.inc14
-rw-r--r--meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch27
-rw-r--r--meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch (renamed from meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch)29
-rw-r--r--meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch51
-rw-r--r--meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch (renamed from meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch)12
-rw-r--r--meta/recipes-extended/cups/cups/cups_serverbin.patch38
-rw-r--r--meta/recipes-extended/cups/cups/use_echo_only_in_init.patch15
-rw-r--r--meta/recipes-extended/cups/cups_2.2.12.bb6
-rw-r--r--meta/recipes-extended/cups/cups_2.3.1.bb6
9 files changed, 117 insertions, 81 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 2149cbe4cf..b94bc1d412 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -5,14 +5,14 @@ Protocol (IPP), and has its own filtering driver model for handling various \
5document types." 5document types."
6HOMEPAGE = "https://www.cups.org/" 6HOMEPAGE = "https://www.cups.org/"
7SECTION = "console/utils" 7SECTION = "console/utils"
8LICENSE = "GPLv2 & LGPLv2" 8LICENSE = "Apache-2.0"
9DEPENDS = "gnutls libpng jpeg dbus zlib libusb1" 9DEPENDS = "gnutls libpng jpeg dbus zlib libusb1"
10 10
11SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \ 11SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \
12 file://use_echo_only_in_init.patch \ 12 file://0001-use-echo-only-in-init.patch \
13 file://0001-don-t-try-to-run-generated-binaries.patch \ 13 file://0002-don-t-try-to-run-generated-binaries.patch \
14 file://cups_serverbin.patch \ 14 file://0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch \
15 file://cups-avoid-install-file-conflicts.patch \ 15 file://0004-cups-fix-multilib-install-file-conflicts.patch\
16 " 16 "
17 17
18UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" 18UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases"
@@ -45,10 +45,6 @@ EXTRA_OECONF = " \
45 --enable-debug \ 45 --enable-debug \
46 --disable-relro \ 46 --disable-relro \
47 --enable-libusb \ 47 --enable-libusb \
48 --without-php \
49 --without-perl \
50 --without-python \
51 --without-java \
52 DSOFLAGS='${LDFLAGS}' \ 48 DSOFLAGS='${LDFLAGS}' \
53 " 49 "
54 50
diff --git a/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch b/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch
new file mode 100644
index 0000000000..80bbad0a44
--- /dev/null
+++ b/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch
@@ -0,0 +1,27 @@
1From a3f4d8ba97f4669a95943a7e65eb61aa44ce7999 Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com>
3Date: Thu, 13 Dec 2012 19:03:52 -0800
4Subject: [PATCH 1/4] use echo only in init
5
6Upstream-Status: Inappropriate [embedded specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 scheduler/cups.sh.in | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/scheduler/cups.sh.in b/scheduler/cups.sh.in
13index 89ac36d..6618a0f 100644
14--- a/scheduler/cups.sh.in
15+++ b/scheduler/cups.sh.in
16@@ -50,7 +50,7 @@ case "`uname`" in
17 ECHO_ERROR=:
18 ;;
19
20- Linux*)
21+ DisableLinux*)
22 IS_ON=/bin/true
23 if test -f /etc/init.d/functions; then
24 . /etc/init.d/functions
25--
262.17.1
27
diff --git a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch
index d6a69f2833..ea248e4710 100644
--- a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
+++ b/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch
@@ -1,7 +1,7 @@
1From 1fb07162a9ed187cccf06e34c9bf841d15c6e64e Mon Sep 17 00:00:00 2001 1From 3e9a965dcd65ab2d40b753b6f792a1a4559182aa Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sun, 30 Jan 2011 16:37:27 +0100 3Date: Sun, 30 Jan 2011 16:37:27 +0100
4Subject: [PATCH] don't try to run generated binaries 4Subject: [PATCH 2/4] don't try to run generated binaries
5 5
6Upstream-Status: Inappropriate [embedded specific] 6Upstream-Status: Inappropriate [embedded specific]
7 7
@@ -12,13 +12,13 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
12 1 file changed, 16 insertions(+), 16 deletions(-) 12 1 file changed, 16 insertions(+), 16 deletions(-)
13 13
14diff --git a/ppdc/Makefile b/ppdc/Makefile 14diff --git a/ppdc/Makefile b/ppdc/Makefile
15index e563988..973dd3f 100644 15index 32e2e0b..f1478d4 100644
16--- a/ppdc/Makefile 16--- a/ppdc/Makefile
17+++ b/ppdc/Makefile 17+++ b/ppdc/Makefile
18@@ -189,8 +189,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ 18@@ -186,8 +186,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
19 $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ 19 $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \
20 libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ 20 libcupsppdc.a $(LINKCUPSSTATIC)
21 $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) 21 $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
22- echo Generating localization strings... 22- echo Generating localization strings...
23- ./genstrings >sample.c 23- ./genstrings >sample.c
24+# echo Generating localization strings... 24+# echo Generating localization strings...
@@ -26,9 +26,9 @@ index e563988..973dd3f 100644
26 26
27 27
28 # 28 #
29@@ -209,9 +209,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po 29@@ -205,9 +205,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
30 ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ 30 $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
31 $(COMMONLIBS) $(LIBZ) 31 $(LINKCUPSSTATIC)
32 $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ 32 $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
33- echo Testing PPD compiler... 33- echo Testing PPD compiler...
34- ./ppdc-static -l en,fr -I ../data foo.drv 34- ./ppdc-static -l en,fr -I ../data foo.drv
@@ -39,9 +39,9 @@ index e563988..973dd3f 100644
39 39
40 40
41 # 41 #
42@@ -240,17 +240,17 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) 42@@ -235,17 +235,17 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
43 ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ 43 $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
44 $(COMMONLIBS) $(LIBZ) 44 $(LINKCUPSSTATIC)
45 $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ 45 $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
46- echo Testing PPD importer... 46- echo Testing PPD importer...
47- $(RM) -r ppd ppd2 sample-import.drv 47- $(RM) -r ppd ppd2 sample-import.drv
@@ -68,3 +68,6 @@ index e563988..973dd3f 100644
68 68
69 69
70 # 70 #
71--
722.17.1
73
diff --git a/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch b/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch
new file mode 100644
index 0000000000..b48c7a9ad2
--- /dev/null
+++ b/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch
@@ -0,0 +1,51 @@
1From 66c2079ae91389ee0f9d704bf0d2cccd53b2c603 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 22 Jul 2012 16:54:17 -0700
4Subject: [PATCH 3/4] cups_1.4.6.bb: Fix build on ppc64
5
6Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches
7e.g. ppc64 where base libdir is lib64 this does not go well
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Upstream-Status: Inappropriate [OE config specific]
11
12Update on 20190904:
13Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction
14when multilib is enabled.
15
16Signed-off-by: Kai Kang <kai.kang@windriver.com>
17
18---
19 config-scripts/cups-directories.m4 | 2 +-
20 configure | 2 +-
21 2 files changed, 2 insertions(+), 2 deletions(-)
22
23diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
24index b74083a..9a5abb2 100644
25--- a/config-scripts/cups-directories.m4
26+++ b/config-scripts/cups-directories.m4
27@@ -270,7 +270,7 @@ case "$host_os_name" in
28 *)
29 # All others
30 INSTALL_SYSV="install-sysv"
31- CUPS_SERVERBIN="$exec_prefix/lib/cups"
32+ CUPS_SERVERBIN="$libexecdir/cups"
33 ;;
34 esac
35
36diff --git a/configure b/configure
37index d3df145..bc68a6c 100755
38--- a/configure
39+++ b/configure
40@@ -6420,7 +6420,7 @@ case "$host_os_name" in
41 *)
42 # All others
43 INSTALL_SYSV="install-sysv"
44- CUPS_SERVERBIN="$exec_prefix/lib/cups"
45+ CUPS_SERVERBIN="$libexecdir/cups"
46 ;;
47 esac
48
49--
502.17.1
51
diff --git a/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch b/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch
index 68885fa4db..bc9260307c 100644
--- a/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch
+++ b/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch
@@ -1,3 +1,8 @@
1From 7dbda1887aa19ab720aff22312f4caff2d575f62 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Wed, 3 Oct 2018 00:27:11 +0800
4Subject: [PATCH 4/4] cups: fix multilib install file conflicts
5
1@CUPS_SERVERBIN@ is ${libdir} related that causes multilib install file 6@CUPS_SERVERBIN@ is ${libdir} related that causes multilib install file
2conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to 7conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to
3avoid the conflict. 8avoid the conflict.
@@ -6,6 +11,10 @@ Upstream-Status: Inappropriate [OE specific]
6 11
7Signed-off-by: Kai Kang <kai.kang@windriver.com> 12Signed-off-by: Kai Kang <kai.kang@windriver.com>
8 13
14---
15 conf/cups-files.conf.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
9diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in 18diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
10index 4a78ba6..03c6582 100644 19index 4a78ba6..03c6582 100644
11--- a/conf/cups-files.conf.in 20--- a/conf/cups-files.conf.in
@@ -19,3 +28,6 @@ index 4a78ba6..03c6582 100644
19 28
20 # SSL/TLS keychain for the scheduler... 29 # SSL/TLS keychain for the scheduler...
21 #ServerKeychain @CUPS_SERVERKEYCHAIN@ 30 #ServerKeychain @CUPS_SERVERKEYCHAIN@
31--
322.17.1
33
diff --git a/meta/recipes-extended/cups/cups/cups_serverbin.patch b/meta/recipes-extended/cups/cups/cups_serverbin.patch
deleted file mode 100644
index 85c6af1071..0000000000
--- a/meta/recipes-extended/cups/cups/cups_serverbin.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches
2e.g. ppc64 where base libdir is lib64 this does not go well
3
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5Upstream-Status: Inappropriate [OE config specific]
6
7Update on 20190904:
8Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction
9when multilib is enabled.
10
11Signed-off-by: Kai Kang <kai.kang@windriver.com>
12
13Index: cups-1.4.6/config-scripts/cups-directories.m4
14===================================================================
15--- cups-1.4.6.orig/config-scripts/cups-directories.m4 2009-04-12 16:04:51.000000000 -0700
16+++ cups-1.4.6/config-scripts/cups-directories.m4 2012-07-21 12:12:05.896405923 -0700
17@@ -397,7 +397,7 @@
18 *)
19 # All others
20 INSTALL_SYSV="install-sysv"
21- CUPS_SERVERBIN="$exec_prefix/lib/cups"
22+ CUPS_SERVERBIN="$libexecdir/cups"
23 ;;
24 esac
25
26Index: cups-1.4.6/configure
27===================================================================
28--- cups-1.4.6.orig/configure 2012-07-21 12:13:34.512405950 -0700
29+++ cups-1.4.6/configure 2012-07-21 12:14:05.724406017 -0700
30@@ -11181,7 +11181,7 @@
31 *)
32 # All others
33 INSTALL_SYSV="install-sysv"
34- CUPS_SERVERBIN="$exec_prefix/lib/cups"
35+ CUPS_SERVERBIN="$libexecdir/cups"
36 ;;
37 esac
38
diff --git a/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch b/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch
deleted file mode 100644
index 696f1374d9..0000000000
--- a/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Index: cups-1.6.1/scheduler/cups.sh.in
4===================================================================
5--- cups-1.6.1.orig/scheduler/cups.sh.in
6+++ cups-1.6.1/scheduler/cups.sh.in
7@@ -67,7 +67,7 @@ case "`uname`" in
8 ECHO_ERROR=:
9 ;;
10
11- Linux*)
12+ DisableLinux*)
13 IS_ON=/bin/true
14 if test -f /etc/init.d/functions; then
15 . /etc/init.d/functions
diff --git a/meta/recipes-extended/cups/cups_2.2.12.bb b/meta/recipes-extended/cups/cups_2.2.12.bb
deleted file mode 100644
index 8e5534a979..0000000000
--- a/meta/recipes-extended/cups/cups_2.2.12.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require cups.inc
2
3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460"
4
5SRC_URI[md5sum] = "e763689f7735d3fe95a2943397189e40"
6SRC_URI[sha256sum] = "0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8"
diff --git a/meta/recipes-extended/cups/cups_2.3.1.bb b/meta/recipes-extended/cups/cups_2.3.1.bb
new file mode 100644
index 0000000000..f5230faf81
--- /dev/null
+++ b/meta/recipes-extended/cups/cups_2.3.1.bb
@@ -0,0 +1,6 @@
1require cups.inc
2
3LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
4
5SRC_URI[md5sum] = "8ad8897c97cf4d90f20dac4318f47421"
6SRC_URI[sha256sum] = "1bca9d89507e3f68cbc84482fe46ae8d5333af5bc2b9061347b2007182ac77ce"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 00:18:50 +0000