Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 90440 Details for
Bug 136452
Building imagemagick-6.2.5.5(stable) up to imagemagick-6.2.8.0(unstable) against every libpng-1.2 fails
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for libpng that fixes the PNG_NO_ASSEMBLER_CODE bug
libpng-1.2.10-no-assembler.patch (text/plain), 1.86 KB, created by
David Nadlinger
on 2006-06-29 09:11:27 UTC
(
hide
)
Description:
Patch for libpng that fixes the PNG_NO_ASSEMBLER_CODE bug
Filename:
MIME Type:
Creator:
David Nadlinger
Created:
2006-06-29 09:11:27 UTC
Size:
1.86 KB
patch
obsolete
>diff -ur libpng-1.2.10-orig/configure.ac libpng-1.2.10/configure.ac >--- libpng-1.2.10-orig/configure.ac 2006-06-30 16:28:17.000000000 +0200 >+++ libpng-1.2.10/configure.ac 2006-06-30 16:52:27.000000000 +0200 >@@ -66,11 +66,14 @@ > LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG\ -DPNG_NO_ASSEMBLER_CODE) > if test "$LIBPNG_DEFINES"; then > AC_MSG_RESULT(no) >+ LIBPNG_NO_ASSEMBLER=true > else > AC_MSG_RESULT(yes) > LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG >+ LIBPNG_NO_ASSEMBLER= > fi > AC_SUBST(LIBPNG_DEFINES) >+AC_SUBST(LIBPNG_NO_ASSEMBLER) > > AC_MSG_CHECKING([if libraries can be versioned]) > GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script` >diff -ur libpng-1.2.10-orig/Makefile.am libpng-1.2.10/Makefile.am >--- libpng-1.2.10-orig/Makefile.am 2006-06-30 16:28:17.000000000 +0200 >+++ libpng-1.2.10/Makefile.am 2006-06-30 16:57:23.000000000 +0200 >@@ -87,6 +87,16 @@ > > CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym > >+pngconf.h.in: >+ cat pngconf.h > pngconf.h.in >+ >+pngconf.h: pngconf.h.in >+ sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h >+ @if test -n "@LIBPNG_NO_ASSEMBLER@"; then \ >+ echo "#define PNG_NO_ASSEMBLER_CODE" >> pngconf.h; \ >+ fi >+ sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h >+ > $(PNGLIB_BASENAME).pc: libpng.pc > cp libpng.pc $@ > >diff -ur libpng-1.2.10-orig/pngconf.h libpng-1.2.10/pngconf.h >--- libpng-1.2.10-orig/pngconf.h 2006-06-30 16:28:17.000000000 +0200 >+++ libpng-1.2.10/pngconf.h 2006-06-30 16:32:58.000000000 +0200 >@@ -19,6 +19,13 @@ > > #define PNG_1_2_X > >+/* Backported no-assembler fix from libpng-1.4.0beta8 */ >+ >+/* Makefile-supplied defines go here: */ >+/* End of Makefile-supplied defines. */ >+ >+/* End of backported no-assembler fix */ >+ > /* > * PNG_USER_CONFIG has to be defined on the compiler command line. This > * includes the resource compiler for Windows DLL configurations.
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 136452
:
88929
|
90082
| 90440 |
91141