Summary: | media-tv/xbmc fails to build with libpng-1.5 | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Diego Elio Pettenò (RETIRED) <flameeyes> |
Component: | New packages | Assignee: | Gentoo Xbox project <xbox> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | axs, lauwers.michael, Martin.vGagern, tomaszg |
Priority: | Normal | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Bug Depends on: | |||
Bug Blocks: | 354479 | ||
Attachments: |
Build log (compressed)
Untested patch (due to also failing with glibc-2.14) modifies the bundled cximage-6.0 lib for libpng-1.5 support |
Description
Diego Elio Pettenò (RETIRED)
2011-08-21 18:40:54 UTC
Created attachment 284139 [details]
Build log (compressed)
> ximapng.h:72:25: error: invalid use of incomplete type ‘png_struct’
> ximapng.h:73:18: error: invalid use of incomplete type ‘png_struct’
These appear to be the problem, but the package fails to compile also with glibc-2.14 per the attached build.log:
/var/tmp/portage/media-tv/xbmc-10.1/work/xbmc-10.1/xbmc/lib/libPython/Python/Modules/nismodule.c:17:21: fatal error: rpc/rpc.h: No such file or directory
so I'm not sure if I can test it, even if I wrote patch for it...
Created attachment 286541 [details, diff]
Untested patch (due to also failing with glibc-2.14)
Please test and commit
Created attachment 286713 [details, diff]
modifies the bundled cximage-6.0 lib for libpng-1.5 support
This patch works; tested it against xbmc-10.1 on a "x86" system with libpng-1.5 manually qmerged and sdl-image re-emerged (so that it too was built against libpng-1.5).
I had very little to actually test xbmc against at runtime, but the skin i was using contains all PNG graphics so I believe the patch is successful and safe.
This patch also does the fixes in a backwards-compatible way, such as would be appropriate for upstream to apply. All changes only take effect against libpng-1.4 and above. I'm going to post it in the cximage forum, but this should be submitted to xbmc upstream.
As for the glibc-2.14 bug, xbmc bundles python-2.4 so if a patch can be made for that then it can be applied to xbmc as well.. my patch also works on xbmc-9999 btw, except that upstream changed the source files from DOS format to unix format (so the patch file itself needs to be converted first) (In reply to comment #6) > my patch also works on xbmc-9999 btw, except that upstream changed the source > files from DOS format to unix format (so the patch file itself needs to be > converted first) your patch is a bit weird for not fixing the errors in the .h file, like the previous patch did anyway, netbsd has a patch for net-im/amsn, also in portage now, it fixes the same bundled cximage perhaps it's worth to reuse the amsn patch for xbmc update your tree and re-emerge glibc-2.14. rpc support was restored. (In reply to comment #3) this patch is incomplete. i have a half written one locally, but got bored with fixing cximage. (In reply to comment #7) his patch does fix the header like yours does should be all set now in the tree; thanks for the report! Commit message: Fix building with libpng-1.5+ http://sources.gentoo.org/media-tv/xbmc/files/xbmc-10.1-headers.patch?rev=1.1 http://sources.gentoo.org/media-tv/xbmc/files/xbmc-10.1-libpng-1.5.patch?rev=1.1 http://sources.gentoo.org/media-tv/xbmc/xbmc-10.1.ebuild?r1=1.6&r2=1.7 *** Bug 383731 has been marked as a duplicate of this bug. *** It seems it is only partially fixed, since xbmc-9999 is still affected. I confirm that patch in the tree works with 9999 after converting dos to unix. It would be nice if it would be also in tree. i dont patch live sources. you want that fixed, then hassle upstream. FYI - this appears to be the relevant upstream bug: http://trac.xbmc.org/ticket/11977 That upstream bug states that they should start using the embedded libpng-1.4 instead of fixing... Thanks very much for posting the patch there; would it be possible for you to add a comment stating that this patch migrates cximage-6.0 to libpng-1.5? (In reply to comment #15) > That upstream bug states that they should start using the embedded libpng-1.4 > instead of fixing... > > Thanks very much for posting the patch there; would it be possible for you to > add a comment stating that this patch migrates cximage-6.0 to libpng-1.5? Comment added. And I realized that since we're making a very different request than the original ticket (which simply wants to stop using external libpng completely), I created a new ticket: http://trac.xbmc.org/ticket/12001 *** Bug 388683 has been marked as a duplicate of this bug. *** |