package/elementary: rename libelementary to elementary

The upstream name is elementary so use it.
Even if this package provide libelementary.so, it also provide
elementary_codegen, elementary_run and elm_prefs_cc tools.

Add a legacy entry.

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/Config.in.legacy b/Config.in.legacy
index c22e35eeeb333aa00b06f87a68919c53da8bbaf9..f4c462a33cc942cc0c3fd395c03f7ab55b585f75 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -161,6 +161,14 @@ config BR2_PACKAGE_DIRECTFB_UNICHROME
          It doesn't build in the latest version and it's unlikely
          anyone has any use for it.
 
+config BR2_PACKAGE_LIBELEMENTARY
+       bool "libelementary has been renamed to elementary"
+       select BR2_LEGACY
+       select BR2_PACKAGE_ELEMENTARY
+       help
+         The libelementary package has been renamed to match the upstream
+         name.
+
 config BR2_PACKAGE_LIBEINA
        bool "libeina package has been removed"
        select BR2_LEGACY

diff --git a/package/Config.in b/package/Config.in
index 5de57de033a44aaf80493d055234fd7c236003bd..55cd874f3274a5d058da35b46a1db7ea0bada02d 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -242,6 +242,7 @@ comment "Graphic libraries"
        source "package/cegui06/Config.in"
        source "package/directfb/Config.in"
        source "package/directfb-examples/Config.in"
+       source "package/elementary/Config.in"
        source "package/fbdump/Config.in"
        source "package/fbgrab/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
@@ -252,7 +253,6 @@ endif
        source "package/fbv/Config.in"
        source "package/freerdp/Config.in"
        source "package/imagemagick/Config.in"
-       source "package/libelementary/Config.in"
        source "package/linux-fusion/Config.in"
        source "package/lite/Config.in"
        source "package/mesa3d/Config.in"

diff --git a/package/elementary/Config.in b/package/elementary/Config.in
new file mode 100644 (file)
index 0000000..f356784
--- /dev/null
+++ b/package/elementary/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_ELEMENTARY
+       bool "elementary"
+       depends on BR2_PACKAGE_EFL
+       depends on BR2_TOOLCHAIN_HAS_THREADS # elm_store.c
+       depends on !BR2_STATIC_LIBS
+       help
+         Elementary is a widget toolkit and EFL wrapper and convenience
+         library to make it easy to build applications and tools with UIs
+         with less code.
+
+         https://enlightenment.org
+
+comment "elementary needs a toolchain w/ threads, dynamic library"
+       depends on BR2_PACKAGE_EFL
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

diff --git a/package/elementary/elementary.hash b/package/elementary/elementary.hash
new file mode 100644 (file)
index 0000000..2cd36d8
--- /dev/null
+++ b/package/elementary/elementary.hash
@@ -0,0 +1,2 @@
+# From https://download.enlightenment.org/rel/libs/elementary/elementary-1.15.2.tar.xz.sha256
+sha256 523c3073210b611817d0f56aa8348962ec757282f9f7dfde93825afa164a0f3f        elementary-1.15.2.tar.xz

diff --git a/package/elementary/elementary.mk b/package/elementary/elementary.mk
new file mode 100644 (file)
index 0000000..4320064
--- /dev/null
+++ b/package/elementary/elementary.mk
@@ -0,0 +1,37 @@
+################################################################################
+#
+# elementary
+#
+################################################################################
+
+ELEMENTARY_VERSION = 1.15.2
+ELEMENTARY_SOURCE = elementary-$(ELEMENTARY_VERSION).tar.xz
+ELEMENTARY_SITE = http://download.enlightenment.org/rel/libs/elementary
+ELEMENTARY_LICENSE = LGPLv2.1
+ELEMENTARY_LICENSE_FILES = COPYING
+
+ELEMENTARY_INSTALL_STAGING = YES
+
+ELEMENTARY_DEPENDENCIES = host-pkgconf host-libefl host-elementary libefl
+
+ELEMENTARY_CONF_OPTS = \
+       --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
+       --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
+       --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
+       --with-eldbus_codegen=$(HOST_DIR)/usr/bin/eldbus-codegen \
+       --with-elm-prefs-cc=$(HOST_DIR)/usr/bin/elm_prefs_cc \
+       --with-doxygen=no \
+       --disable-elementary-test
+
+# We need a host package in order to provide elm_prefs_cc and
+# elementary_codegen.
+HOST_ELEMENTARY_DEPENDENCIES = host-pkgconf host-libefl
+HOST_ELEMENTARY_CONF_OPTS = \
+       --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
+       --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
+       --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
+       --with-doxygen=no \
+       --disable-elementary-test
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))

diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
index 7f0d5830e9354508a17b9828f32120913318f2c9..451fa0bc280ea9dc533e17e6e0226568758d98dd 100644 (file)
--- a/package/enlightenment/Config.in
+++ b/package/enlightenment/Config.in
@@ -15,7 +15,7 @@ config BR2_PACKAGE_ENLIGHTENMENT
        select BR2_PACKAGE_LIBEFL_X_XLIB
        select BR2_PACKAGE_LIBEFL_JPEG # needed at runtime by enlightenment_start
        select BR2_PACKAGE_LIBEFL_PNG # needed at runtime by enlightenment_start
-       select BR2_PACKAGE_LIBELEMENTARY
+       select BR2_PACKAGE_ELEMENTARY
        select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
        select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
        select BR2_PACKAGE_XCB_UTIL_KEYSYMS

diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index f2e0bc3534d1f5c6544bf6a0792852fd327770e9..546b5aa4c5c5fc28622492d5fe338191f9eca31f 100644 (file)
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -14,7 +14,7 @@ ENLIGHTENMENT_DEPENDENCIES = \
        host-pkgconf \
        host-libefl \
        libefl \
-       libelementary \
+       elementary \
        libevas-generic-loaders \
        xcb-util-keysyms
 

diff --git a/package/libelementary/Config.in b/package/libelementary/Config.in
deleted file mode 100644 (file)
index 54f8688..0000000
--- a/package/libelementary/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config BR2_PACKAGE_LIBELEMENTARY
-       bool "libelementary"
-       depends on BR2_PACKAGE_EFL
-       depends on BR2_TOOLCHAIN_HAS_THREADS # elm_store.c
-       depends on !BR2_STATIC_LIBS
-       help
-         Elementary is a widget toolkit and EFL wrapper and convenience
-         library to make it easy to build applications and tools with UIs
-         with less code.
-
-         https://enlightenment.org
-
-comment "libelementary needs a toolchain w/ threads, dynamic library"
-       depends on BR2_PACKAGE_EFL
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

diff --git a/package/libelementary/libelementary.hash b/package/libelementary/libelementary.hash
deleted file mode 100644 (file)
index 2cd36d8..0000000
--- a/package/libelementary/libelementary.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From https://download.enlightenment.org/rel/libs/elementary/elementary-1.15.2.tar.xz.sha256
-sha256 523c3073210b611817d0f56aa8348962ec757282f9f7dfde93825afa164a0f3f        elementary-1.15.2.tar.xz

diff --git a/package/libelementary/libelementary.mk b/package/libelementary/libelementary.mk
deleted file mode 100644 (file)
index 4ba8681..0000000
--- a/package/libelementary/libelementary.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-#
-# libelementary
-#
-################################################################################
-
-LIBELEMENTARY_VERSION = 1.15.2
-LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.xz
-LIBELEMENTARY_SITE = http://download.enlightenment.org/rel/libs/elementary
-LIBELEMENTARY_LICENSE = LGPLv2.1
-LIBELEMENTARY_LICENSE_FILES = COPYING
-
-LIBELEMENTARY_INSTALL_STAGING = YES
-
-LIBELEMENTARY_DEPENDENCIES = host-pkgconf host-libefl host-libelementary libefl
-
-LIBELEMENTARY_CONF_OPTS = \
-       --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
-       --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
-       --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
-       --with-eldbus_codegen=$(HOST_DIR)/usr/bin/eldbus-codegen \
-       --with-elm-prefs-cc=$(HOST_DIR)/usr/bin/elm_prefs_cc \
-       --with-doxygen=no \
-       --disable-elementary-test
-
-# We need a host package in order to provide elm_prefs_cc and
-# elementary_codegen.
-HOST_LIBELEMENTARY_DEPENDENCIES = host-pkgconf host-libefl
-HOST_LIBELEMENTARY_CONF_OPTS = \
-       --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
-       --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
-       --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
-       --with-doxygen=no \
-       --disable-elementary-test
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))