From patchwork Tue Nov 14 22:29:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Prado X-Patchwork-Id: 838063 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=e-labworks-com.20150623.gappssmtp.com header.i=@e-labworks-com.20150623.gappssmtp.com header.b="x1IWnS4Q"; dkim-atps=neutral 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 3yc2r22zwpz9sDB for ; Wed, 15 Nov 2017 09:54:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DE2E4877FB; Tue, 14 Nov 2017 22:54:05 +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 Nj7X4BgjWkSp; Tue, 14 Nov 2017 22:54:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 0D9E3877C2; Tue, 14 Nov 2017 22:54:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 5DB011C2082 for ; Tue, 14 Nov 2017 22:38:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 50E7C87765 for ; Tue, 14 Nov 2017 22:38:25 +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 Y0blE6fe+K7E for ; Tue, 14 Nov 2017 22:38:22 +0000 (UTC) X-Greylist: delayed 00:08:13 by SQLgrey-1.7.6 Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id 1972487763 for ; Tue, 14 Nov 2017 22:38:22 +0000 (UTC) Received: by mail-qt0-f193.google.com with SMTP id h42so8190495qtk.11 for ; Tue, 14 Nov 2017 14:38:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=e-labworks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=eO29NzfKNTp2GF6g7L5fr77ASwTFWloyje+jw7DRCJg=; b=x1IWnS4Qcp+4dY3X/bcnHtIGFrMPlkIo3QoPuvKhrYHNKjsS7AF8tdSNBDALA8qRgl 1EQehE+J0YKXx/BB3sMG1JpNLsUaQgeuJdo/3KI/aifXekrXFyHHAhpkkIWiPBnim93q lnNwJvQGQ9LkytWbn9ba87bqWCAtcLYGShLoUVjKXNBjTAFmKMY+hwrHGuL9Tm4Rtsg/ KjJBy4d+mTdqmB/tOEUzwS8rSc33Z6+l80p+EWJ+P5lSVlQetgJm5ohmwgRBwafq8GjC hQvYZenSSxZW3x5sMeJFucEAfKDVdEk6W5bJeIeEi5BFsVjqL/vJqG3P+LQThiXwOklV 4/aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=eO29NzfKNTp2GF6g7L5fr77ASwTFWloyje+jw7DRCJg=; b=NglEt4dqrpWnuJppKrbtJfZnbr2qMrRv02++u7pO7a6T3KXvVJS0/T22KEzp1IJYMY QksxdtpBJtwqlJ/Z1Mmz4UfAKwhfAL6y267d49dEI+cdydHvABtKzAsK2+ebnJzJGcmY nFhVwsweyXDSbZ53TU3LQMYmt3r2TMj2yyhjY3KoeTU3H3eE0CFV8SQrK/kziV11f7Bq ugWRi7pzSXyRu51fKAJ2+YnGPyf/qvRbAJMjIRVftrx8smed0ULTyFtLXtgFB0qL8/mT yluIAVKIbbv2NdEWMCvNeaTlzNAXXmhgyqPtwLHsWtXaMSl6frJOel2cqVjIWnCqGQ8t TmGg== X-Gm-Message-State: AJaThX5W7fydEh3lgrWtmHnoohc5hJnrghuX3547heC0QovfG9FrhEnU y9Amkl66/8hR3iLP6Rym/2mZ+BRe X-Google-Smtp-Source: AGs4zMZyV83EEQStkdAf6anasx8XQ8th+yUSYuZgA3Uddj6CZJ7U+ei+oIvXCnfB9mbJaqpxOGEBKQ== X-Received: by 10.55.71.143 with SMTP id u137mr20758477qka.166.1510698608100; Tue, 14 Nov 2017 14:30:08 -0800 (PST) Received: from localhost.localdomain ([189.100.34.201]) by smtp.gmail.com with ESMTPSA id s9sm13537765qts.42.2017.11.14.14.30.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Nov 2017 14:30:07 -0800 (PST) From: Sergio Prado To: buildroot@buildroot.org Date: Tue, 14 Nov 2017 20:29:40 -0200 Message-Id: <1510698580-4210-1-git-send-email-sergio.prado@e-labworks.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH] libgdiplus: bump to version 5.4 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sergio Prado MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Also, enable giflib if selected by the user and remove patch already applied upstream. Signed-off-by: Sergio Prado --- ...01-Fix-compile-error-when-cross-compiling.patch | 35 ---------------------- package/libgdiplus/libgdiplus.hash | 2 +- package/libgdiplus/libgdiplus.mk | 11 ++++--- 3 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch diff --git a/package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch b/package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch deleted file mode 100644 index db67d467df42..000000000000 --- a/package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch +++ /dev/null @@ -1,35 +0,0 @@ -From daf96b07c02734dceaf3c3b78c10e4e758b74d9e Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Fri, 18 Dec 2015 15:08:58 -0200 -Subject: [PATCH 1/1] Fix compile error when cross-compiling. - -When cross-compiling with libjpeg enabled, we can get errors like the -following when linking: - -sh-linux-gnu-gcc: ERROR: unsafe header/library path used in -cross-compilation: '/lib' - -That's because there is an error in the configure script that are not -generating ldflags correctly, and are trying to link with -L/lib. - -Signed-off-by: Sergio Prado ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 772d5fc9d87a..58d55ade48e3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -223,7 +223,7 @@ AC_ARG_WITH([libjpeg], - jpeg_ok=no) - AC_MSG_RESULT($jpeg_ok) - if test "$jpeg_ok" = yes; then -- JPEG='jpeg'; LIBJPEG='-L${libjpeg_prefix}/lib -ljpeg' -+ JPEG='jpeg'; LIBJPEG="-L${libjpeg_prefix}/lib -ljpeg" - else - AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***) - fi --- -1.9.1 - diff --git a/package/libgdiplus/libgdiplus.hash b/package/libgdiplus/libgdiplus.hash index f7fdcb58a46c..740fefd986a1 100644 --- a/package/libgdiplus/libgdiplus.hash +++ b/package/libgdiplus/libgdiplus.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 98f8a8e58ed22e136c4ac6eaafbc860757f5a97901ecc0ea357e2b6e4cfa2be5 libgdiplus-4.2.tar.gz +sha256 ce31da0c6952c8fd160813dfa9bf4a9a871bfe7284e9e3abff9a8ee689acfe58 libgdiplus-5.4.tar.gz diff --git a/package/libgdiplus/libgdiplus.mk b/package/libgdiplus/libgdiplus.mk index 7d564b6cd916..eb1858574dd8 100644 --- a/package/libgdiplus/libgdiplus.mk +++ b/package/libgdiplus/libgdiplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGDIPLUS_VERSION = 4.2 +LIBGDIPLUS_VERSION = 5.4 LIBGDIPLUS_SITE = $(call github,mono,libgdiplus,$(LIBGDIPLUS_VERSION)) # Although there is a LICENSE file thas specifies LGPL or MPL-1.1, @@ -21,9 +21,12 @@ LIBGDIPLUS_AUTORECONF = YES LIBGDIPLUS_DEPENDENCIES = xlib_libXft libglib2 cairo libpng host-pkgconf -# API changes in recent versions of libgif makes it incompatible with -# this version of libgdiplus, so we are disabling it for now. -LIBGDIPLUS_CONF_OPTS = --without-libgif +ifeq ($(BR2_PACKAGE_GIFLIB),y) +LIBGDIPLUS_CONF_OPTS += --with-libgif +LIBGDIPLUS_DEPENDENCIES += giflib +else +LIBGDIPLUS_CONF_OPTS += --without-libgif +endif # there is a bug in the configure script that enables pango support # when passing --without-pango, so let's just not use it