bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] cups: reenable libusb support, refresh patches (#11768)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@32519 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-06-28 14:47:02 +00:00
parent a76cd44ea7
commit 6386ddbeda
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/cups/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2011 OpenWrt.org # Copyright (C) 2006-2012 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=cups PKG_NAME:=cups
PKG_VERSION:=1.4.4 PKG_VERSION:=1.4.4
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2
PKG_SOURCE_URL:= \ PKG_SOURCE_URL:= \
@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/cups define Package/cups
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+zlib +libpthread +libpng +libjpeg +libstdcpp DEPENDS:=+zlib +libpthread +libpng +libjpeg +libstdcpp +libusb
TITLE:=Common UNIX Printing System TITLE:=Common UNIX Printing System
URL:=http://www.cups.org/ URL:=http://www.cups.org/
endef endef
@ -50,7 +50,7 @@ define Build/Configure
--without-php \ --without-php \
--enable-shared \ --enable-shared \
--enable-image \ --enable-image \
--disable-libusb \ --enable-libusb \
--disable-dbus \ --disable-dbus \
--disable-dnssd \ --disable-dnssd \
--disable-launchd \ --disable-launchd \

2
net/cups/patches/100-makefile-targets.patch
View File

@ -1,6 +1,6 @@
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -19,8 +19,8 @@ include Makedefs @@ -20,8 +20,8 @@ include Makedefs
# Directories to make... # Directories to make...
# #

2
net/cups/patches/140-uname.patch
View File

@ -1,6 +1,6 @@
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -1926,7 +1926,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -1966,7 +1966,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

8
net/cups/patches/150-64bit_host_fix.patch
View File

@ -1,6 +1,6 @@
--- a/cups-config.in --- a/cups-config.in
+++ b/cups-config.in +++ b/cups-config.in
@@ -53,7 +53,7 @@ else @@ -54,7 +54,7 @@ else
CFLAGS="$CFLAGS -I$includedir" CFLAGS="$CFLAGS -I$includedir"
fi fi
@ -33,7 +33,7 @@
HP-UX*) HP-UX*)
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -9254,7 +9254,7 @@ if test "$libdir" = "\${exec_prefix}/lib @@ -10003,7 +10003,7 @@ if test "$libdir" = "\${exec_prefix}/lib
;; ;;
Linux*) Linux*)
if test -d /usr/lib64; then if test -d /usr/lib64; then
@ -42,7 +42,7 @@
fi fi
;; ;;
HP-UX*) HP-UX*)
@@ -9792,9 +9792,6 @@ case "$uname" in @@ -10626,9 +10626,6 @@ case "$uname" in
LIB32CUPS="32bit/libcups.so.2" LIB32CUPS="32bit/libcups.so.2"
LIB32CUPSIMAGE="32bit/libcupsimage.so.2" LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
LIB32DIR="$exec_prefix/lib" LIB32DIR="$exec_prefix/lib"
@ -52,7 +52,7 @@
UNINSTALL32="uninstall32bit" UNINSTALL32="uninstall32bit"
fi fi
@@ -9804,9 +9801,6 @@ case "$uname" in @@ -10638,9 +10635,6 @@ case "$uname" in
LIB64CUPS="64bit/libcups.so.2" LIB64CUPS="64bit/libcups.so.2"
LIB64CUPSIMAGE="64bit/libcupsimage.so.2" LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
LIB64DIR="$exec_prefix/lib" LIB64DIR="$exec_prefix/lib"

6
net/cups/patches/160-ppdc.patch
View File

@ -1,6 +1,6 @@
--- cups-1.4.2.orig/ppdc/Makefile 2010-01-28 18:06:41.000000000 +0100 --- a/ppdc/Makefile
+++ cups-1.4.2/ppdc/Makefile 2010-01-28 20:25:09.000000000 +0100 +++ b/ppdc/Makefile
@@ -239,12 +239,7 @@ @@ -239,12 +239,7 @@ framedhelp:
genstrings: genstrings.o libcupsppdc.a ../cups/libcups.a \ genstrings: genstrings.o libcupsppdc.a ../cups/libcups.a \
sample.drv ../data/media.defs sample.drv ../data/media.defs