Skip to contentSkip to conversation

EFL upgrade and small fixes

PATCH New Martin Jansa 1 participant 8 messages Jan 12, 2012

lore
Share & tools
lore
#0 lore raw

cover EFL upgrade and small fixes

The following changes since commit a3d91317a3242cc570f213458dcc9e71519e81c5:

kexec-tools_2.0.2.bbappend: remove, packages are now split in oe-core (2012-01-11 09:28:26 +0100)

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

Martin Jansa (6):
e-base: bump EFL_SRCREV a bit more
edje: add eina to DEPENDS, it depends on eina since r36623
emotion: update LIC_FILES_CHKSUM, COPYING file was cleaned to match
rest of EFL
elementary: package examples to PN-tests
edje: fix packaging of multisense module.so
libav, libvpx, mplayer2: drop work around for gcc-4.6 ICE, no need to
pass -fno-tree-vectorize now

Norman Schleicher (1):
ca-certificates: upgrade to 20111211, old version not available
anymore

 meta-efl/classes/e-base.bbclass                    |    2 +-
 meta-efl/recipes-efl/efl/edje.inc                  |    8 ++++----
 meta-efl/recipes-efl/efl/elementary_svn.bb         |    1 +
 meta-efl/recipes-efl/efl/emotion_svn.bb            |    2 +-
 meta-oe/recipes-multimedia/libav/libav.inc         |    4 ++--
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |    4 ++--
 meta-oe/recipes-multimedia/webm/libvpx.inc         |   15 ++-------------
 ...tes_20111025.bb => ca-certificates_20111211.bb} |    4 ++--
 8 files changed, 15 insertions(+), 25 deletions(-)
 rename meta-oe/recipes-support/ca-certificates/{ca-certificates_20111025.bb => ca-certificates_20111211.bb} (89%)
Signature · 1 line
1.7.8.3
#1 lore raw

PATCH 1/7 e-base: bump EFL_SRCREV a bit more

---
 meta-efl/classes/e-base.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta-efl/classes/e-base.bbclass +1 -1
index 5e3e513..17eddec 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "66238"
+EFL_SRCREV ?= "67071"
 
 ARM_INSTRUCTION_SET = "arm"
Signature · 1 line
1.7.8.3
#2 lore raw

PATCH 2/7 edje: add eina to DEPENDS, it depends on eina since r36623

---
 meta-efl/recipes-efl/efl/edje.inc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta-efl/recipes-efl/efl/edje.inc +3 -3
index 9a62156..743227c 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
-DEPENDS = "lua5.1 eet evas ecore embryo edje-native"
-DEPENDS_virtclass-native = "lua5.1-native evas-native ecore-native eet-native embryo-native"
-DEPENDS_virtclass-nativesdk = "evas-native ecore-native eet-native embryo-native"
+DEPENDS = "lua5.1 eet evas ecore embryo edje-native eina"
+DEPENDS_virtclass-native = "lua5.1-native evas-native ecore-native eet-native embryo-native eina-native"
+DEPENDS_virtclass-nativesdk = "evas-native ecore-native eet-native embryo-native eina-native"
 # GPLv2 because of epp in PN-utils
 LICENSE = "MIT BSD GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c18cc221a14a84b033db27794dc36df8"
Signature · 1 line
1.7.8.3
#3 lore raw

PATCH 3/7 emotion: update LIC_FILES_CHKSUM, COPYING file was cleaned to match rest of EFL

In reply to Martin Jansa
---
 meta-efl/recipes-efl/efl/emotion_svn.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta-efl/recipes-efl/efl/emotion_svn.bb +1 -1
index 8b197df..dd0adf2 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "The Enlightenment multimedia library"
 LICENSE = "MIT BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35"
+LIC_FILES_CHKSUM = "file://COPYING;md5=69f44058245ce5c596d56bb622d5dabd"
 # we no longer build the libxine backend, since the gstreamer backend seems more promising
 DEPENDS = "eet eeze evas ecore edje gstreamer gst-plugins-base"
 PV = "0.2.0+svnr${SRCPV}"
Signature · 1 line
1.7.8.3
#4 lore raw

PATCH 4/7 elementary: package examples to PN-tests

In reply to Martin Jansa
---
 meta-efl/recipes-efl/efl/elementary_svn.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta-efl/recipes-efl/efl/elementary_svn.bb +1 -0
index fd5c911..adca217 100644
@@ -52,6 +52,7 @@ FILES_${PN}-tests = "\
   ${bindir}/elementary* \
   ${datadir}/elementary/images \
   ${datadir}/elementary/objects \
+  ${datadir}/elementary/examples \
   ${datadir}/applications/* \
   ${datadir}/icons/* \
   ${libdir}/elementary/modules/test_entry/* \
Signature · 1 line
1.7.8.3
#5 lore raw

PATCH 5/7 edje: fix packaging of multisense module.so

In reply to Martin Jansa
---
 meta-efl/recipes-efl/efl/edje.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta-efl/recipes-efl/efl/edje.inc +1 -1
index 743227c..026f454 100644
@@ -57,6 +57,6 @@ FILES_${PN}-utils = "\
   ${datadir}/edje/include/edje.inc \
 "
 
-FILES_${PN} += "${libdir}/${PN}/modules/*/*/module.${SOLIBS}"
+FILES_${PN} += "${libdir}/${PN}/modules/*/*/module.so"
 FILES_${PN}-dev += "${libdir}/${PN}/modules/*/*/module.la"
 FILES_${PN}-dbg += "${libdir}/${PN}/modules/*/*/.debug"
Signature · 1 line
1.7.8.3
#6 lore raw

PATCH 6/7 ca-certificates: upgrade to 20111211, old version not available anymore

In reply to Martin Jansa

From: Norman Schleicher <[email protected]>

---
 ...tes_20111025.bb => ca-certificates_20111211.bb} |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/ca-certificates/{ca-certificates_20111025.bb => ca-certificates_20111211.bb} (89%)
meta-oe/recipes-support/ca-certificates/ca-certificates_20111211.bb renamed from meta-oe/recipes-support/ca-certificates/ca-certificates_20111025.bb +2 -2
similarity index 89%
rename from meta-oe/recipes-support/ca-certificates/ca-certificates_20111025.bb
rename to meta-oe/recipes-support/ca-certificates/ca-certificates_20111211.bb
index 10848b4..b79f5b1 100644
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=6275b491c91b57d92ebe11205ebf4dfe
 SRC_URI = "${DEBIAN_MIRROR}/main/c/ca-certificates/ca-certificates_${PV}.tar.gz \
            file://remove-c-rehash.patch"
 
-SRC_URI[md5sum] = "dfd593c9f89e64351aae78b9be588696"
-SRC_URI[sha256sum] = "318bbf0f7c0a32adc10105f843148fd0e9e3b013de75645c02ea858652240924"
+SRC_URI[md5sum] = "f99a90a91b23338b4df765c0d18eba73"
+SRC_URI[sha256sum] = "6f0633136d17ffef3ed0adfb171a00136a320f0fd79c9c75733ac02662a754a7"
 
 inherit autotools allarch
 
Signature · 1 line
1.7.8.3
#7 lore raw

PATCH 7/7 libav, libvpx, mplayer2: drop work around for gcc-4.6 ICE, no need to pass -fno-tree-vectorize now

In reply to Martin Jansa
---
 meta-oe/recipes-multimedia/libav/libav.inc         |    4 ++--
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |    4 ++--
 meta-oe/recipes-multimedia/webm/libvpx.inc         |   15 ++-------------
 3 files changed, 6 insertions(+), 17 deletions(-)
meta-oe/recipes-multimedia/libav/libav.inc +2 -2
index 89b14ca..2e3d1c9 100644
@@ -11,7 +11,7 @@ ARM_INSTRUCTION_SET = "arm"
 # faac faad2 lame schroedinger libgsm
 DEPENDS = "virtual/libsdl zlib libogg libvorbis libvpx libtheora ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'liba52', d)}"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
 inherit autotools pkgconfig
 
@@ -22,7 +22,7 @@ inherit autotools pkgconfig
 
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations  -fno-tree-vectorize -fomit-frame-pointer -O4 -ffast-math"
+FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
 BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
 
 EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +2 -2
index 2a2d8af..7ed9055 100644
@@ -21,7 +21,7 @@ SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac"
 ARM_INSTRUCTION_SET = "ARM"
 
 PV = "2.0+gitr${SRCPV}"
-PR = "r5"
+PR = "r6"
 
 PARALLEL_MAKE = ""
 
@@ -130,7 +130,7 @@ EXTRA_OECONF = " \
 EXTRA_OECONF_append_armv6 = " --enable-armv6"
 EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon"
 
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math -fno-tree-vectorize"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"
 BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
 
 CFLAGS_append = " -I${S}/libdvdread4 "
meta-oe/recipes-multimedia/webm/libvpx.inc +2 -13
index 8434f38..31dafb8 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "vpx Multi-Format Codec SDK"
 LICENSE = "BSD"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
 SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2"
 S = "${WORKDIR}/libvpx-v${PV}"
@@ -10,18 +10,7 @@ S = "${WORKDIR}/libvpx-v${PV}"
 # sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4'
 ARM_INSTRUCTION_SET = "arm"
 
-#-ftree-vectorize was causing ICE with gcc-4.6 from meta-oe, see
-# http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-November/036001.html
-#|     [CC] vpx_scale/generic/gen_scalers.c.o
-#| vpx_scale/generic/gen_scalers.c: In function 'vp8cx_vertical_band_3_4_scale_c':
-#| vpx_scale/generic/gen_scalers.c:537:6: internal compiler error: in vect_get_vec_def_for_stmt_copy, at tree-vect-stmts.c:1390
-#| Please submit a full bug report,
-#| with preprocessed source if appropriate.
-#| See <http://gcc.gnu.org/bugs.html> for instructions.
-#| make[1]: *** [vpx_scale/generic/gen_scalers.c.o] Error 1
-#| make: *** [.DEFAULT] Error 2
-
-CFLAGS += "-fPIC -fno-tree-vectorize"
+CFLAGS += "-fPIC"
 
 export CC
 export LD = "${CC}"
Signature · 1 line
1.7.8.3