From 3a164d92bc6786797838fa6d9338d2c56c0cd809 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 26 Aug 2007 11:39:55 +0000 Subject: sane-backends: fix packaging and staging --- packages/sane-backends/sane-backends_1.0.17.bb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/sane-backends/sane-backends_1.0.17.bb b/packages/sane-backends/sane-backends_1.0.17.bb index b4ef25486a..4854f4d10c 100644 --- a/packages/sane-backends/sane-backends_1.0.17.bb +++ b/packages/sane-backends/sane-backends_1.0.17.bb @@ -2,14 +2,14 @@ DESCRIPTION = "Scanner drivers for SANE" DEPENDS = "gphoto2 jpeg libusb" LICENSE = "LGPL" -PR = "r0" +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 +inherit autotools pkgconfig binconfig EXTRA_OECONF = "--disable-translations" @@ -26,7 +26,7 @@ RRECOMMENDS_libsane = "saned sane-utils" FILES_libsane-dev += "${libdir}/sane/*" RRECOMMENDS_saned = "xinetd" -FILES_saned = "i${sbindir}/saned" +FILES_saned = "${sbindir}/saned" FILES_sane-utils = "${bindir}/*" FILES_${PN}-dbg += "${libdir}/sane/.debug" @@ -34,3 +34,9 @@ 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 +} + + + -- cgit v1.2.3 From b12d8562d0e3ee4eed936e2ee15a6be3c54efcbe Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 26 Aug 2007 11:46:55 +0000 Subject: sane-frontends: add 1.0.13 --- packages/sane-backends/.mtn2git_empty | 0 .../sane-backends-1.0.17/.mtn2git_empty | 0 .../sane-backends-1.0.17/Makefile.in.patch | 11 ----- .../sane-backends-1.0.17/sane-plustek.patch | 52 ---------------------- .../sane-backends-1.0.17/saned.xinetd | 10 ----- packages/sane-backends/sane-backends_1.0.17.bb | 42 ----------------- packages/sane/.mtn2git_empty | 0 packages/sane/sane-backends-1.0.17/.mtn2git_empty | 0 .../sane/sane-backends-1.0.17/Makefile.in.patch | 11 +++++ .../sane/sane-backends-1.0.17/sane-plustek.patch | 52 ++++++++++++++++++++++ packages/sane/sane-backends-1.0.17/saned.xinetd | 10 +++++ packages/sane/sane-backends_1.0.17.bb | 42 +++++++++++++++++ packages/sane/sane-frontends_1.0.13.bb | 20 +++++++++ 13 files changed, 135 insertions(+), 115 deletions(-) delete mode 100644 packages/sane-backends/.mtn2git_empty delete mode 100644 packages/sane-backends/sane-backends-1.0.17/.mtn2git_empty delete mode 100644 packages/sane-backends/sane-backends-1.0.17/Makefile.in.patch delete mode 100644 packages/sane-backends/sane-backends-1.0.17/sane-plustek.patch delete mode 100644 packages/sane-backends/sane-backends-1.0.17/saned.xinetd delete mode 100644 packages/sane-backends/sane-backends_1.0.17.bb create mode 100644 packages/sane/.mtn2git_empty create mode 100644 packages/sane/sane-backends-1.0.17/.mtn2git_empty create mode 100644 packages/sane/sane-backends-1.0.17/Makefile.in.patch create mode 100644 packages/sane/sane-backends-1.0.17/sane-plustek.patch create mode 100644 packages/sane/sane-backends-1.0.17/saned.xinetd create mode 100644 packages/sane/sane-backends_1.0.17.bb create mode 100644 packages/sane/sane-frontends_1.0.13.bb diff --git a/packages/sane-backends/.mtn2git_empty b/packages/sane-backends/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/sane-backends/sane-backends-1.0.17/.mtn2git_empty b/packages/sane-backends/sane-backends-1.0.17/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/sane-backends/sane-backends-1.0.17/Makefile.in.patch b/packages/sane-backends/sane-backends-1.0.17/Makefile.in.patch deleted file mode 100644 index d73a2f0fb5..0000000000 --- a/packages/sane-backends/sane-backends-1.0.17/Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/sane-backends/sane-backends-1.0.17/sane-plustek.patch b/packages/sane-backends/sane-backends-1.0.17/sane-plustek.patch deleted file mode 100644 index f6920c6e22..0000000000 --- a/packages/sane-backends/sane-backends-1.0.17/sane-plustek.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- 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/sane-backends/sane-backends-1.0.17/saned.xinetd b/packages/sane-backends/sane-backends-1.0.17/saned.xinetd deleted file mode 100644 index f4e890fdbe..0000000000 --- a/packages/sane-backends/sane-backends-1.0.17/saned.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service sane-port -{ - socket_type = stream - server = /usr/sbin/saned - protocol = tcp - user = nobody - group = nogroup - wait = no - disable = no -} diff --git a/packages/sane-backends/sane-backends_1.0.17.bb b/packages/sane-backends/sane-backends_1.0.17.bb deleted file mode 100644 index 4854f4d10c..0000000000 --- a/packages/sane-backends/sane-backends_1.0.17.bb +++ /dev/null @@ -1,42 +0,0 @@ -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/sane/.mtn2git_empty b/packages/sane/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sane/sane-backends-1.0.17/.mtn2git_empty b/packages/sane/sane-backends-1.0.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sane/sane-backends-1.0.17/Makefile.in.patch b/packages/sane/sane-backends-1.0.17/Makefile.in.patch new file mode 100644 index 0000000000..d73a2f0fb5 --- /dev/null +++ b/packages/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/sane/sane-backends-1.0.17/sane-plustek.patch b/packages/sane/sane-backends-1.0.17/sane-plustek.patch new file mode 100644 index 0000000000..f6920c6e22 --- /dev/null +++ b/packages/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/sane/sane-backends-1.0.17/saned.xinetd b/packages/sane/sane-backends-1.0.17/saned.xinetd new file mode 100644 index 0000000000..f4e890fdbe --- /dev/null +++ b/packages/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/sane/sane-backends_1.0.17.bb b/packages/sane/sane-backends_1.0.17.bb new file mode 100644 index 0000000000..4854f4d10c --- /dev/null +++ b/packages/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/sane/sane-frontends_1.0.13.bb b/packages/sane/sane-frontends_1.0.13.bb new file mode 100644 index 0000000000..f79cf9e508 --- /dev/null +++ b/packages/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" + + -- cgit v1.2.3