diff options
| author | prspkt <prspkt@protonmail.com> | 2019-02-27 14:32:26 +0200 |
|---|---|---|
| committer | prspkt <prspkt@protonmail.com> | 2019-02-27 20:32:43 +0200 |
| commit | 49c4725efbbdcd377b1a1bc6b74f3993b8d743c9 (patch) | |
| tree | dac778556e5f1c09d00fad5bf0bcbe3c526dade9 | |
| parent | be3899b65843b85eff6f993975957758e4dad555 (diff) | |
| download | aports-49c4725efbbdcd377b1a1bc6b74f3993b8d743c9.tar.bz2 aports-49c4725efbbdcd377b1a1bc6b74f3993b8d743c9.tar.xz | |
testing/handbrake: upgrade to 1.2.2, clarify license
| -rw-r--r-- | testing/handbrake/APKBUILD | 12 | ||||
| -rw-r--r-- | testing/handbrake/ffmpeg-4.patch | 17 |
2 files changed, 5 insertions, 24 deletions
diff --git a/testing/handbrake/APKBUILD b/testing/handbrake/APKBUILD index 7106cc90cb..2a03b9ca9c 100644 --- a/testing/handbrake/APKBUILD +++ b/testing/handbrake/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Nathan Angelacos <nangel@alpinelinux.org> pkgname=handbrake _pkgname=HandBrake -pkgver=1.1.2 -pkgrel=2 +pkgver=1.2.2 +pkgrel=0 pkgdesc="Handbrake video transcoder" url="https://handbrake.fr" arch="x86_64 x86 armhf armv7 ppc64le" -license="GPL-2.0" +license="GPL-2.0-only" makedepends="yasm autoconf libtool zlib-dev libbz2 libogg-dev libtheora-dev libvorbis-dev libsamplerate-dev fribidi-dev freetype-dev tinyxml-dev fontconfig-dev libass-dev intltool glib-dev dbus-glib-dev @@ -20,7 +20,6 @@ source="https://download.handbrake.fr/releases/$pkgver/HandBrake-$pkgver-source. handbrake-9999-fix-missing-x265-link-flag.patch handbrake-9999-remove-dvdnav-dup.patch handbrake-9999-remove-faac-dependency.patch - ffmpeg-4.patch " options="!check" builddir="$srcdir"/${_pkgname}-${pkgver} @@ -58,8 +57,7 @@ gtk() { } -sha512sums="360f7fe3e4571bb623f54a00e9478a78d655448ffb1b8d72b7d32636a230f2ae4dabbfe803f6f9491537064ea4f6e238700b3d29912ae34383fbb1922e18e9b8 HandBrake-1.1.2-source.tar.bz2 +sha512sums="434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c HandBrake-1.2.2-source.tar.bz2 9ca716b290f384db839609d176b6883c4dc1aaf31206b206cfd1f29c85bb134e29fbf72bda1a8589f76e1885019dbdee5a39d8299f7f0a20a6ef8a01868f4845 handbrake-9999-fix-missing-x265-link-flag.patch a3d57dd37d518286a62554cfcc4722d6fd588a0c3966d30785100edc4476febb2b48fc4f9b2a7eb5b5dc049043fabd4398e1e190e10cbd63c25b2936824977d3 handbrake-9999-remove-dvdnav-dup.patch -9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc handbrake-9999-remove-faac-dependency.patch -bdfddedef60d0cc6a03b0c91058071991f19e96687dc999e1aa21ea178e98983446a3cc5b4aefcdd53cabbd7ee5fd4237065b90fd67879cf03a0d2bf9ef5ad79 ffmpeg-4.patch" +9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc handbrake-9999-remove-faac-dependency.patch" diff --git a/testing/handbrake/ffmpeg-4.patch b/testing/handbrake/ffmpeg-4.patch deleted file mode 100644 index f5f4ad9985..0000000000 --- a/testing/handbrake/ffmpeg-4.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c -index dc43411..cfae5f1 100644 ---- a/libhb/muxavformat.c -+++ b/libhb/muxavformat.c -@@ -1202,10 +1202,12 @@ static int avformatMux(hb_mux_object_t *m, hb_mux_data_t *track, hb_buffer_t *bu - { - pkt.flags |= AV_PKT_FLAG_KEY; - } -+#ifdef AV_PKT_FLAG_DISPOSABLE - if (!(buf->s.flags & HB_FLAG_FRAMETYPE_REF)) - { - pkt.flags |= AV_PKT_FLAG_DISPOSABLE; - } -+#endif - } - else if (buf->s.frametype & HB_FRAME_MASK_KEY) - { |