Patchwork gdk-pixbuf: Fix libpng determinism issues

login
register
mail settings
Submitter Colin Walters
Date April 15, 2013, 12:12 p.m.
Message ID <1366027932.32176.4.camel@localhost>
Download mbox | patch
Permalink /patch/48237/
State New
Headers show

Comments

Colin Walters - April 15, 2013, 12:12 p.m.
On Mon, 2013-04-15 at 12:31 +0100, Richard Purdie wrote:

> It will make our builds work again for now until the next time someone
> upgrades libpng and and then it will potentially silently start using an
> old version in some builds :(.

So something like the attached on top of the previous patch?

If this looks good I'll push both to master.
Richard Purdie - April 15, 2013, 12:22 p.m.
On Mon, 2013-04-15 at 08:12 -0400, Colin Walters wrote:
> On Mon, 2013-04-15 at 12:31 +0100, Richard Purdie wrote:
> 
> > It will make our builds work again for now until the next time someone
> > upgrades libpng and and then it will potentially silently start using an
> > old version in some builds :(.
> 
> So something like the attached on top of the previous patch?
> 
> If this looks good I'll push both to master.

Looks good to me, thanks!

Richard
Colin Walters - April 15, 2013, 12:59 p.m.
On Mon, 2013-04-15 at 13:22 +0100, Richard Purdie wrote:
> On Mon, 2013-04-15 at 08:12 -0400, Colin Walters wrote:
> > On Mon, 2013-04-15 at 12:31 +0100, Richard Purdie wrote:
> > 
> > > It will make our builds work again for now until the next time someone
> > > upgrades libpng and and then it will potentially silently start using an
> > > old version in some builds :(.
> > 
> > So something like the attached on top of the previous patch?
> > 
> > If this looks good I'll push both to master.
> 
> Looks good to me, thanks!

Both pushed to git, thanks.

<nag>
If OE was building from git as it should, your original patch could have
been a ready-to-upstream "git format-patch" style instead of the default
"Upstream-Status: inappropriate" non-git patches =/
</nag>
Richard Purdie - April 19, 2013, 12:59 p.m.
On Mon, 2013-04-15 at 08:59 -0400, Colin Walters wrote:
> On Mon, 2013-04-15 at 13:22 +0100, Richard Purdie wrote:
> > On Mon, 2013-04-15 at 08:12 -0400, Colin Walters wrote:
> > > On Mon, 2013-04-15 at 12:31 +0100, Richard Purdie wrote:
> > > 
> > > > It will make our builds work again for now until the next time someone
> > > > upgrades libpng and and then it will potentially silently start using an
> > > > old version in some builds :(.
> > > 
> > > So something like the attached on top of the previous patch?
> > > 
> > > If this looks good I'll push both to master.
> > 
> > Looks good to me, thanks!
> 
> Both pushed to git, thanks.

Much appreciated!

> <nag>
> If OE was building from git as it should, your original patch could have
> been a ready-to-upstream "git format-patch" style instead of the default
> "Upstream-Status: inappropriate" non-git patches =/
> </nag>

Noted, although I doubt we'll be using git SRC_URIs for everything any
time soon for a variety of reasons. I would love to see the option of
building most things from bleeding source but that would require a lot
of work which we don't have the bandwidth for.

Cheers,

Richard
Koen Kooi - April 19, 2013, 1:41 p.m.
Op 19 apr. 2013, om 14:59 heeft Richard Purdie <richard.purdie@linuxfoundation.org> het volgende geschreven:

> On Mon, 2013-04-15 at 08:59 -0400, Colin Walters wrote:
>> On Mon, 2013-04-15 at 13:22 +0100, Richard Purdie wrote:
>>> On Mon, 2013-04-15 at 08:12 -0400, Colin Walters wrote:
>>>> On Mon, 2013-04-15 at 12:31 +0100, Richard Purdie wrote:
>>>> 
>>>>> It will make our builds work again for now until the next time someone
>>>>> upgrades libpng and and then it will potentially silently start using an
>>>>> old version in some builds :(.
>>>> 
>>>> So something like the attached on top of the previous patch?
>>>> 
>>>> If this looks good I'll push both to master.
>>> 
>>> Looks good to me, thanks!
>> 
>> Both pushed to git, thanks.
> 
> Much appreciated!
> 
>> <nag>
>> If OE was building from git as it should, your original patch could have
>> been a ready-to-upstream "git format-patch" style instead of the default
>> "Upstream-Status: inappropriate" non-git patches =/
>> </nag>
> 
> Noted, although I doubt we'll be using git SRC_URIs for everything any
> time soon for a variety of reasons. I would love to see the option of
> building most things from bleeding source but that would require a lot
> of work which we don't have the bandwidth for.

And would introduce some dependency hell (gtk-doc-native needed for every little gnome thing *and* udev) but more importantly it will expose us to that stupid, stupid, stupid practice of using git submodules to drag in autoconf stuff. Gstreamer is the worst offender, but there are a lot of others.

I try to have recipe build from a git tag instead of a tarball whenever possible, but it hurts a lot if it's one of that gtk-doc users, you can't disable that completely.

regards,

Koen
Colin Walters - April 19, 2013, 5:17 p.m.
On Fri, 2013-04-19 at 15:41 +0200, Koen Kooi wrote:

> And would introduce some dependency hell (gtk-doc-native needed for every little gnome thing *and* udev) 

Nope, that's why gtk-doc-stub exists, and it's already used in OE:

http://git.gnome.org/browse/gtk-doc-stub

> but more importantly it will expose us to that stupid, stupid, stupid practice of using git submodules to drag in autoconf stuff. 

Correct handling of git submodules is definitely nontrivial.

Patch

From 91074d01a0e2b4508f7f253f1e0a7669363cb128 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 15 Apr 2013 08:06:45 -0400
Subject: [PATCH] build: drop "libpng" from detected list

This gives us an arbitrary version depending on the build root, and we
may not be upwards compatible with future versions.  Or it's possible
that the ancient (but LSB mandated) 1.2 claims the "libpng.pc" name.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 106fab1..5efc1b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -586,7 +586,7 @@  fi
 
 dnl Test for libpng
   if test x$with_libpng != xno && test -z "$LIBPNG"; then
-    for l in libpng16 libpng15 libpng14 libpng12 libpng13 libpng10 libpng; do
+    for l in libpng16 libpng15 libpng14 libpng12 libpng13 libpng10; do
       AC_MSG_CHECKING(for $l)
       if $PKG_CONFIG --exists $l ; then
         AC_MSG_RESULT(yes)
-- 
1.7.1