[oe-commits] Martin Jansa : ecore: introduce 1.0.0

[git version control]

Module: openembedded.git
Branch: shr/testing2011.1
Commit: 226b77836925ed6d74c6905bcb54d09bc6d8be0a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=226b77836925ed6d74c6905bcb54d09bc6d8be0a

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Jan 29 14:30:42 2011 +0100

ecore: introduce 1.0.0

* ecore_svn is now D_P -1

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/efl1/ecore.inc      |   45 ++++++++++++++++++++++++++++++++++-----
 recipes/efl1/ecore_1.0.0.bb |   12 ++++++++++
 recipes/efl1/ecore_svn.bb   |   49 +++---------------------------------------
 3 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc
index bb7eea5..6ff455f 100644
--- a/recipes/efl1/ecore.inc
+++ b/recipes/efl1/ecore.inc
@@ -4,22 +4,19 @@ DEPENDS = "gettext-native virtual/libiconv tslib curl eet evas glib-2.0 \
            libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor libxprintutil"
 DEPENDS_virtclass-native = "eet-native evas-native"	   
 # optional
-# DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv"
-PV = "0.9.9.060+svnr${SRCPV}"
-PR = "r5"
+# DEPENDS += "directfb virtual/libsdl openssl virtual/libiconv"
 
 inherit efl
 
 BBCLASSEXTEND = "native"
-
-SRC_URI += "file://fix-ecore-fb-initialization.patch"
+INC_PR = "r0"
 
 do_configure_prepend() {
 	touch ${S}/po/Makefile.in.in || true
 	sed -i -e 's: po::g' ${S}/Makefile.am
 }
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
+FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"
 
 PACKAGES =+ "\
     ${PN}-con \
@@ -76,3 +73,39 @@ FILES_${PN}-txt = "${libdir}/libecore_txt*.so.*"
 FILES_${PN}-x = "${libdir}/libecore_x*.so.*"
 FILES_${PN}-input = "${libdir}/libecore_input*.so.*"
 
+ECORE_OECONF = "\
+  --x-includes=${STAGING_INCDIR}/X11 \
+  --x-libraries=${STAGING_LIBDIR} \
+  --enable-simple-x11 \
+  --enable-ecore-config \
+  --enable-ecore-x \
+  --enable-ecore-job \
+  --enable-ecore-fb \
+  --enable-ecore-evas \
+  --enable-ecore-evas-software-16-x11 \
+  --enable-ecore-evas-xrender \
+  --enable-abstract-sockets \
+  --enable-ecore-con \
+  --enable-ecore-ipc \
+  --enable-ecore-file \
+  --enable-inotify \
+  --disable-ecore-desktop \
+  --disable-ecore-x-xcb \
+  --disable-ecore-directfb \
+  --disable-ecore-sdl \
+  --enable-ecore-evas-opengl-x11 \
+  --disable-ecore-evas-dfb \
+  --disable-ecore-evas-sdl \
+  --disable-openssl \
+  --disable-poll \
+  --enable-xim \
+"
+
+EXTRA_OECONF = "${ECORE_OECONF} \
+                 --enable-curl \
+"
+
+EXTRA_OECONF_virtclass-native = "\
+                 ${ECORE_OECONF} \
+                 --disable-curl \
+"
diff --git a/recipes/efl1/ecore_1.0.0.bb b/recipes/efl1/ecore_1.0.0.bb
new file mode 100644
index 0000000..fd7b6e2
--- /dev/null
+++ b/recipes/efl1/ecore_1.0.0.bb
@@ -0,0 +1,12 @@
+require ecore.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
+  file://fix-ecore-fb-initialization.patch \
+  file://exit_uclibc.patch \
+"
+
+SRC_URI[md5sum] = "db2ef62d7c877e54087a4ce805368419"
+SRC_URI[sha256sum] = "8a1f89a7cef27d93d87155d53d54f651b3fae810f8995b3c634b4d709ef4e1fa"
diff --git a/recipes/efl1/ecore_svn.bb b/recipes/efl1/ecore_svn.bb
index cef420b..99fb3e2 100644
--- a/recipes/efl1/ecore_svn.bb
+++ b/recipes/efl1/ecore_svn.bb
@@ -1,6 +1,9 @@
 require ecore.inc
+
 SRCREV = "${EFL_SRCREV}"
-PR = "r12"
+PV = "1.0.999+svnr${SRCPV}"
+PR = "${INC_PR}.0"
+DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};proto=http;scmdata=keep \
@@ -8,47 +11,3 @@ SRC_URI = "\
   file://fix-ecore-fb-initialization.patch \
 "
 S = "${WORKDIR}/${SRCNAME}"
-
-ECORE_OECONF = "\
-  --x-includes=${STAGING_INCDIR}/X11 \
-  --x-libraries=${STAGING_LIBDIR} \
-  --enable-simple-x11 \
-  --enable-ecore-config \
-  --enable-ecore-x \
-  --enable-ecore-job \
-  --enable-ecore-fb \
-  --enable-ecore-evas \
-  --enable-ecore-evas-software-16-x11 \
-  --enable-ecore-evas-xrender \
-  --enable-abstract-sockets \
-  --enable-ecore-con \
-  --enable-ecore-ipc \
-  --enable-ecore-file \
-  --enable-inotify \
-  --disable-ecore-desktop \
-  --disable-ecore-x-xcb \
-  --disable-ecore-directfb \
-  --disable-ecore-sdl \
-  --enable-ecore-evas-opengl-x11 \
-  --disable-ecore-evas-dfb \
-  --disable-ecore-evas-sdl \
-  --disable-openssl \
-  --disable-poll \
-  --enable-xim \
-"
-
-EXTRA_OECONF = "${ECORE_OECONF} \
-                 --enable-curl \
-"
-
-EXTRA_OECONF_virtclass-native = "\
-                 ${ECORE_OECONF} \
-                 --disable-curl \
-"
-# List of options which were different in ecore-native,
-# I know it's SCM, but with missing -native.bb is much easier to check here
-#                --disable-ecore-x \
-#                --enable-ecore-evas-fb \
-#                --disable-ecore-evas-x11-gl \
-#                --disable-ecore-imf \
-#                --disable-ecore-imf_evas \