From 8cd5ccdfc0a267dc6c9a632e35b72178d20677d3 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Aug 03 2013 11:19:27 +0000
Subject: Add patch to fix FTBFS with libpng-1.6


---

diff --git a/libtheora-1.1.1-libpng16.patch b/libtheora-1.1.1-libpng16.patch
new file mode 100644
index 0000000..93da700
--- /dev/null
+++ b/libtheora-1.1.1-libpng16.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/465450
+http://trac.xiph.org/ticket/1947
+
+--- examples/png2theora.c
++++ examples/png2theora.c
+@@ -462,9 +462,9 @@
+   png_set_strip_alpha(png_ptr);
+ 
+   row_data = (png_bytep)png_malloc(png_ptr,
+-    3*height*width*png_sizeof(*row_data));
++    3*height*width*sizeof(*row_data));
+   row_pointers = (png_bytep *)png_malloc(png_ptr,
+-    height*png_sizeof(*row_pointers));
++    height*sizeof(*row_pointers));
+   for(y = 0; y < height; y++) {
+     row_pointers[y] = row_data + y*(3*width);
+   }
diff --git a/libtheora.spec b/libtheora.spec
index bccc8f6..bee43d4 100644
--- a/libtheora.spec
+++ b/libtheora.spec
@@ -1,13 +1,16 @@
 Name:           libtheora
 Epoch:          1
 Version:        1.1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Theora Video Compression Codec
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.theora.org
 Source0:        http://downloads.xiph.org/releases/theora/%{name}-%{version}.tar.xz
 Patch0:         libtheora-1.1.1-fix-pp_sharp_mod-calc.patch
+# https://bugs.archlinux.org/task/35985
+Patch1:         libtheora-1.1.1-libpng16.patch
+
 BuildRequires:  libogg-devel >= 2:1.1
 BuildRequires:  libvorbis-devel
 BuildRequires:  SDL-devel libpng-devel
@@ -63,6 +66,8 @@ with theora bitstreams.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0 -b .libpng16
+
 # no custom CFLAGS please
 sed -i 's/CFLAGS="$CFLAGS $cflags_save"/CFLAGS="$cflags_save"/g' configure
 
@@ -111,6 +116,9 @@ install -m 755 examples/.libs/png2theora $RPM_BUILD_ROOT/%{_bindir}/png2theora
 
 
 %changelog
+* Sat Aug  3 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1:1.1.1-9
+- Add patch to fix FTBFS with libpng-1.6
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild