summaryrefslogtreecommitdiff
path: root/extra/libtheora
diff options
context:
space:
mode:
Diffstat (limited to 'extra/libtheora')
-rw-r--r--extra/libtheora/PKGBUILD22
-rw-r--r--extra/libtheora/libtheora-1.1.1-libpng16.patch17
2 files changed, 32 insertions, 7 deletions
diff --git a/extra/libtheora/PKGBUILD b/extra/libtheora/PKGBUILD
index 89cdaecb7..1f6322c42 100644
--- a/extra/libtheora/PKGBUILD
+++ b/extra/libtheora/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 137894 2011-09-12 09:56:42Z pierre $
+# $Id: PKGBUILD 189280 2013-07-02 08:08:13Z jgc $
# Maintainer: Tom Killian <tom@archlinux.org>
# Committer: dorphell <dorphell@archlinux.org>
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 @@ license=('BSD')
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}"
diff --git a/extra/libtheora/libtheora-1.1.1-libpng16.patch b/extra/libtheora/libtheora-1.1.1-libpng16.patch
new file mode 100644
index 000000000..93da700c4
--- /dev/null
+++ b/extra/libtheora/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);
+ }