Update fast-pp ppatch again.

Package-Manager: portage-2.1.10.44/cvs/Linux i686

3 files changed, 60 insertions, 33 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 9010d9ae41e6..c5463ecc10da 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.212 2012/02/16 19:35:13 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.213 2012/02/21 18:15:23 billie Exp $
+
+  21 Feb 2012; Daniel Pielmeier <billie@gentoo.org>
+  files/hplip-3.11.12-fast-pp.patch:
+  Update fast-pp ppatch again.
 
 *hplip-3.12.2-r1 (16 Feb 2012)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 7aaf837285bc..4f0ec98664f6 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -7,7 +7,7 @@ AUX hplip-3.11.1-htmldir.patch 4470 RMD160 ab8369b02b3590a19dec6277e03d3e79768ab
 AUX hplip-3.11.1-udev-attrs.patch 13946 RMD160 3634385078375936692251464ad9d31f76bc1c63 SHA1 abf1f2cfc709c9a46c18b4bff5f08420e50e2ae9 SHA256 a7ce9b86783c94f3c3c5e111364ef7874bbfda4af89137b1e7d158961d084d33
 AUX hplip-3.11.10-udev-attrs.patch 13895 RMD160 e350d51abbf93f20c1829bdeaf01d300b7030bc5 SHA1 e67a3053f12ac84ca496ddfe75d2864a3a257017 SHA256 83a7b126877f49fbfb28e5d9df26607e1f165a74a865030023c081c60e7256cd
 AUX hplip-3.11.12-black-stripes-pcl5c.patch 552 RMD160 8f6828824244e387418c2d467be63b2c9131e84a SHA1 4d6174bc075560b6ae49bc246a4ff8d55da21217 SHA256 5636e9d32d6bcc71ea358426d1723a0e57080ae5be0e65d597f1d1764eb5728e
-AUX hplip-3.11.12-fast-pp.patch 22850 RMD160 048ccbc67a5baa669694d05db8bf3a9822050405 SHA1 5f48cc43ee69362a4817ac6684253c56bcbb55e6 SHA256 ee827c8c18591815d4994fa216778e9efeba1627c927015699c89e0b96ac3dee
+AUX hplip-3.11.12-fast-pp.patch 23727 RMD160 cb819277aa2d86753ab6408b58e17b249d67f35b SHA1 6a64e6a971d8d770e98a170cc6105b937d7eabcd SHA256 66d9b199bf1c4d4234971d6cf08c27b13014c1e027c01ea5b020ffe92a383d11
 AUX hplip-3.11.12-udev-rules.patch 951 RMD160 29947b36f48b2bce89baf44c215ee044ea916711 SHA1 ef9d4b84520d3ddfdb4f300acc125f86fc47fe0f SHA256 9e461b7f6a264434317fcc83bb53c313f5f9c467bdec8c572b49684f6ddfcfa7
 AUX hplip-3.12.2-minimal.patch 1543 RMD160 860e4c19b32c1458b3b80026a3223505982c3c3a SHA1 37f21a6d88d47d7ccb03105cd99442eddafdcc98 SHA256 c1eb3b95bca8806720a476b74bf0a9a34e8856bfc906f9ca9b3d7cb3f3938a00
 AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
@@ -22,12 +22,12 @@ EBUILD hplip-3.11.12-r2.ebuild 7942 RMD160 79686dccbbeb52d91c4b2cdb322a59d4e3f38
 EBUILD hplip-3.11.5.ebuild 7524 RMD160 9796167bb42c741ec7334c92efac174d2b1e3ab0 SHA1 f64c398442fe0ee399ea290afe67d1dec9726265 SHA256 f649c426149b98b1458d4b146718427905c46d3cf4bcf5fe57eb62acbb81dc44
 EBUILD hplip-3.12.2-r1.ebuild 7568 RMD160 60796022764fa723cccaa60db9b43926b02e3878 SHA1 7c4dff075adb717af5946d5c022f582b8d7c4417 SHA256 c388ae5e2c57fe0bc98fc1472d7812800b0ee38cc647bce980141185bd5d0aca
 EBUILD hplip-3.12.2.ebuild 7823 RMD160 3301e2f85b69a1ac4102a47a4298af6b77dab396 SHA1 4d327c0895fb7064912144296c59cdd38032ef0e SHA256 d927a6bcc29eacdf4ccbedd729b30806a371731119931e6d1d049acf47826814
-MISC ChangeLog 36971 RMD160 c1038d6811e6f500bce4ae7d80ab3f5c33794262 SHA1 9f023192c473b3171a8e5a054c48cf1506e1fc1d SHA256 feef380229bfb126b7aed0c557b7028558a90295822ecad8b8a4d2a6412b7987
+MISC ChangeLog 37092 RMD160 d1aaf0a19bf7851d21ccb24102a32e848bf1fb35 SHA1 5e0918236ccd2426e6bafa916252ff3ea46fbb0d SHA256 d63796c2bac609fb6377449b9aff67b9a20bc45170a0efca485d6fa252d6e1cf
 MISC metadata.xml 1806 RMD160 e707e0dfafb5138991bd381897b2cfdc101592e6 SHA1 7b62985602d07602626bc27078eec3744935cb29 SHA256 351d1d208236544a9a693902bcbcf16e32640f9e049ea0b2326dc1f1a13ad8bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk89Wn4ACgkQlcuUeyFa0U39gQCfW3/yo/uVGBbqOYBTWTr2R9t1
-RwYAoMDYrQGK7uKvI7cUedtI2IRalZuH
-=Y3ZB
+iEYEAREIAAYFAk9D30YACgkQlcuUeyFa0U0gCQCgzF5AVc/o7GvBD2iNtrRPJkDa
+7g8AoNliVjGwHoTvFI2qyAc1M4sCmhUD
+=6c1d
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/files/hplip-3.11.12-fast-pp.patch b/net-print/hplip/files/hplip-3.11.12-fast-pp.patch
index 7eaa9cd855b6..95170e9f514b 100644
--- a/net-print/hplip/files/hplip-3.11.12-fast-pp.patch
+++ b/net-print/hplip/files/hplip-3.11.12-fast-pp.patch
@@ -1,6 +1,40 @@
-diff -Naur hplip-3.12.2-orig/io/hpmud/pp.c hplip-3.12.2/io/hpmud/pp.c
---- hplip-3.12.2-orig/io/hpmud/pp.c	2012-02-01 12:53:52.000000000 +0100
-+++ hplip-3.12.2/io/hpmud/pp.c	2012-02-08 20:04:14.559884716 +0100
+Speed up HPLIP's parallel port I/O
+
+HPLIP should stop emulating IEE1284 ECP in userspace; that requires so many
+ioctls that it's uncomfortably (and sometimes unusably) slow, even on fast
+systems.  Instead, it should use ppdev read/write calls, working around ppdev
+quirks/bugs as necessary.
+
+Until now, we avoided this because we feared that using ppdev would make us
+susceptible to variations in PC parallel port hardware.  However, it turns out
+that the kernel already addresses that problem: on PCs, the kernel defaults to
+software-emulated ECP, which is exactly what the current HPLIP code does.
+Using the kernel code avoids the massive ioctl overhead, and it makes it
+possible to use hardware-accelerated ECP in those cases where it works.
+
+To apply this patch, 'cd' into the unpacked hplip source directory and run:
+$ patch -p1 <../hplip-fast-pp-v2.patch
+$ libtoolize --force
+$ AUTOMAKE="automake --foreign" autoreconf
+(Remember to use the --enable-pp-build option with ./configure)
+
+Patch by Daniel Gnoutcheff <daniel@gnoutcheff.name>
+Thanks to Daniel Pielmeir for figuring out the autotools bits
+
+diff -ur hplip-3.12.2/configure.in hplip-3.12.2-fast-pp/configure.in
+--- hplip-3.12.2/configure.in	2012-02-01 06:56:29.000000000 -0500
++++ hplip-3.12.2-fast-pp/configure.in	2012-02-20 21:09:45.850744922 -0500
+@@ -222,6 +222,7 @@
+ else
+    AC_MSG_RESULT(no)
+ fi
++AM_CONDITIONAL(PP_BUILD, test x$pp_build = xyes)
+    
+ AC_MSG_CHECKING([for scanner build])
+ AC_ARG_ENABLE(scan_build,
+diff -ur hplip-3.12.2/io/hpmud/pp.c hplip-3.12.2-fast-pp/io/hpmud/pp.c
+--- hplip-3.12.2/io/hpmud/pp.c	2012-02-01 06:53:52.000000000 -0500
++++ hplip-3.12.2-fast-pp/io/hpmud/pp.c	2012-02-20 19:28:27.990747569 -0500
 @@ -28,6 +28,8 @@
  
  #include "hpmud.h"
@@ -784,9 +818,9 @@ diff -Naur hplip-3.12.2-orig/io/hpmud/pp.c hplip-3.12.2/io/hpmud/pp.c
  
        m = IEEE1284_MODE_NIBBLE;
        ioctl(pd->mlc_fd, PPNEGOT, &m);
-diff -Naur hplip-3.12.2-orig/io/hpmud/pp.h hplip-3.12.2/io/hpmud/pp.h
---- hplip-3.12.2-orig/io/hpmud/pp.h	2012-02-01 12:53:52.000000000 +0100
-+++ hplip-3.12.2/io/hpmud/pp.h	2012-02-08 20:04:14.559884716 +0100
+diff -ur hplip-3.12.2/io/hpmud/pp.h hplip-3.12.2-fast-pp/io/hpmud/pp.h
+--- hplip-3.12.2/io/hpmud/pp.h	2012-02-01 06:53:52.000000000 -0500
++++ hplip-3.12.2-fast-pp/io/hpmud/pp.h	2012-02-20 19:28:27.990747569 -0500
 @@ -60,18 +60,11 @@
   *   0 - Strobe *
   * 
@@ -806,27 +840,16 @@ diff -Naur hplip-3.12.2-orig/io/hpmud/pp.h hplip-3.12.2/io/hpmud/pp.h
  
  struct _mud_device;
  struct _mud_channel;
-diff -Naur hplip-3.12.2-orig/Makefile.am hplip-3.12.2/Makefile.am
---- hplip-3.12.2-orig/Makefile.am	2012-02-01 12:53:57.000000000 +0100
-+++ hplip-3.12.2/Makefile.am	2012-02-08 20:04:14.576551703 +0100
-@@ -68,9 +68,9 @@
- 	  io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/musb.h io/hpmud/pml.h io/hpmud/dot4.c \

- 	  io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h

- if NETWORK_BUILD

--libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread -l$(SNMPLIB) -lcrypto

-+libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread -lrt -l$(SNMPLIB) -lcrypto

- else

--libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread

-+libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread -lrt

+diff -ur hplip-3.12.2/Makefile.am hplip-3.12.2-fast-pp/Makefile.am
+--- hplip-3.12.2/Makefile.am	2012-02-01 06:53:57.000000000 -0500
++++ hplip-3.12.2-fast-pp/Makefile.am	2012-02-20 21:26:21.210745149 -0500
+@@ -73,6 +73,9 @@
+ libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread

  endif

  libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"

++if PP_BUILD

++libhpmud_la_LDFLAGS += -lrt

++endif

  

-@@ -87,7 +87,7 @@
- hp_mkuridir = $(bindir)

- hp_mkuri_PROGRAMS = hp-mkuri

- hp_mkuri_SOURCES = io/hpmud/hp-mkuri.c

--hp_mkuri_LDADD = -ldl libhpmud.la

-+hp_mkuri_LDADD = -ldl -lrt libhpmud.la

- hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"

- 

- # hpmud.rules

+ # ip library

+ lib_LTLIBRARIES += libhpip.la