pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print/cups Incorporate:
details: https://anonhg.NetBSD.org/pkgsrc/rev/62e44ce969da
branches: trunk
changeset: 576303:62e44ce969da
user: sbd <sbd%pkgsrc.org@localhost>
date: Sat Jun 05 23:03:15 2010 +0000
description:
Incorporate:
usb-backend-both-usblp-and-libusb.dpatch by <till.kamppeter%gmail.com@localhost>
http://www.cups.org/str.php?L3357
One "usb" CUPS backend for both libusb-based and usblp-based access.
Bump PKGREVISION.
diffstat:
print/cups/Makefile | 4 +-
print/cups/distinfo | 9 +-
print/cups/patches/patch-af | 18 +++-
print/cups/patches/patch-aj | 39 +++++++
print/cups/patches/patch-ak | 96 +++++++++++++++++++
print/cups/patches/patch-al | 217 ++++++++++++++++++++++++++++++++++++++++++++
print/cups/patches/patch-am | 212 ++++++++++++++++++++++++++++++++++++++++++
print/cups/patches/patch-ap | 17 +++
8 files changed, 606 insertions(+), 6 deletions(-)
diffs (truncated from 675 to 300 lines):
diff -r a9abc14f9f7c -r 62e44ce969da print/cups/Makefile
--- a/print/cups/Makefile Sat Jun 05 20:37:27 2010 +0000
+++ b/print/cups/Makefile Sat Jun 05 23:03:15 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.162 2010/05/26 09:18:48 sbd Exp $
+# $NetBSD: Makefile,v 1.163 2010/06/05 23:03:15 sbd Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -8,7 +8,7 @@
PKGNAME= cups-${DIST_VERS:S/-/./g}
BASE_VERS= 1.4.3
DIST_VERS= ${BASE_VERS}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= print
MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
diff -r a9abc14f9f7c -r 62e44ce969da print/cups/distinfo
--- a/print/cups/distinfo Sat Jun 05 20:37:27 2010 +0000
+++ b/print/cups/distinfo Sat Jun 05 23:03:15 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.70 2010/05/25 08:52:59 wiz Exp $
+$NetBSD: distinfo,v 1.71 2010/06/05 23:03:15 sbd Exp $
SHA1 (cups-1.4.3-source.tar.bz2) = 0dd9e3d709614d26cce77728b9263556c94c9559
RMD160 (cups-1.4.3-source.tar.bz2) = 6c5ab282405d6a1132163c727583f3a572307d88
@@ -8,10 +8,15 @@
SHA1 (patch-ac) = d99dfa6e71efdc5f069c2c3e73e1b29beebf5c9b
SHA1 (patch-ad) = 4ba06354ead85138340b87caabf87d153a15036a
SHA1 (patch-ae) = d89b47961d899f99b6c57be3ebdb6a7b34e55324
-SHA1 (patch-af) = d062df1855e86e92f883f702996f28afc7aff90d
+SHA1 (patch-af) = c05f7739d65c7b81cc712cbf6008d53568601f6a
SHA1 (patch-ag) = 680c1c7fb44d8153b5825252d2e297a5196ca98e
SHA1 (patch-ah) = 763220bdbc01c9ab323c62b7bc601a3082bd03e2
SHA1 (patch-ai) = fae5b2b5e54ea947d92c89c0bdcdd86c7e3bad12
+SHA1 (patch-aj) = 471a2738bd7bd6a00596dbeb120084ac37840b31
+SHA1 (patch-ak) = 25b923d85e34d42f41d9d7747c22e1a452b9bf4e
+SHA1 (patch-al) = b5dd793efed46fc950f08bfbd5fb92180ba3be77
+SHA1 (patch-am) = e719b1f2666ee843a7f834aa37db61e88bcbdbf7
SHA1 (patch-an) = 231c871e31db279e8aeafba71506f93330e0a971
SHA1 (patch-ao) = 7fe50080b9a6fd4dac186020f9351ef6000373c7
+SHA1 (patch-ap) = 70c5fa4a19ca2812818844180ca9db9cb7cfd601
SHA1 (patch-at) = aee1f0e8cbcd9e2dbcfa9af3fb675ea7ce1ce622
diff -r a9abc14f9f7c -r 62e44ce969da print/cups/patches/patch-af
--- a/print/cups/patches/patch-af Sat Jun 05 20:37:27 2010 +0000
+++ b/print/cups/patches/patch-af Sat Jun 05 23:03:15 2010 +0000
@@ -1,6 +1,11 @@
-$NetBSD: patch-af,v 1.19 2010/05/21 10:05:20 sbd Exp $
+$NetBSD: patch-af,v 1.20 2010/06/05 23:03:15 sbd Exp $
+
+* Remove unneeded $(LIBTOOL), it's now in $(INSTALL_BIN).
---- backend/Makefile.orig 2009-03-03 19:39:21.000000000 +0000
+* Add usb-hybrid.c for
+usb-backend-both-usblp-and-libusb.dpatch by <till.kamppeter%gmail.com@localhost>
+
+--- backend/Makefile.orig 2010-06-05 02:08:34.225590281 +0000
+++ backend/Makefile
@@ -84,7 +84,7 @@ install-data:
install-exec:
@@ -11,3 +16,12 @@
done
for file in $(UBACKENDS); do \
$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+@@ -267,7 +267,7 @@ usb: usb.o ../cups/$(LIBCUPS) libbackend
+ echo Linking $@...
+ $(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
+ $(BACKLIBS) $(LIBS)
+-usb.o: usb.c usb-darwin.c usb-libusb.c usb-unix.c
++usb.o: usb.c usb-darwin.c usb-hybrid.c usb-libusb.c usb-unix.c
+
+
+ #
diff -r a9abc14f9f7c -r 62e44ce969da print/cups/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/cups/patches/patch-aj Sat Jun 05 23:03:15 2010 +0000
@@ -0,0 +1,39 @@
+$NetBSD: patch-aj,v 1.13 2010/06/05 23:09:29 sbd Exp $
+
+Incorporate
+usb-backend-both-usblp-and-libusb.dpatch by <till.kamppeter%gmail.com@localhost>
+http://www.cups.org/str.php?L3357
+
+--- backend/ieee1284.c.orig 2009-12-08 02:13:42.000000000 +0000
++++ backend/ieee1284.c
+@@ -255,6 +255,7 @@ backendGetDeviceID(
+ cups_option_t *values; /* Keys and values in device ID */
+ const char *mfg, /* Manufacturer */
+ *mdl, /* Model */
++ *des, /* Description */
+ *sern; /* Serial number */
+ char temp[256], /* Temporary manufacturer string */
+ *tempptr; /* Pointer into temp string */
+@@ -285,10 +286,20 @@ backendGetDeviceID(
+ }
+ else
+ {
+- strlcpy(temp, make_model, sizeof(temp));
++ /*
++ * No manufacturer? Use the model string or description...
++ */
++
++ if (mdl)
++ _ppdNormalizeMakeAndModel(mdl, temp, sizeof(temp));
++ else if ((des = cupsGetOption("DESCRIPTION", num_values, values)) != NULL ||
++ (des = cupsGetOption("DES", num_values, values)) != NULL)
++ _ppdNormalizeMakeAndModel(des, temp, sizeof(temp));
++ else
++ strlcpy(temp, "Unknown", sizeof(temp));
+
+ if ((tempptr = strchr(temp, ' ')) != NULL)
+- *tempptr = '\0';
++ *tempptr = '\0';
+
+ mfg = temp;
+ }
diff -r a9abc14f9f7c -r 62e44ce969da print/cups/patches/patch-ak
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/cups/patches/patch-ak Sat Jun 05 23:03:15 2010 +0000
@@ -0,0 +1,96 @@
+$NetBSD: patch-ak,v 1.13 2010/06/05 23:09:29 sbd Exp $
+
+Incorporate
+usb-backend-both-usblp-and-libusb.dpatch by <till.kamppeter%gmail.com@localhost>
+http://www.cups.org/str.php?L3357
+
+--- backend/usb-hybrid.c.orig 2010-06-05 02:02:53.089601743 +0000
++++ backend/usb-hybrid.c
+@@ -0,0 +1,87 @@
++/*
++ * "Id: usb-hybrid.c 8807 2009-08-31 18:45:43Z mike "
++ *
++ * USB port backend for the Common UNIX Printing System (CUPS).
++ *
++ * This file is included from "usb.c" when compiled on Linux.
++ *
++ * Copyright 2007-2008 by Apple Inc.
++ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
++ *
++ * These coded instructions, statements, and computer programs are the
++ * property of Apple Inc. and are protected by Federal copyright
++ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
++ * "LICENSE" which should have been included with this file. If this
++ * file is missing or damaged, see the license at "http://www.cups.org/";.
++ *
++ * This file is subject to the Apple OS-Developed Software exception.
++ *
++ * Contents:
++ *
++ * print_device() - Print a file to a USB device.
++ * list_devices() - List all USB devices.
++ */
++
++/*
++ * Include necessary headers.
++ */
++
++#include <sys/select.h>
++
++/*
++ * Include the two USB implementations used under Linux ...
++ */
++
++#include "usb-libusb.c"
++#include "usb-unix.c"
++
++/*
++ * 'print_device()' - Print a file to a USB device.
++ */
++
++int /* O - Exit status */
++print_device(const char *uri, /* I - Device URI */
++ const char *hostname, /* I - Hostname/manufacturer */
++ const char *resource, /* I - Resource/modelname */
++ char *options, /* I - Device options/serial number */
++ int print_fd, /* I - File descriptor to print */
++ int copies, /* I - Copies to print */
++ int argc, /* I - Number of command-line arguments (6 or 7) */
++ char *argv[]) /* I - Command-line arguments */
++{
++ int result;
++ for(;;)
++ {
++ result = print_device_unix(uri, hostname, resource, options, print_fd,
++ copies, argc, argv);
++ if (result == -1)
++ {
++ result = print_device_libusb(uri, hostname, resource, options, print_fd,
++ copies, argc, argv);
++ if (result == -1)
++ sleep(5);
++ else
++ return(result);
++ }
++ else
++ return(result);
++ }
++}
++
++/*
++ * 'list_devices()' - List all USB devices.
++ */
++
++void
++list_devices(void)
++{
++ /* Try both discovery methods, each device will appear only under one
++ of them */
++ list_devices_libusb();
++ list_devices_unix();
++}
++
++
++/*
++ * End of "Id: usb-hybrid.c 8807 2009-08-31 18:45:43Z mike ".
++ */
diff -r a9abc14f9f7c -r 62e44ce969da print/cups/patches/patch-al
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/cups/patches/patch-al Sat Jun 05 23:03:15 2010 +0000
@@ -0,0 +1,217 @@
+$NetBSD: patch-al,v 1.8 2010/06/05 23:09:29 sbd Exp $
+
+Incorporate
+usb-backend-both-usblp-and-libusb.dpatch by <till.kamppeter%gmail.com@localhost>
+http://www.cups.org/str.php?L3357
+
+--- backend/usb-libusb.c.orig 2009-09-11 20:03:31.000000000 +0000
++++ backend/usb-libusb.c
+@@ -13,16 +13,16 @@
+ *
+ * Contents:
+ *
+- * list_devices() - List the available printers.
+- * print_device() - Print a file to a USB device.
++ * list_devices_libusb() - List the available printers.
++ * print_device_libusb() - Print a file to a USB device.
+ * close_device() - Close the connection to the USB printer.
+ * find_device() - Find or enumerate USB printers.
+ * get_device_id() - Get the IEEE-1284 device ID for the printer.
+ * list_cb() - List USB printers for discovery.
+ * make_device_uri() - Create a device URI for a USB printer.
+- * open_device() - Open a connection to the USB printer.
++ * open_device_libusb() - Open a connection to the USB printer.
+ * print_cb() - Find a USB printer for printing.
+- * side_cb() - Handle side-channel requests.
++ * side_cb_libusb() - Handle side-channel requests.
+ */
+
+ /*
+@@ -65,30 +65,30 @@ static int list_cb(usb_printer_t *print
+ static char *make_device_uri(usb_printer_t *printer,
+ const char *device_id,
+ char *uri, size_t uri_size);
+-static int open_device(usb_printer_t *printer, int verbose);
++static int open_device_libusb(usb_printer_t *printer, int verbose);
+ static int print_cb(usb_printer_t *printer, const char *device_uri,
+ const char *device_id, const void *data);
+-static ssize_t side_cb(usb_printer_t *printer, int print_fd);
++static ssize_t side_cb_libusb(usb_printer_t *printer, int print_fd);
+
+
+ /*
+- * 'list_devices()' - List the available printers.
++ * 'list_devices_libusb()' - List the available printers.
+ */
+
+ void
+-list_devices(void)
++list_devices_libusb(void)
+ {
+- fputs("DEBUG: list_devices\n", stderr);
++ fputs("DEBUG: list_devices_libusb\n", stderr);
+ find_device(list_cb, NULL);
+ }
+
+
+ /*
+- * 'print_device()' - Print a file to a USB device.
++ * 'print_device_libusb()' - Print a file to a USB device.
+ */
+
+ int /* O - Exit status */
+-print_device(const char *uri, /* I - Device URI */
++print_device_libusb(const char *uri, /* I - Device URI */
+ const char *hostname, /* I - Hostname/manufacturer */
+ const char *resource, /* I - Resource/modelname */
+ char *options, /* I - Device options/serial number */
+@@ -105,19 +105,23 @@ print_device(const char *uri, /* I - De
+ struct pollfd pfds[2]; /* Poll descriptors */
+
+
+- fputs("DEBUG: print_device\n", stderr);
++ fputs("DEBUG: print_device_libusb\n", stderr);
+
+ /*
+ * Connect to the printer...
+ */
+
++#if defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
Home |
Main Index |
Thread Index |
Old Index