ucview: Fix compiling and move patches around

diff --git a/packages/unicap/files/cross.patch b/packages/unicap/files/cross.patch
new file mode 100644 (file)
index 0000000..b8d01f2
--- /dev/null
+++ b/packages/unicap/files/cross.patch
@@ -0,0 +1,12 @@
+--- ucview-0.22/src/Makefile.am~       2008-12-09 18:05:26.000000000 +0100
++++ ucview-0.22/src/Makefile.am        2008-12-09 18:05:26.000000000 +0100
+@@ -11,8 +11,7 @@
+ 
+ 
+ INCLUDES = \
+-      -I$(top_srcdir) \
+-      -I$(includedir)
++      -I$(top_srcdir)
+ 
+ 
+ BUILT_SOURCES = $(ucview_dbus_built_sources)

diff --git a/packages/unicap/unicap-0.9.3/pkgconfig.patch b/packages/unicap/files/pkgconfig.patch
similarity index 100%
rename from packages/unicap/unicap-0.9.3/pkgconfig.patch
rename to packages/unicap/files/pkgconfig.patch

diff --git a/packages/unicap/ucview_0.22.bb b/packages/unicap/ucview_0.22.bb
index dde8fd1..e1f22b4 100644 (file)
--- a/packages/unicap/ucview_0.22.bb
+++ b/packages/unicap/ucview_0.22.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "Simple camera capture GUI based on unicap."
 SECTION = "graphics"
 LICENSE = "GPL"
 DEPENDS = "intltool-native gtk+ libpng unicap gconf libglade gdk-pixbuf-csource-native"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://www.unicap-imaging.org/downloads/${P}.tar.gz"
+SRC_URI = "http://www.unicap-imaging.org/downloads/${P}.tar.gz \
+           file://cross.patch;patch=1"
 
 inherit autotools pkgconfig