summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-10-22 13:14:50 +0200
committerKoen Kooi <koen@openembedded.org>2008-10-22 13:14:50 +0200
commit4cd19c0dc67b9ef3abf32430f6d370d4d07a29c5 (patch)
treecf481b78dd332b25d044ddcce37eb31825c0b282
parenta1825f04c3b8b98a66ae402e99fd40ff2be59c82 (diff)
parentb5a531d6dea1892de33245958ca362762b1574d1 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
-rw-r--r--packages/fswebcam/fswebcam_20070108.bb10
-rw-r--r--packages/unicap/unicap_0.9.3.bb6
2 files changed, 13 insertions, 3 deletions
diff --git a/packages/fswebcam/fswebcam_20070108.bb b/packages/fswebcam/fswebcam_20070108.bb
new file mode 100644
index 0000000000..e24dbf3533
--- /dev/null
+++ b/packages/fswebcam/fswebcam_20070108.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Webcam imaage grabber and manipulation application."
+SECTION = "graphics"
+DEPENDS = "gd"
+LICENSE = "GPL"
+
+PR = "r0"
+
+inherit autotools
+
+SRC_URI = "http://www.firestorm.cx/fswebcam/files/${P}.tar.gz"
diff --git a/packages/unicap/unicap_0.9.3.bb b/packages/unicap/unicap_0.9.3.bb
index c527c80819..dcc0897aa8 100644
--- a/packages/unicap/unicap_0.9.3.bb
+++ b/packages/unicap/unicap_0.9.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A uniform interface to video capture devices."
SECTION = "graphics"
LICENSE = "GPL"
DEPENDS = "intltool-native gtk+ libpng libxv"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.unicap-imaging.org/downloads/unicap-${PV}.tar.gz \
file://pkgconfig.patch;patch=1"
@@ -13,10 +13,10 @@ do_stage () {
autotools_stage_all
}
-PACKAGES += "libucil libunicapgtk"
+PACKAGES += "libucil unicapgtk"
FILES_${PN} = "${libdir}/libunicap.*so.* ${libdir}/unicap2/cpi/lib*.*so.*"
FILES_${PN}-dev += " ${libdir}/unicap2/cpi/lib*.*so ${libdir}/unicap2/cpi/lib*.*a"
FILES_${PN}-dbg += " ${libdir}/unicap2/cpi/.debug"
FILES_libucil = "${libdir}/libucil*so.*"
-FILES_libunicapgtk = "${libdir}/libunicapgtk*so.*"
+FILES_unicapgtk = "${libdir}/libunicapgtk*so.*"