From patchwork Sat Mar 7 16:26:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 447618 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id AF59C14009B for ; Sun, 8 Mar 2015 03:26:22 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=iAA3kHOC; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CAE2A8B3B6; Sat, 7 Mar 2015 16:26:21 +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 86lUWQVO7L7V; Sat, 7 Mar 2015 16:26:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 06E258B315; Sat, 7 Mar 2015 16:26:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D74131C25D9 for ; Sat, 7 Mar 2015 16:26:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D326C8B315 for ; Sat, 7 Mar 2015 16:26:19 +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 lA60bni6RK31 for ; Sat, 7 Mar 2015 16:26:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by hemlock.osuosl.org (Postfix) with ESMTPS id CAE898B2F6 for ; Sat, 7 Mar 2015 16:26:18 +0000 (UTC) Received: by wibbs8 with SMTP id bs8so10328879wib.4 for ; Sat, 07 Mar 2015 08:26:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=uoijBzkYftohLo0U1jPu0DXpE7uEhO320wxEXQL9CWw=; b=iAA3kHOCbhS/MC4ba5ytQGC6aI3oAyZ4h19KnzCMA7f/2AfjCM5h9AcrlQbhcjoYhE gjnorRvqwl5qf/DY8gMGXE/bR38CIQWFmLfJykMBiG09aSYIQjfs39YwmfJFckQe1vyW Tlv5ltmtoDcrKOTupbgkYIchD0E0jwszKg28myD8JY2dZOGRpDw+UjdN6waHwRqu4o24 J8A19i8TjGMARvS5xkcoF5APzf0XVvDrF0pAQgdo32BtUQPX3+twOFZC0Rt5Aso/c61K VBKPaaF+0qtSG/cM6oWOPSwA4oP+VdlE4v3dYsXzQR0wD7zo7LfYxb1Vd8UncIJ/pEXf tD7g== X-Received: by 10.180.103.40 with SMTP id ft8mr89168854wib.68.1425745577433; Sat, 07 Mar 2015 08:26:17 -0800 (PST) Received: from mobeast.localdomain (dynamic-adsl-78-15-149-44.clienti.tiscali.it. [78.15.149.44]) by mx.google.com with ESMTPSA id e2sm19952178wjy.46.2015.03.07.08.26.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Mar 2015 08:26:16 -0800 (PST) From: Fabio Porcedda To: buildroot@uclibc.org Date: Sat, 7 Mar 2015 17:26:13 +0100 Message-Id: <1425745574-2241-1-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 2.3.1 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/2] imlib2: bump to version 1.4.6 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" Also add two upstream patch to fix a warning and a build failure of the version 1.4.6. Also add AUTORECONF because one patch change the file "src/lib/Makefile.am". Signed-off-by: Fabio Porcedda --- ...AY_MISSING-redefined-warnings-when-X-is-d.patch | 75 ++++++++++++++++++++++ ...o-not-link-with-X-libs-when-X-is-disabled.patch | 29 +++++++++ package/imlib2/imlib2.hash | 2 +- package/imlib2/imlib2.mk | 3 +- 4 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 package/imlib2/0001-fix-X_DISPLAY_MISSING-redefined-warnings-when-X-is-d.patch create mode 100644 package/imlib2/0002-do-not-link-with-X-libs-when-X-is-disabled.patch diff --git a/package/imlib2/0001-fix-X_DISPLAY_MISSING-redefined-warnings-when-X-is-d.patch b/package/imlib2/0001-fix-X_DISPLAY_MISSING-redefined-warnings-when-X-is-d.patch new file mode 100644 index 0000000..f3327a0 --- /dev/null +++ b/package/imlib2/0001-fix-X_DISPLAY_MISSING-redefined-warnings-when-X-is-d.patch @@ -0,0 +1,75 @@ +From 49e3034ab714c9f05a6c0a04cf85ecbdb65c02d5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Mon, 28 Jul 2014 22:59:35 -0400 +Subject: [PATCH 1/2] fix X_DISPLAY_MISSING redefined warnings when X is + disabled + +This is set up in config.h by configure, so avoid defining it again. +--- + src/bin/imlib2_conv.c | 2 ++ + src/lib/api.c | 2 ++ + src/lib/image.h | 2 ++ + src/lib/script.c | 2 ++ + 4 files changed, 8 insertions(+) + +diff --git a/src/bin/imlib2_conv.c b/src/bin/imlib2_conv.c +index 1b05b1f..1c46d0c 100644 +--- a/src/bin/imlib2_conv.c ++++ b/src/bin/imlib2_conv.c +@@ -8,7 +8,9 @@ + #include + #include + ++#ifndef X_DISPLAY_MISSING + #define X_DISPLAY_MISSING ++#endif + #include + + #define PROG_NAME "imlib2_conv" +diff --git a/src/lib/api.c b/src/lib/api.c +index e29eaf0..178d2ca 100644 +--- a/src/lib/api.c ++++ b/src/lib/api.c +@@ -4,8 +4,10 @@ + #include + #include + #else ++#ifndef X_DISPLAY_MISSING + #define X_DISPLAY_MISSING + #endif ++#endif + #include + #include + #include "common.h" +diff --git a/src/lib/image.h b/src/lib/image.h +index eef59d2..52dde9d 100644 +--- a/src/lib/image.h ++++ b/src/lib/image.h +@@ -5,7 +5,9 @@ + # ifdef BUILD_X11 + # include + # else ++#ifndef X_DISPLAY_MISSING + # define X_DISPLAY_MISSING ++#endif + # endif + + # include +diff --git a/src/lib/script.c b/src/lib/script.c +index 55ebd4e..7c974c0 100644 +--- a/src/lib/script.c ++++ b/src/lib/script.c +@@ -13,8 +13,10 @@ + #ifdef BUILD_X11 + #include + #else ++#ifndef X_DISPLAY_MISSING + #define X_DISPLAY_MISSING + #endif ++#endif + #include "image.h" + #include "file.h" + #include "dynamic_filters.h" +-- +2.3.1 + diff --git a/package/imlib2/0002-do-not-link-with-X-libs-when-X-is-disabled.patch b/package/imlib2/0002-do-not-link-with-X-libs-when-X-is-disabled.patch new file mode 100644 index 0000000..e34f9bc --- /dev/null +++ b/package/imlib2/0002-do-not-link-with-X-libs-when-X-is-disabled.patch @@ -0,0 +1,29 @@ +From f5caf5432609938794d7a72afe059cfcfccd38bf Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Mon, 28 Jul 2014 23:01:23 -0400 +Subject: [PATCH 2/2] do not link with X libs when X is disabled + +URL: https://bugs.gentoo.org/517670 +--- + src/lib/Makefile.am | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am +index 64de98b..ea94991 100644 +--- a/src/lib/Makefile.am ++++ b/src/lib/Makefile.am +@@ -86,7 +86,10 @@ AMD64_OBJS = $(AMD64_SRCS:.S=.lo) + + EXTRA_DIST = $(MMX_SRCS) $(AMD64_SRCS) asm_loadimmq.S + +-MY_LIBS = -lXext -lX11 $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm ++MY_LIBS = $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm ++if BUILD_X11 ++MY_LIBS += -lXext -lX11 ++endif + + if BUILD_MMX + libImlib2_la_LIBADD = $(MMX_OBJS) $(MY_LIBS) +-- +2.3.1 + diff --git a/package/imlib2/imlib2.hash b/package/imlib2/imlib2.hash index 356a95b..c8d5fe9 100644 --- a/package/imlib2/imlib2.hash +++ b/package/imlib2/imlib2.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 24700d93931838d2149cc2b4b58b9355cc81ec11d297f101a98dbb8d1c5c945a imlib2-1.4.5.tar.bz2 +sha256 af51be727d62cfcff7457c753f355e44848fb997f33a7e1d43775276a9073274 imlib2-1.4.6.tar.bz2 diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk index 62f3989..6539246 100644 --- a/package/imlib2/imlib2.mk +++ b/package/imlib2/imlib2.mk @@ -4,12 +4,13 @@ # ################################################################################ -IMLIB2_VERSION = 1.4.5 +IMLIB2_VERSION = 1.4.6 IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2 IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION) IMLIB2_LICENSE = imlib2 license IMLIB2_LICENSE_FILES = COPYING +IMLIB2_AUTORECONF = YES IMLIB2_INSTALL_STAGING = YES IMLIB2_DEPENDENCIES = host-pkgconf freetype IMLIB2_CONF_OPTS = --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config