Balló György pushed to branch main at Arch Linux / Packaging / Packages /
libtheora
Commits:
a0732f7b by Balló György at 2024-05-13T02:10:21+02:00
Switch to git source
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − libtheora-1.1.1-libpng16.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -5,14 +5,15 @@ pkgbase = libtheora
url = https://www.theora.org/
arch = x86_64
license = BSD-3-Clause
+ makedepends = doxygen
+ makedepends = git
makedepends = libpng
makedepends = libvorbis
makedepends = sdl
depends = glibc
depends = libogg
- source =
https://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.xz
- source = libtheora-1.1.1-libpng16.patch
- sha256sums =
f36da409947aa2b3dcc6af0a8c2e3144bc19db2ed547d64e9171c59c66561c61
- sha256sums =
e4c9a8dc798c596ed32a2a720020ae27a0e72f5add1a47cb8fadebe0e7180d7e
+ source = git+https://github.com/xiph/theora.git?signed#tag=v1.1.1
+ validpgpkeys = 17E78AB6BD65A91EE811D60947000F7BB1441DEF
+ b2sums =
b7eb9a0ebc83c84eac0049b7dbfea63a2da6c8913251e24229c6d32b048bcca64e2ec5a1c0caa9763f93d7e134ad7c95b54a0c86f8c6631437a5fe7bfd198251
pkgname = libtheora
=====================================
PKGBUILD
=====================================
@@ -10,30 +10,36 @@ arch=('x86_64')
url='https://www.theora.org/'
license=('BSD-3-Clause')
depends=('glibc' 'libogg')
-makedepends=('libpng' 'libvorbis' 'sdl')
-source=("https://downloads.xiph.org/releases/theora/$pkgname-$pkgver.tar.xz";
- 'libtheora-1.1.1-libpng16.patch')
-sha256sums=('f36da409947aa2b3dcc6af0a8c2e3144bc19db2ed547d64e9171c59c66561c61'
- 'e4c9a8dc798c596ed32a2a720020ae27a0e72f5add1a47cb8fadebe0e7180d7e')
+makedepends=('doxygen' 'git' 'libpng' 'libvorbis' 'sdl')
+source=("git+https://github.com/xiph/theora.git?signed#tag=v$pkgver";)
+b2sums=('b7eb9a0ebc83c84eac0049b7dbfea63a2da6c8913251e24229c6d32b048bcca64e2ec5a1c0caa9763f93d7e134ad7c95b54a0c86f8c6631437a5fe7bfd198251')
+validpgpkeys=('17E78AB6BD65A91EE811D60947000F7BB1441DEF') # Ralph Giles
<gi...@mozilla.com>
prepare() {
- cd $pkgname-$pkgver
- patch -Np0 -i ../libtheora-1.1.1-libpng16.patch
+ cd theora
+
+ # Fix build with libpng 1.6
+ git cherry-pick -n 7288b539c52e99168488dc3a343845c9365617c8
+
+ # Don't run configure from autogen.sh
+ sed -i '/\$srcdir\/configure/d' autogen.sh
+
+ ./autogen.sh
}
build() {
- cd $pkgname-$pkgver
+ cd theora
./configure --prefix=/usr
make
}
check() {
- cd $pkgname-$pkgver
+ cd theora
make check
}
package() {
- cd $pkgname-$pkgver
+ cd theora
make DESTDIR="$pkgdir" install
install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" LICENSE COPYING
}
=====================================
libtheora-1.1.1-libpng16.patch deleted
=====================================
@@ -1,17 +0,0 @@
-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);
- }
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/libtheora/-/commit/a0732f7b9de5de4642798c4dbebdfdbee5b3fb01
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/libtheora/-/commit/a0732f7b9de5de4642798c4dbebdfdbee5b3fb01
You're receiving this email because of your account on gitlab.archlinux.org.
