diff --git a/gd-libvpx.patch b/gd-libvpx.patch new file mode 100644 index 0000000..b63a1de --- /dev/null +++ b/gd-libvpx.patch @@ -0,0 +1,24 @@ +--- src/webpimg.c.orig 2015-01-06 10:16:03.000000000 +0100 ++++ src/webpimg.c 2015-05-12 15:02:50.784722900 +0200 +@@ -711,14 +711,14 @@ + 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 --git a/gd.changes b/gd.changes index 2e821e0..7aaaee3 100644 --- a/gd.changes +++ b/gd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 12 14:11:33 UTC 2015 - joerg.lorenzen@ki.tng.de + +- Added patch gd-libvpx.patch to enable build against libvpx >= 1.4, + new VPX_ prefixed namespaces are available since libvpx = 0.9.1. + ------------------------------------------------------------------- Sat Feb 28 08:44:08 UTC 2015 - mpluskal@suse.com diff --git a/gd.spec b/gd.spec index 43dd854..92d9c56 100644 --- a/gd.spec +++ b/gd.spec @@ -37,6 +37,8 @@ Patch1: gd-fontpath.patch Patch2: gd-format.patch # could be upstreamed Patch3: gd-aliasing.patch +# could be upstreamed +Patch4: gd-libvpx.patch BuildRequires: fontconfig-devel BuildRequires: freetype2-devel BuildRequires: libjpeg-devel @@ -92,6 +94,7 @@ the formats accepted for inline images by most browsers. %patch1 %patch2 %patch3 +%patch4 %build autoreconf -fiv