From patchwork Tue Mar 7 23:50:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 736404 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vdD3H5ZQFz9sNJ for ; Wed, 8 Mar 2017 10:52:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 977018A23C; Tue, 7 Mar 2017 23:52:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jZWk2uQyEh6G; Tue, 7 Mar 2017 23:52:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 484D1877A0; Tue, 7 Mar 2017 23:52:01 +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 4CD6D1C05CE for ; Tue, 7 Mar 2017 23:51:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3EFCB890B8 for ; Tue, 7 Mar 2017 23:51:46 +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 32lmS5-Tkray for ; Tue, 7 Mar 2017 23:51:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from exchange.essensium.com (220.77.144.195.ipv4.evonet.be [195.144.77.220]) by whitealder.osuosl.org (Postfix) with ESMTPS id A3A1A8954B for ; Tue, 7 Mar 2017 23:51:44 +0000 (UTC) Received: from localhost.localdomain (10.3.7.11) by beleexch01.local.ess-mail.com (10.3.7.8) with Microsoft SMTP Server (TLS) id 15.0.847.32; Wed, 8 Mar 2017 00:51:07 +0100 From: "Arnout Vandecappelle (Essensium/Mind)" To: Date: Wed, 8 Mar 2017 00:50:54 +0100 Message-ID: <20170307235054.25149-6-arnout@mind.be> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170307235054.25149-1-arnout@mind.be> References: <20170307235054.25149-1-arnout@mind.be> MIME-Version: 1.0 X-Originating-IP: [10.3.7.11] X-ClientProxiedBy: beleexch01.local.ess-mail.com (10.3.7.8) To beleexch01.local.ess-mail.com (10.3.7.8) Cc: Romain Naour , Gustavo Sverzut Barbieri Subject: [Buildroot] [PATCH 6/6] efl: remove broken JP2K loader 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This option has been marked as broken since 2016.08. Since nobody repaired it, we'll just remove it. Since technically it was already removed in 2016.08, it's added to the 2016.08 section of the legacy menu. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Gustavo Sverzut Barbieri Reviewed-By: Gustavo Sverzut Barbieri Acked-by: Romain Naour --- Romain, Gustavo, last chance to unbreak the package :-) --- Config.in.legacy | 7 +++++++ package/efl/Config.in | 10 ---------- package/efl/efl.mk | 8 +------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 1f3d09b389..67f6e4e3a0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -475,6 +475,13 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL ############################################################################### comment "Legacy options removed in 2016.08" +config BR2_PACKAGE_EFL_JP2K + bool "libevas jp2k loader has been removed" + select BR2_LEGACY + JP2K support in EFL requires openjpeg 1.x (libopenjpeg1.pc) + while Buildroot only packages openjpeg 2.x. Therefore, the + JP2K loader has been removed from EFL. + config BR2_PACKAGE_SYSTEMD_COMPAT bool "systemd compatibility libraries have been removed" select BR2_LEGACY diff --git a/package/efl/Config.in b/package/efl/Config.in index 5e89af602c..960f2752c3 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -252,16 +252,6 @@ config BR2_PACKAGE_EFL_PNG This enables the loader code that loads png files using libpng. -# JP2K support require openjpeg 1.x (libopenjpeg1.pc) which is not -# available in Buildroot anymore. -config BR2_PACKAGE_EFL_JP2K - bool "libevas jp2k loader" - select BR2_PACKAGE_OPENJPEG - depends on BROKEN # require openjpeg 1.x - help - This enables the loader code that loads jp2k files using - openjpeg. - config BR2_PACKAGE_EFL_JPEG bool "libevas jpeg loader" help diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 1e54f72810..e0ec6d6bcc 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -38,6 +38,7 @@ EFL_CONF_OPTS = \ --with-elm-prefs-cc=$(HOST_DIR)/usr/bin/elm_prefs_cc \ --with-elua=$(HOST_DIR)/usr/bin/elua \ --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \ + --disable-image-loader-jp2k \ --disable-lua-old \ --disable-poppler \ --disable-sdl \ @@ -251,13 +252,6 @@ else EFL_CONF_OPTS += --disable-image-loader-tiff endif -ifeq ($(BR2_PACKAGE_EFL_JP2K),y) -EFL_CONF_OPTS += --enable-image-loader-jp2k=yes -EFL_DEPENDENCIES += openjpeg -else -EFL_CONF_OPTS += --disable-image-loader-jp2k -endif - ifeq ($(BR2_PACKAGE_EFL_WEBP),y) EFL_CONF_OPTS += --enable-image-loader-webp=yes EFL_DEPENDENCIES += webp