From d5836e6a0008c0d78324368a822f16a5c2f6efb8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 25 Feb 2014 17:25:43 +0100 Subject: efl: upgrade to 1.9.0 * announcement: http://sourceforge.net/mailarchive/message.php?msg_id=32024303 * emotion-generic-players and evas-generic-loaders LIC_FILES_CHKSUM change is just copyright update < Copyright (C) 2011-2011 Carsten Haitzler and various contributors (see AUTHORS) --- > Copyright (C) 2011-2014 Carsten Haitzler and various contributors (see AUTHORS) Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/efl.inc | 18 +++++-- meta-efl/recipes-efl/efl/efl_1.8.5.bb | 17 ------ meta-efl/recipes-efl/efl/efl_1.9.0.bb | 17 ++++++ meta-efl/recipes-efl/efl/elementary.inc | 2 +- ...e-elementary_codegen-defined-in-configure.patch | 29 ++++++++++ ...e-elm_prefs_cc-and-elementary_codegen-def.patch | 61 ---------------------- meta-efl/recipes-efl/efl/elementary_1.8.4.bb | 12 ----- meta-efl/recipes-efl/efl/elementary_1.9.0.bb | 12 +++++ .../recipes-efl/efl/emotion-generic-players.inc | 4 +- .../efl/emotion-generic-players_1.8.1.bb | 8 --- .../efl/emotion-generic-players_1.9.0.bb | 8 +++ meta-efl/recipes-efl/efl/evas-generic-loaders.inc | 2 +- .../recipes-efl/efl/evas-generic-loaders_1.8.1.bb | 8 --- .../recipes-efl/efl/evas-generic-loaders_1.9.0.bb | 8 +++ 14 files changed, 94 insertions(+), 112 deletions(-) delete mode 100644 meta-efl/recipes-efl/efl/efl_1.8.5.bb create mode 100644 meta-efl/recipes-efl/efl/efl_1.9.0.bb create mode 100644 meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elementary_codegen-defined-in-configure.patch delete mode 100644 meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elm_prefs_cc-and-elementary_codegen-def.patch delete mode 100644 meta-efl/recipes-efl/efl/elementary_1.8.4.bb create mode 100644 meta-efl/recipes-efl/efl/elementary_1.9.0.bb delete mode 100644 meta-efl/recipes-efl/efl/emotion-generic-players_1.8.1.bb create mode 100644 meta-efl/recipes-efl/efl/emotion-generic-players_1.9.0.bb delete mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb create mode 100644 meta-efl/recipes-efl/efl/evas-generic-loaders_1.9.0.bb (limited to 'meta-efl') diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc index 4e25389c97..56b3cd21ec 100644 --- a/meta-efl/recipes-efl/efl/efl.inc +++ b/meta-efl/recipes-efl/efl/efl.inc @@ -3,7 +3,7 @@ LICENSE = "MIT BSD LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a1809a807e39dd48ddcf7be98477d130" DEPENDS_class-native = "lua5.1-native freetype-native libxext-native libpng-native jpeg-native tiff-native libfribidi-native glib-2.0-native dbus-native" -DEPENDS = "virtual/libiconv tslib curl glib-2.0 gnutls pkgconfig zlib jpeg openssl libsndfile1 lua5.1 dbus libexif librsvg freetype libpng tiff libxext virtual/libx11 libxrender fontconfig libfribidi giflib udev libxcursor libxcomposite libxinerama libxrandr libxtst libxscrnsaver efl-native" +DEPENDS = "virtual/libiconv tslib curl glib-2.0 gnutls pkgconfig zlib jpeg openssl libsndfile1 luajit dbus libexif librsvg freetype libpng tiff libxext virtual/libx11 libxrender fontconfig libfribidi giflib udev libxcursor libxcomposite libxinerama libxrandr libxtst libxscrnsaver efl-native" inherit efl gettext pkgconfig @@ -12,8 +12,14 @@ BBCLASSEXTEND = "native" PROVIDES += "ecore edje eet eeze efreet eina eio embryo emotion ethumb evas eldbus" # we don't have bullet for physics +# You have chosen to disable physics support. This disables lots of +# core functionality and is effectively never tested. You are going +# to find features that suddenly don't work and as a result cause +# a series of breakages. This is simply not tested so you are on +# your own in terms of ensuring everything works if you do this EXTRA_OECONF = " \ --disable-physics \ + --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aaa \ " EXTRA_OECONF_append_class-target = " \ --with-bin-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ @@ -36,16 +42,19 @@ EXTRA_OECONF_append_class-native = " \ --disable-image-loader-xpm \ " -PACKAGECONFIG ??= "opengl-es" +PACKAGECONFIG ?= "opengl-es gstreamer1 pulseaudio" PACKAGECONFIG_class-native = "" # sort of tri-state PACKAGECONFIG[opengl-full] = "--with-opengl=full,,virtual/libgl" PACKAGECONFIG[opengl-es] = "--with-opengl=es,,virtual/libgles2" PACKAGECONFIG[opengl-none] = "--with-opengl=none,," -# used only in ecore examples and supports only 0.10 now PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer" +PACKAGECONFIG[gstreamer1] = "--enable-gstreamer1,--disable-gstreamer1,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" +# we don't have luajit-native now, so use old lua for -native +PACKAGECONFIG[luajit] = "--disable-lua-old,--enable-lua-old,luajit" # new efl doesn't have option to disable eeze build and we don't want to provide udev-native just to build eeze-native we don't need do_configure_prepend_class-native() { @@ -175,6 +184,7 @@ FILES_eet = " \ " FILES_emotion = " \ ${datadir}/emotion \ + ${libdir}/emotion/modules/gstreamer1/*/module.so \ " FILES_embryo-tests = " \ ${datadir}/embryo/ \ @@ -234,6 +244,7 @@ FILES_${PN}-dbg += " \ ${libdir}/edje/utils/*/.debug \ ${libdir}/ethumb/*/*/*/.debug \ ${libdir}/ethumb_client/utils/*/.debug \ + ${libdir}/emotion/modules/gstreamer1/*/.debug \ " FILES_${PN}-dev += " \ ${libdir}/cmake \ @@ -242,6 +253,7 @@ FILES_${PN}-dev += " \ ${libdir}/ethumb*/*/*/*/module.la \ ${libdir}/eeze*/*/*/*/*/module.la \ ${libdir}/edje*/*/*/*/module.la \ + ${libdir}/emotion/modules/gstreamer1/*/module.la \ ${datadir}/gdb/auto-load \ ${datadir}/eo/gdb \ ${bindir}/eldbus-codegen \ diff --git a/meta-efl/recipes-efl/efl/efl_1.8.5.bb b/meta-efl/recipes-efl/efl/efl_1.8.5.bb deleted file mode 100644 index cacae5f7ac..0000000000 --- a/meta-efl/recipes-efl/efl/efl_1.8.5.bb +++ /dev/null @@ -1,17 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "\ - ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "3d2c3ca2ff1a072b72ffab40ff598dfb" -SRC_URI[sha256sum] = "7e514c0a972feea1c44c9074a4b58c14821d93dc91ff6f51066528f12ab42fe5" - -# Temporary disable until error like the one following are fixed -# efl-native/2_1.8.4-r0/efl-1.8.4/src/lib/eet/.libs/libeet.so: file not recognized: File truncated -# collect2: error: ld returned 1 exit status -# x86_64-linux-libtool: install: error: relink `modules/evas/savers/tiff/module.la' with the above command before installing it -# Makefile:11031: recipe for target 'install-savertiffpkgLTLIBRARIES' failed -PARALLEL_MAKE = "" - -SRC_URI += "file://0001-configure.ac-Don-t-check-for-Xprint-extension.patch" diff --git a/meta-efl/recipes-efl/efl/efl_1.9.0.bb b/meta-efl/recipes-efl/efl/efl_1.9.0.bb new file mode 100644 index 0000000000..b6aa77fe2b --- /dev/null +++ b/meta-efl/recipes-efl/efl/efl_1.9.0.bb @@ -0,0 +1,17 @@ +require ${BPN}.inc + +SRC_URI = "\ + ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "f5d0c61db951cb6a5434a30672975dd1" +SRC_URI[sha256sum] = "fd4703edb56c01b713f92849fb15f6ca3d866227ce4abff2d90b08244cd99a99" + +# Temporary disable until error like the one following are fixed +# efl-native/2_1.8.4-r0/efl-1.8.4/src/lib/eet/.libs/libeet.so: file not recognized: File truncated +# collect2: error: ld returned 1 exit status +# x86_64-linux-libtool: install: error: relink `modules/evas/savers/tiff/module.la' with the above command before installing it +# Makefile:11031: recipe for target 'install-savertiffpkgLTLIBRARIES' failed +PARALLEL_MAKE_class-native = "" + +SRC_URI += "file://0001-configure.ac-Don-t-check-for-Xprint-extension.patch" diff --git a/meta-efl/recipes-efl/efl/elementary.inc b/meta-efl/recipes-efl/efl/elementary.inc index 8d95967a16..6de749a05c 100644 --- a/meta-efl/recipes-efl/efl/elementary.inc +++ b/meta-efl/recipes-efl/efl/elementary.inc @@ -1,6 +1,6 @@ DESCRIPTION = "EFL based widget set for mobile devices" LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=ae1a906a61040d01df137a6b2c6acb68" +LIC_FILES_CHKSUM = "file://COPYING;md5=a173054a93896e933df53e3382d472c2" DEPENDS = "eet-native edje-native elementary-native efreet evas ecore edje eet eldbus ethumb poppler eio" DEPENDS_class-native = "efl-native" diff --git a/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elementary_codegen-defined-in-configure.patch b/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elementary_codegen-defined-in-configure.patch new file mode 100644 index 0000000000..9524c70d7d --- /dev/null +++ b/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elementary_codegen-defined-in-configure.patch @@ -0,0 +1,29 @@ +From 75d104d105aa03dd9d446fa7d84fa95e0f566cf9 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 11 Jan 2014 12:55:59 +0100 +Subject: [PATCH] Makefile: Use elementary_codegen defined in configure + +* using binaries from top_buildir doesn't work when cross-compiling elementary + where we need to pass native binaries in configure params + +Signed-off-by: Martin Jansa +--- + src/examples/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am +index fc35c75..1e10b0b 100644 +--- a/src/examples/Makefile.am ++++ b/src/examples/Makefile.am +@@ -29,7 +29,7 @@ LDADD = \ + @ELEMENTARY_X_LIBS@ \ + $(top_builddir)/src/lib/libelementary.la + +-ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/@ELEMENTARY_CODEGEN_PRG@ ++ELEMENTARY_CODEGEN = @elementary_codegen@ + ELEMENTARY_CODEGEN_FLAGS = --prefix=codegen_example + + SRCS = \ +-- +1.9.0 + diff --git a/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elm_prefs_cc-and-elementary_codegen-def.patch b/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elm_prefs_cc-and-elementary_codegen-def.patch deleted file mode 100644 index e3fba9b28f..0000000000 --- a/meta-efl/recipes-efl/efl/elementary/0001-Makefile-Use-elm_prefs_cc-and-elementary_codegen-def.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 53c7046933d1b622a7f99e70a08a0bf46e38369f Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 11 Jan 2014 12:55:59 +0100 -Subject: [PATCH] Makefile: Use elm_prefs_cc and elementary_codegen defined in - configure - -* using binaries from top_buildir doesn't work when cross-compiling elementary - where we need to pass native binaries in configure params - -Signed-off-by: Martin Jansa ---- - data/objects/Makefile.am | 2 +- - doc/widgets/Makefile.am | 2 +- - src/examples/Makefile.am | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/data/objects/Makefile.am b/data/objects/Makefile.am -index c6a775d..88c4f1a 100644 ---- a/data/objects/Makefile.am -+++ b/data/objects/Makefile.am -@@ -11,7 +11,7 @@ filesdir = $(datadir)/elementary/objects - - files_DATA = test.edj test_external.edj multip.edj cursors.edj font_preview.edj postit_ent.edj multibuttonentry.edj test_prefs.edj test_prefs.epb test_focus_custom.edj - --ELM_PREFS_CC = $(top_builddir)/src/bin/@ELM_PREFS_CC_PRG@ -+ELM_PREFS_CC = @elm_prefs_cc@ - - EXTRA_DIST = \ - test.edc \ -diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am -index c1508b8..c0544f9 100644 ---- a/doc/widgets/Makefile.am -+++ b/doc/widgets/Makefile.am -@@ -19,7 +19,7 @@ AM_CPPFLAGS = \ - @ELEMENTARY_EWEATHER_CFLAGS@ \ - @ELEMENTARY_EMAP_CFLAGS@ - --ELM_PREFS_CC = $(top_builddir)/src/bin/@ELM_PREFS_CC_PRG@ -+ELM_PREFS_CC = @elm_prefs_cc@ - - noinst_DATA = widget_preview_prefs.epb - -diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am -index 7184ca1..ce80a46 100644 ---- a/src/examples/Makefile.am -+++ b/src/examples/Makefile.am -@@ -33,9 +33,9 @@ EDJE_FLAGS_VERBOSE_0 = - EDJE_FLAGS_VERBOSE_1 = -v - EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) - --ELM_PREFS_CC = $(top_builddir)/src/bin/@ELM_PREFS_CC_PRG@ -+ELM_PREFS_CC = @elm_prefs_cc@ - --ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/@ELEMENTARY_CODEGEN_PRG@ -+ELEMENTARY_CODEGEN = @elementary_codegen@ - ELEMENTARY_CODEGEN_FLAGS = --prefix=codegen_example - - SRCS = \ --- -1.8.5.2 - diff --git a/meta-efl/recipes-efl/efl/elementary_1.8.4.bb b/meta-efl/recipes-efl/efl/elementary_1.8.4.bb deleted file mode 100644 index 7208210c9d..0000000000 --- a/meta-efl/recipes-efl/efl/elementary_1.8.4.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "\ - ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -# only for target, because configure doesn't default to sane default when -# these paths aren't passed in -native build -SRC_URI_append_class-target = " file://0001-Makefile-Use-elm_prefs_cc-and-elementary_codegen-def.patch" - -SRC_URI[md5sum] = "898d0ee0e18078640948fa5d04d56efe" -SRC_URI[sha256sum] = "129b8a015c34df3e8633b5b65aa3bcdd77ed101992948cb096389fed3f3a4244" diff --git a/meta-efl/recipes-efl/efl/elementary_1.9.0.bb b/meta-efl/recipes-efl/efl/elementary_1.9.0.bb new file mode 100644 index 0000000000..e7cbb5b39a --- /dev/null +++ b/meta-efl/recipes-efl/efl/elementary_1.9.0.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +SRC_URI = "\ + ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +# only for target, because configure doesn't default to sane default when +# these paths aren't passed in -native build +SRC_URI_append_class-target = " file://0001-Makefile-Use-elementary_codegen-defined-in-configure.patch" + +SRC_URI[md5sum] = "408b61a080f51731eeed81968d3cc7f5" +SRC_URI[sha256sum] = "95cb9ade6c1f135b673555d927d13b5e06986353047178125346abdf6c2b4d82" diff --git a/meta-efl/recipes-efl/efl/emotion-generic-players.inc b/meta-efl/recipes-efl/efl/emotion-generic-players.inc index 5c168027f2..4ab89ae32f 100644 --- a/meta-efl/recipes-efl/efl/emotion-generic-players.inc +++ b/meta-efl/recipes-efl/efl/emotion-generic-players.inc @@ -1,6 +1,8 @@ DESCRIPTION = "Emotion generic players" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=69f44058245ce5c596d56bb622d5dabd" +LIC_FILES_CHKSUM = "file://COPYING;md5=a0f11eedf8706bf6d4d6639fb67eb8ae" + +DEPENDS = "emotion" inherit efl diff --git a/meta-efl/recipes-efl/efl/emotion-generic-players_1.8.1.bb b/meta-efl/recipes-efl/efl/emotion-generic-players_1.8.1.bb deleted file mode 100644 index 9fc50a7d2f..0000000000 --- a/meta-efl/recipes-efl/efl/emotion-generic-players_1.8.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "\ - ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "895d8057fb5cdcadd9ed1f710a460b4e" -SRC_URI[sha256sum] = "d3221726df583b3d5d43192e4909c08ac4dbf7ff35b81568ac339d7dbaf84d36" diff --git a/meta-efl/recipes-efl/efl/emotion-generic-players_1.9.0.bb b/meta-efl/recipes-efl/efl/emotion-generic-players_1.9.0.bb new file mode 100644 index 0000000000..0337751975 --- /dev/null +++ b/meta-efl/recipes-efl/efl/emotion-generic-players_1.9.0.bb @@ -0,0 +1,8 @@ +require ${BPN}.inc + +SRC_URI = "\ + ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "dc897ba540560fce0787bbff8455c022" +SRC_URI[sha256sum] = "d26546adf61db7521f9d46f2baedcb645af72497fc259e93907026970d42d794" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc index 904527cd11..e64fa88741 100644 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Evas generic loaders" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=f86abf15f4d911ae87092e90222d0ef3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f3877fbaaa46306051a559814451883c" DEPENDS = "eina poppler librsvg cairo" inherit efl diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb deleted file mode 100644 index 21e57f9163..0000000000 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.8.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "\ - ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ -" - -SRC_URI[md5sum] = "2f39de031a236e53d251beefb4f6fcfd" -SRC_URI[sha256sum] = "fa5d40324367b2e126853ba70f6522552fff9e80f6dd91566b2dacc4b0ffebc0" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.9.0.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.9.0.bb new file mode 100644 index 0000000000..38d0518c10 --- /dev/null +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.9.0.bb @@ -0,0 +1,8 @@ +require ${BPN}.inc + +SRC_URI = "\ + ${E_RELEASES}/libs/${SRCNAME}/${SRCNAME}-${SRCVER}.tar.gz \ +" + +SRC_URI[md5sum] = "bec6d27fc4afd2f5e4829da5aeccdc0b" +SRC_URI[sha256sum] = "9447839047b087b0293b2ed6c453249919f66e5c4f62e252a7b7e4f996c2ac5f" -- cgit 1.2.3-korg