cups: add cups 1.4.6

This package has been added from meta-openembedded committed by Koen Kooi.
Changes from the meta-openembedded version:
* Add SUMMARY
* Change dependence name: libusb
* Add PR

Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>

2 files changed, 79 insertions, 0 deletions

diff --git a/meta/recipes-extended/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch
new file mode 100644
index 0000000000..7b544ca0e3
--- /dev/null
+++ b/meta/recipes-extended/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch
@@ -0,0 +1,68 @@
+From 90069586167b930befce7303aea57078f04b4ed8 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Sun, 30 Jan 2011 16:37:27 +0100
+Subject: [PATCH] don't try to run generated binaries
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ ppdc/Makefile |   30 +++++++++++++++---------------
+ 1 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/ppdc/Makefile b/ppdc/Makefile
+index 0288d47..fc87f1b 100644
+--- a/ppdc/Makefile
++++ b/ppdc/Makefile
+@@ -243,8 +243,8 @@ genstrings:         genstrings.o libcupsppdc.a ../cups/libcups.a \
+        $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
+                libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \
+                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+-       echo Generating localization strings...
+-       ./genstrings >sample.c
++#      echo Generating localization strings...
++#      ./genstrings >sample.c
+ 
+ 
+ #
+@@ -261,9 +261,9 @@ ppdc-static:                ppdc.o libcupsppdc.a  ../cups/libcups.a foo.drv foo-fr.po
+        $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
+                ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+                $(COMMONLIBS) $(LIBZ)
+-       echo Testing PPD compiler...
+-       ./ppdc-static -l en,fr -I ../data foo.drv
+-       ./ppdc-static -l en,fr -z -I ../data foo.drv
++#      echo Testing PPD compiler...
++#      ./ppdc-static -l en,fr -I ../data foo.drv
++#      ./ppdc-static -l en,fr -z -I ../data foo.drv
+ 
+ 
+ #
+@@ -290,16 +290,16 @@ ppdi-static:              ppdc-static ppdi.o libcupsppdc.a  ../cups/libcups.a
+                ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+                $(COMMONLIBS) $(LIBZ)
+        echo Testing PPD importer...
+-       $(RM) -r ppd ppd2 sample-import.drv
+-       ./ppdc-static -I ../data sample.drv
+-       ./ppdi-static -I ../data -o sample-import.drv ppd/*
+-       ./ppdc-static -I ../data -d ppd2 sample-import.drv
+-       if diff -r ppd ppd2 >/dev/null; then \
+-               echo PPD import OK; \
+-       else \
+-               echo PPD import FAILED; \
+-               exit 1; \
+-       fi
++#      $(RM) -r ppd ppd2 sample-import.drv
++#      ./ppdc-static -I ../data sample.drv
++#      ./ppdi-static -I ../data -o sample-import.drv ppd/*
++#      ./ppdc-static -I ../data -d ppd2 sample-import.drv
++#      if diff -r ppd ppd2 >/dev/null; then \
++#              echo PPD import OK; \
++#      else \
++#              echo PPD import FAILED; \
++#              exit 1; \
++#      fi
+ 
+ 
+ #
+-- 
+1.6.6.1
+
diff --git a/meta/recipes-extended/cups/cups-1.4.6/use_echo_only_in_init.patch b/meta/recipes-extended/cups/cups-1.4.6/use_echo_only_in_init.patch
new file mode 100644
index 0000000000..21ff0e535b
--- /dev/null
+++ b/meta/recipes-extended/cups/cups-1.4.6/use_echo_only_in_init.patch
@@ -0,0 +1,11 @@
+--- a/init/cups.sh.in.orig      2008-10-04 16:50:46.000000000 -0300
++++ b/init/cups.sh.in   2008-10-04 16:51:39.000000000 -0300
+@@ -68,7 +68,7 @@
+                ECHO_ERROR=:
+                ;;
+ 
+-       Linux*)
++       DISABLELinux*)
+                IS_ON=/bin/true
+                if test -f /etc/init.d/functions; then
+                        . /etc/init.d/functions