diff options
Diffstat (limited to 'media-libs/qtav')
| -rw-r--r-- | media-libs/qtav/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch | 36 | ||||
| -rw-r--r-- | media-libs/qtav/qtav-1.12.0.ebuild | 7 |
3 files changed, 43 insertions, 3 deletions
diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest index c15af65ddf60..66d3a0efa9e0 100644 --- a/media-libs/qtav/Manifest +++ b/media-libs/qtav/Manifest @@ -1,5 +1,6 @@ +AUX qtav-1.12.0-ffmpeg-4.patch 1225 BLAKE2B 392c7290067aef2132e7024e268af250221b4138942c882b3c6955616f66561a067520f389731b53cc689e96cbbd43d1294a25efcdb4bdd61275f5d067a92014 SHA512 a46d37f00f92860d0b4e9d7c0bb2ec2aabf9517b39876b0ade58081955005eb8be7b4c18d16abcdaf98441c6179924b0bd1974041ede04467e7b7f5953a4fe8b AUX qtav-1.12.0-multilib.patch 716 BLAKE2B 4cb5518cb14e91963e5371eafdf3f02452fb32add562a54e9d5eb17d3da603e6bdbcf2544ef60667390de0a44475d9b0457c8664f40b982162a569846b511adf SHA512 0b9db739ab6b4a23d653de56d993f44a6e8d108df3a635a2ebc822bdcc2ac1006643f31ceda8a94626a84aa8556b45ab5aa72aec20d990cf09e7396191bac3bb DIST qtav-1.12.0-capi.h-b43aa93.xz 6120 BLAKE2B b2aca6c4ae70e227728bf908a7b5b9ad9fcb4ba52a254362eaaefaa9480c6a1c551bf47f02f8a44273952bf2816d2dbc7dc92142264892547d4fe602184b5fba SHA512 f5e458b157a5f343bc5d4133cfe45ffefb5c6cbb902b41ae6b9d9349e31ca7ac5a2746addc4fef89fb74856f5db7691cf174d82e88b51cc0b7a356c4fdab5aa7 DIST qtav-1.12.0.tar.gz 998117 BLAKE2B 85f8a470333e683353c305b06cec10f65b553c26b05fad4824d8f05f6aeb1fc2622ab8b60ba42a35260402a950bf41458e90342be6c53cbdb8400642c2d09741 SHA512 f273d10a4fe9126cd7d7b1293c087527bf898513e8add7958d905b6039b0c9c3891ea751c40e4c13ba683febff73912322953b151a131726ef8b44db199e0f32 -EBUILD qtav-1.12.0.ebuild 1392 BLAKE2B 61b0aaf2f6896050dc408170f8324109c24bab44f382c312a4a87ccb1c8734ebf3ee1ca6f4eae8dd505f0a90db48ec8512eede83ed92e88e088eebcce5ddf321 SHA512 00e7eb1480445bcc4ace81f7dc38efecfd945737e0a3799c0f63ab0399dd619ae4b45364dec2940c1af3c7284adc736b85795703edcba4a2fdbae7a99abe39aa +EBUILD qtav-1.12.0.ebuild 1428 BLAKE2B 55e9e1529bebd86adf2057136b57dfdcabe810694367d0f63e1be2587f514e0db38a61c7c0525f9e0e9ba92a1570e88cc818ad80ce774252a88e8cf46ae377e1 SHA512 4c12d4182ae82c3da68cd8c01b57d10defded1d41f17045638737d9633c3e7928ded02eeae083349bb5ccf350da5c34018f801461e32a99876d1b670e167c870 MISC metadata.xml 389 BLAKE2B 6f4c10122acf9e5b30236f531b433ffc9cc46f9ddd6e6322bb5e17c70f60ba6ad0966eb93af1946a1df67e03cde1921ef24bad93fc115d5af84be848cbb04585 SHA512 145488dd0015ae2b014509610c33cf28e4e46e966bd37073d1199230297e66df520f3ac0afedd63c8eac20a7aa02ee492e5ad0658aa3b6fd660bd685b984161c diff --git a/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch b/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch new file mode 100644 index 000000000000..cb77e9adebb2 --- /dev/null +++ b/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch @@ -0,0 +1,36 @@ +From 1633f2962e195eb2a013072e694a2e1c701613a8 Mon Sep 17 00:00:00 2001 +From: 0xFelix <evostar@gmx.de> +Date: Tue, 12 Dec 2017 13:24:34 +0100 +Subject: [PATCH] Remove usage of deprecated avfiltergraph.h header + +avfiltergraph.h was replaced by avfilter.h in libavfilter version +3.8.0+ so only include it when the used libavfilter version +is older than 3.8.0 +--- + src/QtAV/private/AVCompat.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/QtAV/private/AVCompat.h b/src/QtAV/private/AVCompat.h +index 6c38596d1..944cfd7de 100644 +--- a/src/QtAV/private/AVCompat.h ++++ b/src/QtAV/private/AVCompat.h +@@ -59,6 +59,7 @@ extern "C" + #include <libavutil/parseutils.h> + #include <libavutil/pixdesc.h> + #include <libavutil/avstring.h> ++#include <libavfilter/version.h> + + #if !FFMPEG_MODULE_CHECK(LIBAVUTIL, 51, 73, 101) + #include <libavutil/channel_layout.h> +@@ -79,8 +80,11 @@ extern "C" + #endif //QTAV_HAVE(AVRESAMPLE) + + #if QTAV_HAVE(AVFILTER) ++#if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,8,0) + #include <libavfilter/avfiltergraph.h> /*code is here for old version*/ ++#else + #include <libavfilter/avfilter.h> ++#endif + #include <libavfilter/buffersink.h> + #include <libavfilter/buffersrc.h> + #endif //QTAV_HAVE(AVFILTER) diff --git a/media-libs/qtav/qtav-1.12.0.ebuild b/media-libs/qtav/qtav-1.12.0.ebuild index 62a4f6419592..f3e1ff02cc1d 100644 --- a/media-libs/qtav/qtav-1.12.0.ebuild +++ b/media-libs/qtav/qtav-1.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -37,7 +37,10 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_PN}-${PV}" -PATCHES=( "${FILESDIR}/${P}-multilib.patch" ) +PATCHES=( + "${FILESDIR}/${P}-multilib.patch" + "${FILESDIR}/${P}-ffmpeg-4.patch" +) src_prepare() { cmake-utils_src_prepare |