On Wed, Dec 13, 2006 at 12:48:11AM +0100, Daniel Kobras wrote:
> On Tue, Dec 12, 2006 at 11:15:24PM +0100, Kurt Roeckx wrote:
> > What is the status of this bug?
> >
> > It seems libpng was fixed, but it's now still failing to build
> > and needs the patch.
>
> I'm currently preparing an NMU and will try to get it uploaded tomorrow.
> (Plus an upload of graphicsmagick that suffers from the same problem.)
See attached the changes in NMU 6.2.4.5.dfsg1-0.13 that I intend to
upload shortly to fix the FTBFS error on amd64.
Regards,
Daniel.
diff -u imagemagick-6.2.4.5.dfsg1/debian/changelog
imagemagick-6.2.4.5.dfsg1/debian/changelog
--- imagemagick-6.2.4.5.dfsg1/debian/changelog
+++ imagemagick-6.2.4.5.dfsg1/debian/changelog
@@ -1,3 +1,13 @@
+imagemagick (7:6.2.4.5.dfsg1-0.13) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * coders/png.c: Fix amd64 build failure with recent libpng versions.
+ Closes: #401047
+ * debian/control: Tighten libpng12-dev build-dependency to exclude versions
+ that are known to fail to link even with the above fix in place.
+
+ -- Daniel Kobras <[EMAIL PROTECTED]> Wed, 13 Dec 2006 11:33:25 +0100
+
imagemagick (7:6.2.4.5.dfsg1-0.12) unstable; urgency=high
* Non-maintainer upload.
diff -u imagemagick-6.2.4.5.dfsg1/debian/control
imagemagick-6.2.4.5.dfsg1/debian/control
--- imagemagick-6.2.4.5.dfsg1/debian/control
+++ imagemagick-6.2.4.5.dfsg1/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Ryuichi Arafune <[EMAIL PROTECTED]>
Standards-Version: 3.7.2
-Build-Depends: libjpeg62-dev, libbz2-dev, libtiff4-dev, libwmf-dev (>=
0.2.7-1), libz-dev, libpng12-dev, libx11-dev, libxt-dev, libxext-dev, debhelper
(>> 3.0.5), libxml2-dev, libfreetype6-dev, liblcms1-dev, libexif-dev, perl (>=
5.8.0-3), libjasper-1.701-dev, libltdl3-dev, graphviz (>= 2.8), gs-gpl,
pkg-config
+Build-Depends: libjpeg62-dev, libbz2-dev, libtiff4-dev, libwmf-dev (>=
0.2.7-1), libz-dev, libpng12-dev (<= 1.2.8rel-7) | libpng12-dev (>=
1.2.15~beta5-0), libx11-dev, libxt-dev, libxext-dev, debhelper (>> 3.0.5),
libxml2-dev, libfreetype6-dev, liblcms1-dev, libexif-dev, perl (>= 5.8.0-3),
libjasper-1.701-dev, libltdl3-dev, graphviz (>= 2.8), gs-gpl, pkg-config
Package: imagemagick
Architecture: any
only in patch2:
unchanged:
--- imagemagick-6.2.4.5.dfsg1.orig/coders/png.c
+++ imagemagick-6.2.4.5.dfsg1/coders/png.c
@@ -1704,7 +1704,7 @@
#if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \
&& (PNG_LIBPNG_VER >= 10200)
/* Disable thread-unsafe features of pnggccrd */
- if (png_access_version() >= 10200)
+ if (png_access_version_number() >= 10200)
{
png_uint_32 mmx_disable_mask=0;
png_uint_32 asm_flags;
@@ -1713,8 +1713,8 @@
| PNG_ASM_FLAG_MMX_READ_FILTER_SUB \
| PNG_ASM_FLAG_MMX_READ_FILTER_AVG \
| PNG_ASM_FLAG_MMX_READ_FILTER_PAETH );
- asm_flags=png_get_asm_flags(png_ptr);
- png_set_asm_flags(png_ptr, asm_flags & ~mmx_disable_mask);
+ asm_flags=png_get_asm_flags(ping);
+ png_set_asm_flags(ping, asm_flags & ~mmx_disable_mask);
}
#endif
