[oe-commits] org.oe.dev merge of 'b2043e7a059106dce11b80a41022ab9a738027e4'

Wed Aug 22 19:26:07 UTC 2007

merge of 'b2043e7a059106dce11b80a41022ab9a738027e4'
     and 'f45f0798cde6df6f34666e284a5ebf02d788477a'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: f2109f0b5423893b09743e0a086dd3e86b7e57cb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f2109f0b5423893b09743e0a086dd3e86b7e57cb
Files:
1
conf/distro/include/sane-srcdates.inc
packages/sane-backends/sane-backends-1.0.15
packages/sane-backends/sane-backends-1.0.17
packages/sane-backends/sane-backends_1.0.15.bb
packages/sane-backends/sane-backends_1.0.17.bb
packages/gphoto2/gphoto2_2.4.0.bb
packages/libgphoto2/libgphoto2_2.4.0.bb
Diffs:

#
# mt diff -rb2043e7a059106dce11b80a41022ab9a738027e4 -rf2109f0b5423893b09743e0a086dd3e86b7e57cb
#
# 
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [f1ab446a8fd03f4c3c21fe929989805983c34b8d]
#    to [8f2a2257e9cf41af47a20315e5688da7a65871dd]
# 
============================================================

--- conf/distro/include/sane-srcdates.inc	f1ab446a8fd03f4c3c21fe929989805983c34b8d
+++ conf/distro/include/sane-srcdates.inc	8f2a2257e9cf41af47a20315e5688da7a65871dd
@@ -136,7 +136,7 @@ SRCDATE_python-cairo ?= "20060814"
 SRCDATE_portaudio ?= "20060814"
 SRCDATE_putty ?= "20060814"
 SRCDATE_python-cairo ?= "20060814"
-SRCDATE_qemu-native ?= "20060723"
+SRCDATE_qemu-native ?= "20070613"
 SRCDATE_roadster ?= "20060814"
 SRCDATE_sctzap ?= "20060814"
 SRCDATE_tslib ?= "20051101"


#
# mt diff -rf45f0798cde6df6f34666e284a5ebf02d788477a -rf2109f0b5423893b09743e0a086dd3e86b7e57cb
#
# 
# 
# rename "packages/sane-backends/sane-backends-1.0.15"
#     to "packages/sane-backends/sane-backends-1.0.17"
# 
# rename "packages/sane-backends/sane-backends_1.0.15.bb"
#     to "packages/sane-backends/sane-backends_1.0.17.bb"
# 
# add_file "packages/gphoto2/gphoto2_2.4.0.bb"
#  content [cd3e313d727b48a81b5b3d9736604d8e8c5f99a6]
# 
# add_file "packages/libgphoto2/libgphoto2_2.4.0.bb"
#  content [63b6ff882613dcebc4d9b12e6b17ce72b5fc7f90]
# 
# patch "packages/sane-backends/sane-backends_1.0.17.bb"
#  from [aa0a2542dc9d35bf8b826559e78b4fd36110413c]
#    to [07b6cc439e8848fef052730e4a858171c6bda4ae]
# 
============================================================
--- packages/gphoto2/gphoto2_2.4.0.bb	cd3e313d727b48a81b5b3d9736604d8e8c5f99a6
+++ packages/gphoto2/gphoto2_2.4.0.bb	cd3e313d727b48a81b5b3d9736604d8e8c5f99a6
@@ -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}:'
+}
+
============================================================
--- packages/libgphoto2/libgphoto2_2.4.0.bb	63b6ff882613dcebc4d9b12e6b17ce72b5fc7f90
+++ packages/libgphoto2/libgphoto2_2.4.0.bb	63b6ff882613dcebc4d9b12e6b17ce72b5fc7f90
@@ -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
+}
+
+
============================================================
--- packages/sane-backends/sane-backends_1.0.15.bb	aa0a2542dc9d35bf8b826559e78b4fd36110413c
+++ packages/sane-backends/sane-backends_1.0.17.bb	07b6cc439e8848fef052730e4a858171c6bda4ae
@@ -1,17 +1,17 @@ DESCRIPTION = "Scanner drivers for SANE"
 DESCRIPTION = "Scanner drivers for SANE"
-PR = "r4"
 DEPENDS = "gphoto2 jpeg libusb"
 LICENSE = "LGPL"
 
+PR = "r0"
+
 SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \
-	file://sane-plustek.patch;patch=1 \
 	file://Makefile.in.patch;patch=1 \
 	file://saned.xinetd \
 	"
 
-EXTRA_OECONF = "--disable-translations"
+inherit autotools
 
-inherit autotools
+EXTRA_OECONF = "--disable-translations"
 
 do_install_append() {
 	install -d "${D}/${sysconfdir}/xinetd.d"
@@ -19,19 +19,18 @@ do_install_append() {
 	install -m 644 "${WORKDIR}/saned.xinetd" "${D}/${sysconfdir}/xinetd.d/saned"
 }
 
-PACKAGES = "libsane saned sane-utils"
+PACKAGES =+ "libsane libsane-dev saned sane-utils"
 
-FILES_libsane = "/usr/lib/sane/*.so.* /usr/lib/lib*.so.* /etc"
-PKG_libsane = "libsane"
-RCONFLICTS = "sane-backends"
+FILES_libsane = "${libdir}/sane/*.so.* ${libdir}/lib*.so.* /etc"
 RRECOMMENDS_libsane = "saned sane-utils"
+FILES_libsane-dev += "${libdir}/sane/*"
 
-RDEPENDS_saned = "libsane"
 RRECOMMENDS_saned = "xinetd"
-FILES_saned = "/usr/sbin/saned"
+FILES_saned = "i${sbindir}/saned"
 
-RDEPENDS_sane-utils = "libsane"
-FILES_sane-utils = "/usr/bin"
+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"
 




