From 942f47c9941c54393ffa6749b26569b1e163197c Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 29 Dec 2019 09:52:58 -0600 Subject: user/ffmpeg: Forward-port patch to 4.2.1 --- user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch | 2 +- user/ffmpeg/APKBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'user/ffmpeg') diff --git a/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch b/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch index 93e3ac995..9cc6fdfcf 100644 --- a/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch +++ b/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch @@ -15,7 +15,7 @@ diff --git a/libavutil/internal.h b/libavutil/internal.h index 61784b5..69d63d5 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h -@@ -177,34 +177,6 @@ +@@ -187,34 +187,6 @@ #endif /** diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index 06d9db55c..48b70752c 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -98,4 +98,4 @@ libs() { } sha512sums="3efddc7d6bbccba9a1f55bf0e6caa8a578405a7e12058ce526766ed5eca9d45a783dbf86325ab860a8eabbe29701f8093e691f0138e0d9cc883cfe5200b3561b ffmpeg-4.2.1.tar.xz -32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" +1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" -- cgit v1.2.3-70-g09d2 From d6a8ba9c4f2c0dc8dfc3a5892b3e447fbf68da42 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 14 Jan 2020 10:28:46 +0000 Subject: user/*: Modernise / fix syntax --- system/openssh/APKBUILD | 2 +- system/perl/APKBUILD | 4 ---- user/ffmpeg/APKBUILD | 1 - user/gcompris-qt/APKBUILD | 10 +++------- user/nextcloud-client/APKBUILD | 2 +- user/xapian-core/APKBUILD | 1 - 6 files changed, 5 insertions(+), 15 deletions(-) (limited to 'user/ffmpeg') diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD index 38d947585..10eee5514 100644 --- a/system/openssh/APKBUILD +++ b/system/openssh/APKBUILD @@ -136,7 +136,7 @@ server() { pkgdesc="OpenSSH server" depends="openssh-client openssh-keygen" replaces="openssh-server-common" - cd "$builddir" + install -d "$subpkgdir"/usr/sbin install -d "$subpkgdir"/etc/ssh mv "$pkgdir"/usr/sbin/sshd "$subpkgdir"/usr/sbin/ diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD index 0fc25d609..f65edd034 100644 --- a/system/perl/APKBUILD +++ b/system/perl/APKBUILD @@ -37,7 +37,6 @@ _archlib=/usr/lib/perl5/core_perl prepare() { chmod +w "$builddir"/*.c default_prepare - cd "$builddir" sed -e 's/less -R/less/g' \ -e 's/libswanted="\(.*\) nsl\(.*\)"/libswanted="\1\2"/g' \ -i ./Configure || @@ -50,7 +49,6 @@ prepare() { } build() { - cd "$builddir" BUILD_ZLIB=0 BUILD_BZIP2=0 BZIP2_LIB=/usr/lib @@ -89,12 +87,10 @@ build() { } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install if [ -n "$(find $pkgdir/usr/local -type f)" ]; then error "files found under /usr/local" diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index 48b70752c..c3537f5fe 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -85,7 +85,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install-man install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" } diff --git a/user/gcompris-qt/APKBUILD b/user/gcompris-qt/APKBUILD index 9240e9af7..6b53bd372 100644 --- a/user/gcompris-qt/APKBUILD +++ b/user/gcompris-qt/APKBUILD @@ -17,9 +17,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="http://gcompris.net/download/qt/src/gcompris-qt-$pkgver.tar.xz" build() { - cd "$builddir" - mkdir build - cd build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -31,13 +28,12 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ ${CMAKE_CROSSOPTS} \ - .. - make + -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="bc4515acc5c58869997e44c0c3c38d2904f34a7a5efede1ee7aefcbd1ae5907fe00b29a3ecf8e5e46396031736d10df64523e280dfffe3bac2df7e34fe9a8eda gcompris-qt-0.91.tar.xz" diff --git a/user/nextcloud-client/APKBUILD b/user/nextcloud-client/APKBUILD index 84f90982f..19b8959ae 100644 --- a/user/nextcloud-client/APKBUILD +++ b/user/nextcloud-client/APKBUILD @@ -25,7 +25,7 @@ build() { -DNO_SHIBBOLETH=1 \ -DWITH_CRASHREPORTER=bool:OFF \ -DUNIT_TESTING=bool:ON \ - -DNO_SHIBBOLETH=bool:ON + -DNO_SHIBBOLETH=bool:ON . make } diff --git a/user/xapian-core/APKBUILD b/user/xapian-core/APKBUILD index e8041d355..20005d338 100644 --- a/user/xapian-core/APKBUILD +++ b/user/xapian-core/APKBUILD @@ -42,7 +42,6 @@ package() { libxapian() { pkgdesc="Xapian search engine library" - cd "$builddir" install -d "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/$subpkgname* "$subpkgdir"/usr/lib } -- cgit v1.2.3-70-g09d2 From e53771be5016073794f32a10cf7a27198cd0ee49 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Wed, 26 Feb 2020 01:56:49 +0000 Subject: user/ffmpeg: Bump to 4.2.2 --- user/ffmpeg/APKBUILD | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'user/ffmpeg') diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index c3537f5fe..b6de0597c 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -3,21 +3,22 @@ # Contributor: Jakub Skrzypnik # Maintainer: A. Wilcox pkgname=ffmpeg -pkgver=4.2.1 +pkgver=4.2.2 pkgrel=0 pkgdesc="Record, convert, and stream audio and video" url="https://ffmpeg.org/" arch="all" -license="GPL-2.0-only" options="!check textrels" # Test suite requires proper licensing headers on all files, # which upstream does not provide. -subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" +license="GPL-2.0-only" +depends="" makedepends="alsa-lib-dev bzip2-dev freetype-dev gnutls-dev imlib2-dev ladspa-dev lame-dev libcdio-dev libcdio-paranoia-dev libmodplug-dev libtheora-dev libva-dev libvdpau-dev libvorbis-dev libwebp-dev libxfixes-dev opus-dev perl-dev pulseaudio-dev sdl2-dev speex-dev v4l-utils-dev wavpack-dev x264-dev x265-dev xvidcore-dev xz-dev yasm zlib-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch " @@ -38,7 +39,7 @@ source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz # - CVE-2017-14225 build() { - local _asm="" + _asm="" case "$CARCH" in ppc64) _asm="--cpu=G5" ;; @@ -96,5 +97,5 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="3efddc7d6bbccba9a1f55bf0e6caa8a578405a7e12058ce526766ed5eca9d45a783dbf86325ab860a8eabbe29701f8093e691f0138e0d9cc883cfe5200b3561b ffmpeg-4.2.1.tar.xz +sha512sums="381cd6732fa699eb89000621cf34256920596ed1f9de3c2194dbad35fdf2165269eb7d3a147a0eb75dc18fbb6d601382b5801750e09fc63547766842f84208e3 ffmpeg-4.2.2.tar.xz 1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" -- cgit v1.2.3-70-g09d2