diff options
Diffstat (limited to 'testing/handbrake')
-rw-r--r-- | testing/handbrake/APKBUILD | 12 | ||||
-rw-r--r-- | testing/handbrake/ffmpeg-4.patch | 17 |
2 files changed, 23 insertions, 6 deletions
diff --git a/testing/handbrake/APKBUILD b/testing/handbrake/APKBUILD index 059be415365..e1464f48a15 100644 --- a/testing/handbrake/APKBUILD +++ b/testing/handbrake/APKBUILD @@ -20,6 +20,7 @@ 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} @@ -29,8 +30,7 @@ prepare() { default_prepare # build against external libs sed -i 's:.*contrib/.*::g' \ - make/include/main.defs \ - || die "Contrib removal failed." + make/include/main.defs } build() { @@ -38,11 +38,10 @@ build() { ./configure --prefix=/usr \ --force \ --verbose \ - --disable-gtk-update-checks \ - || return 1 + --disable-gtk-update-checks cd build - make || return 1 + make } package() { @@ -62,4 +61,5 @@ gtk() { sha512sums="360f7fe3e4571bb623f54a00e9478a78d655448ffb1b8d72b7d32636a230f2ae4dabbfe803f6f9491537064ea4f6e238700b3d29912ae34383fbb1922e18e9b8 HandBrake-1.1.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" +9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc handbrake-9999-remove-faac-dependency.patch +bdfddedef60d0cc6a03b0c91058071991f19e96687dc999e1aa21ea178e98983446a3cc5b4aefcdd53cabbd7ee5fd4237065b90fd67879cf03a0d2bf9ef5ad79 ffmpeg-4.patch" diff --git a/testing/handbrake/ffmpeg-4.patch b/testing/handbrake/ffmpeg-4.patch new file mode 100644 index 00000000000..f5f4ad9985c --- /dev/null +++ b/testing/handbrake/ffmpeg-4.patch @@ -0,0 +1,17 @@ +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) + { |