commit fb88ce7fa90b918cb350ba87d94877d9a66c38be Author: Juergen Daubert <jue@jue.li> Date: Sun Jan 2 12:28:43 2011 +0100 [notify] cups: allow printer access via libusb or the usblp kernel module the "usb" backend can currently be either compiled to access the printers through the "usblp" kernel module (/dev/usb/lp*) or through libusb (low-level USB), but one cannot have one backend which uses both access methods. The applied patch from Till Kamppeter fixes this disappointing behaviour. See http://www.cups.org/str.php?L3357 diff --git a/cups/.footprint b/cups/.footprint index 9871830..d1e6cd2 100644 --- a/cups/.footprint +++ b/cups/.footprint @@ -31,10 +31,6 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/ppdi -rwxr-xr-x root/root usr/bin/ppdmerge -rwxr-xr-x root/root usr/bin/ppdpo -drwxr-xr-x root/root usr/etc/ -drwxr-xr-x root/root usr/etc/dbus-1/ -drwxr-xr-x root/root usr/etc/dbus-1/system.d/ --rw-r--r-- root/root usr/etc/dbus-1/system.d/cups.conf drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/cups/ -rw-r--r-- root/root usr/include/cups/adminutil.h diff --git a/cups/.md5sum b/cups/.md5sum index 493785d..a0c25ad 100644 --- a/cups/.md5sum +++ b/cups/.md5sum @@ -1,3 +1,4 @@ 01b6a755c5b0fb7df2d2c94571f67e1d cups 50729f6fc46ba54223e0eaf5009f3419 cups-1.4.5-source.tar.bz2 2220f411940c4f7504ed4457c6304d4a cups-config.patch +4a94252a0deb74c6fe12f373be576182 usb-backend-both-usblp-and-libusb.dpatch diff --git a/cups/Pkgfile b/cups/Pkgfile index 0540cd9..b9bc8d6 100644 --- a/cups/Pkgfile +++ b/cups/Pkgfile @@ -1,18 +1,19 @@ # Description: CUPS - Common UNIX Printing System # URL: http://www.cups.org # Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de -# Depends on: tcp_wrappers libusb-compat libpng libtiff openssl dbus +# Depends on: acl tcp_wrappers libusb-compat libpng libtiff openssl name=cups version=1.4.5 -release=2 -source=(http://ftp.easysw.com/pub/cups/$version/$name-$version-source.tar.bz2 \ - cups-config.patch cups) +release=3 +source=(http://ftp.easysw.com/pub/cups/$version/$name-$version-source.tar.bz2 + cups-config.patch cups usb-backend-both-usblp-and-libusb.dpatch) build () { cd $name-$version patch -p1 -i $SRC/cups-config.patch + patch -p1 -i $SRC/usb-backend-both-usblp-and-libusb.dpatch ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -20,7 +21,6 @@ build () { --localstatedir=/var \ --with-docdir=/usr/share/cups/doc \ --with-logdir=/var/log/cups \ - --with-dbusdir=/usr/etc/dbus-1 \ --with-cups-user=daemon \ --with-cups-group=lp \ --with-languages="" \ @@ -31,8 +31,7 @@ build () { --enable-{ssl,openssl} --disable-gnutls \ --disable-pam \ --enable-tcp-wrappers \ - --disable-dbus \ - --enable-libusb + --disable-dbus make make BUILDROOT=$PKG install