Sfoglia il codice sorgente

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>
Romain Naour 9 anni fa
parent
commit
820e16856a

+ 8 - 0
Config.in.legacy

@@ -161,6 +161,14 @@ config BR2_PACKAGE_DIRECTFB_UNICHROME
 	  It doesn't build in the latest version and it's unlikely
 	  It doesn't build in the latest version and it's unlikely
 	  anyone has any use for it.
 	  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
 config BR2_PACKAGE_LIBEINA
 	bool "libeina package has been removed"
 	bool "libeina package has been removed"
 	select BR2_LEGACY
 	select BR2_LEGACY

+ 1 - 1
package/Config.in

@@ -242,6 +242,7 @@ comment "Graphic libraries"
 	source "package/cegui06/Config.in"
 	source "package/cegui06/Config.in"
 	source "package/directfb/Config.in"
 	source "package/directfb/Config.in"
 	source "package/directfb-examples/Config.in"
 	source "package/directfb-examples/Config.in"
+	source "package/elementary/Config.in"
 	source "package/fbdump/Config.in"
 	source "package/fbdump/Config.in"
 	source "package/fbgrab/Config.in"
 	source "package/fbgrab/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
@@ -252,7 +253,6 @@ endif
 	source "package/fbv/Config.in"
 	source "package/fbv/Config.in"
 	source "package/freerdp/Config.in"
 	source "package/freerdp/Config.in"
 	source "package/imagemagick/Config.in"
 	source "package/imagemagick/Config.in"
-	source "package/libelementary/Config.in"
 	source "package/linux-fusion/Config.in"
 	source "package/linux-fusion/Config.in"
 	source "package/lite/Config.in"
 	source "package/lite/Config.in"
 	source "package/mesa3d/Config.in"
 	source "package/mesa3d/Config.in"

+ 3 - 3
package/libelementary/Config.in → package/elementary/Config.in

@@ -1,5 +1,5 @@
-config BR2_PACKAGE_LIBELEMENTARY
-	bool "libelementary"
+config BR2_PACKAGE_ELEMENTARY
+	bool "elementary"
 	depends on BR2_PACKAGE_EFL
 	depends on BR2_PACKAGE_EFL
 	depends on BR2_TOOLCHAIN_HAS_THREADS # elm_store.c
 	depends on BR2_TOOLCHAIN_HAS_THREADS # elm_store.c
 	depends on !BR2_STATIC_LIBS
 	depends on !BR2_STATIC_LIBS
@@ -10,6 +10,6 @@ config BR2_PACKAGE_LIBELEMENTARY
 
 
 	  https://enlightenment.org
 	  https://enlightenment.org
 
 
-comment "libelementary needs a toolchain w/ threads, dynamic library"
+comment "elementary needs a toolchain w/ threads, dynamic library"
 	depends on BR2_PACKAGE_EFL
 	depends on BR2_PACKAGE_EFL
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

+ 0 - 0
package/libelementary/libelementary.hash → package/elementary/elementary.hash


+ 11 - 11
package/libelementary/libelementary.mk → package/elementary/elementary.mk

@@ -1,20 +1,20 @@
 ################################################################################
 ################################################################################
 #
 #
-# libelementary
+# elementary
 #
 #
 ################################################################################
 ################################################################################
 
 
-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
+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
 
 
-LIBELEMENTARY_INSTALL_STAGING = YES
+ELEMENTARY_INSTALL_STAGING = YES
 
 
-LIBELEMENTARY_DEPENDENCIES = host-pkgconf host-libefl host-libelementary libefl
+ELEMENTARY_DEPENDENCIES = host-pkgconf host-libefl host-elementary libefl
 
 
-LIBELEMENTARY_CONF_OPTS = \
+ELEMENTARY_CONF_OPTS = \
 	--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
 	--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
 	--with-eet-eet=$(HOST_DIR)/usr/bin/eet \
 	--with-eet-eet=$(HOST_DIR)/usr/bin/eet \
 	--with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
 	--with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
@@ -25,8 +25,8 @@ LIBELEMENTARY_CONF_OPTS = \
 
 
 # We need a host package in order to provide elm_prefs_cc and
 # We need a host package in order to provide elm_prefs_cc and
 # elementary_codegen.
 # elementary_codegen.
-HOST_LIBELEMENTARY_DEPENDENCIES = host-pkgconf host-libefl
-HOST_LIBELEMENTARY_CONF_OPTS = \
+HOST_ELEMENTARY_DEPENDENCIES = host-pkgconf host-libefl
+HOST_ELEMENTARY_CONF_OPTS = \
 	--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
 	--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
 	--with-eet-eet=$(HOST_DIR)/usr/bin/eet \
 	--with-eet-eet=$(HOST_DIR)/usr/bin/eet \
 	--with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
 	--with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \

+ 1 - 1
package/enlightenment/Config.in

@@ -15,7 +15,7 @@ config BR2_PACKAGE_ENLIGHTENMENT
 	select BR2_PACKAGE_LIBEFL_X_XLIB
 	select BR2_PACKAGE_LIBEFL_X_XLIB
 	select BR2_PACKAGE_LIBEFL_JPEG # needed at runtime by enlightenment_start
 	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_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
 	select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
 	select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
 	select BR2_PACKAGE_XCB_UTIL_KEYSYMS
 	select BR2_PACKAGE_XCB_UTIL_KEYSYMS

+ 1 - 1
package/enlightenment/enlightenment.mk

@@ -14,7 +14,7 @@ ENLIGHTENMENT_DEPENDENCIES = \
 	host-pkgconf \
 	host-pkgconf \
 	host-libefl \
 	host-libefl \
 	libefl \
 	libefl \
-	libelementary \
+	elementary \
 	libevas-generic-loaders \
 	libevas-generic-loaders \
 	xcb-util-keysyms
 	xcb-util-keysyms