Date: Tuesday, July 2, 2013 @ 10:08:13 Author: jgc Revision: 189280 archrelease: copy trunk to extra-i686, extra-x86_64
Added: libtheora/repos/extra-i686/PKGBUILD (from rev 189279, libtheora/trunk/PKGBUILD) libtheora/repos/extra-i686/libtheora-1.1.1-libpng16.patch (from rev 189279, libtheora/trunk/libtheora-1.1.1-libpng16.patch) libtheora/repos/extra-x86_64/PKGBUILD (from rev 189279, libtheora/trunk/PKGBUILD) libtheora/repos/extra-x86_64/libtheora-1.1.1-libpng16.patch (from rev 189279, libtheora/trunk/libtheora-1.1.1-libpng16.patch) Deleted: libtheora/repos/extra-i686/PKGBUILD libtheora/repos/extra-x86_64/PKGBUILD ---------------------------------------------+ /PKGBUILD | 78 ++++++++++++++++++++++++++ extra-i686/PKGBUILD | 31 ---------- extra-i686/libtheora-1.1.1-libpng16.patch | 17 +++++ extra-x86_64/PKGBUILD | 31 ---------- extra-x86_64/libtheora-1.1.1-libpng16.patch | 17 +++++ 5 files changed, 112 insertions(+), 62 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-07-02 08:08:06 UTC (rev 189279) +++ extra-i686/PKGBUILD 2013-07-02 08:08:13 UTC (rev 189280) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Tom Killian <t...@archlinux.org> -# Committer: dorphell <dorph...@archlinux.org> - -pkgname=libtheora -pkgver=1.1.1 -pkgrel=2 -pkgdesc="An open video codec developed by the Xiph.org" -arch=('i686' 'x86_64') -url="http://www.xiph.org" -license=('BSD') -depends=('libogg') -makedepends=('libvorbis') -options=('!libtool') -source=("http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2") -md5sums=('292ab65cedd5021d6b7ddd117e07cd8e') -sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262') - -build() { - cd "${srcdir}/libtheora-${pkgver}" - ./configure --prefix=/usr --enable-shared --disable-static - make -} - -package() { - cd "${srcdir}/libtheora-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 LICENSE COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} Copied: libtheora/repos/extra-i686/PKGBUILD (from rev 189279, libtheora/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-07-02 08:08:13 UTC (rev 189280) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Tom Killian <t...@archlinux.org> +# Committer: dorphell <dorph...@archlinux.org> + +pkgname=libtheora +pkgver=1.1.1 +pkgrel=3 +pkgdesc="An open video codec developed by the Xiph.org" +arch=('i686' 'x86_64') +url="http://www.xiph.org" +license=('BSD') +depends=('libogg') +makedepends=('libvorbis') +options=('!libtool') +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 ${pkgname}-${pkgver} + ./configure --prefix=/usr --enable-shared --disable-static + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} Copied: libtheora/repos/extra-i686/libtheora-1.1.1-libpng16.patch (from rev 189279, libtheora/trunk/libtheora-1.1.1-libpng16.patch) =================================================================== --- extra-i686/libtheora-1.1.1-libpng16.patch (rev 0) +++ extra-i686/libtheora-1.1.1-libpng16.patch 2013-07-02 08:08:13 UTC (rev 189280) @@ -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); + } Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-07-02 08:08:06 UTC (rev 189279) +++ extra-x86_64/PKGBUILD 2013-07-02 08:08:13 UTC (rev 189280) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Tom Killian <t...@archlinux.org> -# Committer: dorphell <dorph...@archlinux.org> - -pkgname=libtheora -pkgver=1.1.1 -pkgrel=2 -pkgdesc="An open video codec developed by the Xiph.org" -arch=('i686' 'x86_64') -url="http://www.xiph.org" -license=('BSD') -depends=('libogg') -makedepends=('libvorbis') -options=('!libtool') -source=("http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2") -md5sums=('292ab65cedd5021d6b7ddd117e07cd8e') -sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262') - -build() { - cd "${srcdir}/libtheora-${pkgver}" - ./configure --prefix=/usr --enable-shared --disable-static - make -} - -package() { - cd "${srcdir}/libtheora-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 LICENSE COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} Copied: libtheora/repos/extra-x86_64/PKGBUILD (from rev 189279, libtheora/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-07-02 08:08:13 UTC (rev 189280) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Tom Killian <t...@archlinux.org> +# Committer: dorphell <dorph...@archlinux.org> + +pkgname=libtheora +pkgver=1.1.1 +pkgrel=3 +pkgdesc="An open video codec developed by the Xiph.org" +arch=('i686' 'x86_64') +url="http://www.xiph.org" +license=('BSD') +depends=('libogg') +makedepends=('libvorbis') +options=('!libtool') +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 ${pkgname}-${pkgver} + ./configure --prefix=/usr --enable-shared --disable-static + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} Copied: libtheora/repos/extra-x86_64/libtheora-1.1.1-libpng16.patch (from rev 189279, libtheora/trunk/libtheora-1.1.1-libpng16.patch) =================================================================== --- extra-x86_64/libtheora-1.1.1-libpng16.patch (rev 0) +++ extra-x86_64/libtheora-1.1.1-libpng16.patch 2013-07-02 08:08:13 UTC (rev 189280) @@ -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); + }