[oe-commits] org.oe.dev efl: merge with Mamona
mickeyl commit
oe at amethyst.openembedded.net
Fri Mar 21 23:32:15 UTC 2008
efl: merge with Mamona
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: e7f56777755e18d1ce874d8f1f99893a3d71f85d
ViewMTN: http://monotone.openembedded.org/revision/info/e7f56777755e18d1ce874d8f1f99893a3d71f85d
Files:
1
classes/efl_base.bbclass
classes/efl_library.bbclass
classes/efl.bbclass
conf/distro/include/sane-srcdates.inc
packages/efl1/ecore.inc
packages/efl1/edb_cvs.bb
packages/efl1/edbus_cvs.bb
packages/efl1/edje_cvs.bb
packages/efl1/eet_cvs.bb
packages/efl1/eflpp_cvs.bb
packages/efl1/efreet_cvs.bb
packages/efl1/embryo_cvs.bb
packages/efl1/emotion_cvs.bb
packages/efl1/engrave_cvs.bb
packages/efl1/enhance_cvs.bb
packages/efl1/epdf_cvs.bb
packages/efl1/epeg_cvs.bb
packages/efl1/epsilon_cvs.bb
packages/efl1/esmart_cvs.bb
packages/efl1/etk-native_cvs.bb
packages/efl1/etk_cvs.bb
packages/efl1/evas.inc
packages/efl1/evolve_cvs.bb
packages/efl1/ewl_cvs.bb
packages/efl1/exml_cvs.bb
packages/efl1/imlib2_cvs.bb
Diffs:
#
# mt diff -rc4e90a7878b25e86e87c8a013a9e8c736603a86e -re7f56777755e18d1ce874d8f1f99893a3d71f85d
#
#
#
# delete "classes/efl_base.bbclass"
#
# rename "classes/efl_library.bbclass"
# to "classes/efl.bbclass"
#
# patch "classes/efl.bbclass"
# from [9f05c0b66273f55a4febe214ee17814ca010f922]
# to [812d079a9b429c552508ab74839a4404eb45a0df]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [0942864757143ee38a2cf6fb953104e7f5931519]
# to [f95a0a7a90230afcb63264eef972e31be7d8622f]
#
# patch "packages/efl1/ecore.inc"
# from [c4d7e192157f599c231b67a6298d08da551f9cd2]
# to [2ebb4427d05c26ac7aeea4cc122ac019813f57bb]
#
# patch "packages/efl1/edb_cvs.bb"
# from [54392dfc853fbcd20b44803de6c5f3b91f488074]
# to [8dbf42fc209cfd4e3abc970b18a7225533056354]
#
# patch "packages/efl1/edbus_cvs.bb"
# from [ac1cf9bfc62d113063302423acccc78cf5ddf1f9]
# to [45f56ca80c3ce2f61d98980e32989c248e15a909]
#
# patch "packages/efl1/edje_cvs.bb"
# from [651ab5e3265e556ae79b9f809c4a345f3b87739b]
# to [7fd344e45307e880572dab5a4ab2d8f8467ba1df]
#
# patch "packages/efl1/eet_cvs.bb"
# from [0540f3c9a184c0016866cf3e28d6cf60612c548d]
# to [eada78b9148d3a22f1b46d69d3aabbdfe747410c]
#
# patch "packages/efl1/eflpp_cvs.bb"
# from [2d95e8b0fc6b9dc8aca0b07ec27251d0eb4d9839]
# to [d4bd7d99d11b2047b25e820fdf0c47acd70d4260]
#
# patch "packages/efl1/efreet_cvs.bb"
# from [eafca9ec13aa035e7d425da3addbff7c5274c705]
# to [4b80740afd5106d5bc474fa4921c6522ca473d30]
#
# patch "packages/efl1/embryo_cvs.bb"
# from [79c4589004660f326e476191a6a522f75318fbba]
# to [54dc755d8be69024d06ad360043068177617795e]
#
# patch "packages/efl1/emotion_cvs.bb"
# from [5115917704eecbdbda95d8c8020f14563b59480a]
# to [07bb0f3a78b355b1d80ffc58470ee989fb34b92f]
#
# patch "packages/efl1/engrave_cvs.bb"
# from [bec559cdd998186f53c02ed352d159987b2b2e41]
# to [752c8bb49b03d223c3d8e0d2f6f77b54e450f100]
#
# patch "packages/efl1/enhance_cvs.bb"
# from [98e5f9a53bbca75e2b369d6556728f366b26ade6]
# to [3c3ac34bd582b0b09e2895e72b03c256f214da63]
#
# patch "packages/efl1/epdf_cvs.bb"
# from [cc4469584c9d183ecc4e0a17b9f37d7f77df098c]
# to [cf9b3d50ac3aaff3dfc89a7dc654af20369399cc]
#
# patch "packages/efl1/epeg_cvs.bb"
# from [fceb3b23bf774810acb12e16ce0a0e7d904868a0]
# to [f6daf317074d6c4a1975daf882557beacc576d98]
#
# patch "packages/efl1/epsilon_cvs.bb"
# from [03e9f9d6a58adb67d396787733e522986d849b3b]
# to [7ec5c502b536c6c127630cb9fb7208aa661fef65]
#
# patch "packages/efl1/esmart_cvs.bb"
# from [cacbf3b70f73a7e32bcb35bd2ce022641432b9ea]
# to [6502bab7ea2f2d0380e49644e4204603a1395ff1]
#
# patch "packages/efl1/etk-native_cvs.bb"
# from [24762ce075076d9dcc7feea45c57ad02ea43ea76]
# to [a3658eeb40a0ab13cb3f4738bf070b308faedd27]
#
# patch "packages/efl1/etk_cvs.bb"
# from [74244567bcd7506fb878b7e1e0b5e527e5a6fbe6]
# to [1c4ad62955a3041ca60b191f4f46f758a4a45cb4]
#
# patch "packages/efl1/evas.inc"
# from [f4bea097c84b09f97ff301ce61d6fedfa3111605]
# to [13da3a3288def60746b06f49f1e6bf070fb91d53]
#
# patch "packages/efl1/evolve_cvs.bb"
# from [28b3b6d8799b62cf4ed73c7cce33e729e5eb548c]
# to [8aa01b6c728b2a3f2b4327d628ddf5d6595cbbdb]
#
# patch "packages/efl1/ewl_cvs.bb"
# from [4b95b18bfd82af00f7025839e31897d752b42ee1]
# to [4b58bff160ea1363790f37cde48a9303c7129239]
#
# patch "packages/efl1/exml_cvs.bb"
# from [36dc5bf1bc769d147967195abcd043d4bce849c6]
# to [7ae5127036e12c4f7b4225f0136bc6647f68a96b]
#
# patch "packages/efl1/imlib2_cvs.bb"
# from [0b169dbc0710ec78d933298eac59d845507532f7]
# to [90324b9d8bfadfca430da3b72c2b1f9c7089ee52]
#
============================================================
--- classes/efl_library.bbclass 9f05c0b66273f55a4febe214ee17814ca010f922
+++ classes/efl.bbclass 812d079a9b429c552508ab74839a4404eb45a0df
@@ -1,9 +1,40 @@
-inherit efl_base
-
+SECTION = "e/libs"
+HOMEPAGE = "http://www.enlightenment.org"
+LICENSE = "MIT BSD"
+SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
SRC_URI = "${E_CVS};module=e17/libs/${SRCNAME}"
S = "${WORKDIR}/${SRCNAME}"
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-tests"
+
+FILES_${PN} = "${libdir}/*.so.*"
+
+FILES_${PN}-themes = "${datadir}/${PN}/themes \
+ ${datadir}/${PN}/data \
+ ${datadir}/${PN}/fonts \
+ ${datadir}/${PN}/pointers \
+ ${datadir}/${PN}/images \
+ ${datadir}/${PN}/users \
+ ${datadir}/${PN}/images \
+ ${datadir}/${PN}/styles"
+
+FILES_${PN}-dev += "${bindir}/${PN}-config \
+ ${libdir}/pkgconfig/* \
+ ${libdir}/lib*.la \
+ ${libdir}/lib*.a \
+ ${libdir}/*.so \
+ ${libdir}/${PN}/*.a \
+ ${libdir}/${PN}/*.la \
+ ${libdir}/${PN}/*/*.a \
+ ${libdir}/${PN}/*/*.la"
+
+FILES_${PN}-tests = "${bindir}/${PN} \
+ ${bindir}/*_* \
+ ${datadir}"
+
-PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${bindir}/${PN} ${bindir}/*_* ${datadir}"
-FILES_${PN}-dev += "${bindir}/*-config ${libdir}/${PN}/*.a ${libdir}/${PN}/*.la ${libdir}/${PN}/*/*.a ${libdir}/${PN}/*/*.la"
-FILES_${PN} = "${libdir}/*.so*"
============================================================
--- conf/distro/include/sane-srcdates.inc 0942864757143ee38a2cf6fb953104e7f5931519
+++ conf/distro/include/sane-srcdates.inc f95a0a7a90230afcb63264eef972e31be7d8622f
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE = "20080311"
+EFL_SRCDATE = "20080321"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- packages/efl1/ecore.inc c4d7e192157f599c231b67a6298d08da551f9cd2
+++ packages/efl1/ecore.inc 2ebb4427d05c26ac7aeea4cc122ac019813f57bb
@@ -5,7 +5,7 @@ PV = "0.9.9.042+cvs${SRCDATE}"
# DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv"
PV = "0.9.9.042+cvs${SRCDATE}"
-inherit efl_library
+inherit efl
SRC_URI += "file://fix-directfb-include.patch;patch=1"
============================================================
--- packages/efl1/edb_cvs.bb 54392dfc853fbcd20b44803de6c5f3b91f488074
+++ packages/efl1/edb_cvs.bb 8dbf42fc209cfd4e3abc970b18a7225533056354
@@ -3,4 +3,4 @@ PV = "1.0.5.042+cvs${SRCDATE}"
DEPENDS = "zlib"
PV = "1.0.5.042+cvs${SRCDATE}"
+inherit efl
-inherit efl_library
============================================================
--- packages/efl1/edbus_cvs.bb ac1cf9bfc62d113063302423acccc78cf5ddf1f9
+++ packages/efl1/edbus_cvs.bb 45f56ca80c3ce2f61d98980e32989c248e15a909
@@ -4,7 +4,7 @@ PR = "r3"
PV = "0.1.0.042+cvs${SRCDATE}"
PR = "r3"
-inherit efl_library
+inherit efl
SRC_URI = "${E_CVS};module=e17/libs/e_dbus"
S = "${WORKDIR}/e_dbus"
============================================================
--- packages/efl1/edje_cvs.bb 651ab5e3265e556ae79b9f809c4a345f3b87739b
+++ packages/efl1/edje_cvs.bb 7fd344e45307e880572dab5a4ab2d8f8467ba1df
@@ -2,9 +2,13 @@ PV = "0.5.0.042+cvs${SRCDATE}"
DEPENDS = "eet evas ecore embryo edje-native"
LICENSE = "MIT BSD"
PV = "0.5.0.042+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
-inherit efl_library
+inherit efl
+PACKAGES =+ "${PN}-utils"
+DEBIAN_NOAUTONAME_${PN}-utils = "1"
+FILES_${PN}-utils = "\
+ ${bindir}/edje_* \
+ ${datadir}/edje/include/edje.inc \
+"
-PACKAGES =+ "${PN}-tools"
-FILES_${PN}-tools = "${bindir}/edje_*"
============================================================
--- packages/efl1/eet_cvs.bb 0540f3c9a184c0016866cf3e28d6cf60612c548d
+++ packages/efl1/eet_cvs.bb eada78b9148d3a22f1b46d69d3aabbdfe747410c
@@ -4,4 +4,4 @@ PR = "r0"
PV = "0.9.10.042+cvs${SRCDATE}"
PR = "r0"
+inherit efl
-inherit efl_library
============================================================
--- packages/efl1/eflpp_cvs.bb 2d95e8b0fc6b9dc8aca0b07ec27251d0eb4d9839
+++ packages/efl1/eflpp_cvs.bb d4bd7d99d11b2047b25e820fdf0c47acd70d4260
@@ -5,7 +5,7 @@ PV = "0.1.0+cvs${SRCDATE}"
DEPENDS = "evas ecore edje emotion esmart etk ewl libsigc++-2.0"
PV = "0.1.0+cvs${SRCDATE}"
-inherit efl_library
+inherit efl
EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
============================================================
--- packages/efl1/efreet_cvs.bb eafca9ec13aa035e7d425da3addbff7c5274c705
+++ packages/efl1/efreet_cvs.bb 4b80740afd5106d5bc474fa4921c6522ca473d30
@@ -4,7 +4,7 @@ PR = "r0"
PV = "0.0.3.042+cvs${SRCDATE}"
PR = "r0"
-inherit efl_library
+inherit efl
PACKAGES =+ "${PN}-mime"
FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*"
============================================================
--- packages/efl1/embryo_cvs.bb 79c4589004660f326e476191a6a522f75318fbba
+++ packages/efl1/embryo_cvs.bb 54dc755d8be69024d06ad360043068177617795e
@@ -1,6 +1,9 @@ PV = "0.9.1.042+cvs${SRCDATE}"
DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
LICENSE = "MIT BSD"
PV = "0.9.1.042+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
+inherit efl
+
+# HACK alert: When compiling for VFP embryo emits bugs -- maybe gcc bug
+#FULL_OPTIMIZATION_arm =+ "-O0"
-inherit efl_library
============================================================
--- packages/efl1/emotion_cvs.bb 5115917704eecbdbda95d8c8020f14563b59480a
+++ packages/efl1/emotion_cvs.bb 07bb0f3a78b355b1d80ffc58470ee989fb34b92f
@@ -5,7 +5,7 @@ PR = "r1"
PV = "0.1.0+cvs${SRCDATE}"
PR = "r1"
-inherit efl_library
+inherit efl
EXTRA_OECONF = "--disable-xine --enable-gstreamer"
============================================================
--- packages/efl1/engrave_cvs.bb bec559cdd998186f53c02ed352d159987b2b2e41
+++ packages/efl1/engrave_cvs.bb 752c8bb49b03d223c3d8e0d2f6f77b54e450f100
@@ -4,4 +4,4 @@ PV = "0.0.0+cvs${SRCDATE}"
DEPENDS = "evas ecore"
PV = "0.0.0+cvs${SRCDATE}"
+inherit efl
-inherit efl_library
============================================================
--- packages/efl1/enhance_cvs.bb 98e5f9a53bbca75e2b369d6556728f366b26ade6
+++ packages/efl1/enhance_cvs.bb 3c3ac34bd582b0b09e2895e72b03c256f214da63
@@ -3,4 +3,4 @@ PV = "0.0.0+cvs${SRCDATE}"
DEPENDS = "exml"
PV = "0.0.0+cvs${SRCDATE}"
+inherit efl
-inherit efl_library
============================================================
--- packages/efl1/epdf_cvs.bb cc4469584c9d183ecc4e0a17b9f37d7f77df098c
+++ packages/efl1/epdf_cvs.bb cf9b3d50ac3aaff3dfc89a7dc654af20369399cc
@@ -4,7 +4,7 @@ PR = "r0"
PV = "0.1.0+cvs${SRCDATE}"
PR = "r0"
-inherit efl_library
+inherit efl
SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME} \
file://fix-plugin-path-check.patch;HACK=1;patch=1"
============================================================
--- packages/efl1/epeg_cvs.bb fceb3b23bf774810acb12e16ce0a0e7d904868a0
+++ packages/efl1/epeg_cvs.bb f6daf317074d6c4a1975daf882557beacc576d98
@@ -4,4 +4,4 @@ PR = "r0"
PV = "0.9.0+cvs${SRCDATE}"
PR = "r0"
+inherit efl
-inherit efl_library
============================================================
--- packages/efl1/epsilon_cvs.bb 03e9f9d6a58adb67d396787733e522986d849b3b
+++ packages/efl1/epsilon_cvs.bb 7ec5c502b536c6c127630cb9fb7208aa661fef65
@@ -6,7 +6,7 @@ PR = "r1"
PV = "0.3.0.012+cvs${SRCDATE}"
PR = "r1"
-inherit efl_library
+inherit efl
SRC_URI += "file://fix_alignment_error.patch;patch=1"
============================================================
--- packages/efl1/esmart_cvs.bb cacbf3b70f73a7e32bcb35bd2ce022641432b9ea
+++ packages/efl1/esmart_cvs.bb 6502bab7ea2f2d0380e49644e4204603a1395ff1
@@ -3,7 +3,7 @@ PV = "0.9.0.042+cvs${SRCDATE}"
DEPENDS = "evas ecore edje imlib2 epsilon libtool"
PV = "0.9.0.042+cvs${SRCDATE}"
-inherit efl_library
+inherit efl
EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
============================================================
--- packages/efl1/etk-native_cvs.bb 24762ce075076d9dcc7feea45c57ad02ea43ea76
+++ packages/efl1/etk-native_cvs.bb a3658eeb40a0ab13cb3f4738bf070b308faedd27
@@ -3,8 +3,3 @@ SRC_URI += "file://no-tests.patch;patch=
DEPENDS = "evas-native ecore-native edje-native"
SRC_URI += "file://no-tests.patch;patch=1"
-
-do_stage_append() {
- mv ${STAGING_DIR}/include/etk ${STAGING_INCDIR}
-}
-
============================================================
--- packages/efl1/etk_cvs.bb 74244567bcd7506fb878b7e1e0b5e527e5a6fbe6
+++ packages/efl1/etk_cvs.bb 1c4ad62955a3041ca60b191f4f46f758a4a45cb4
@@ -4,7 +4,7 @@ PR = "r0"
PV = "0.1.0.042+cvs${SRCDATE}"
PR = "r0"
-inherit efl_library
+inherit efl
# TODO package engines seperatly (do_split_packages)
@@ -16,3 +16,21 @@ RRECOMMENDS_${PN} = "${PN}-engines"
FILES_${PN}-dbg += "${libdir}/etk/engines/.debug/"
RRECOMMENDS_${PN} = "${PN}-engines"
+
+PACKAGES += "etk-engines-software-x11"
+FILES_${PN}-engines-software-x11 = "${libdir}/etk/engines/ecore_evas_software_x11.so"
+
+#PACKAGES =+ "etk-engines-gl-x11"
+#FILES_${PN}-engines-gl-x11 = "${libdir}/etk/engines/ecore_evas_gl_x11.so"
+
+PACKAGES =+ "etk-engines-evas"
+FILES_${PN}-engines-evas = "${libdir}/etk/engines/ecore_evas.so"
+
+PACKAGES =+ "etk-engines-fb"
+FILES_${PN}-engines-fb = "${libdir}/etk/engines/ecore_fb.so"
+
+PACKAGES =+ "etk-engines-x11"
+FILES_${PN}-engines-x11 = "${libdir}/etk/engines/ecore_evas_x11.so"
+
+PACKAGES =+ "etk-engines-software-x11-16"
+FILES_${PN}-engines-software-x11-16 = "${libdir}/etk/engines/ecore_evas_software_x11_16.so"
============================================================
--- packages/efl1/evas.inc f4bea097c84b09f97ff301ce61d6fedfa3111605
+++ packages/efl1/evas.inc 13da3a3288def60746b06f49f1e6bf070fb91d53
@@ -4,7 +4,7 @@ PV = "0.9.9.042+cvs${SRCDATE}"
DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender"
PV = "0.9.9.042+cvs${SRCDATE}"
-inherit efl_library
+inherit efl
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
EXTRA_OECONF = "<override me>"
@@ -26,7 +26,6 @@ FILES_${PN}-dbg += "${libdir}/evas/modul
FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
-FILES_${PN} = "${libdir}/libevas*.so*"
PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
============================================================
--- packages/efl1/evolve_cvs.bb 28b3b6d8799b62cf4ed73c7cce33e729e5eb548c
+++ packages/efl1/evolve_cvs.bb 8aa01b6c728b2a3f2b4327d628ddf5d6595cbbdb
@@ -3,4 +3,4 @@ PV = "0.0.0+cvs${SRCDATE}"
DEPENDS = "etk evolve-native"
PV = "0.0.0+cvs${SRCDATE}"
+inherit efl
-inherit efl_library
============================================================
--- packages/efl1/ewl_cvs.bb 4b95b18bfd82af00f7025839e31897d752b42ee1
+++ packages/efl1/ewl_cvs.bb 4b58bff160ea1363790f37cde48a9303c7129239
@@ -4,7 +4,7 @@ PR = "r0"
PV = "0.5.2.042+cvs${SRCDATE}"
PR = "r0"
-inherit efl_library
+inherit efl
EXTRA_OECONF = "\
--enable-software-x11 \
============================================================
--- packages/efl1/exml_cvs.bb 36dc5bf1bc769d147967195abcd043d4bce849c6
+++ packages/efl1/exml_cvs.bb 7ae5127036e12c4f7b4225f0136bc6647f68a96b
@@ -3,5 +3,5 @@ PV = "0.1.1+cvs${SRCDATE}"
DEPENDS = "libxml2 libxslt ecore"
PV = "0.1.1+cvs${SRCDATE}"
-inherit efl_library
+inherit efl
============================================================
--- packages/efl1/imlib2_cvs.bb 0b169dbc0710ec78d933298eac59d845507532f7
+++ packages/efl1/imlib2_cvs.bb 90324b9d8bfadfca430da3b72c2b1f9c7089ee52
@@ -5,7 +5,7 @@ PR = "r0"
PV = "1.4.1.000+cvs${SRCDATE}"
PR = "r0"
-inherit efl_library
+inherit efl
SRC_URI += "file://remove-local-includes.patch;patch=1"
More information about the Openembedded-commits
mailing list