EFL upgrade and lightmediascanner

My eve patches were applied upstream, so we can use newer webkit-efl without those patches in OE.

Webkit-efl build depends on fixed fontconfig see
http://patches.openembedded.org/patch/13371/

The following changes since commit 2631ed9f4c987192749960bc7a2209b5f5bbfa78:

epdfview: add initial recipe with version 0.1.8 (2011-10-18 13:47:21 +0200)

are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Martin Jansa (2):
e-base: bump EFL_SRCREV
webkit-efl: upgrade to 1.6.1

pespin (1):
lightmediascanner: Add version 0.4.4 (initial recipe)

 meta-efl/classes/e-base.bbclass                    |    2 +-
 .../webkit/webkit-efl/revert.r78057.patch          |   19 --------------
 meta-efl/recipes-efl/webkit/webkit-efl_svn.bb      |   11 +------
 .../lightmediascanner/lightmediascanner_0.4.4.bb   |   27 ++++++++++++++++++++
 4 files changed, 30 insertions(+), 29 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/revert.r78057.patch
 create mode 100644 meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb

1.7.7

---
 meta-efl/classes/e-base.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 8eaabd8..ed08105 100644
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
 # usually tracks svn trunk HEAD
-EFL_SRCREV ?= "63721"
+EFL_SRCREV ?= "64150"
 # revision when 1.0.0 was released, for recipes which don't need rebuild so often
 EFL_SRCREV_1.0.0 ?= "56356"
 

1.7.7

* revert.r78057.patch is not needed, because context menus were removed from eve in r59455
* we still need to force ARM mode, only the segfault is different:

| /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-efl-1.6.1+svnr97672-r0/src/Source/JavaScriptCore/heap/HandleTypes.h: In static member function 'static T* JSC::HandleTypes<T>::getFromSlot(JSC::HandleSlot) [with T = JSC::Structure, JSC::HandleTypes<T>::ExternalType = JSC::Structure*, JSC::HandleSlot = JSC::JSValue*]':
| /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-efl-1.6.1+svnr97672-r0/src/Source/JavaScriptCore/heap/Handle.h:126:79:   instantiated from 'JSC::Handle<T>::ExternalType JSC::Handle<T>::get() const [with T = JSC::Structure, JSC::Handle<T>::ExternalType = JSC::Structure*]'
| /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-efl-1.6.1+svnr97672-r0/src/Source/JavaScriptCore/runtime/ScopeChain.h:39:75:   instantiated from here
| /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-efl-1.6.1+svnr97672-r0/src/Source/JavaScriptCore/heap/HandleTypes.h:38:130: warning: cast from 'JSC::JSCell*' to 'JSC::HandleTypes<JSC::Structure>::ExternalType {aka JSC::Structure*}' increases required alignment of target type [-Wcast-align]
| {standard input}: Assembler messages:
| {standard input}:1116: Error: invalid immediate: 983040 is out of range
| {standard input}:1116: Error: value of 983040 too large for field of 2 bytes at 28
| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.2/as: BFD (GNU Binutils) 2.21.1 assertion fail /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/binutils-cross-2.21.1a-r0/binutils-2.21.1/bfd/elf.c:2819
| arm-oe-linux-gnueabi-g++: internal compiler error: Segmentation fault (program as)
| Please submit a full bug report,
| with preprocessed source if appropriate.
| See <http://gcc.gnu.org/bugs.html> for instructions.
| make[2]: *** [JavaScriptCore/CMakeFiles/javascriptcore_efl.dir/jit/JIT.cpp.o] Error 4
| make[2]: *** Waiting for unfinished jobs....
| {standard input}: Assembler messages:
| {standard input}:2059: Error: invalid immediate: 983040 is out of range
| {standard input}:2059: Error: value of 983040 too large for field of 2 bytes at 28
| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.2/as: BFD (GNU Binutils) 2.21.1 assertion fail /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/binutils-cross-2.21.1a-r0/binutils-2.21.1/bfd/elf.c:2819
| arm-oe-linux-gnueabi-g++: internal compiler error: Segmentation fault (program as)
| Please submit a full bug report,
| with preprocessed source if appropriate.
| See <http://gcc.gnu.org/bugs.html> for instructions.
| make[2]: *** [JavaScriptCore/CMakeFiles/javascriptcore_efl.dir/jit/JITOpcodes32_64.cpp.o] Error 4
| make[2]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-efl-1.6.1+svnr97672-r0/src/Source'
| make[1]: *** [JavaScriptCore/CMakeFiles/javascriptcore_efl.dir/all] Error 2
| make[1]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-efl-1.6.1+svnr97672-r0/src/Source'

---
 .../webkit/webkit-efl/revert.r78057.patch          |   19 -------------------
 meta-efl/recipes-efl/webkit/webkit-efl_svn.bb      |   11 ++---------
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/revert.r78057.patch

deleted file mode 100644
index 966a977..0000000
@@ -1,19 +0,0 @@
-see https://bugs.webkit.org/show_bug.cgi?id=50762
-fixed by:
-http://trac.webkit.org/changeset/78047/trunk/Source/WebCore/CMakeLists.txt
-fix reverted by:
-http://trac.webkit.org/changeset/78057/trunk/Source/WebCore/CMakeLists.txt
-
-so revert revert as we care about webkit-efl and don't care about WinCE
-
-Index: Source/WebCore/CMakeLists.txt
-===================================================================
---- Source/WebCore/CMakeLists.txt	(revision 78042)
-+++ Source/WebCore/CMakeLists.txt	(revision 78047)
-@@ -1157,6 +1157,4 @@
- 
-     platform/Arena.cpp
--    platform/ContextMenu.cpp
--    platform/ContextMenuItem.cpp
-     platform/ContentType.cpp
-     platform/CrossThreadCopier.cpp

index bffded7..9f02a59 100644
@@ -9,27 +9,20 @@ DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
            libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \
            libxml2 pango eina ecore evas edje"
 
-SRCREV = "79192"
-PV = "1.3.11+svnr${SRCPV}"
+SRCREV = "97724"
+PV = "1.6.1+svnr${SRCPV}"
 
 SRCREV_FORMAT = "source"
 
 SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;proto=http;subdir=src \
   svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;proto=http;subdir=src \
-  file://revert.r78057.patch \
  "
 
 S = "${WORKDIR}/src/Source"
 
 inherit cmake lib_package pkgconfig perlnative
 
-# Wants to jump too far for THUMB on armv4t
-# in WebCore::DocTypeStringsHash::doctype_hash_function(char const*, unsigned int)':
-# DocTypeStrings.cpp:(.text._ZN7WebCore18DocTypeStringsHash21doctype_hash_functionEPKcj[WebCore::DocTypeStringsHash::doctype_hash_function(char const*, unsigned int)]+0x12): relocation truncated to fit: R_ARM_THM_CALL against symbol `__gnu_thumb1_case_uhi' defined in .text section in x86_64-linux/usr/armv4t/lib/gcc/arm-oe-linux-gnueabi/4.5.2/libgcc.a(_thumb1_case_uhi.o)
-# the same in WebCore::CSSValueKeywordsHash::value_hash_function(char const*, unsigned int)':
-#             WebCore::CSSPropertyNamesHash::propery_hash_function(char const*, unsigned int)':
-#             WebCore::ColorDataHash::colordata_hash_function(char const*, unsigned int)':
 ARM_INSTRUCTION_SET = "arm"
 
 EXTRA_OECMAKE = "-DPORT=Efl -DSHARED_CORE=ON"

1.7.7

From: pespin <[email protected]>

* Copied from oe-classic <http://git.openembedded.org/openembedded/commit/?id=63d3969b0f839fc4b7bf7fe836daec729d9d3c53>
* Remove PE=1
* Add LIC_FILES_CHKSUM
* Builds fine using SHR distro
* JaMa: removed PR

---
 .../lightmediascanner/lightmediascanner_0.4.4.bb   |   27 ++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)
 create mode 100644 meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb

new file mode 100644
index 0000000..96f4ba8
@@ -0,0 +1,27 @@
+DESCRIPTION = "Lightweight media scanner meant to be used in not-so-powerful devices"
+AUTHOR = "ProFUSION"
+HOMEPAGE = "http://lms.garage.maemo.org/"
+SECTION = "libs/multimedia"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
+DEPENDS = "sqlite3 flac virtual/libiconv"
+
+SRC_URI = "http://git.profusion.mobi/cgit.cgi/lightmediascanner.git/snapshot/release_${PV}.tar.bz2 \
+"
+SRC_URI[md5sum] = "f423376a70f8f321af69b12563b176fe"
+SRC_URI[sha256sum] = "302a7f6cc355467cd20332f4e02c8b87ba6c0c7a6818a6a987e007aace19b41e"
+
+S = "${WORKDIR}/release_${PV}"
+
+inherit autotools pkgconfig
+
+do_install_append() {
+    install -d ${D}/${bindir}/
+    install -m 755 ${S}/src/bin/.libs/test  ${D}/${bindir}/test-lms
+}
+
+PACKAGES =+ "${PN}-test"
+
+FILES_${PN}-test = "${bindir}/test-lms"
+
+FILES_${PN}-dbg += "${libdir}/${PN}/plugins/.debug"

1.7.7

Am Dienstag, den 18.10.2011, 16:10 +0200 schrieb Martin Jansa:

The name is still not correct. Although the Signed-off-by line is. Please correct that.

Was the recipe tested somehow?

[…]

Thanks,

Paul

Thanks for catching that, fixed in jansa/pull branch.

Tested on om-gta02 after building it with SHR and added RDEPENDS_${PN}-test = "glibc-gconv-utf-16" (was also updated in branch after sending pull request)

Also there is trivial patch for enjoy in 4/4:
enjoy: include icon in FILES_${PN}

Regards,

Martin 'JaMa' Jansa     jabber: [email protected]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 18-10-11 18:24, Martin Jansa schreef:

* Remove PE=1

Could you please change that to something like:

RDEPENDS_${PN}_append_libc-glibc " glibc-gconv-utf-16"

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOnav8MkyGM64RGpERAoswAJ9cEsFI3GGwHoy6wwSSxHq3rKFjGgCfR6o6 JheuujpRfaxIxHr6qL3lK30=
=vuU4
-----END PGP SIGNATURE-----

because of eglibc or uclibc?
SHR root@gjama ~ $ opkg info eglibc-gconv-utf-16
Provides: glibc-gconv-utf-16

I'm using eglibc and it worked fine, but I haven't tested with uclibc..

But if I add:
RDEPENDS_${PN}-test_libc-uclibc = ""
then I guess it will fail in runtime like for me without eglibc-gconv-utf-16.

Someone with uclibc please test in runtime?

I'm aware of:
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-August/034467.html
but it says nothing about runtime behavior on uclibc..

Regards,

Martin 'JaMa' Jansa     jabber: [email protected]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 18-10-11 18:51, Martin Jansa schreef:

* Remove PE=1

uclibc, the 'libc-glibc' override is true for both (e)glibc.

but it says nothing about runtime behavior on uclibc..

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOna/EMkyGM64RGpERAmoHAJ9kVzGr8BJkcrAj7PlU6aV1qt24VACcCWsc aSeFLZj+27zq83MWbTOzcno=
=0xpF
-----END PGP SIGNATURE-----

Ah OK,

-RDEPENDS_${PN}-test = "glibc-gconv-utf-16" +RDEPENDS_${PN}-test_append_libc-glibc = "glibc-gconv-utf-16"

tested on nokia900 and done in branch

Regards,

Martin 'JaMa' Jansa     jabber: [email protected]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 18-10-11 19:39, Martin Jansa schreef:

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOndG/MkyGM64RGpERAsasAKCUMgJWC9EAxDVKVJRF3P5k3cC4AQCghk7g 9xAqFKNdmygRhd7vSRq2Yqs=
=ALWc
-----END PGP SIGNATURE-----

Not yet, but I'll add it.. but now it works without fine
Depends: liblightmediascanner0 (>= 0.4.4), libsqlite3-0 (>= 3.7.7.1), glibc-gconv-utf-16, libc6 (>= 2.14)

Martin 'JaMa' Jansa     jabber: [email protected]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 19-10-11 02:04, Martin Jansa schreef:

Applied, thanks! (fontconfig went into oe-core)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOnm2ZMkyGM64RGpERAsILAJ92BtAi/cdxtztTCRKgYvJlaQ42SgCdEqji Wu20of+7MZcL7WEQ2R5Rw6k=
=TTKB
-----END PGP SIGNATURE-----

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 18-10-11 16:10, Martin Jansa schreef:

I'll wait till that goes in, I asked on the OE-core list for an ETA.

regards,

Koen

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOnYr1MkyGM64RGpERAlYAAJ9+hJewnLM3TRk5C/jWmiITOmBLnQCeOtHS gt8mgcxx5B3H6qOjeiyOSbg=
=8FeF
-----END PGP SIGNATURE-----