From: Romain Naour Date: Sat, 19 Dec 2015 16:39:13 +0000 (+0100) Subject: package/libelementary: move to package directory X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=983b74fca799703dc3f22816e82e13bba3e4831b;p=buildroot.git package/libelementary: move to package directory As discussed on the list the two remaining packages in package/efl subdirectory will be moved to package/ directory. - Add the efl dependency to libelementary. - Set LIBELEMENTARY_VERSION with the version number directly. Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- diff --git a/package/Config.in b/package/Config.in index 45de28f2ba..5de57de033 100644 --- a/package/Config.in +++ b/package/Config.in @@ -252,6 +252,7 @@ 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/efl/Config.in b/package/efl/Config.in index 80658b2f0c..7ef1b5bd9d 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -16,7 +16,6 @@ menuconfig BR2_PACKAGE_EFL if BR2_PACKAGE_EFL source "package/efl/libefl/Config.in" -source "package/efl/libelementary/Config.in" endif # BR2_PACKAGE_EFL diff --git a/package/efl/libelementary/Config.in b/package/efl/libelementary/Config.in deleted file mode 100644 index ce597de6c7..0000000000 --- a/package/efl/libelementary/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBELEMENTARY - bool "libelementary" - select BR2_PACKAGE_LIBEFL - 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_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/efl/libelementary/libelementary.hash b/package/efl/libelementary/libelementary.hash deleted file mode 100644 index 2cd36d8db8..0000000000 --- a/package/efl/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/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk deleted file mode 100644 index c920801b2d..0000000000 --- a/package/efl/libelementary/libelementary.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# libelementary -# -################################################################################ - -LIBELEMENTARY_VERSION = $(EFL_VERSION) -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)) diff --git a/package/libelementary/Config.in b/package/libelementary/Config.in new file mode 100644 index 0000000000..54f8688c34 --- /dev/null +++ b/package/libelementary/Config.in @@ -0,0 +1,15 @@ +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 new file mode 100644 index 0000000000..2cd36d8db8 --- /dev/null +++ b/package/libelementary/libelementary.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/libelementary/libelementary.mk b/package/libelementary/libelementary.mk new file mode 100644 index 0000000000..4ba8681dd7 --- /dev/null +++ b/package/libelementary/libelementary.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# 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))