summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Raschbacher <lordvan@gentoo.org>2019-02-27 23:20:05 +0100
committerThomas Raschbacher <lordvan@gentoo.org>2019-02-27 23:20:05 +0100
commit2ecc010a8cf7a9e8a22e8ca24e927102bb2c433b (patch)
tree4b1a08dab1de2d9fc81ac80a4c4c56c24a93e3e0 /media-video
parentapp-admin/salt: Version bump to 2018.3.4 (diff)
downloadgentoo-2ecc010a8cf7a9e8a22e8ca24e927102bb2c433b.tar.gz
gentoo-2ecc010a8cf7a9e8a22e8ca24e927102bb2c433b.tar.bz2
gentoo-2ecc010a8cf7a9e8a22e8ca24e927102bb2c433b.zip
media-video/vlc: fix libav compile bug
Closes: https://bugs.gentoo.org/show_bug.cgi?id=676032 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Thomas Raschbacher <lordvan@gentoo.org>
Diffstat (limited to 'media-video')
-rw-r--r--media-video/vlc/files/vlc-3.0.6-libav.patch12
-rw-r--r--media-video/vlc/vlc-3.0.6-r1.ebuild1
2 files changed, 13 insertions, 0 deletions
diff --git a/media-video/vlc/files/vlc-3.0.6-libav.patch b/media-video/vlc/files/vlc-3.0.6-libav.patch
new file mode 100644
index 00000000000..08e13f15fb6
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.6-libav.patch
@@ -0,0 +1,12 @@
+--- a/modules/codec/avcodec/fourcc.c 2019-02-27 22:57:55.878463261 +0100
++++ a/modules/codec/avcodec/fourcc.c_orig 2018-10-28 12:11:19.000000000 +0100
+@@ -182,7 +182,9 @@
+ /* AV_CODEC_ID_V210X */
+ { VLC_CODEC_TMV, AV_CODEC_ID_TMV },
+ { VLC_CODEC_V210, AV_CODEC_ID_V210 },
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 50, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100
+ { VLC_CODEC_VUYA, AV_CODEC_ID_AYUV },
++#endif
+ /* AV_CODEC_ID_DPX */
+ { VLC_CODEC_MAD, AV_CODEC_ID_MAD },
+ { VLC_CODEC_FRWU, AV_CODEC_ID_FRWU },
diff --git a/media-video/vlc/vlc-3.0.6-r1.ebuild b/media-video/vlc/vlc-3.0.6-r1.ebuild
index b803e74a18e..519aa96447b 100644
--- a/media-video/vlc/vlc-3.0.6-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.6-r1.ebuild
@@ -234,6 +234,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
"${FILESDIR}"/${P}-libvpx-1.8.0.patch # bug 677606
"${FILESDIR}"/${P}-fdk-aac-2.0.0.patch # bug 672290
+ "${FILESDIR}"/${P}-libav.patch
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )