summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2008-12-16 11:50:03 +0100
committerFlorian Boor <florian.boor@kernelconcepts.de>2009-01-06 21:38:52 +0100
commited1e1b42c0a348ed90ca1a5b3a55532af8e6232f (patch)
treeb10f43ff9dd7b8d98a3161ce858132f3eafd90c5
parent0e2f59b4fc441fb186233219162b7a25fc5a8ed9 (diff)
ucview: Fix compiling and move patches around
-rw-r--r--packages/unicap/files/cross.patch12
-rw-r--r--packages/unicap/files/pkgconfig.patch (renamed from packages/unicap/unicap-0.9.3/pkgconfig.patch)0
-rw-r--r--packages/unicap/ucview_0.22.bb5
3 files changed, 15 insertions, 2 deletions
diff --git a/packages/unicap/files/cross.patch b/packages/unicap/files/cross.patch
new file mode 100644
index 0000000000..b8d01f2095
--- /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
index ce5ac2085f..ce5ac2085f 100644
--- a/packages/unicap/unicap-0.9.3/pkgconfig.patch
+++ b/packages/unicap/files/pkgconfig.patch
diff --git a/packages/unicap/ucview_0.22.bb b/packages/unicap/ucview_0.22.bb
index dde8fd1be5..e1f22b48c1 100644
--- 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