gphoto|sane: move some stuff depending on libexif to nonworking.

* once libexif has been fixed, these packages can probably be moved back

16 files changed, 304 insertions, 0 deletions

diff --git a/packages/nonworking/gphoto2/.mtn2git_empty b/packages/nonworking/gphoto2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/gphoto2/.mtn2git_empty
diff --git a/packages/nonworking/gphoto2/gphoto2_2.1.4.bb b/packages/nonworking/gphoto2/gphoto2_2.1.4.bb
new file mode 100644
index 0000000000..80d0ee0f27
--- /dev/null
+++ b/packages/nonworking/gphoto2/gphoto2_2.1.4.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "libgphoto2 popt"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2"
+
+inherit autotools
diff --git a/packages/nonworking/gphoto2/gphoto2_2.1.5.bb b/packages/nonworking/gphoto2/gphoto2_2.1.5.bb
new file mode 100644
index 0000000000..0913b9743c
--- /dev/null
+++ b/packages/nonworking/gphoto2/gphoto2_2.1.5.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "libgphoto2 popt"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz"
+
+inherit autotools
diff --git a/packages/nonworking/gphoto2/gphoto2_2.1.6.bb b/packages/nonworking/gphoto2/gphoto2_2.1.6.bb
new file mode 100644
index 0000000000..63dad91f14
--- /dev/null
+++ b/packages/nonworking/gphoto2/gphoto2_2.1.6.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "libgphoto2 popt"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz"
+
+inherit autotools
diff --git a/packages/nonworking/gphoto2/gphoto2_2.4.0.bb b/packages/nonworking/gphoto2/gphoto2_2.4.0.bb
new file mode 100644
index 0000000000..6bc1a42f9e
--- /dev/null
+++ b/packages/nonworking/gphoto2/gphoto2_2.4.0.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "libgphoto2 popt"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2"
+
+inherit autotools
+
+do_configure_append() {
+        find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+}
+
diff --git a/packages/nonworking/gphoto2/libgphoto2_2.1.4.bb b/packages/nonworking/gphoto2/libgphoto2_2.1.4.bb
new file mode 100644
index 0000000000..fed7c41e40
--- /dev/null
+++ b/packages/nonworking/gphoto2/libgphoto2_2.1.4.bb
@@ -0,0 +1,29 @@
+SECTION = "libs"
+DEPENDS = "jpeg libusb libexif"
+DESCRIPTION = "libgphoto2 allows you to access digital cameras"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2"
+
+EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial"
+LICENSE = "GPL"
+inherit autotools pkgconfig
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}
+	mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true
+	oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR}
+	oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR}
+
+	install -d ${STAGING_LIBDIR}/gphoto2/2.0
+	oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0
+
+        install -d ${STAGING_INCDIR}/gphoto2
+        for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h
+        do
+                install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X
+        done
+        for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h
+        do
+                install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X
+        done
+}
diff --git a/packages/nonworking/gphoto2/libgphoto2_2.1.5.bb b/packages/nonworking/gphoto2/libgphoto2_2.1.5.bb
new file mode 100644
index 0000000000..67efc38785
--- /dev/null
+++ b/packages/nonworking/gphoto2/libgphoto2_2.1.5.bb
@@ -0,0 +1,32 @@
+SECTION = "libs"
+DEPENDS = "jpeg libusb libexif"
+RPEDENDS = "libusb"
+DESCRIPTION = "libgphoto2 allows you to access digital cameras"
+PR = "r3"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz"
+
+EXTRA_OECONF = " --with-drivers=all"
+EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial"
+LICENSE = "GPL"
+inherit autotools pkgconfig
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}
+	mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true
+	oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR}
+	oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR}
+
+	install -d ${STAGING_LIBDIR}/gphoto2/2.0
+	oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0
+
+        install -d ${STAGING_INCDIR}/gphoto2
+        for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h
+        do
+                install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X
+        done
+        for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h
+        do
+                install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X
+        done
+}
diff --git a/packages/nonworking/gphoto2/libgphoto2_2.1.6.bb b/packages/nonworking/gphoto2/libgphoto2_2.1.6.bb
new file mode 100644
index 0000000000..ad57ba8cf1
--- /dev/null
+++ b/packages/nonworking/gphoto2/libgphoto2_2.1.6.bb
@@ -0,0 +1,36 @@
+SECTION = "libs"
+DEPENDS = "jpeg libusb libexif"
+RPEDENDS = "libusb"
+DESCRIPTION = "libgphoto2 allows you to access digital cameras"
+PR = "r6"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz"
+
+EXTRA_OECONF = " --with-drivers=all"
+EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial"
+LICENSE = "GPL"
+inherit autotools pkgconfig
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}
+	mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true
+	oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR}
+	oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR}
+
+	install -d ${STAGING_LIBDIR}/gphoto2/2.0
+	oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0
+
+        install -d ${STAGING_INCDIR}/gphoto2
+        for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h
+        do
+                install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X
+        done
+        for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h
+        do
+                install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X
+        done
+}
+PACKAGES =+ "libgphoto2-camlibs"
+FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/"
+RDEPENDS_libgphoto2 = "libgphoto2-camlibs"
+
diff --git a/packages/nonworking/gphoto2/libgphoto2_2.4.0.bb b/packages/nonworking/gphoto2/libgphoto2_2.4.0.bb
new file mode 100644
index 0000000000..c6f63374cc
--- /dev/null
+++ b/packages/nonworking/gphoto2/libgphoto2_2.4.0.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "libgphoto2 allows you to access digital cameras"
+
+SECTION = "libs"
+LICENSE = "GPL"
+DEPENDS = "libtool jpeg libusb libexif"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2"
+
+inherit autotools pkgconfig lib_package
+
+OE_LT_RPATH_ALLOW=":${libdir}:"
+OE_LT_RPATH_ALLOW[export]="1"
+
+EXTRA_OECONF = " --with-drivers=all"
+
+PACKAGES =+ "libgphotoport libgphoto2-camlibs"
+FILES_libgphoto2-camlibs = "${libdir}/libgphoto2*/*/*.so*"
+RDEPENDS_${PN} = "libgphoto2-camlibs"
+
+FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*" 
+
+FILES_${PN} += "${libdir}/udev/*"
+FILES_${PN}-dbg += "${libdir}/*/*/.debug"
+
+do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/nonworking/sane/.mtn2git_empty b/packages/nonworking/sane/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/sane/.mtn2git_empty
diff --git a/packages/nonworking/sane/sane-backends-1.0.17/.mtn2git_empty b/packages/nonworking/sane/sane-backends-1.0.17/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/sane/sane-backends-1.0.17/.mtn2git_empty
diff --git a/packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch b/packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch
new file mode 100644
index 0000000000..d73a2f0fb5
--- /dev/null
+++ b/packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch
@@ -0,0 +1,11 @@
+--- 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 \
diff --git a/packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch b/packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch
new file mode 100644
index 0000000000..f6920c6e22
--- /dev/null
+++ b/packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch
@@ -0,0 +1,52 @@
+--- 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 {
+ 
diff --git a/packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd b/packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd
new file mode 100644
index 0000000000..f4e890fdbe
--- /dev/null
+++ b/packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd
@@ -0,0 +1,10 @@
+service sane-port
+{
+	socket_type = stream
+	server = /usr/sbin/saned
+	protocol = tcp
+	user = nobody
+	group = nogroup
+	wait = no
+	disable = no
+}
diff --git a/packages/nonworking/sane/sane-backends_1.0.17.bb b/packages/nonworking/sane/sane-backends_1.0.17.bb
new file mode 100644
index 0000000000..4854f4d10c
--- /dev/null
+++ b/packages/nonworking/sane/sane-backends_1.0.17.bb
@@ -0,0 +1,42 @@
+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    
+}
+
+
+
diff --git a/packages/nonworking/sane/sane-frontends_1.0.13.bb b/packages/nonworking/sane/sane-frontends_1.0.13.bb
new file mode 100644
index 0000000000..f79cf9e508
--- /dev/null
+++ b/packages/nonworking/sane/sane-frontends_1.0.13.bb
@@ -0,0 +1,20 @@
+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"
+
+