Revert "ecore: catch up with the new SONAMEs; move to autosplitting"

This reverts commit 8101ad8e1229b3b9f8aa0be0fdc262b5283034d0.

diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc
index 8d99414..5078c55 100644 (file)
--- a/recipes/efl1/ecore.inc
+++ b/recipes/efl1/ecore.inc
@@ -3,23 +3,43 @@ LICENSE = "MIT BSD"
 DEPENDS = "curl eet evas tslib libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor libxprintutil"
 # optional
 # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv"
-PV = "0.9.9.060+svnr${SRCREV}"
-PR = "r0"
+PV = "0.9.9.050+svnr${SRCREV}"
+PR = "r3"
 
 inherit efl
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
 
-python populate_packages_prepend() {
-       plugindir = bb.data.expand('${libdir}/', d)
-       do_split_packages(d,
-               plugindir,
-               '^libecore_(.+)-ver-pre-svn-(.*)\.so\.(.*)',
-               'ecore-lib-%s',
-               'ECore support for %s',
-               extra_depends = '',
-               aux_files_pattern = ['${libdir}/libecore_%s*.so.*'] )
-}
-
-FILES_${PN} = "${libdir}/libecore-ver-pre-svn*.so.*"
-PACKAGES_DYNAMIC = "ecore-lib-*"
+PACKAGES += "\
+    ${PN}-con \
+    ${PN}-config \
+    ${PN}-desktop \
+    ${PN}-directfb \
+    ${PN}-sdl \
+    ${PN}-evas \
+    ${PN}-fb \
+    ${PN}-file \
+    ${PN}-imf-evas \
+    ${PN}-imf \
+    ${PN}-ipc \
+    ${PN}-job \
+    ${PN}-txt \
+    ${PN}-x \
+    ${PN}-input \
+    "
+FILES_${PN} = "${libdir}/libecore*.so.*"
+FILES_${PN}-con = "${libdir}/libecore_con*.so.*"
+FILES_${PN}-config = "${libdir}/libecore_config*.so.*"
+FILES_${PN}-desktop = "${libdir}/libecore_desktop*.so.*"
+FILES_${PN}-directfb = "${libdir}/libecore_directfb*.so.*"
+FILES_${PN}-sdl = "${libdir}/libecore_sdl*.so.*"
+FILES_${PN}-evas = "${libdir}/libecore_evas*.so.*"
+FILES_${PN}-fb = "${libdir}/libecore_fb*.so.*"
+FILES_${PN}-file = "${libdir}/libecore_file*.so.*"
+FILES_${PN}-imf = "${libdir}/libecore_imf*.so.*"
+FILES_${PN}-imf-evas = "${libdir}/libecore_imf_evas*.so.*"
+FILES_${PN}-ipc = "${libdir}/libecore_ipc*.so.*"
+FILES_${PN}-job = "${libdir}/libecore_job*.so.*"
+FILES_${PN}-txt = "${libdir}/libecore_txt*.so.*"
+FILES_${PN}-x = "${libdir}/libecore_x*.so.*"
+FILES_${PN}-input = "${libdir}/libecore_input*.so.*"