rpms/libtheora
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patch to fix FTBFS with libpng-1.6

Browse Source
This commit is contained in:
Peter Robinson 2013-08-03 12:19:27 +01:00
parent 4c12d11844
commit 8cd5ccdfc0
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libtheora-1.1.1-libpng16.patch Normal file
View File

@ -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);
}

10
libtheora.spec
View File

@ -1,13 +1,16 @@
Name: libtheora Name: libtheora
Epoch: 1 Epoch: 1
Version: 1.1.1 Version: 1.1.1
Release: 8%{?dist} Release: 9%{?dist}
Summary: Theora Video Compression Codec Summary: Theora Video Compression Codec
Group: System Environment/Libraries Group: System Environment/Libraries
License: BSD License: BSD
URL: http://www.theora.org URL: http://www.theora.org
Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}.tar.xz Source0: http://downloads.xiph.org/releases/theora/%{name}-%{version}.tar.xz
Patch0: libtheora-1.1.1-fix-pp_sharp_mod-calc.patch 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: libogg-devel >= 2:1.1
BuildRequires: libvorbis-devel BuildRequires: libvorbis-devel
BuildRequires: SDL-devel libpng-devel BuildRequires: SDL-devel libpng-devel
@ -63,6 +66,8 @@ with theora bitstreams.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p0 -b .libpng16
# no custom CFLAGS please # no custom CFLAGS please
sed -i 's/CFLAGS="$CFLAGS $cflags_save"/CFLAGS="$cflags_save"/g' configure 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 %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 * 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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild