[pkg-GD-devel] Bug#785403: libgd2: FTBFS with libvpx 1.4

[Sebastian Ramacher]

Control: tags -1 + patch

On 2015-05-15 19:24:35, Emilio Pozuelo Monfort wrote:
> Source: libgd2
> Version: 2.1.0-5
> Severity: serious
> Tags: sid stretch
> 
> Your package fails to build against the new libvpx:
> 
> webpimg.c: In function 'VPXEncode':
> webpimg.c:714:24: error: 'IMG_FMT_I420' undeclared (first use in this function)
>      vpx_img_wrap(&img, IMG_FMT_I420,
>                         ^
> webpimg.c:714:24: note: each undeclared identifier is reported only once for each function it appears in
> webpimg.c:716:16: error: 'PLANE_Y' undeclared (first use in this function)
>      img.planes[PLANE_Y] = (uint8*)(Y);
>                 ^
> webpimg.c:717:16: error: 'PLANE_U' undeclared (first use in this function)
>      img.planes[PLANE_U] = (uint8*)(U);
>                 ^
> webpimg.c:718:16: error: 'PLANE_V' undeclared (first use in this function)
>      img.planes[PLANE_V] = (uint8*)(V);
>                 ^
> make[3]: *** [webpimg.lo] Error 1
> 
> These (and others you may be using in other files) should now be VPX_FOO.

A patch fixing this issue can be found at [1]. Debdiff attached.

Cheers

[1] https://github.com/libgd/libgd/commit/d41eb72cd4545c394578332e5c102dee69e02ee8
-- 
Sebastian Ramacher
-------------- next part --------------
diff -Nru libgd2-2.1.0/debian/changelog libgd2-2.1.0/debian/changelog
--- libgd2-2.1.0/debian/changelog	2014-12-18 13:31:20.000000000 +0100
+++ libgd2-2.1.0/debian/changelog	2015-05-17 00:19:28.000000000 +0200
@@ -1,3 +1,11 @@
+libgd2 (2.1.0-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/libvpx-1.4.patch: Fix build against libvpx 1.4. (Closes:
+    #785403)
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Sat, 16 May 2015 23:53:26 +0200
+
 libgd2 (2.1.0-5) unstable; urgency=high
 
   * Remove seanius from Uploaders.  So Long, and Thanks for All the Fish.
diff -Nru libgd2-2.1.0/debian/patches/libvpx-1.4.patch libgd2-2.1.0/debian/patches/libvpx-1.4.patch
--- libgd2-2.1.0/debian/patches/libvpx-1.4.patch	1970-01-01 01:00:00.000000000 +0100
+++ libgd2-2.1.0/debian/patches/libvpx-1.4.patch	2015-05-17 00:18:44.000000000 +0200
@@ -0,0 +1,29 @@
+Description: Fix build with latest libvpx 1.4.0
+Author: Remi Collet <fedora at famillecollet.com>
+Bug-Debian: https://bugs.debian.org/785403
+Last-Update: 2015-05-16
+
+--- libgd2-2.1.0.orig/src/webpimg.c
++++ libgd2-2.1.0/src/webpimg.c
+@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8*
+     codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
+     codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
+ 
+-    vpx_img_wrap(&img, IMG_FMT_I420,
++    vpx_img_wrap(&img, VPX_IMG_FMT_I420,
+                  y_width, y_height, 16, (uint8*)(Y));
+-    img.planes[PLANE_Y] = (uint8*)(Y);
+-    img.planes[PLANE_U] = (uint8*)(U);
+-    img.planes[PLANE_V] = (uint8*)(V);
+-    img.stride[PLANE_Y] = y_stride;
+-    img.stride[PLANE_U] = uv_stride;
+-    img.stride[PLANE_V] = uv_stride;
++    img.planes[VPX_PLANE_Y] = (uint8*)(Y);
++    img.planes[VPX_PLANE_U] = (uint8*)(U);
++    img.planes[VPX_PLANE_V] = (uint8*)(V);
++    img.stride[VPX_PLANE_Y] = y_stride;
++    img.stride[VPX_PLANE_U] = uv_stride;
++    img.stride[VPX_PLANE_V] = uv_stride;
+ 
+     res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);
+ 
diff -Nru libgd2-2.1.0/debian/patches/series libgd2-2.1.0/debian/patches/series
--- libgd2-2.1.0/debian/patches/series	2014-12-18 13:31:20.000000000 +0100
+++ libgd2-2.1.0/debian/patches/series	2015-05-16 23:55:13.000000000 +0200
@@ -3,3 +3,4 @@
 fix-compiled-in-version.patch
 subdir-objects.patch
 CVE-2014-2497.patch
+libvpx-1.4.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-gd-devel/attachments/20150517/3063038e/attachment.sig>