Today I merged last few changes directly to oe.dev branch, cleaned srcpv
branch a bit. Here is remaining stuff nobody is willing to push to
oe.dev (it was hanging in our patchwork for few months already)
and will die with shr branch change.
I'll start building localy directly from oe.dev branch directly with whole
srcpv branch in one patch, maybe we can start clean shr/unstable branch like
that? And then merge shr/unstable when SRPV is enabled for git in
oe.dev?
BTW: can someone apply that Esperanto translation from Michael Moroni,
or is it applied already? To make patchwork clean again :).
--
uin:136542059 jid:[email protected]
Jansa Martin sip:[email protected]
JaMa
diff --git a/recipes/blktool/blktool_4.bb b/recipes/blktool/blktool_4.bb
index e658e32..8375f4d 100644
--- a/recipes/blktool/blktool_4.bb
+++ b/recipes/blktool/blktool_4.bb
@@ -1,8 +1,11 @@
DESCRIPTION = "Display or change block device settings"
LICENSE = "GPLv2"
+DEPENDS = "glib-2.0"
+PR = "r2"
+
SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz"
S = "${WORKDIR}/${PN}-${PV}.orig"
-inherit autotools
\ No newline at end of file
+inherit pkgconfig autotools
diff --git a/recipes/efl1/emotion_svn.bb b/recipes/efl1/emotion_svn.bb
index c5733be..ce0d2c4 100644
--- a/recipes/efl1/emotion_svn.bb
+++ b/recipes/efl1/emotion_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT BSD"
# we no longer build the libxine backend, since the gstreamer backend seems
more promising
DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
PV = "0.1.0.042+svnr${SRCPV}"
-PR = "r4"
+PR = "r5"
inherit efl
@@ -12,3 +12,7 @@ EXTRA_OECONF = "--disable-xine --enable-gstreamer
--with-edje-cc=${STAGING_BINDI
PACKAGES =+ "emotion-backend-gstreamer"
FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so"
RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
+
+do_compile_append() {
+ sed -i
"s/${@"${PKG_CONFIG_SYSROOT_DIR}".replace('/','\/')}\/usr\/local\/lib/\$\{libdir\}/"
${S}/emotion.pc
+}
diff --git a/recipes/efl1/libefso_svn.bb b/recipes/efl1/libefso_svn.bb
index d9bc651..14b6d9f 100644
--- a/recipes/efl1/libefso_svn.bb
+++ b/recipes/efl1/libefso_svn.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "EFL FSO wrapper library"
SECTION = "e/libs"
LICENSE = "GPLv2"
-DEPENDS = "ecore edbus"
+DEPENDS = "ecore edbus efreet"
PV = "0.0.1+svnr${SRCPV}"
SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=libefso"
diff --git a/recipes/fbreader/fbreader_0.8.2a.bb
b/recipes/fbreader/fbreader_0.8.2a.bb
index 7d6a2b0..490d8b5 100644
--- a/recipes/fbreader/fbreader_0.8.2a.bb
+++ b/recipes/fbreader/fbreader_0.8.2a.bb
@@ -4,7 +4,7 @@ SECTION = "x11/utils"
PRIORITY = "optional"
LICENSE = "GPLv2"
DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv"
-PR = "r5"
+PR = "r6"
# The RESOLUTION is defined at compile time which makes
# this package MACHINE specific.
@@ -23,6 +23,9 @@ SRC_URI_append_akita = "\
SRC_URI_append_htcuniversal = "\
file://zaurus-VGA.patch;patch=1"
+# Workaround QA issue
+TARGET_CC_ARCH += "${LDFLAGS}"
+
# Set the defaults
READER_RESOLUTION = "240x320"
READER_ARCH = "openzaurus"
diff --git a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index 8baffd2..d746177 100644
--- a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
CONFLICTS = "ipkg-link"
RDEPENDS = "python"
SRCDATE = "20050404"
-PR = "r23"
+PR = "r24"
SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
file://ipkg-utils-fix.patch;patch=1 \
@@ -19,6 +19,9 @@ SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
S = "${WORKDIR}/ipkg-utils"
+# Workaround QA issue
+TARGET_CC_ARCH += "${LDFLAGS}"
+
INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions
ipkg-upload ipkg-make-index ipkg-link ipkg.py ipkg-list-fields"
do_compile() {
diff --git a/recipes/libmikmod/libmikmod_3.2.0-beta2.bb
b/recipes/libmikmod/libmikmod_3.2.0-beta2.bb
index 07e3af9..4124d58 100644
--- a/recipes/libmikmod/libmikmod_3.2.0-beta2.bb
+++ b/recipes/libmikmod/libmikmod_3.2.0-beta2.bb
@@ -3,6 +3,8 @@ SECTION = "libs"
PRIORITY = "optional"
LICENSE = "LGPL"
+PR = "r1"
+
DEFAULT_PREFERENCE = "-1"
SRC_URI = "\
@@ -24,6 +26,10 @@ EXTRA_OECONF = "\
--enable-threads \
"
+# Workaround QA issue
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+
do_stage() {
oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR}
install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/
diff --git a/recipes/matchbox2/matchbox-panel-2_svn.bb
b/recipes/matchbox2/matchbox-panel-2_svn.bb
index a2a807f..ae3b122 100644
--- a/recipes/matchbox2/matchbox-panel-2_svn.bb
+++ b/recipes/matchbox2/matchbox-panel-2_svn.bb
@@ -7,7 +7,7 @@ DEPENDS += " $...@base_contains("MACHINE_FEATURES", "apm",
"apmd", "",d)}"
RDEPENDS_${PN} = "matchbox-panel-2-icon-theme"
PACKAGE_ARCH = "${MACHINE_ARCH}"
PV = "2.0+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
inherit autotools_stage pkgconfig
@@ -19,6 +19,8 @@ SRC_URI =
"svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
"
S = "${WORKDIR}/${PN}"
+TARGET_CFLAGS += "-Wno-error"
+
EXTRA_OECONF = "--disable-static --program-transform-name='s/$/-2/'"
EXTRA_OECONF += " $...@base_contains("MACHINE_FEATURES", "acpi",
"--with-battery=acpi", "",d)}"
EXTRA_OECONF += " $...@base_contains("MACHINE_FEATURES", "apm",
"--with-battery=apm", "",d)}"
diff --git a/recipes/pingus/pingus_0.7.2.bb b/recipes/pingus/pingus_0.7.2.bb
index 10f99ba..7ece33c 100644
--- a/recipes/pingus/pingus_0.7.2.bb
+++ b/recipes/pingus/pingus_0.7.2.bb
@@ -7,6 +7,9 @@ PR = "r2"
ARM_INSTRUCTION_SET = "arm"
+# Workaround QA issue
+TARGET_CC_ARCH += "${LDFLAGS}"
+
inherit scons
SRC_URI = "\
_______________________________________________
Shr-devel mailing list
[email protected]
http://lists.shr-project.org/mailman/listinfo/shr-devel
