gd: update to version 2.1.0 and two fixes

PATCH In review [email protected] 3 participants 11 messages Apr 15, 2014 – Apr 22, 2014

lore

Share & tools

lore

[email protected]

author

2014-04-15 07:00 UTC #0 lore raw

cover gd: update to version 2.1.0 and two fixes

From: Jackie Huang <[email protected]>

--
The following changes since commit 477ccd867cc71f8277f2670b7be34b3b15300052:

klibc: restylize a bit the recipes (2014-04-06 13:36:20 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib jhuang0/t_gd_140415-1
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/t_gd_140415-1

Hongxu Jia (1):
gd: add perl to RDEPENDS

Jackie Huang (1):
gd: update to version 2.1.0

Robert Yang (1):
gd: fix the subdir-objects error

 .../gd/gd-2.1.0/fix-the-subdir-objects-error.patch |   39 ++++++++++++++++++++
 .../gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb}     |   25 ++++++++-----
 2 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch
 rename meta-oe/recipes-support/gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb} (40%)

Signature · 1 line

1.7.9.5

[email protected]

author

2014-04-15 07:00 UTC #1 lore raw

PATCH 1/3 gd: update to version 2.1.0

From: Jackie Huang <[email protected]>

Changes:
- Add DESCRIPTION and HOMEPAGE
- libgd.org is down, use bitbucket.org instead and also remove the MIRROR for it.
- Remove the unnecessary specified dir for --with-png.

Signed-off-by Jackie Huang <[email protected]>

---
 .../gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb}     |   22 ++++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)
 rename meta-oe/recipes-support/gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb} (43%)

meta-oe/recipes-support/gd/gd_2.1.0.bb renamed from meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb +13 -9

similarity index 43%
rename from meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb
rename to meta-oe/recipes-support/gd/gd_2.1.0.bb
index 957c4eb..1b78b9b 100644
@@ -1,22 +1,26 @@
+SUMMARY = "gd is a library used to create PNG, JPEG, or WBMP images"
+DESCRIPTION = "The gd graphics library allows your code to quickly draw images \
+complete with lines, arcs, text, multiple colors, cut and paste from other \
+images, and flood fills, and to write out the result as a PNG or JPEG file. \
+This is particularly useful in Web applications, where PNG and JPEG are two \
+of the formats accepted for inline images by most browsers. Note that gd is not \
+a paint program."
+HOMEPAGE = "http://libgd.bitbucket.org/"
 SECTION = "libs"
+
 LICENSE = "GD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669"
-SUMMARY = "gd is a library used to create PNG, JPEG, or WBMP images"
 DEPENDS = "freetype libpng jpeg zlib"
-PR = "r5"
-
-SRC_URI = "http://www.libgd.org/releases/gd-2.0.36RC1.tar.gz"
-SRC_URI[md5sum] = "39ac48e6d5e0012a3bd2248a0102f209"
-SRC_URI[sha256sum] = "dd7c1795271221b9237769b96b8cec7fbdc5db7b8954d864ead51fc1296a6ac8"
 
-MIRRORS += "http://www.libgd.org/releases/ http://fossies.org/unix/www/ \n"
+SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV}.tar.bz2"
+SRC_URI[md5sum] = "5a1d5bab3a4a41d9f111bcceee4ad25b"
+SRC_URI[sha256sum] = "f3e1bc472bd81ee976a739436659fe752a14727a964c64530fde68531ddeee91"
 
-S = "${WORKDIR}/gd-2.0.36RC1"
+S = "${WORKDIR}/libgd-${PV}"
 
 inherit autotools binconfig gettext
 
 EXTRA_OECONF += " --with-zlib=${STAGING_LIBDIR}/.. \
-                  --with-png=${STAGING_LIBDIR}/.. \
                   --with-jpeg=${STAGING_LIBDIR}/.. \
                   --with-freetype \
                   --without-fontconfig \

Signature · 1 line

1.7.9.5

Martin Jansa

2014-04-20 08:23 UTC #2 lore raw

Re: [meta-oe][PATCH 1/3] gd: update to version 2.1.0

Quoted 46 lines · On Tue, Apr 15, 2014 at 03:01:24PM +0800, [email protected] wrote:

From: Jackie Huang <[email protected]>

Changes:
- Add DESCRIPTION and HOMEPAGE
- libgd.org is down, use bitbucket.org instead and also remove the MIRROR for it.
- Remove the unnecessary specified dir for --with-png.

Signed-off-by Jackie Huang <[email protected]>

---
 .../gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb}     |   22 ++++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)
 rename meta-oe/recipes-support/gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb} (43%)

meta-oe/recipes-support/gd/gd_2.1.0.bb renamed from meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb +12 -7

similarity index 43%
rename from meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb
rename to meta-oe/recipes-support/gd/gd_2.1.0.bb
index 957c4eb..1b78b9b 100644
@@ -1,22 +1,26 @@
+SUMMARY = "gd is a library used to create PNG, JPEG, or WBMP images"
+DESCRIPTION = "The gd graphics library allows your code to quickly draw images \
+complete with lines, arcs, text, multiple colors, cut and paste from other \
+images, and flood fills, and to write out the result as a PNG or JPEG file. \
+This is particularly useful in Web applications, where PNG and JPEG are two \
+of the formats accepted for inline images by most browsers. Note that gd is not \
+a paint program."
+HOMEPAGE = "http://libgd.bitbucket.org/"
 SECTION = "libs"
+
 LICENSE = "GD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669"
-SUMMARY = "gd is a library used to create PNG, JPEG, or WBMP images"
 DEPENDS = "freetype libpng jpeg zlib"
-PR = "r5"
-
-SRC_URI = "http://www.libgd.org/releases/gd-2.0.36RC1.tar.gz"
-SRC_URI[md5sum] = "39ac48e6d5e0012a3bd2248a0102f209"
-SRC_URI[sha256sum] = "dd7c1795271221b9237769b96b8cec7fbdc5db7b8954d864ead51fc1296a6ac8"
 
-MIRRORS += "http://www.libgd.org/releases/ http://fossies.org/unix/www/ \n"
+SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV}.tar.bz2"
+SRC_URI[md5sum] = "5a1d5bab3a4a41d9f111bcceee4ad25b"
+SRC_URI[sha256sum] = "f3e1bc472bd81ee976a739436659fe752a14727a964c64530fde68531ddeee91"

meta-oe/recipes-support/gd/gd_2.1.0.bb line 25

Quoted 10 lines

meta-oe/recipes-support/gd/gd_2.1.0.bb renamed from meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb +1 -2

 
-S = "${WORKDIR}/gd-2.0.36RC1"
+S = "${WORKDIR}/libgd-${PV}"
 
 inherit autotools binconfig gettext
 
 EXTRA_OECONF += " --with-zlib=${STAGING_LIBDIR}/.. \
-                  --with-png=${STAGING_LIBDIR}/.. \
                   --with-jpeg=${STAGING_LIBDIR}/.. \
                   --with-freetype \

http://patchwork.openembedded.org/patch/69991/ adds --with-freetype=${STAGING_LIBDIR}/.. \

and together with this it fails with:
| configure:13838: error: freetype support requested, but not found:
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/lib/../bin/freetype-config

can you please check it?

Quoted 9 lines

meta-oe/recipes-support/gd/gd_2.1.0.bb renamed from meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb +0 -0
                   --without-fontconfig \
Signature · 7 lines
1.7.9.5

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

2014-04-20 14:04 UTC #3 lore raw

PATCH 1/1 gd: fix --with-freetype option

* 'yes' value means using pkg-config to find freetype, other values are using FREETYPE_CONFIG=/bin/freetype-config and freetype-config isn't in STAGING_LIBDIR but in STAGING_BINDIR/crossscripts/freetype-config

Signed-off-by Martin Jansa <[email protected]>

---
 meta-oe/recipes-support/gd/gd_2.1.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta-oe/recipes-support/gd/gd_2.1.0.bb +1 -1

index 24f6f34..0f14130 100644
@@ -25,7 +25,7 @@ inherit autotools binconfig gettext
 
 EXTRA_OECONF += " --disable-rpath \
                   --with-jpeg=${STAGING_LIBDIR}/.. \
-                  --with-freetype=${STAGING_LIBDIR}/.. \
+                  --with-freetype=yes \
                   --without-fontconfig \
                   --without-xpm \
                   --without-x"

Signature · 1 line

1.9.1

Huang, Jie (Jackie)

author

2014-04-21 02:58 UTC #4 lore raw

Re: [meta-oe][PATCH 1/3] gd: update to version 2.1.0

In reply to Martin Jansa

Quoted 73 lines

-----Original Message-----
From: [email protected] [mailto:openembedded-devel- [email protected]] On Behalf Of Martin Jansa
Sent: Sunday, April 20, 2014 4:24 PM
To: [email protected]
Subject: Re: [oe] [meta-oe][PATCH 1/3] gd: update to version 2.1.0
Quoted 33 lines · On Tue, Apr 15, 2014 at 03:01:24PM +0800, [email protected] wrote:
From: Jackie Huang <[email protected]>
Changes:
- Add DESCRIPTION and HOMEPAGE
- libgd.org is down, use bitbucket.org instead and also remove the MIRROR for it.
- Remove the unnecessary specified dir for --with-png.
Signed-off-by Jackie Huang <[email protected]>
---
 .../gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb}     |   22 ++++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)  rename
meta-oe/recipes-support/gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb} (43%)
meta-oe/recipes-support/gd/gd_2.1.0.bb renamed from meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb +8 -0
similarity index 43%
rename from meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb
rename to meta-oe/recipes-support/gd/gd_2.1.0.bb
index 957c4eb..1b78b9b 100644
@@ -1,22 +1,26 @@
+SUMMARY = "gd is a library used to create PNG, JPEG, or WBMP images"
+DESCRIPTION = "The gd graphics library allows your code to quickly
+draw images \ complete with lines, arcs, text, multiple colors, cut
+and paste from other \ images, and flood fills, and to write out the
+result as a PNG or JPEG file. \ This is particularly useful in Web
+applications, where PNG and JPEG are two \ of the formats accepted
+for inline images by most browsers. Note that gd is not \ a paint program."
+HOMEPAGE = "http://libgd.bitbucket.org/"
 SECTION = "libs"
meta-oe/recipes-support/gd/gd_2.1.0.bb line 10
Quoted 10 lines
meta-oe/recipes-support/gd/gd_2.1.0.bb renamed from meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb +1 -6
+
 LICENSE = "GD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669"
-SUMMARY = "gd is a library used to create PNG, JPEG, or WBMP images"
 DEPENDS = "freetype libpng jpeg zlib"
-PR = "r5"
-
-SRC_URI = "http://www.libgd.org/releases/gd-2.0.36RC1.tar.gz"
-SRC_URI[md5sum] = "39ac48e6d5e0012a3bd2248a0102f209"
-SRC_URI[sha256sum] =
"dd7c1795271221b9237769b96b8cec7fbdc5db7b8954d864ead51fc1296a6ac8"
meta-oe/recipes-support/gd/gd_2.1.0.bb
Quoted 5 lines
meta-oe/recipes-support/gd/gd_2.1.0.bb renamed from meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb +3 -1
-MIRRORS += "http://www.libgd.org/releases/ http://fossies.org/unix/www/ \n"
+SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV}.tar.bz2"
+SRC_URI[md5sum] = "5a1d5bab3a4a41d9f111bcceee4ad25b"
+SRC_URI[sha256sum] =
"f3e1bc472bd81ee976a739436659fe752a14727a964c64530fde68531ddeee91"
meta-oe/recipes-support/gd/gd_2.1.0.bb line 25
Quoted 10 lines
meta-oe/recipes-support/gd/gd_2.1.0.bb renamed from meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb +1 -2
-S = "${WORKDIR}/gd-2.0.36RC1"
+S = "${WORKDIR}/libgd-${PV}"
 
 inherit autotools binconfig gettext
 
 EXTRA_OECONF += " --with-zlib=${STAGING_LIBDIR}/.. \
-                  --with-png=${STAGING_LIBDIR}/.. \
                   --with-jpeg=${STAGING_LIBDIR}/.. \
                   --with-freetype \
http://patchwork.openembedded.org/patch/69991/ adds --with-freetype=${STAGING_LIBDIR}/.. \

Quoted 6 lines

and together with this it fails with:
| configure:13838: error: freetype support requested, but not found:
/home/jenkins/oe/shr-core-branches/shr-core/tmp- eglibc/sysroots/qemuarm/usr/lib/../bin/freetype-config
can you please check it?

I saw that you have fixed it "[oe] [meta-oe][PATCH] gd: fix --with-freetype option", I checked that it work fine with your patch, thanks!

Thanks,
Jackie

Quoted 13 lines

Quoted 10 lines
meta-oe/recipes-support/gd/gd_2.1.0.bb renamed from meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb +0 -1
                   --without-fontconfig \
--
1.7.9.5
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: [email protected]

[email protected]

author

2014-04-15 07:00 UTC #5 lore raw

PATCH 2/3 gd: add perl to RDEPENDS

In reply to [email protected]

From: Hongxu Jia <[email protected]>

| Note: adding Smart RPM DB channel
|
| Note: to be installed:  gd@x86_64 run-postinsts@x86_64 kernel-modules@qemux86_64 packagegroup-core-boot@qemux86_64
| Loading cache...
| Updating cache...               ######################################## [100%]
|
| Computing transaction...error: Can't install gd-2.1.0-r0.0@x86_64: no package provides /usr/bin/perl
|
| Saving cache...
|
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_rootfs (log file is located at tmp/work/qemux86_64-wrs-linux/wrlinux-image-glibc-small/1.0-r1/temp/do_rootfs/log.do_rootfs.26487)

Signed-off-by Hongxu Jia <[email protected]>

Signed-off-by Jackie Huang <[email protected]>

---
 meta-oe/recipes-support/gd/gd_2.1.0.bb |    1 +
 1 file changed, 1 insertion(+)

meta-oe/recipes-support/gd/gd_2.1.0.bb +1 -0

index 1b78b9b..3d41eec 100644
@@ -11,6 +11,7 @@ SECTION = "libs"
 LICENSE = "GD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669"
 DEPENDS = "freetype libpng jpeg zlib"
+RDEPENDS_${PN} = "perl"
 
 SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV}.tar.bz2"
 SRC_URI[md5sum] = "5a1d5bab3a4a41d9f111bcceee4ad25b"

Signature · 1 line

1.7.9.5

Koen Kooi

2014-04-15 08:23 UTC #6 lore raw

Re: [meta-oe][PATCH 2/3] gd: add perl to RDEPENDS

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[email protected] schreef op 15-04-14 09:01:

Quoted 8 lines

From: Hongxu Jia <[email protected]>
| Note: adding Smart RPM DB channel | | Note: to be installed: gd@x86_64 run-postinsts@x86_64 kernel-modules@qemux86_64 packagegroup-core-boot@qemux86_64 | Loading cache... | Updating cache... ######################################## [100%] | | Computing transaction...error: Can't install gd-2.1.0-r0.0@x86_64: no package provides /usr/bin/perl

That's nice and all, but you don't seem to runtime test this. I'm pretty sure gd needs additional perl modules installed for its perl sections.

And FWIW, the bits that need perl should be split out in gd-perl

Quoted 9 lines

| | Saving cache... | | WARNING: exit code 1 from a shell command. |
ERROR: Function failed: do_rootfs (log file is located at tmp/work/qemux86_64-wrs-linux/wrlinux-image-glibc-small/1.0-r1/temp/do_rootfs/log.do_rootfs.26487)
Signed-off-by Hongxu Jia <[email protected]> Signed-off-by:
Jackie Huang <[email protected]> ---
meta-oe/recipes-support/gd/gd_2.1.0.bb | 1 + 1 file changed, 1
insertion(+)

Quoted 7 lines

(quoted diff) +0 -0
b/meta-oe/recipes-support/gd/gd_2.1.0.bb index 1b78b9b..3d41eec 100644 --- a/meta-oe/recipes-support/gd/gd_2.1.0.bb +++ b/meta-oe/recipes-support/gd/gd_2.1.0.bb @@ -11,6 +11,7 @@ SECTION = "libs" LICENSE = "GD" LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669" DEPENDS = "freetype libpng jpeg zlib" +RDEPENDS_${PN} = "perl"

R* variables go below do_install

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFTTOyEMkyGM64RGpERAu1dAJ4xqraqlz5pEmf+uZnOcxSt0gc9HgCghTpX SWCuUnlnxjLDTnJSvlHHGqQ=
=IivC
-----END PGP SIGNATURE-----

Huang, Jie (Jackie)

author

2014-04-16 02:29 UTC #7 lore raw

Re: [meta-oe][PATCH 2/3] gd: add perl to RDEPENDS

Quoted 23 lines

-----Original Message-----
From: [email protected] [mailto:openembedded-devel- [email protected]] On Behalf Of Koen Kooi
Sent: Tuesday, April 15, 2014 4:24 PM
To: [email protected]
Subject: Re: [oe] [meta-oe][PATCH 2/3] gd: add perl to RDEPENDS
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[email protected] schreef op 15-04-14 09:01:
Quoted 9 lines
From: Hongxu Jia <[email protected]>
| Note: adding Smart RPM DB channel | | Note: to be installed:
| gd@x86_64
run-postinsts@x86_64 kernel-modules@qemux86_64 packagegroup-core-boot@qemux86_64 | Loading cache... | Updating cache... ######################################## [100%] | | Computing transaction...error: Can't install gd-2.1.0-r0.0@x86_64: no package provides /usr/bin/perl

Quoted 2 lines

That's nice and all, but you don't seem to runtime test this. I'm pretty sure gd needs additional perl modules installed for its perl sections.

The tools provided by gd that needs perl is the "fstobdf" which is a simple convertor from bdf to gd font format, yes, it's using the 'strict' perl module, and I checked that ' perl-module-strict' is rprovided by 'perl', so it would be fine to rdepends on 'perl' only, and I did the runtime test and it works fine.

Quoted 2 lines

And FWIW, the bits that need perl should be split out in gd-perl

En.., I didn't realize that. Currently the gd package is providing the the gd graphics library and a bunch of converts between gd and other graphics formats, one of which is perl script, and I see that some Linux distribution (e.g. Ubuntu) usually split them into two package: 'libgd' for the library, libgd-tools for the convert binaries/scripts, rather than splitting the perl script into gd-perl, I prefer to split all the converts into gd-tools (or libgd-tools), what do you think?

Quoted 11 lines

Quoted 11 lines
| | Saving cache... | | WARNING: exit code 1 from a shell command. |
ERROR: Function failed: do_rootfs (log file is located at tmp/work/qemux86_64-wrs-linux/wrlinux-image-glibc-small/1.0-r1/temp/do _rootfs/log.do_rootfs.26487)
Signed-off-by Hongxu Jia <[email protected]> Signed-off-by:
Jackie Huang <[email protected]> ---
meta-oe/recipes-support/gd/gd_2.1.0.bb | 1 + 1 file changed, 1
insertion(+)

Quoted 9 lines

Quoted 7 lines
(quoted diff) +0 -0
b/meta-oe/recipes-support/gd/gd_2.1.0.bb index 1b78b9b..3d41eec 100644 --- a/meta-oe/recipes-support/gd/gd_2.1.0.bb +++ b/meta-oe/recipes-support/gd/gd_2.1.0.bb @@ -11,6 +11,7 @@ SECTION = "libs" LICENSE = "GD" LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669" DEPENDS = "freetype libpng jpeg zlib" +RDEPENDS_${PN} = "perl"
R* variables go below do_install

Yeah, thanks, I will re-send for the changes.

Thanks,
Jackie

Quoted 15 lines

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFTTOyEMkyGM64RGpERAu1dAJ4xqraqlz5pEmf+uZnOcxSt0gc9HgCghTpX SWCuUnlnxjLDTnJSvlHHGqQ=
=IivC
-----END PGP SIGNATURE-----
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[email protected]

author

2014-04-15 07:00 UTC #8 lore raw

PATCH 3/3 gd: fix the subdir-objects error

In reply to [email protected]

From: Robert Yang <[email protected]>

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.

Signed-off-by Robert Yang <[email protected]>

Signed-off-by Jackie Huang <[email protected]>

---
 .../gd/gd-2.1.0/fix-the-subdir-objects-error.patch |   39 ++++++++++++++++++++
 meta-oe/recipes-support/gd/gd_2.1.0.bb             |    4 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch

meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch new file +39 -0

new file mode 100644
index 0000000..02b1670
@@ -0,0 +1,39 @@
+From b1ae702a48888e2c3b0ebe0772a88b45a37b84f5 Mon Sep 17 00:00:00 2001
+From: Robert Yang <[email protected]>
+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 <[email protected]>
+---
+ 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
+

meta-oe/recipes-support/gd/gd_2.1.0.bb +3 -1

index 3d41eec..c051481 100644
@@ -13,7 +13,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669"
 DEPENDS = "freetype libpng jpeg zlib"
 RDEPENDS_${PN} = "perl"
 
-SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV}.tar.bz2"
+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"

Signature · 1 line

1.7.9.5

Martin Jansa

2014-04-21 11:33 UTC #9 lore raw

In reply to [email protected]

Quoted 1 line · On Tue, Apr 15, 2014 at 03:01:23PM +0800, [email protected] wrote:

From: Jackie Huang <[email protected]>

Merged 2 from 3 and 1 mine, thanks

"add perl" one has some feedback

Quoted 34 lines

--
The following changes since commit 477ccd867cc71f8277f2670b7be34b3b15300052:
klibc: restylize a bit the recipes (2014-04-06 13:36:20 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib jhuang0/t_gd_140415-1
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/t_gd_140415-1
Hongxu Jia (1):
gd: add perl to RDEPENDS
Jackie Huang (1):
gd: update to version 2.1.0
Robert Yang (1):
gd: fix the subdir-objects error
 .../gd/gd-2.1.0/fix-the-subdir-objects-error.patch |   39 ++++++++++++++++++++
 .../gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb}     |   25 ++++++++-----
 2 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch
 rename meta-oe/recipes-support/gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb} (40%)
Signature · 7 lines
1.7.9.5

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Huang, Jie (Jackie)

author

2014-04-22 01:41 UTC #10 lore raw

Quoted 9 lines

-----Original Message-----
From: [email protected] [mailto:openembedded-devel- [email protected]] On Behalf Of Martin Jansa
Sent: Monday, April 21, 2014 7:34 PM
To: [email protected]
Subject: Re: [oe] [meta-oe][PATCH 0/3] gd: update to version 2.1.0 and two fixes

Quoted 6 lines

Quoted 1 line · On Tue, Apr 15, 2014 at 03:01:23PM +0800, [email protected] wrote:
From: Jackie Huang <[email protected]>
Merged 2 from 3 and 1 mine, thanks
"add perl" one has some feedback

I'm working for v2 for this one, thanks!

Thanks,
Jackie

Quoted 41 lines

Quoted 30 lines
--
The following changes since commit 477ccd867cc71f8277f2670b7be34b3b15300052:
klibc: restylize a bit the recipes (2014-04-06 13:36:20 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib jhuang0/t_gd_140415-1
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/t_gd_140
415-1
Hongxu Jia (1):
gd: add perl to RDEPENDS
Jackie Huang (1):
gd: update to version 2.1.0
Robert Yang (1):
gd: fix the subdir-objects error
 .../gd/gd-2.1.0/fix-the-subdir-objects-error.patch |   39 ++++++++++++++++++++
 .../gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb}     |   25 ++++++++-----
 2 files changed, 55 insertions(+), 9 deletions(-)  create mode 100644
meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch
 rename meta-oe/recipes-support/gd/{gd_2.0.35+2.0.36rc1.bb =>
gd_2.1.0.bb} (40%)
Quoted 8 lines
--
1.7.9.5
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: [email protected]