Skip to contentSkip to conversation

Match the bbappend to OE-Core

PATCH New Khem Raj 1 participant 6 messages Oct 15, 2013

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/6 Match the bbappend to OE-Core

---
 .../connman/{connman_1.17.bbappend => connman_1.18.bbappend}              | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta-systemd/oe-core/recipes-connectivity/connman/{connman_1.17.bbappend => connman_1.18.bbappend} (100%)
meta-systemd/oe-core/recipes-connectivity/connman/connman_1.18.bbappend renamed from meta-systemd/oe-core/recipes-connectivity/connman/connman_1.17.bbappend +0 -0
similarity index 100%
rename from meta-systemd/oe-core/recipes-connectivity/connman/connman_1.17.bbappend
rename to meta-systemd/oe-core/recipes-connectivity/connman/connman_1.18.bbappend
Signature · 1 line
1.8.3.2
author
#1 lore raw

PATCH 2/6 libqofono: Use BPN instead of PN in SRC_URI

Makes multilib builds happy as a rule of thumb
never let PN be in SRC_URI

---
 meta-oe/recipes-qt/libqofono/libqofono_0.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-qt/libqofono/libqofono_0.4.bb +1 -1
index 826f646..6af8e5e 100644
@@ -18,7 +18,7 @@ PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg ${PN}-test"
 RRECOMMENDS_${PN} = "${PN}-plugin"
 
 SRC_URI = " \
-    git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \
+    git://github.com/nemomobile/${BPN}.git;branch=${BRANCH} \
 "
 S = "${WORKDIR}/git"
 
Signature · 1 line
1.8.3.2
author
#2 lore raw

PATCH 3/6 libraw1394: add recipe

In reply to Khem Raj

From: Cliff Brake <[email protected]>

Initial recipe created by Khem Raj

---
 meta-oe/recipes-multimedia/libraw1394/libraw1394_2.0.9.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/libraw1394/libraw1394_2.0.9.bb
meta-oe/recipes-multimedia/libraw1394/libraw1394_2.0.9.bb new file +11 -0
new file mode 100644
index 0000000..b0b4a53
@@ -0,0 +1,11 @@
+DESCRIPTION = "base library for low-level IEEE 1394 accesses"
+HOMEPAGE = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394"
+SECTION = "libs"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499"
+
+SRC_URI = "https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.gz"
+SRC_URI[md5sum] = "faf6b18a92075d80e45b603f9a659670"
+SRC_URI[sha256sum] = "f83268b3f5d37e8d42ae9881c099b55839b70ac0af71549be7ef6af2578e809a"
+
+inherit autotools
Signature · 1 line
1.8.3.2
author
#3 lore raw

PATCH 4/6 libdc1394: add recipe

In reply to Khem Raj

From: Cliff Brake <[email protected]>

Initial recipe created by Khem Raj

---
 .../libdc1394/files/install_examples.patch           | 14 ++++++++++++++
 .../recipes-multimedia/libdc1394/libdc1394_git.bb    | 20 ++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100755 meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch
 create mode 100755 meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb
meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch new file +14 -0
new file mode 100755
index 0000000..89133ad
@@ -0,0 +1,14 @@
+Index: libdc1394/examples/Makefile.am
+===================================================================
+--- libdc1394.orig/examples/Makefile.am	2012-06-30 17:50:46.000000000 -0700
++++ libdc1394/examples/Makefile.am	2012-06-30 19:02:13.822646430 -0700
+@@ -36,8 +36,7 @@
+ AM_LDFLAGS = -framework CoreFoundation -framework Carbon
+ endif
+ 
+-noinst_PROGRAMS = $(A)
+-bin_PROGRAMS = $(B)
++bin_PROGRAMS = $(A) $(B)
+ 
+ LDADD = ../dc1394/libdc1394.la
+ 
meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb new file +20 -0
new file mode 100755
index 0000000..87a12bd
@@ -0,0 +1,20 @@
+DESCRIPTION = "Capture and control API for IIDC compliant cameras"
+HOMEPAGE = "http://sourceforge.net/projects/libdc1394/"
+SECTION = "libs"
+LICENSE = "LGPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c848e78d9a4a5cc69906178e4d6fbd64"
+DEPENDS += "libxv virtual/libsdl virtual/libx11 libusb1 libraw1394"
+
+PV = "2.2.1+gitr${SRCPV}"
+
+SRCREV = "b90342933b4b48634b98b73805f47bd25ed5857e"
+
+SRC_URI = "git://git.code.sf.net/p/libdc1394/code;branch=master;protocol=git \
+           file://install_examples.patch \
+          "
+
+S = "${WORKDIR}/git/${PN}"
+
+inherit autotools pkgconfig sdl
+
+EXTRA_OECONF += "--disable-doxygen-doc"
Signature · 1 line
1.8.3.2
author
#4 lore raw

PATCH 5/6 coriander: add recipe

In reply to Khem Raj

From: Cliff Brake <[email protected]>

Initial recipe created by Khem Raj

---
 .../coriander/coriander/cross-compile.patch             | 17 +++++++++++++++++
 .../recipes-multimedia/coriander/coriander_2.0.2.bb     | 15 +++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/coriander/coriander/cross-compile.patch
 create mode 100755 meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb
meta-multimedia/recipes-multimedia/coriander/coriander/cross-compile.patch new file +17 -0
new file mode 100644
index 0000000..49350fe
@@ -0,0 +1,17 @@
+In a cross compile environment adding paths like /usr are not correct.
+With this patch we make it so that its relative to sysroot if the compiler
+defines one.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+Index: a/src/Makefile.am
+===================================================================
+--- a/src/Makefile.am	2013-02-08 22:35:08.000000000 -0800
++++ b/src/Makefile.am	2013-10-13 01:31:38.812869080 -0700
+@@ -33,5 +33,5 @@
+ 	video_encode.c video_encode.h \
+ 	subtitles.c subtitles.h 
+ 
+-coriander_LDADD = -L/usr/X11R6/lib/ @PACKAGE_LIBS@ $(INTLLIBS) $(LIBTIFF_LIBS) $(FTPLIB_LIBS) $(SDLLIB_LIBS) $(LIBDC_LIBS) $(LIBRAW_LIBS) $(XV_LIBS) $(COR_LFS_LDFLAGS) -lgthread-2.0 $(FFMPEG_LIBS) $(X11_LIBS)
++coriander_LDADD = -L=/usr/X11R6/lib/ @PACKAGE_LIBS@ $(INTLLIBS) $(LIBTIFF_LIBS) $(FTPLIB_LIBS) $(SDLLIB_LIBS) $(LIBDC_LIBS) $(LIBRAW_LIBS) $(XV_LIBS) $(COR_LFS_LDFLAGS) -lgthread-2.0 $(FFMPEG_LIBS) $(X11_LIBS)
+ 
meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb new file +15 -0
new file mode 100755
index 0000000..587055d
@@ -0,0 +1,15 @@
+DESCRIPTION = "Control and capture GUI for IIDC compliant cameras"
+HOMEPAGE = "http://damien.douxchamps.net/ieee1394/coriander/"
+SECTION = "applications"
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+DEPENDS = "gtk+ libgnomeui libraw1394 libdc1394 libxv"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${PN}/coriander-2/${PV}/${P}.tar.gz \
+           file://cross-compile.patch \
+          "
+
+SRC_URI[md5sum] = "431d98fb013217681f97ade168201fb8"
+SRC_URI[sha256sum] = "5c7fd31cb58d398e2742352bf1ffbd2ca22e06686c6668ecfd437735c2b79123"
+
+inherit autotools gettext sdl
Signature · 1 line
1.8.3.2
author
#5 lore raw

PATCH 6/6 opencv: Upgrade to latest on 2.4 branch

In reply to Khem Raj
---
 meta-oe/recipes-support/opencv/opencv_2.4.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-support/opencv/opencv_2.4.bb +2 -2
index ccb26e0..9dd9cd0 100644
@@ -9,12 +9,12 @@ ARM_INSTRUCTION_SET = "arm"
 
 DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0"
 
-SRCREV = "6fae07ba8867b8fd2c53344a774aab669afa7c5e"
+SRCREV = "c5afaa4e8dfe507e87531f7688b9cf65c1f701c6"
 SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \
            file://opencv-fix-pkgconfig-generation.patch \
 "
 
-PV = "2.4.3+git${SRCPV}"
+PV = "2.4.6+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
1.8.3.2