Date: Tuesday, July 2, 2013 @ 10:08:06 Author: jgc Revision: 189279 upgpkg: libtheora 1.1.1-3
Fix compile with libpng 1.6 Added: libtheora/trunk/libtheora-1.1.1-libpng16.patch Modified: libtheora/trunk/PKGBUILD --------------------------------+ PKGBUILD | 20 ++++++++++++++------ libtheora-1.1.1-libpng16.patch | 17 +++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-07-02 07:41:51 UTC (rev 189278) +++ PKGBUILD 2013-07-02 08:08:06 UTC (rev 189279) @@ -4,7 +4,7 @@ pkgname=libtheora pkgver=1.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="An open video codec developed by the Xiph.org" arch=('i686' 'x86_64') url="http://www.xiph.org" @@ -12,18 +12,26 @@ depends=('libogg') makedepends=('libvorbis') options=('!libtool') -source=("http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2") -md5sums=('292ab65cedd5021d6b7ddd117e07cd8e') -sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262') +source=(http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2 + libtheora-1.1.1-libpng16.patch) +md5sums=('292ab65cedd5021d6b7ddd117e07cd8e' + '08edd81c7a1be2c4edfd2cd3c112a8c6') +sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262' + 'c3f03dbaa5c6459846ce79ea904db1b66971878d') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np0 -i ../libtheora-1.1.1-libpng16.patch +} + build() { - cd "${srcdir}/libtheora-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --enable-shared --disable-static make } package() { - cd "${srcdir}/libtheora-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" Added: libtheora-1.1.1-libpng16.patch =================================================================== --- libtheora-1.1.1-libpng16.patch (rev 0) +++ libtheora-1.1.1-libpng16.patch 2013-07-02 08:08:06 UTC (rev 189279) @@ -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); + }