+++ /dev/null
---- sane-backends/Makefile.in 2004-05-04 11:44:26.000000000 -0400
-+++ sane-backends-1.0.15/Makefile.in 2005-05-11 12:43:20.870000000 -0400
-@@ -33,7 +33,7 @@
-
- @SET_MAKE@
-
--SUBDIRS = include lib sanei backend frontend tools doc po
-+SUBDIRS = include lib sanei backend frontend tools po
-
- DISTFILES = AUTHORS COPYING ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \
- ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \
+++ /dev/null
---- sane-backends-1.0.15/backend/plustek-usb.h.orig 2005-07-06 00:45:43.000000000 +0200
-+++ sane-backends-1.0.15/backend/plustek-usb.h 2005-07-06 00:47:36.000000000 +0200
-@@ -106,17 +106,20 @@
- #define _PHILO2WORD(x) ((u_short)x->bHi * 256U + x->bLo)
-
- /* useful for RGB-values */
-+#define PACKED8 __attribute__ ((packed,aligned(1)))
-+#define PACKED16 __attribute__ ((packed,aligned(2)))
-+
- typedef struct {
- u_char Red;
- u_char Green;
- u_char Blue;
--} RGBByteDef, *pRGBByteDef;
-+} PACKED8 RGBByteDef, *pRGBByteDef;
-
- typedef struct {
- u_short Red;
- u_short Green;
- u_short Blue;
--} RGBUShortDef, *pRGBUShortDef;
-+} PACKED16 RGBUShortDef, *pRGBUShortDef;
-
- typedef struct {
- u_long Red;
-@@ -126,22 +129,22 @@
-
- typedef struct {
- u_char a_bColor[3];
--} ColorByteDef, *pColorByteDef;
-+} PACKED8 ColorByteDef, *pColorByteDef;
-
- typedef struct {
- u_char bHi;
- u_char bLo;
--} HiLoDef, *pHiLoDef;
-+} PACKED8 HiLoDef, *pHiLoDef;
-
- typedef union {
- HiLoDef HiLo[3];
- u_short Colors[3];
--} ColorWordDef, *pColorWordDef;
-+} PACKED16 ColorWordDef, *pColorWordDef;
-
- typedef union {
- HiLoDef HiLo;
- u_short Mono;
--} MonoWordDef, *pMonoWordDef;
-+} PACKED16 MonoWordDef, *pMonoWordDef;
-
- typedef union {
-
+++ /dev/null
-service sane-port
-{
- socket_type = stream
- server = /usr/sbin/saned
- protocol = tcp
- user = nobody
- group = nogroup
- wait = no
- disable = no
-}
+++ /dev/null
-DESCRIPTION = "Scanner drivers for SANE"
-DEPENDS = "gphoto2 jpeg libusb"
-LICENSE = "LGPL"
-
-PR = "r2"
-
-SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \
- file://Makefile.in.patch;patch=1 \
- file://saned.xinetd \
- "
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--disable-translations"
-
-do_install_append() {
- install -d "${D}/${sysconfdir}/xinetd.d"
- install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}"
- install -m 644 "${WORKDIR}/saned.xinetd" "${D}/${sysconfdir}/xinetd.d/saned"
-}
-
-PACKAGES =+ "libsane libsane-dev saned sane-utils"
-
-FILES_libsane = "${libdir}/sane/*.so.* ${libdir}/lib*.so.* /etc"
-RRECOMMENDS_libsane = "saned sane-utils"
-FILES_libsane-dev += "${libdir}/sane/*"
-
-RRECOMMENDS_saned = "xinetd"
-FILES_saned = "${sbindir}/saned"
-
-FILES_sane-utils = "${bindir}/*"
-FILES_${PN}-dbg += "${libdir}/sane/.debug"
-
-
-CONFFILES_libsane = "${sysconfdir}/sane.d/abaton.conf ${sysconfdir}/sane.d/agfafocus.conf ${sysconfdir}/sane.d/apple.conf ${sysconfdir}/sane.d/artec.conf ${sysconfdir}/sane.d/avision.conf ${sysconfdir}/sane.d/bh.conf ${sysconfdir}/sane.d/canon.conf ${sysconfdir}/sane.d/canon630u.conf ${sysconfdir}/sane.d/coolscan.conf ${sysconfdir}/sane.d/coolscan2.conf ${sysconfdir}/sane.d/dc25.conf ${sysconfdir}/sane.d/dmc.conf ${sysconfdir}/sane.d/epson.conf ${sysconfdir}/sane.d/fujitsu.conf ${sysconfdir}/sane.d/gt68xx.conf ${sysconfdir}/sane.d/hp.conf ${sysconfdir}/sane.d/leo.conf ${sysconfdir}/sane.d/matsushita.conf ${sysconfdir}/sane.d/microtek.conf ${sysconfdir}/sane.d/microtek2.conf ${sysconfdir}/sane.d/mustek.conf ${sysconfdir}/sane.d/mustek_usb.conf ${sysconfdir}/sane.d/nec.conf ${sysconfdir}/sane.d/pie.conf ${sysconfdir}/sane.d/plustek.conf ${sysconfdir}/sane.d/plustek_pp.conf ${sysconfdir}/sane.d/ricoh.conf ${sysconfdir}/sane.d/s9036.conf ${sysconfdir}/sane.d/sceptre.conf ${sysconfdir}/sane.d/sharp.conf ${sysconfdir}/sane.d/sp15c.conf ${sysconfdir}/sane.d/st400.conf ${sysconfdir}/sane.d/tamarack.conf ${sysconfdir}/sane.d/test.conf ${sysconfdir}/sane.d/teco1.conf ${sysconfdir}/sane.d/teco2.conf ${sysconfdir}/sane.d/teco3.conf ${sysconfdir}/sane.d/umax.conf ${sysconfdir}/sane.d/umax_pp.conf ${sysconfdir}/sane.d/umax1220u.conf ${sysconfdir}/sane.d/artec_eplus48u.conf ${sysconfdir}/sane.d/ma1509.conf ${sysconfdir}/sane.d/ibm.conf ${sysconfdir}/sane.d/hp5400.conf ${sysconfdir}/sane.d/u12.conf ${sysconfdir}/sane.d/snapscan.conf ${sysconfdir}/sane.d/dc210.conf ${sysconfdir}/sane.d/dc240.conf ${sysconfdir}/sane.d/gphoto2.conf ${sysconfdir}/sane.d/qcam.conf ${sysconfdir}/sane.d/v4l.conf ${sysconfdir}/sane.d/net.conf ${sysconfdir}/sane.d/dll.conf ${sysconfdir}/sane.d/saned.conf"
-
-do_stage() {
- autotools_stage_all
-}
-
-
-
--- /dev/null
+--- sane-backends/Makefile.in 2004-05-04 11:44:26.000000000 -0400
++++ sane-backends-1.0.15/Makefile.in 2005-05-11 12:43:20.870000000 -0400
+@@ -33,7 +33,7 @@
+
+ @SET_MAKE@
+
+-SUBDIRS = include lib sanei backend frontend tools doc po
++SUBDIRS = include lib sanei backend frontend tools po
+
+ DISTFILES = AUTHORS COPYING ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \
+ ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \
--- /dev/null
+--- sane-backends-1.0.15/backend/plustek-usb.h.orig 2005-07-06 00:45:43.000000000 +0200
++++ sane-backends-1.0.15/backend/plustek-usb.h 2005-07-06 00:47:36.000000000 +0200
+@@ -106,17 +106,20 @@
+ #define _PHILO2WORD(x) ((u_short)x->bHi * 256U + x->bLo)
+
+ /* useful for RGB-values */
++#define PACKED8 __attribute__ ((packed,aligned(1)))
++#define PACKED16 __attribute__ ((packed,aligned(2)))
++
+ typedef struct {
+ u_char Red;
+ u_char Green;
+ u_char Blue;
+-} RGBByteDef, *pRGBByteDef;
++} PACKED8 RGBByteDef, *pRGBByteDef;
+
+ typedef struct {
+ u_short Red;
+ u_short Green;
+ u_short Blue;
+-} RGBUShortDef, *pRGBUShortDef;
++} PACKED16 RGBUShortDef, *pRGBUShortDef;
+
+ typedef struct {
+ u_long Red;
+@@ -126,22 +129,22 @@
+
+ typedef struct {
+ u_char a_bColor[3];
+-} ColorByteDef, *pColorByteDef;
++} PACKED8 ColorByteDef, *pColorByteDef;
+
+ typedef struct {
+ u_char bHi;
+ u_char bLo;
+-} HiLoDef, *pHiLoDef;
++} PACKED8 HiLoDef, *pHiLoDef;
+
+ typedef union {
+ HiLoDef HiLo[3];
+ u_short Colors[3];
+-} ColorWordDef, *pColorWordDef;
++} PACKED16 ColorWordDef, *pColorWordDef;
+
+ typedef union {
+ HiLoDef HiLo;
+ u_short Mono;
+-} MonoWordDef, *pMonoWordDef;
++} PACKED16 MonoWordDef, *pMonoWordDef;
+
+ typedef union {
+
--- /dev/null
+service sane-port
+{
+ socket_type = stream
+ server = /usr/sbin/saned
+ protocol = tcp
+ user = nobody
+ group = nogroup
+ wait = no
+ disable = no
+}
--- /dev/null
+DESCRIPTION = "Scanner drivers for SANE"
+DEPENDS = "gphoto2 jpeg libusb"
+LICENSE = "LGPL"
+
+PR = "r2"
+
+SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \
+ file://Makefile.in.patch;patch=1 \
+ file://saned.xinetd \
+ "
+
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--disable-translations"
+
+do_install_append() {
+ install -d "${D}/${sysconfdir}/xinetd.d"
+ install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}"
+ install -m 644 "${WORKDIR}/saned.xinetd" "${D}/${sysconfdir}/xinetd.d/saned"
+}
+
+PACKAGES =+ "libsane libsane-dev saned sane-utils"
+
+FILES_libsane = "${libdir}/sane/*.so.* ${libdir}/lib*.so.* /etc"
+RRECOMMENDS_libsane = "saned sane-utils"
+FILES_libsane-dev += "${libdir}/sane/*"
+
+RRECOMMENDS_saned = "xinetd"
+FILES_saned = "${sbindir}/saned"
+
+FILES_sane-utils = "${bindir}/*"
+FILES_${PN}-dbg += "${libdir}/sane/.debug"
+
+
+CONFFILES_libsane = "${sysconfdir}/sane.d/abaton.conf ${sysconfdir}/sane.d/agfafocus.conf ${sysconfdir}/sane.d/apple.conf ${sysconfdir}/sane.d/artec.conf ${sysconfdir}/sane.d/avision.conf ${sysconfdir}/sane.d/bh.conf ${sysconfdir}/sane.d/canon.conf ${sysconfdir}/sane.d/canon630u.conf ${sysconfdir}/sane.d/coolscan.conf ${sysconfdir}/sane.d/coolscan2.conf ${sysconfdir}/sane.d/dc25.conf ${sysconfdir}/sane.d/dmc.conf ${sysconfdir}/sane.d/epson.conf ${sysconfdir}/sane.d/fujitsu.conf ${sysconfdir}/sane.d/gt68xx.conf ${sysconfdir}/sane.d/hp.conf ${sysconfdir}/sane.d/leo.conf ${sysconfdir}/sane.d/matsushita.conf ${sysconfdir}/sane.d/microtek.conf ${sysconfdir}/sane.d/microtek2.conf ${sysconfdir}/sane.d/mustek.conf ${sysconfdir}/sane.d/mustek_usb.conf ${sysconfdir}/sane.d/nec.conf ${sysconfdir}/sane.d/pie.conf ${sysconfdir}/sane.d/plustek.conf ${sysconfdir}/sane.d/plustek_pp.conf ${sysconfdir}/sane.d/ricoh.conf ${sysconfdir}/sane.d/s9036.conf ${sysconfdir}/sane.d/sceptre.conf ${sysconfdir}/sane.d/sharp.conf ${sysconfdir}/sane.d/sp15c.conf ${sysconfdir}/sane.d/st400.conf ${sysconfdir}/sane.d/tamarack.conf ${sysconfdir}/sane.d/test.conf ${sysconfdir}/sane.d/teco1.conf ${sysconfdir}/sane.d/teco2.conf ${sysconfdir}/sane.d/teco3.conf ${sysconfdir}/sane.d/umax.conf ${sysconfdir}/sane.d/umax_pp.conf ${sysconfdir}/sane.d/umax1220u.conf ${sysconfdir}/sane.d/artec_eplus48u.conf ${sysconfdir}/sane.d/ma1509.conf ${sysconfdir}/sane.d/ibm.conf ${sysconfdir}/sane.d/hp5400.conf ${sysconfdir}/sane.d/u12.conf ${sysconfdir}/sane.d/snapscan.conf ${sysconfdir}/sane.d/dc210.conf ${sysconfdir}/sane.d/dc240.conf ${sysconfdir}/sane.d/gphoto2.conf ${sysconfdir}/sane.d/qcam.conf ${sysconfdir}/sane.d/v4l.conf ${sysconfdir}/sane.d/net.conf ${sysconfdir}/sane.d/dll.conf ${sysconfdir}/sane.d/saned.conf"
+
+do_stage() {
+ autotools_stage_all
+}
+
+
+
--- /dev/null
+DESCRIPTION = "Frontends for SANE"
+DEPENDS = "virtual/libx11 gimp sane-backends"
+LICENSE = "LGPL"
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-${PV}/sane-frontends-${PV}.tar.gz \
+ "
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-translations"
+
+PACKAGES =+ "scanadf xcam xscanimage"
+
+FILES_scanadf = "${bindir}/scanadf"
+FILES_xcam = "${bindir}/xcam"
+FILES_xscanimage = "${bindir}/xscanimage ${datadir}/sane"
+
+