From patchwork Sat Dec 12 13:33:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 556049 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 3913D140B12 for ; Sun, 13 Dec 2015 00:35:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6430492E94; Sat, 12 Dec 2015 13:35:21 +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 YtHLQ3hgJa+E; Sat, 12 Dec 2015 13:35:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id DD45C92E9A; Sat, 12 Dec 2015 13:34:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 1B35A1CF439 for ; Sat, 12 Dec 2015 13:33:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1464A33D9A for ; Sat, 12 Dec 2015 13:33:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yR-oQE8o--uP for ; Sat, 12 Dec 2015 13:33:44 +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 silver.osuosl.org (Postfix) with ESMTPS id 5606D32209 for ; Sat, 12 Dec 2015 13:33:44 +0000 (UTC) Received: from adeos.localdomain (unknown [81.57.22.125]) by smtp1-g21.free.fr (Postfix) with ESMTP id E6FC1940055; Sat, 12 Dec 2015 14:32:41 +0100 (CET) From: Romain Naour To: buildroot@buildroot.org Date: Sat, 12 Dec 2015 14:33:23 +0100 Message-Id: <1449927215-3452-21-git-send-email-romain.naour@openwide.fr> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1449927215-3452-1-git-send-email-romain.naour@openwide.fr> References: <1449927215-3452-1-git-send-email-romain.naour@openwide.fr> Subject: [Buildroot] [PATCH v9 20/32] package/expedite: bump to efl-1.15 branch 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" Since expedite hasn't been released since 1.7.10 release, use efl-1.15 branch in the git tree. Use the newly added libefl package wich provide a new version of efl libraries. Autoreconf the package since there is no configure script in the git tree. Signed-off-by: Romain Naour Reviewed-by: "Yann E. MORIN" --- v6: Add host-pkgconfig dependency (Yann E.Morin) v5: Use depends on BR2_PACKAGE_EFL instead of select (ThomasP) remove comments on dependencies v4: update Config.in to use libefl improve commit log keep the dependency on threads Replace the old BR2_PACKAGE_LIBEVAS_X11 by BR2_PACKAGE_LIBEFL_X v2: bump to 1.15 branch --- package/expedite/Config.in | 8 ++------ package/expedite/expedite.mk | 13 +++++++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/package/expedite/Config.in b/package/expedite/Config.in index e60510b..0bcf343 100644 --- a/package/expedite/Config.in +++ b/package/expedite/Config.in @@ -2,15 +2,11 @@ config BR2_PACKAGE_EXPEDITE bool "expedite" depends on BR2_PACKAGE_EFL depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # libevas - select BR2_PACKAGE_LIBEET - select BR2_PACKAGE_LIBEINA - select BR2_PACKAGE_LIBEVAS help Expedite is the official Evas benchmark tool. It can test different engines, such as X11, XRender, OpenGL (also ES variant), SDL, DirectFB and so on. Its tests are quite extensive, trying to reproduce real world usage cases. -comment "expedite needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "expedite needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/expedite/expedite.mk b/package/expedite/expedite.mk index 9b232f8..6b3bbfe 100644 --- a/package/expedite/expedite.mk +++ b/package/expedite/expedite.mk @@ -4,14 +4,19 @@ # ################################################################################ -EXPEDITE_VERSION = 1.7.10 -EXPEDITE_SITE = http://download.enlightenment.org/releases +# efl-1.15 branch +EXPEDITE_VERSION = 3ce8b3f1451700f9a2da60c2e717c644220e2449 +EXPEDITE_SITE = http://git.enlightenment.org/tools/expedite.git +EXPEDITE_SITE_METHOD = git EXPEDITE_LICENSE = BSD-2c EXPEDITE_LICENSE_FILES = COPYING -EXPEDITE_DEPENDENCIES = libevas libeina libeet +EXPEDITE_DEPENDENCIES = host-libefl host-pkgconf libefl -ifeq ($(BR2_PACKAGE_LIBEVAS_X11),y) +# There is no configure script in the git tree. +EXPEDITE_AUTORECONF = YES + +ifeq ($(BR2_PACKAGE_LIBEFL_X),y) EXPEDITE_CONF_OPTS += --with-x=$(STAGING_DIR) \ --x-includes=$(STAGING_DIR)/usr/include \ --x-libraries=$(STAGING_DIR)/usr/lib