[oe-commits] Roy Li : gd: upgrade to 2.1.1

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 701490fc7c2540c3f7ecab163b40358b8398201e
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=701490fc7c2540c3f7ecab163b40358b8398201e

Author: Roy Li <rongqing.li at windriver.com>
Date:   Tue Aug 18 14:29:39 2015 +0800

gd: upgrade to 2.1.1

remove fix-the-subdir-objects-error.patch, a same fix has been merged
into source code.

Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../gd/gd-2.1.0/fix-the-subdir-objects-error.patch | 39 ----------------------
 .../gd/{gd_2.1.0.bb => gd_2.1.1.bb}                |  5 ++-
 2 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch b/meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch
deleted file mode 100644
index 02b1670..0000000
--- a/meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b1ae702a48888e2c3b0ebe0772a88b45a37b84f5 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang at windriver.com>
-Date: Fri, 17 Jan 2014 01:58:05 -0500
-Subject: [PATCH] configure.ac: fix the subdir-objects error
-
-Fix this error:
-iautomake: warning: possible forward-incompatibility.
-automake: At least a source file is in a subdirectory, but the 'subdir-objects'
-automake: automake option hasn't been enabled.  For now, the corresponding output
-automake: object file(s) will be placed in the top-level directory.  However,
-automake: this behaviour will change in future Automake versions: they will
-automake: unconditionally cause object files to be placed in the same subdirectory
-automake: of the corresponding sources.
-automake: You are advised to start using 'subdir-objects' option throughout your
-automake: project, to avoid future incompatibilities.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2f9f744..438e08b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -45,7 +45,7 @@ AC_SUBST(GDLIB_AGE)
- FEATURES="GD_GIF GD_GIFANIM GD_OPENPOLYGON"
- AC_SUBST(FEATURES)
- 
--AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz -Wall -Werror])
-+AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz -Wall -Werror subdir-objects])
- AC_CONFIG_HEADERS([src/config.h:src/config.hin])
- 
- dnl newer automake wants this, but we still want to work with older
--- 
-1.7.10.4
-
diff --git a/meta-oe/recipes-support/gd/gd_2.1.0.bb b/meta-oe/recipes-support/gd/gd_2.1.1.bb
similarity index 87%
rename from meta-oe/recipes-support/gd/gd_2.1.0.bb
rename to meta-oe/recipes-support/gd/gd_2.1.1.bb
index f03b9b0..0731902 100644
--- a/meta-oe/recipes-support/gd/gd_2.1.0.bb
+++ b/meta-oe/recipes-support/gd/gd_2.1.1.bb
@@ -13,10 +13,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669"
 DEPENDS = "freetype libpng jpeg zlib tiff libvpx"
 
 SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV}.tar.bz2 \
-           file://fix-the-subdir-objects-error.patch \
 "
-SRC_URI[md5sum] = "5a1d5bab3a4a41d9f111bcceee4ad25b"
-SRC_URI[sha256sum] = "f3e1bc472bd81ee976a739436659fe752a14727a964c64530fde68531ddeee91"
+SRC_URI[md5sum] = "d3f1a992ac9c550ebc6da89c147f89af"
+SRC_URI[sha256sum] = "895ea9c6fcab187b0a908ae3e9e6b06423756f8a643d362349b0caab4014bd0d"
 
 S = "${WORKDIR}/libgd-${PV}"