From patchwork Sat Oct 10 10:03:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 528568 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 9C267140D24 for ; Sat, 10 Oct 2015 21:04:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D47158FA64; Sat, 10 Oct 2015 10:04:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id F9Yxrjbqvoqh; Sat, 10 Oct 2015 10:03:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9BBA98901A; Sat, 10 Oct 2015 10:03:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D7F4B1C1F36 for ; Sat, 10 Oct 2015 10:03:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D18C78895B for ; Sat, 10 Oct 2015 10:03:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VqEYo5GDUCoA for ; Sat, 10 Oct 2015 10:03:50 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2B1B6888BB for ; Sat, 10 Oct 2015 10:03:50 +0000 (UTC) Received: from adeos.localdomain (unknown [81.57.22.125]) by smtp1-g21.free.fr (Postfix) with ESMTP id 6E05C940026; Sat, 10 Oct 2015 12:03:48 +0200 (CEST) From: Romain Naour To: buildroot@buildroot.org Date: Sat, 10 Oct 2015 12:03:09 +0200 Message-Id: <1444471422-15118-5-git-send-email-romain.naour@openwide.fr> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1444471422-15118-1-git-send-email-romain.naour@openwide.fr> References: <1444471422-15118-1-git-send-email-romain.naour@openwide.fr> Subject: [Buildroot] [PATCH v3 04/37] package/libevas-generic-loaders: move to package directory X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Romain Naour --- package/Config.in | 1 + package/efl/Config.in | 1 - package/efl/libevas-generic-loaders/Config.in | 29 ------------------- .../libevas-generic-loaders.mk | 31 -------------------- package/libevas-generic-loaders/Config.in | 33 ++++++++++++++++++++++ .../libevas-generic-loaders.mk | 31 ++++++++++++++++++++ 6 files changed, 65 insertions(+), 61 deletions(-) delete mode 100644 package/efl/libevas-generic-loaders/Config.in delete mode 100644 package/efl/libevas-generic-loaders/libevas-generic-loaders.mk create mode 100644 package/libevas-generic-loaders/Config.in create mode 100644 package/libevas-generic-loaders/libevas-generic-loaders.mk diff --git a/package/Config.in b/package/Config.in index 49ce01a..2bc87d4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -241,6 +241,7 @@ endif source "package/freerdp/Config.in" source "package/imagemagick/Config.in" source "package/libelementary/Config.in" + source "package/libevas-generic-loaders/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 cf82f8b..659ee10 100644 --- 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 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 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 index 0000000..47e5aa2 --- /dev/null +++ b/package/libevas-generic-loaders/Config.in @@ -0,0 +1,33 @@ +config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS + bool "libevas generic loaders" + select BR2_PACKAGE_LIBEINA + select BR2_PACKAGE_ZLIB + depends on BR2_USE_WCHAR # efl + depends on BR2_USE_MMU # efl + 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_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/ threads, C++" + depends on BR2_ARCH_HAS_ATOMICS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP + +endif + +comment "libevas generic loaders needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR diff --git a/package/libevas-generic-loaders/libevas-generic-loaders.mk b/package/libevas-generic-loaders/libevas-generic-loaders.mk new file mode 100644 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))