package/libevas-generic-loaders: move to package directory

As for expedite package, there is no advantage for efl related
packages to share the same version number anymore
(except for efl and libelementary).

Also, we usually do not have a sub-directory for a family of related
packages which doen't share the same version number, so move
libevas-generic-loaders to package directory.
Libevas-generic-loaders appear now in "Libraries" -> "Graphics" in
the Kconfig menu.

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/Config.in b/package/Config.in
index 9610423145e2820923719fb03e353a5c0401b287..00aedad8439530adade4dda887d4a9c2f719664d 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -827,6 +827,7 @@ menu "Graphics"
        source "package/libdri2/Config.in"
        source "package/libdrm/Config.in"
        source "package/libexif/Config.in"
+       source "package/libevas-generic-loaders/Config.in"
        source "package/libfm/Config.in"
        source "package/libfm-extra/Config.in"
        source "package/libfreeimage/Config.in"

diff --git a/package/efl/Config.in b/package/efl/Config.in
index cb91660afc1d0ec90581545a796537c2ef89537e..7ce5a36cbed3e47aa6ff863eb8982e097c41a356 100644 (file)
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -16,7 +16,6 @@ source "package/efl/libeet/Config.in"
 source "package/efl/libefreet/Config.in"
 source "package/efl/libeio/Config.in"
 source "package/efl/libevas/Config.in"
-source "package/efl/libevas-generic-loaders/Config.in"
 source "package/efl/libembryo/Config.in"
 source "package/efl/libedje/Config.in"
 source "package/efl/libethumb/Config.in"

diff --git a/package/efl/libevas-generic-loaders/Config.in b/package/efl/libevas-generic-loaders/Config.in
deleted file mode 100644 (file)
index 3f7581f..0000000
--- a/package/efl/libevas-generic-loaders/Config.in
+++ /dev/null
@@ -1,29 +0,0 @@
-config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
-       bool "libevas generic loaders"
-       select BR2_PACKAGE_LIBEINA
-       select BR2_PACKAGE_ZLIB
-       help
-         These are additional "generic" loaders for Evas that are
-         stand-alone executables that evas may run from its generic
-         loader module.
-
-         http://trac.enlightenment.org/e/wiki/Evas_Generic_Loaders
-
-if BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
-
-config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
-       bool "SVG loader"
-       select BR2_PACKAGE_LIBRSVG
-       select BR2_PACKAGE_CAIRO
-       depends on BR2_USE_WCHAR # librsvg -> glib2
-       depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2
-       depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango
-       depends on BR2_ARCH_HAS_ATOMICS # cairo
-       help
-         This option enables the Evas generic SVG loader
-
-comment "SVG loader needs a toolchain w/ wchar, threads, C++"
-       depends on BR2_ARCH_HAS_ATOMICS
-       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
-
-endif

diff --git a/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk b/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
deleted file mode 100644 (file)
index ac6b1cc..0000000
--- a/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-################################################################################
-#
-# libevas-generic-loaders
-#
-################################################################################
-
-LIBEVAS_GENERIC_LOADERS_VERSION = 1.7.10
-LIBEVAS_GENERIC_LOADERS_SOURCE = evas_generic_loaders-$(LIBEVAS_GENERIC_LOADERS_VERSION).tar.bz2
-LIBEVAS_GENERIC_LOADERS_SITE = http://download.enlightenment.org/releases
-LIBEVAS_GENERIC_LOADERS_LICENSE = GPLv2
-LIBEVAS_GENERIC_LOADERS_LICENSE_FILES = COPYING
-
-LIBEVAS_GENERIC_LOADERS_INSTALL_STAGING = YES
-
-LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = libeina zlib
-
-# For now, we only support the SVG loader
-LIBEVAS_GENERIC_LOADERS_CONF_OPTS += \
-       --disable-poppler \
-       --disable-spectre \
-       --disable-libraw \
-       --disable-gstreamer
-
-ifeq ($(BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG),y)
-LIBEVAS_GENERIC_LOADERS_DEPENDENCIES += librsvg cairo
-LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --enable-svg
-else
-LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --disable-svg
-endif
-
-$(eval $(autotools-package))

diff --git a/package/libevas-generic-loaders/Config.in b/package/libevas-generic-loaders/Config.in
new file mode 100644 (file)
index 0000000..c69f5e8
--- /dev/null
+++ b/package/libevas-generic-loaders/Config.in
@@ -0,0 +1,30 @@
+config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
+       bool "libevas generic loaders"
+       depends on BR2_PACKAGE_EFL
+       select BR2_PACKAGE_LIBEINA
+       select BR2_PACKAGE_ZLIB
+       help
+         These are additional "generic" loaders for Evas that are
+         stand-alone executables that evas may run from its generic
+         loader module.
+
+         http://trac.enlightenment.org/e/wiki/Evas_Generic_Loaders
+
+if BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
+
+config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
+       bool "SVG loader"
+       select BR2_PACKAGE_LIBRSVG
+       select BR2_PACKAGE_CAIRO
+       depends on BR2_USE_WCHAR # librsvg -> glib2
+       depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2
+       depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango
+       depends on BR2_ARCH_HAS_ATOMICS # cairo
+       help
+         This option enables the Evas generic SVG loader
+
+comment "SVG loader needs a toolchain w/ wchar, threads, C++"
+       depends on BR2_ARCH_HAS_ATOMICS
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
+
+endif

diff --git a/package/libevas-generic-loaders/libevas-generic-loaders.mk b/package/libevas-generic-loaders/libevas-generic-loaders.mk
new file mode 100644 (file)
index 0000000..ac6b1cc
--- /dev/null
+++ b/package/libevas-generic-loaders/libevas-generic-loaders.mk
@@ -0,0 +1,31 @@
+################################################################################
+#
+# libevas-generic-loaders
+#
+################################################################################
+
+LIBEVAS_GENERIC_LOADERS_VERSION = 1.7.10
+LIBEVAS_GENERIC_LOADERS_SOURCE = evas_generic_loaders-$(LIBEVAS_GENERIC_LOADERS_VERSION).tar.bz2
+LIBEVAS_GENERIC_LOADERS_SITE = http://download.enlightenment.org/releases
+LIBEVAS_GENERIC_LOADERS_LICENSE = GPLv2
+LIBEVAS_GENERIC_LOADERS_LICENSE_FILES = COPYING
+
+LIBEVAS_GENERIC_LOADERS_INSTALL_STAGING = YES
+
+LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = libeina zlib
+
+# For now, we only support the SVG loader
+LIBEVAS_GENERIC_LOADERS_CONF_OPTS += \
+       --disable-poppler \
+       --disable-spectre \
+       --disable-libraw \
+       --disable-gstreamer
+
+ifeq ($(BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG),y)
+LIBEVAS_GENERIC_LOADERS_DEPENDENCIES += librsvg cairo
+LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --enable-svg
+else
+LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --disable-svg
+endif
+
+$(eval $(autotools-package))