summaryrefslogtreecommitdiff
path: root/media-video
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/Manifest.gzbin29763 -> 29742 bytes
-rw-r--r--media-video/avidemux/Manifest2
-rw-r--r--media-video/avidemux/avidemux-2.6.20.ebuild15
-rw-r--r--media-video/cinelerra/Manifest16
-rw-r--r--media-video/cinelerra/cinelerra-2.3.ebuild25
-rw-r--r--media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch134
-rw-r--r--media-video/cinelerra/files/cinelerra-20140710-underlinking.patch16
-rw-r--r--media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch14
-rw-r--r--media-video/cinelerra/files/cinelerra-ffmpeg.patch76
-rw-r--r--media-video/cinelerra/files/cinelerra-ffmpeg2.patch218
-rw-r--r--media-video/cinelerra/files/cinelerra-ffmpeg29.patch658
-rw-r--r--media-video/cinelerra/files/cinelerra-implicit_decls.patch36
-rw-r--r--media-video/cinelerra/files/cinelerra-includes.patch12
-rw-r--r--media-video/cinelerra/files/cinelerra-libav9.patch93
-rw-r--r--media-video/cinelerra/files/cinelerra-pngtoh.patch15
-rw-r--r--media-video/cinelerra/files/cinelerra-putbits-gcc52.patch29
-rw-r--r--media-video/totem/Manifest4
-rw-r--r--media-video/totem/totem-3.24.0.ebuild2
-rw-r--r--media-video/transcode/Manifest17
-rw-r--r--media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch15
-rw-r--r--media-video/transcode/files/transcode-1.1.7-ffmpeg-0.11.patch303
-rw-r--r--media-video/transcode/files/transcode-1.1.7-ffmpeg.patch51
-rw-r--r--media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch557
-rw-r--r--media-video/transcode/files/transcode-1.1.7-ffmpeg24.patch18
-rw-r--r--media-video/transcode/files/transcode-1.1.7-ffmpeg29.patch352
-rw-r--r--media-video/transcode/files/transcode-1.1.7-freetype251.patch12
-rw-r--r--media-video/transcode/files/transcode-1.1.7-libav-10.patch36
-rw-r--r--media-video/transcode/files/transcode-1.1.7-libav-9.patch31
-rw-r--r--media-video/transcode/files/transcode-1.1.7-preset-force.patch28
-rw-r--r--media-video/transcode/files/transcode-1.1.7-preset-free.patch34
-rw-r--r--media-video/transcode/transcode-1.1.7-r3.ebuild26
-rw-r--r--media-video/vcdimager/Manifest5
-rw-r--r--media-video/vcdimager/files/vcdimager-0.7.24-libcdio-1.0.0.patch230
-rw-r--r--media-video/vcdimager/vcdimager-0.7.24.ebuild13
-rw-r--r--media-video/vlc/Manifest10
-rw-r--r--media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch28
-rw-r--r--media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch24
-rw-r--r--media-video/vlc/vlc-2.2.8.ebuild464
-rw-r--r--media-video/vlc/vlc-2.2.9999.ebuild47
-rw-r--r--media-video/vlc/vlc-3.0.9999.ebuild6
-rw-r--r--media-video/vlc/vlc-9999.ebuild6
41 files changed, 826 insertions, 2852 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index b1545783f87b..ce2ca16ca573 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 25b4f50a690c..e7ed4b76f162 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,4 +1,4 @@
DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
-EBUILD avidemux-2.6.20.ebuild 4429 BLAKE2B fe55520ebcf116160744bb155bf26d2e3047aa7294fa6fa1be5ca39a891fafcb8677de2b7ac97f29ec9334f14d33ec0a66c2c6a95ba04ff92797935ef9ddd74c SHA512 bfb165003b197c1bd6ce6579cc5ef2ef6e974087bb66589cf7f72d50f0f0fe0521bfa9f1cec00cc3abb9f2a03b87bc046c6c0fb94ab0f58176afc5581d92acee
+EBUILD avidemux-2.6.20.ebuild 4273 BLAKE2B 20de4b85c6457e93bdb6261dc35debb231dbf29e35d178ff5400cf95582773308212f6d443f437f760a60be33ed1960de8212edbdbdf6df4e030573770df9203 SHA512 1023420a43275f2f1dd9d65b45abd900d4d66146745906226d8b095c4896dcba2df768ecf4d61c80595e0f65e1b27b6796b5cb800d0efb191ab2df02de814fb9
EBUILD avidemux-9999.ebuild 4273 BLAKE2B 7770fa9c525a7f3cf7d1937c7278a65c9942eac2502e76b11cd7ec8c53894276348a16aa70ccd0dafb676cb9b2cd8a9ebe1d4e766b46b51cdfb11297d88349d1 SHA512 34141d9cd63135e71adb7a338341a7d5e4e4d0b5d3e93b2840287184654e978482199eb8c6dcd629c2a1a857a8d3ee41633188e71f34c0266af3a3f2ed85db55
MISC metadata.xml 489 BLAKE2B 51c28e4d932facf14fe99d0d18e736f16c754961e8fde468505f03c989e8ec3cb9afab9c916752468a5f9f0a07ad8d25da01e64cb987cfed1db835f657512b1e SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d
diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
index 72ad632f6969..cd242925e7a0 100644
--- a/media-video/avidemux/avidemux-2.6.20.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=6
PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
@@ -13,7 +13,7 @@ HOMEPAGE="http://fixounet.free.fr/${PN}"
# Multiple licenses because of all the bundled stuff.
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
SLOT="2.6"
-IUSE="debug opengl nls nvenc qt4 qt5 sdl vaapi vdpau xv"
+IUSE="debug opengl nls nvenc qt5 sdl vaapi vdpau xv"
if [[ ${PV} == *9999* ]] ; then
MY_P="${P}"
@@ -29,7 +29,6 @@ fi
DEPEND="
~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
opengl? ( virtual/opengl:0 )
- qt4? ( >=dev-qt/qtgui-4.8.3:4 )
qt5? ( dev-qt/qtgui:5 )
vaapi? ( x11-libs/libva:0 )
nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
@@ -38,7 +37,7 @@ RDEPEND="
$DEPEND
nls? ( virtual/libintl:0 )
"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?,qt5?]"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
S="${WORKDIR}/${MY_P}"
@@ -46,7 +45,7 @@ src_prepare() {
default
processes="buildCli:avidemux/cli"
- if use qt4 || use qt5 ; then
+ if use qt5 ; then
processes+=" buildQt4:avidemux/qt4"
fi
@@ -139,10 +138,6 @@ src_install() {
cd "${S}" || die "Can't enter source folder."
newicon ${PN}_icon.png ${PN}-2.6.png
- if [[ -f "${ED}"/usr/bin/avidemux3_qt4 ]] ; then
- fperms +x /usr/bin/avidemux3_qt4
- fi
-
if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
fperms +x /usr/bin/avidemux3_qt5
fi
@@ -151,7 +146,7 @@ src_install() {
fperms +x /usr/bin/avidemux3_jobs_qt5
fi
- if use qt4 || use qt5 ; then
+ if use qt5 ; then
domenu ${PN}-2.6.desktop
fi
}
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index 4522383d6d74..403003b733a5 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,14 +1,4 @@
-AUX cinelerra-20140710-ffmpeg-0.11.patch 4029 BLAKE2B 2ff01b8ac85b7c212d0ddf0c06a25716fa9754013a9da7fd9622d876f5b0eeb328d28f3ed2cdec5990f8ee8ecac949fdf2439568bfa641bf962e5a9735687a98 SHA512 bd1a511d616c8c1661b05db4297dea7c57702658ecb1a18c8cb930a78f396f28f29e87275ec75e70140048caba454e577062c15efb1dcd49c1bf35f51b82cfa0
-AUX cinelerra-20140710-underlinking.patch 273 BLAKE2B 1e75adf59b5614310e677cd67bed8b25df38333e193d94a83966dc627829fba13fa28dbebad60b3b2754fa0234e8d524ad958bee0036f66debfb9c00510f7e86 SHA512 09db68fecaa8591b5ca1f90b654d30f436c2dcec82642c76303f1db2450bfe90ee0a880decb4fb148a05b24605eacaee566d082bf4ff256ed1a0c099479054ca
-AUX cinelerra-20140710-validate_desktop_entry.patch 338 BLAKE2B 8705c40c5841636f2efa4b4c09a92963a0bec84597ad7476f0775cbc045062164077d4a133a83689b28a474d274905b19e8244e84f746d6811f17f2da6b9509d SHA512 a8b2d629c952187741671db1806b126a9abf05167fe6fa103053e35354301af168d0fa98146c9007216e6c551b0ed72d518cec543c6e0cdb49959de3b73d8d83
-AUX cinelerra-ffmpeg.patch 2472 BLAKE2B 792cdafb27d89ac89520e9fdfde504b1243ad314cd080a1546dc6a56e6a0550c544559e96224aa43bd7ed55dd7e145e1097bb0a0b438a46f7a25bb577ca9645a SHA512 59299661832f5631d9a07a0eab0685f897a39acf6c9e8a3f79730f9479c942775005f59abb29f40c9df7446882ccac332fd97bb6387807f41c35e67301022196
-AUX cinelerra-ffmpeg2.patch 7440 BLAKE2B f07eb68c8f8ce0907131bfb0295f6ef0f2e7b5b3d307ef70fd88e38a1bdaab3a1f88d8e688366f014e594c0987421afcf3d0389c9d41394f8f13b024e30ed4e0 SHA512 c0c5a6e72ca925ca7c0b724aad08bf3c40697903683c7628801e3aceb1f5724e24a634c0d43527ed3256934eed90d30d54b97683c107fcb5519367f921c5a4bd
-AUX cinelerra-ffmpeg29.patch 22007 BLAKE2B bbbdd3992388c1729ad3c3ecb1f1c934014b21acba61048fc380b459a77123a781c0ca49944b5c6bf5d1fc896148109a96ec5118824c5cbb95260db45cc952ce SHA512 1ec88f44348a67c98931a27225fd0df29afa319b4b36ab5397f37a0d0f7a5707f8cafd93955091f82759e1bc2f73edcff164baa6959fa064afc82f6b17b3fb93
-AUX cinelerra-implicit_decls.patch 1019 BLAKE2B 7af11af8198cb13ed0dc784345a18b4b98767804b29de8d0835a591a6809016aeab9de6c6c9fbc4a275fd1b4a073899d9bf68482a85e3ea52ef2336ac6352e6f SHA512 20dfcf31de8cfd4c7e1564839366798d37570b939ee14b53c06ffacd1d9e45bd2247e4c85e70b5289c6150dc1927fa103df3d5f7ef5494487a38dc98d62966f5
-AUX cinelerra-includes.patch 312 BLAKE2B 82ce0cd70dee79a1d8e48afee96dd7f1049693852c2f6fce8917108f4d48d3a6564991fc7789cb5aad61320f7c98ba478501c24fc77bca6abf78edaa781808f1 SHA512 42f0fba5d071e1f811d0700a799c2cad7af62aa7a21324b66a7944b3bf8955afc512f7de5fc2ec21fd9310036acc1ad16de672fcd7bdb4bad7d5d92ae4bfd38a
-AUX cinelerra-libav9.patch 3760 BLAKE2B bc04643fa4dfcdae815e4ef33a873f25235c31c294255a6a634f4280c7e3984bee7406d40823f3d780646a60e4e14e7f99f5bc2b08b1c484f3121be9234da062 SHA512 c6bd7a3ffd02daebd3575a4d99cbfd9bb5278dfce66f5c2289c57793f1b9c9994207c63ecdb2a5a3bcbd0d4ddb5cece4d973dd488c9308ddd5501f5bad201cc2
-AUX cinelerra-pngtoh.patch 298 BLAKE2B f6746441b987cade8032952373ae0b32736b81594871ea2a0b0e540b1633497883267147d8077452a31c145af358dce9c6b71cd56739d55a35c66618f1581aa2 SHA512 1e3fe901b193aa2ce6237910894be5351c32162d5588485ab86ec36f72bb85e69c78f6d64ae3a0665450206604717e3fce7ec767910bf5e28780882b9f38a0bb
-AUX cinelerra-putbits-gcc52.patch 1222 BLAKE2B 6a5aa0cbf4f15bcfa6732b3a75103d84bde5f5a01cf2a5082af927845f8f005f4d9e55b43c710d22683596c1e69439043504e87484f99047475d5f17f5c2fa8a SHA512 523acccdf22ae7c4d78df554ddd8b4f957dc7e3948bedd61e7e8ed07725d28a14df478a3d01e88d4223f90ae6661c70fcc406d9829b685b1fce20892c2306f0d
-DIST CinelerraCV-2.3.tar.xz 25705608 SHA256 4bcb450347de5eccea0ed6d49d6d70e4b065905516e4416f9a788d0d7ccc926f SHA512 908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e WHIRLPOOL 52a74c74cfeacbebd3cf3e2aced7a0054b68ce3ec04309ac608c4e1e5779a9ced8d9ea50a0898b610288aef588b613455b38b46af3ab67c44f3581ef3676b79e
-EBUILD cinelerra-2.3.ebuild 2974 BLAKE2B 2f95955bf5f2b56c4e3fa78a5513fd9ee20e1e6217ce5296f6287f4d1d08c2db0c4f4ecb75bc198f2aa0081b1054403a68386f926638bccc202679e8511ba79b SHA512 181cdec14eb74ffdcf0d4166db9995cdf3cfd7a5d1b2ba5839ae099f217fea6d14204ccebec4e5544365960a687891e82b25e79a2a9f635555a416c2602cd26c
+DIST CinelerraCV-2.3.tar.xz 25705608 BLAKE2B 70efe03d8c928faca0b60f76b83d7147a7ef68ebee06e7afcb589fd24d73ecbe96e16a375c38f5c89cf337593c824cc22dd6301790ac988946671cb12ba901e6 SHA512 908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e
+DIST cinelerra-2.3-patchset.tar.xz 10056 BLAKE2B c50d65a991a2643267f4c9aff11fb8caf09ba1fae0abe89125207312e8129b28f5ca86846b30a94a90b6958704c1733635b0987752a4d2ec442ea185bf870d89 SHA512 9825729ed15e106b1ec2ca58da4d587597d58a6b62f4440e08e984660821fa0e3cc3dcded5da0a5daae16edf1564a45a32490f50e51d77795ce47e4a5ba39122
+EBUILD cinelerra-2.3.ebuild 3175 BLAKE2B e2ca4361cc086678675ae927822f6b14cf441dc530fd7a0f3d7f95b1594b86aa40ff172be33971b1524f66c665a25ff58a6144f131477a54ec011b92b374e28a SHA512 e3a5d83fc96eee3be189b93718738aadd1aa7ad9f258a0fbb280ae7e8905e621238eb732b4a38bde1f87fc5c219a1fe361333125cc066d80b43abdaf0b1b122a
MISC metadata.xml 259 BLAKE2B d0ebadef8dc30ed8fcc89ae38ab6a5d4af940b2cd75dea1494d96c37557532dea21ef0e014d09e32ae49eca64fe3d6bd56494fb7460ad69b70f40dd4b7ebc8b0 SHA512 c81aea0e68817fa210dc6f66313aee75246139e50d6324338707f11bca2173c64e88ce8440794c85eb64194ff97cf6c6760a06b4822a121e40629bdc3a04e1fd
diff --git a/media-video/cinelerra/cinelerra-2.3.ebuild b/media-video/cinelerra/cinelerra-2.3.ebuild
index 812eb75dbb32..9bb4a4e74fda 100644
--- a/media-video/cinelerra/cinelerra-2.3.ebuild
+++ b/media-video/cinelerra/cinelerra-2.3.ebuild
@@ -6,7 +6,8 @@ inherit autotools eutils multilib flag-o-matic
DESCRIPTION="The most advanced non-linear video editor and compositor"
HOMEPAGE="http://www.cinelerra.org/"
-SRC_URI="https://cinelerra-cv.org/releases/CinelerraCV-${PV}.tar.xz"
+SRC_URI="https://cinelerra-cv.org/releases/CinelerraCV-${PV}.tar.xz
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz"
LICENSE="GPL-2"
SLOT="0"
@@ -58,22 +59,22 @@ S="${WORKDIR}/CinelerraCV-${PV}"
src_prepare() {
epatch \
- "${FILESDIR}"/${PN}-20140710-validate_desktop_entry.patch \
- "${FILESDIR}"/${PN}-ffmpeg.patch \
- "${FILESDIR}"/${PN}-20140710-underlinking.patch \
- "${FILESDIR}"/${PN}-20140710-ffmpeg-0.11.patch \
- "${FILESDIR}"/${PN}-libav9.patch \
- "${FILESDIR}"/${PN}-pngtoh.patch \
- "${FILESDIR}"/${PN}-putbits-gcc52.patch \
- "${FILESDIR}"/${PN}-implicit_decls.patch \
- "${FILESDIR}"/${PN}-includes.patch
+ "${WORKDIR}"/${P}-patchset/${PN}-20140710-validate_desktop_entry.patch \
+ "${WORKDIR}"/${P}-patchset/${PN}-ffmpeg.patch \
+ "${WORKDIR}"/${P}-patchset/${PN}-20140710-underlinking.patch \
+ "${WORKDIR}"/${P}-patchset/${PN}-20140710-ffmpeg-0.11.patch \
+ "${WORKDIR}"/${P}-patchset/${PN}-libav9.patch \
+ "${WORKDIR}"/${P}-patchset/${PN}-pngtoh.patch \
+ "${WORKDIR}"/${P}-patchset/${PN}-putbits-gcc52.patch \
+ "${WORKDIR}"/${P}-patchset/${PN}-implicit_decls.patch \
+ "${WORKDIR}"/${P}-patchset/${PN}-includes.patch
if has_version '>=media-video/ffmpeg-2' ; then
- epatch "${FILESDIR}"/${PN}-ffmpeg2.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-ffmpeg2.patch
fi
if has_version '>=media-video/ffmpeg-2.9' ; then
- epatch "${FILESDIR}"/${PN}-ffmpeg29.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-ffmpeg29.patch
fi
eautoreconf
diff --git a/media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch b/media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch
deleted file mode 100644
index 2aebd7008c3c..000000000000
--- a/media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- cinelerra/ffmpeg.C
-+++ cinelerra/ffmpeg.C
-@@ -23,7 +23,6 @@
-
- int FFMPEG::init(char *codec_string) {
-
-- avcodec_init();
- avcodec_register_all();
-
- CodecID id = codec_id(codec_string);
---- cinelerra/fileac3.C
-+++ cinelerra/fileac3.C
-@@ -84,7 +84,6 @@
-
- if(wr)
- {
-- avcodec_init();
- avcodec_register_all();
- codec = avcodec_find_encoder(CODEC_ID_AC3);
- if(!codec)
---- configure.ac
-+++ configure.ac
-@@ -497,7 +497,7 @@
- AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library]))
-
- if test "x$with_external_ffmpeg" = "xyes"; then
-- PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc])
-+ PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc libavutil])
- FFMPEG_FOLDER=""
- FFMPEG_EXTERNALTEXT="External ffmpeg"
-
-@@ -515,10 +515,10 @@
- AC_MSG_RESULT($enable_ffmpeg_swscale)
- if test x"$enable_ffmpeg_swscale" = xyes; then
- dnl AC_DEFINE(HAVE_SWSCALER)
-- PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale])
-+ PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale libavutil])
- FFMPEG_CFLAGS="$FFMPEG_CFLAGS -I/usr/include/libavcodec -I/usr/include/libswscale -DHAVE_SWSCALER"
- else
-- PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc])
-+ PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libavutil])
- fi
- FFMPEG_EXTERNALTEXT="External ffmpeg"
- else
---- quicktime/mpeg4.c
-+++ quicktime/mpeg4.c
-@@ -624,12 +624,12 @@
- else
- // ffmpeg section
- {
-+ AVDictionary ** opts = NULL;
- static char *video_rc_eq="tex^qComp";
- codec->encode_initialized[current_field] = 1;
- if(!ffmpeg_initialized)
- {
- ffmpeg_initialized = 1;
-- avcodec_init();
- avcodec_register_all();
- }
-
-@@ -673,8 +673,10 @@
- context->b_quant_offset = 1.25;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- context->error_resilience = FF_ER_CAREFUL;
--#else
-+#elif LIBAVCODEC_VERSION_INT < ((54<<16)+(0<<8)+0)
- context->error_recognition = FF_ER_CAREFUL;
-+#else
-+ context->err_recognition |= AV_EF_CAREFUL;
- #endif
- context->error_concealment = 3;
- context->frame_skip_cmp = FF_CMP_DCTMAX;
-@@ -699,7 +701,7 @@
- context->profile= FF_PROFILE_UNKNOWN;
- context->rc_buffer_aggressivity = 1.0;
- context->level= FF_LEVEL_UNKNOWN;
-- context->flags |= CODEC_FLAG_H263P_UMV;
-+ av_dict_set(opts, "umv", "1", 0);
- context->flags |= CODEC_FLAG_AC_PRED;
-
- // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg...
-@@ -717,10 +719,8 @@
- (codec->ffmpeg_id == CODEC_ID_MPEG4 ||
- codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
- codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
-- codec->ffmpeg_id == CODEC_ID_H263P ||
-- codec->ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
-+ codec->ffmpeg_id == CODEC_ID_H263P ))
- {
-- avcodec_thread_init(context, file->cpus);
- context->thread_count = file->cpus;
- }
-
-@@ -740,7 +740,7 @@
- * codec->fix_bitrate,
- * codec->quantizer);
- */
-- avcodec_open(context, codec->encoder[current_field]);
-+ avcodec_open2(context, codec->encoder[current_field], opts);
-
- avcodec_get_frame_defaults(&codec->picture[current_field]);
-
---- quicktime/qtffmpeg.c
-+++ quicktime/qtffmpeg.c
-@@ -54,7 +54,6 @@
- if(!ffmpeg_initialized)
- {
- ffmpeg_initialized = 1;
-- avcodec_init();
- avcodec_register_all();
- }
-
-@@ -90,10 +89,8 @@
- (ffmpeg_id == CODEC_ID_MPEG4 ||
- ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
- ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
-- ffmpeg_id == CODEC_ID_H263P ||
-- ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
-+ ffmpeg_id == CODEC_ID_H263P ))
- {
-- avcodec_thread_init(context, cpus);
- context->thread_count = cpus;
- }
- if(avcodec_open(context,
---- quicktime/wma.c
-+++ quicktime/wma.c
-@@ -67,7 +67,6 @@
- if(!ffmpeg_initialized)
- {
- ffmpeg_initialized = 1;
-- avcodec_init();
- avcodec_register_all();
- }
-
diff --git a/media-video/cinelerra/files/cinelerra-20140710-underlinking.patch b/media-video/cinelerra/files/cinelerra-20140710-underlinking.patch
deleted file mode 100644
index a7dc74f2d445..000000000000
--- a/media-video/cinelerra/files/cinelerra-20140710-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/367509
-
-pluginserver.C is using dlsym, dlopen, dlclose and dlerror
-
---- cinelerra/Makefile.am
-+++ cinelerra/Makefile.am
-@@ -692,7 +692,8 @@
- $(LIBDV_LIBS) \
- -luuid \
- $(MJPEG_LIBS) \
-- -lstdc++
-+ -lstdc++ \
-+ -ldl
-
- EXTRA_DIST = gen-feather-h
-
diff --git a/media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch b/media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch
deleted file mode 100644
index 006217586630..000000000000
--- a/media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- image/cinelerra-cv.desktop
-+++ image/cinelerra-cv.desktop
-@@ -5,9 +5,8 @@
- Name[fr]=Cinelerra-CV
- Name[es]=Cinelerra-CV
- Comment=Video Editor
--Categories=Application;AudioVideo;Multimedia;VideoEditing;
--Encoding=UTF-8
-+Categories=AudioVideo;
- Exec=cinelerra
--Icon=cinelerra-cv.xpm
-+Icon=cinelerra-cv
- Terminal=false
- Type=Application
diff --git a/media-video/cinelerra/files/cinelerra-ffmpeg.patch b/media-video/cinelerra/files/cinelerra-ffmpeg.patch
deleted file mode 100644
index 6f7962fb1a54..000000000000
--- a/media-video/cinelerra/files/cinelerra-ffmpeg.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Fix build with ffmpeg/libav trunk / 0.7
-
-Index: cinelerra-20101104/cinelerra/ffmpeg.C
-===================================================================
---- cinelerra-20101104.orig/cinelerra/ffmpeg.C
-+++ cinelerra-20101104/cinelerra/ffmpeg.C
-@@ -364,12 +364,15 @@ int FFMPEG::decode(uint8_t *data, long d
-
- // NOTE: frame must already have data space allocated
-
-+ AVPacket pkt;
- got_picture = 0;
-- int length = avcodec_decode_video(context,
-+ av_init_packet( &pkt );
-+ pkt.data = data;
-+ pkt.size = data_size;
-+ int length = avcodec_decode_video2(context,
- picture,
- &got_picture,
-- data,
-- data_size);
-+ &pkt);
-
- if (length < 0) {
- printf("FFMPEG::decode error decoding frame\n");
-Index: cinelerra-20101104/quicktime/qtffmpeg.c
-===================================================================
---- cinelerra-20101104.orig/quicktime/qtffmpeg.c
-+++ cinelerra-20101104/quicktime/qtffmpeg.c
-@@ -181,6 +181,7 @@ static int decode_wrapper(quicktime_t *f
-
- if(!result)
- {
-+ AVPacket pkt;
-
-
- // No way to determine if there was an error based on nonzero status.
-@@ -189,11 +190,13 @@ static int decode_wrapper(quicktime_t *f
- ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_NONREF /* AVDISCARD_BIDIR */;
- else
- ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_DEFAULT;
-- result = avcodec_decode_video(ffmpeg->decoder_context[current_field],
-+ av_init_packet( &pkt );
-+ pkt.data = ffmpeg->work_buffer;
-+ pkt.size = bytes + header_bytes;
-+ result = avcodec_decode_video2(ffmpeg->decoder_context[current_field],
- &ffmpeg->picture[current_field],
- &got_picture,
-- ffmpeg->work_buffer,
-- bytes + header_bytes);
-+ &pkt);
-
-
-
-Index: cinelerra-20101104/quicktime/wma.c
-===================================================================
---- cinelerra-20101104.orig/quicktime/wma.c
-+++ cinelerra-20101104/quicktime/wma.c
-@@ -195,11 +195,14 @@ printf("decode 2 %x %llx %llx\n", chunk_
- chunk_size);
- #else
- bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-- result = avcodec_decode_audio2(codec->decoder_context,
-+ AVPacket pkt;
-+ av_init_packet( &pkt );
-+ pkt.data = codec->packet_buffer;
-+ pkt.size = chunk_size;
-+ result = avcodec_decode_audio3(codec->decoder_context,
- (int16_t*)(codec->work_buffer + codec->output_size * sample_size),
- &bytes_decoded,
-- codec->packet_buffer,
-- chunk_size);
-+ &pkt);
- #endif
-
- pthread_mutex_unlock(&ffmpeg_lock);
diff --git a/media-video/cinelerra/files/cinelerra-ffmpeg2.patch b/media-video/cinelerra/files/cinelerra-ffmpeg2.patch
deleted file mode 100644
index 01680ac952f1..000000000000
--- a/media-video/cinelerra/files/cinelerra-ffmpeg2.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=479394
-By Helmut Jarausch
-
---- cinelerra/ffmpeg.h.ORIG 2012-07-06 22:40:26.000000000 +0200
-+++ cinelerra/ffmpeg.h 2013-08-01 12:58:12.342474136 +0200
-@@ -26,7 +26,7 @@
- static int convert_cmodel_transfer(VFrame *frame_in,VFrame *frame_out);
- static int init_picture_from_frame(AVPicture *picture, VFrame *frame);
-
-- static CodecID codec_id(char *codec_string);
-+ static AVCodecID codec_id(char *codec_string);
-
- private:
- static PixelFormat color_model_to_pix_fmt(int color_model);
---- cinelerra/ffmpeg.C.ORIG 2013-08-01 11:24:43.794419246 +0200
-+++ cinelerra/ffmpeg.C 2013-08-01 12:57:48.121473899 +0200
-@@ -25,7 +25,7 @@
-
- avcodec_register_all();
-
-- CodecID id = codec_id(codec_string);
-+ AVCodecID id = codec_id(codec_string);
- codec = avcodec_find_decoder(id);
- if (codec == NULL) {
- printf("FFMPEG::init no decoder for '%s'", codec_string);
-@@ -51,7 +51,7 @@
- }
-
-
--CodecID FFMPEG::codec_id(char *codec_string) {
-+AVCodecID FFMPEG::codec_id(char *codec_string) {
- #define CODEC_IS(x) (! strncmp(codec_string, x, 4))
-
- if (CODEC_IS(QUICKTIME_DV) ||
---- quicktime/ffmpeg/ffmpeg.c.ORIG 2012-07-06 22:40:26.000000000 +0200
-+++ quicktime/ffmpeg/ffmpeg.c 2013-08-01 12:57:59.025474005 +0200
-@@ -2663,7 +2663,7 @@
- return 0;
- }
-
--static enum CodecID find_codec_or_die(const char *name, int type, int encoder)
-+static enum AVCodecID find_codec_or_die(const char *name, int type, int encoder)
- {
- const char *codec_string = encoder ? "encoder" : "decoder";
- AVCodec *codec;
---- quicktime/ffmpeg/libavformat/electronicarts.c.ORIG 2012-07-06 22:40:26.000000000 +0200
-+++ quicktime/ffmpeg/libavformat/electronicarts.c 2013-08-01 13:00:57.855475755 +0200
-@@ -49,11 +49,11 @@
- typedef struct EaDemuxContext {
- int big_endian;
-
-- enum CodecID video_codec;
-+ enum AVCodecID video_codec;
- AVRational time_base;
- int video_stream_index;
-
-- enum CodecID audio_codec;
-+ enum AVCodecID audio_codec;
- int audio_stream_index;
- int audio_frame_counter;
-
---- quicktime/ffmpeg/libavformat/img2.c.ORIG 2012-07-06 22:40:26.000000000 +0200
-+++ quicktime/ffmpeg/libavformat/img2.c 2013-08-01 12:59:21.408474812 +0200
-@@ -34,7 +34,7 @@
- } VideoData;
-
- typedef struct {
-- enum CodecID id;
-+ enum AVCodecID id;
- const char *str;
- } IdStrMap;
-
-@@ -97,7 +97,7 @@
- }
- return -1;
- }
--static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
-+static enum AVCodecID av_str2id(const IdStrMap *tags, const char *str)
- {
- str= strrchr(str, '.');
- if(!str) return CODEC_ID_NONE;
-@@ -175,7 +175,7 @@
- return 0;
- }
-
--enum CodecID av_guess_image2_codec(const char *filename){
-+enum AVCodecID av_guess_image2_codec(const char *filename){
- return av_str2id(img_tags, filename);
- }
-
---- quicktime/ffmpeg/libavformat/matroskadec.c.ORIG 2012-07-06 22:40:26.000000000 +0200
-+++ quicktime/ffmpeg/libavformat/matroskadec.c 2013-08-01 12:59:57.556475165 +0200
-@@ -2476,7 +2476,7 @@
- AVStream *st;
-
- for (i = 0; i < matroska->num_tracks; i++) {
-- enum CodecID codec_id = CODEC_ID_NONE;
-+ enum AVCodecID codec_id = CODEC_ID_NONE;
- uint8_t *extradata = NULL;
- int extradata_size = 0;
- int extradata_offset = 0;
-@@ -2495,7 +2495,7 @@
- }
- }
-
-- /* Set the FourCC from the CodecID. */
-+ /* Set the FourCC from the AVCodecID. */
- /* This is the MS compatibility mode which stores a
- * BITMAPINFOHEADER in the CodecPrivate. */
- if (!strcmp(track->codec_id,
-@@ -2600,7 +2600,7 @@
-
- if (codec_id == CODEC_ID_NONE) {
- av_log(matroska->ctx, AV_LOG_INFO,
-- "Unknown/unsupported CodecID %s.\n",
-+ "Unknown/unsupported AVCodecID %s.\n",
- track->codec_id);
- }
-
---- quicktime/ffmpeg/libavformat/matroska.h.ORIG 2012-07-06 22:40:26.000000000 +0200
-+++ quicktime/ffmpeg/libavformat/matroska.h 2013-08-01 13:00:22.218475407 +0200
-@@ -220,12 +220,12 @@
-
- typedef struct CodecTags{
- char str[16];
-- enum CodecID id;
-+ enum AVCodecID id;
- }CodecTags;
-
- typedef struct CodecMime{
- char str[32];
-- enum CodecID id;
-+ enum AVCodecID id;
- }CodecMime;
-
- #define MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC "V_MS/VFW/FOURCC"
---- quicktime/ffmpeg/libavformat/mov.c.ORIG 2012-07-06 22:40:26.000000000 +0200
-+++ quicktime/ffmpeg/libavformat/mov.c 2013-08-01 12:59:33.935474934 +0200
-@@ -678,7 +678,7 @@
-
- for(pseudo_stream_id=0; pseudo_stream_id<entries; pseudo_stream_id++) {
- //Parsing Sample description table
-- enum CodecID id;
-+ enum AVCodecID id;
- int dref_id;
- MOV_atom_t a = { 0, 0, 0 };
- offset_t start_pos = url_ftell(pb);
---- quicktime/ffmpeg/libavformat/mxf.c.ORIG 2012-07-06 22:40:26.000000000 +0200
-+++ quicktime/ffmpeg/libavformat/mxf.c 2013-08-01 12:59:12.025474720 +0200
-@@ -157,7 +157,7 @@
- typedef struct {
- UID uid;
- unsigned matching_len;
-- enum CodecID id;
-+ enum AVCodecID id;
- } MXFCodecUL;
-
- typedef struct {
---- quicktime/ffmpeg/libavformat/riff.h.ORIG 2012-07-06 22:40:26.000000000 +0200
-+++ quicktime/ffmpeg/libavformat/riff.h 2013-08-01 12:59:45.950475052 +0200
-@@ -48,7 +48,7 @@
- extern const AVCodecTag codec_wav_tags[];
-
- unsigned int codec_get_tag(const AVCodecTag *tags, int id);
--enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag);
-+enum AVCodecID codec_get_id(const AVCodecTag *tags, unsigned int tag);
- void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale);
-
- #endif /* FFMPEG_RIFF_H */
---- quicktime/ffmpeg/libavformat/rtp.c.ORIG 2012-07-06 22:40:26.000000000 +0200
-+++ quicktime/ffmpeg/libavformat/rtp.c 2013-08-01 12:59:01.778474619 +0200
-@@ -40,7 +40,7 @@
- int pt;
- const char enc_name[6];
- enum CodecType codec_type;
-- enum CodecID codec_id;
-+ enum AVCodecID codec_id;
- int clock_rate;
- int audio_channels;
- } AVRtpPayloadTypes[]=
-@@ -120,7 +120,7 @@
- return "";
- }
-
--enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type)
-+enum AVCodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type)
- {
- int i;
-
---- quicktime/ffmpeg/libavformat/rtp_internal.h.ORIG 2012-07-06 22:40:26.000000000 +0200
-+++ quicktime/ffmpeg/libavformat/rtp_internal.h 2013-08-01 13:00:09.147475279 +0200
-@@ -61,7 +61,7 @@
- // fields from AVRtpDynamicPayloadType_s
- const char enc_name[50]; /* XXX: still why 50 ? ;-) */
- enum CodecType codec_type;
-- enum CodecID codec_id;
-+ enum AVCodecID codec_id;
-
- // may be null
- int (*parse_sdp_a_line) (AVStream * stream,
-@@ -123,7 +123,7 @@
-
- void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m);
- const char *ff_rtp_enc_name(int payload_type);
--enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type);
-+enum AVCodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type);
-
- void av_register_rtp_dynamic_payload_handlers(void);
-
---- quicktime/wma.h.ORIG 2012-07-06 22:40:26.000000000 +0200
-+++ quicktime/wma.h 2013-08-01 13:11:46.431482103 +0200
-@@ -3,5 +3,6 @@
-
- extern void quicktime_init_codec_wmav1(quicktime_audio_map_t *);
- extern void quicktime_init_codec_wmav2(quicktime_audio_map_t *);
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
-
- #endif
diff --git a/media-video/cinelerra/files/cinelerra-ffmpeg29.patch b/media-video/cinelerra/files/cinelerra-ffmpeg29.patch
deleted file mode 100644
index 604000eff380..000000000000
--- a/media-video/cinelerra/files/cinelerra-ffmpeg29.patch
+++ /dev/null
@@ -1,658 +0,0 @@
-Index: cinelerra-20140710/cinelerra/ffmpeg.C
-===================================================================
---- cinelerra-20140710.orig/cinelerra/ffmpeg.C
-+++ cinelerra-20140710/cinelerra/ffmpeg.C
-@@ -38,7 +38,7 @@ int FFMPEG::init(char *codec_string) {
- printf("FFMPEG::init avcodec_open() failed\n");
- }
-
-- picture = avcodec_alloc_frame();
-+ picture = av_frame_alloc();
-
-
- return 0;
-@@ -55,62 +55,62 @@ AVCodecID FFMPEG::codec_id(char *codec_s
- #define CODEC_IS(x) (! strncmp(codec_string, x, 4))
-
- if (CODEC_IS(QUICKTIME_DV) ||
-- CODEC_IS(QUICKTIME_DVSD)) return CODEC_ID_DVVIDEO;
-+ CODEC_IS(QUICKTIME_DVSD)) return AV_CODEC_ID_DVVIDEO;
-
- if (CODEC_IS(QUICKTIME_MP4V) ||
-- CODEC_IS(QUICKTIME_DIVX)) return CODEC_ID_MPEG4;
-+ CODEC_IS(QUICKTIME_DIVX)) return AV_CODEC_ID_MPEG4;
-
-- return CODEC_ID_NONE;
-+ return AV_CODEC_ID_NONE;
-
- #undef CODEC_IS
- }
-
--PixelFormat FFMPEG::color_model_to_pix_fmt(int color_model) {
-+AVPixelFormat FFMPEG::color_model_to_pix_fmt(int color_model) {
- switch (color_model)
- {
- case BC_YUV422:
-- return PIX_FMT_YUYV422;
-+ return AV_PIX_FMT_YUYV422;
- case BC_RGB888:
-- return PIX_FMT_RGB24;
-+ return AV_PIX_FMT_RGB24;
- case BC_BGR8888: // NOTE: order flipped
-- return PIX_FMT_RGB32;
-+ return AV_PIX_FMT_RGB32;
- case BC_BGR888:
-- return PIX_FMT_BGR24;
-+ return AV_PIX_FMT_BGR24;
- case BC_YUV420P:
-- return PIX_FMT_YUV420P;
-+ return AV_PIX_FMT_YUV420P;
- case BC_YUV422P:
-- return PIX_FMT_YUV422P;
-+ return AV_PIX_FMT_YUV422P;
- case BC_YUV444P:
-- return PIX_FMT_YUV444P;
-+ return AV_PIX_FMT_YUV444P;
- case BC_YUV411P:
-- return PIX_FMT_YUV411P;
-+ return AV_PIX_FMT_YUV411P;
- case BC_RGB565:
-- return PIX_FMT_RGB565;
-+ return AV_PIX_FMT_RGB565;
- };
-
-- return PIX_FMT_NB;
-+ return AV_PIX_FMT_NB;
- }
-
--int FFMPEG::pix_fmt_to_color_model(PixelFormat pix_fmt) {
-+int FFMPEG::pix_fmt_to_color_model(AVPixelFormat pix_fmt) {
- switch (pix_fmt)
- {
-- case PIX_FMT_YUYV422:
-+ case AV_PIX_FMT_YUYV422:
- return BC_YUV422;
-- case PIX_FMT_RGB24:
-+ case AV_PIX_FMT_RGB24:
- return BC_RGB888;
-- case PIX_FMT_RGB32:
-+ case AV_PIX_FMT_RGB32:
- return BC_BGR8888;
-- case PIX_FMT_BGR24:
-+ case AV_PIX_FMT_BGR24:
- return BC_BGR888;
-- case PIX_FMT_YUV420P:
-+ case AV_PIX_FMT_YUV420P:
- return BC_YUV420P;
-- case PIX_FMT_YUV422P:
-+ case AV_PIX_FMT_YUV422P:
- return BC_YUV422P;
-- case PIX_FMT_YUV444P:
-+ case AV_PIX_FMT_YUV444P:
- return BC_YUV444P;
-- case PIX_FMT_YUV411P:
-+ case AV_PIX_FMT_YUV411P:
- return BC_YUV411P;
-- case PIX_FMT_RGB565:
-+ case AV_PIX_FMT_RGB565:
- return BC_RGB565;
- };
-
-@@ -119,7 +119,7 @@ int FFMPEG::pix_fmt_to_color_model(Pixel
-
- int FFMPEG::init_picture_from_frame(AVPicture *picture, VFrame *frame) {
- int cmodel = frame->get_color_model();
-- PixelFormat pix_fmt = color_model_to_pix_fmt(cmodel);
-+ AVPixelFormat pix_fmt = color_model_to_pix_fmt(cmodel);
-
- int size = avpicture_fill(picture, frame->get_data(), pix_fmt,
- frame->get_w(), frame->get_h());
-@@ -142,16 +142,16 @@ int FFMPEG::init_picture_from_frame(AVPi
-
- int FFMPEG::convert_cmodel(VFrame *frame_in, VFrame *frame_out) {
-
-- PixelFormat pix_fmt_in =
-+ AVPixelFormat pix_fmt_in =
- color_model_to_pix_fmt(frame_in->get_color_model());
-- PixelFormat pix_fmt_out =
-+ AVPixelFormat pix_fmt_out =
- color_model_to_pix_fmt(frame_out->get_color_model());
- #ifdef HAVE_SWSCALER
- // We need a context for swscale
- struct SwsContext *convert_ctx;
- #endif
- // do conversion within libavcodec if possible
-- if (pix_fmt_in != PIX_FMT_NB && pix_fmt_out != PIX_FMT_NB) {
-+ if (pix_fmt_in != AV_PIX_FMT_NB && pix_fmt_out != AV_PIX_FMT_NB) {
- // set up a temporary pictures from frame_in and frame_out
- AVPicture picture_in, picture_out;
- init_picture_from_frame(&picture_in, frame_in);
-@@ -226,14 +226,14 @@ int FFMPEG::convert_cmodel_transfer(VFra
- }
-
-
--int FFMPEG::convert_cmodel(AVPicture *picture_in, PixelFormat pix_fmt_in,
-+int FFMPEG::convert_cmodel(AVPicture *picture_in, AVPixelFormat pix_fmt_in,
- int width_in, int height_in, VFrame *frame_out) {
-
- // set up a temporary picture_out from frame_out
- AVPicture picture_out;
- init_picture_from_frame(&picture_out, frame_out);
- int cmodel_out = frame_out->get_color_model();
-- PixelFormat pix_fmt_out = color_model_to_pix_fmt(cmodel_out);
-+ AVPixelFormat pix_fmt_out = color_model_to_pix_fmt(cmodel_out);
-
- #ifdef HAVE_SWSCALER
- // We need a context for swscale
-@@ -242,7 +242,7 @@ int FFMPEG::convert_cmodel(AVPicture *pi
- int result;
- #ifndef HAVE_SWSCALER
- // do conversion within libavcodec if possible
-- if (pix_fmt_out != PIX_FMT_NB) {
-+ if (pix_fmt_out != AV_PIX_FMT_NB) {
- result = img_convert(&picture_out,
- pix_fmt_out,
- picture_in,
-@@ -280,7 +280,7 @@ int FFMPEG::convert_cmodel(AVPicture *pi
- // make an intermediate temp frame only if necessary
- int cmodel_in = pix_fmt_to_color_model(pix_fmt_in);
- if (cmodel_in == BC_TRANSPARENCY) {
-- if (pix_fmt_in == PIX_FMT_RGB32) {
-+ if (pix_fmt_in == AV_PIX_FMT_RGB32) {
- // avoid infinite recursion if things are broken
- printf("FFMPEG::convert_cmodel pix_fmt_in broken!\n");
- return 1;
-Index: cinelerra-20140710/cinelerra/ffmpeg.h
-===================================================================
---- cinelerra-20140710.orig/cinelerra/ffmpeg.h
-+++ cinelerra-20140710/cinelerra/ffmpeg.h
-@@ -18,7 +18,7 @@ class FFMPEG
- int init(char *codec_string);
- int decode(uint8_t *data, long data_size, VFrame *frame_out);
-
-- static int convert_cmodel(AVPicture *picture_in, PixelFormat pix_fmt,
-+ static int convert_cmodel(AVPicture *picture_in, AVPixelFormat pix_fmt,
- int width_in, int height_in,
- VFrame *frame_out);
- static int convert_cmodel(VFrame *frame_in, VFrame *frame_out);
-@@ -29,8 +29,8 @@ class FFMPEG
- static AVCodecID codec_id(char *codec_string);
-
- private:
-- static PixelFormat color_model_to_pix_fmt(int color_model);
-- static int pix_fmt_to_color_model(PixelFormat pix_fmt);
-+ static AVPixelFormat color_model_to_pix_fmt(int color_model);
-+ static int pix_fmt_to_color_model(AVPixelFormat pix_fmt);
-
- int got_picture;
- Asset *asset;
-Index: cinelerra-20140710/cinelerra/fileac3.C
-===================================================================
---- cinelerra-20140710.orig/cinelerra/fileac3.C
-+++ cinelerra-20140710/cinelerra/fileac3.C
-@@ -85,7 +85,7 @@ int FileAC3::open_file(int rd, int wr)
- if(wr)
- {
- avcodec_register_all();
-- codec = avcodec_find_encoder(CODEC_ID_AC3);
-+ codec = avcodec_find_encoder(AV_CODEC_ID_AC3);
- if(!codec)
- {
- eprintf("codec not found.\n");
-@@ -211,12 +211,56 @@ int FileAC3::write_samples(double **buff
- current_sample + frame_size <= temp_raw_size;
- current_sample += frame_size)
- {
-- int compressed_size = avcodec_encode_audio(
-- codec_context,
-- temp_compressed + output_size,
-- compressed_allocated - output_size,
-- temp_raw + current_sample * asset->channels);
-- output_size += compressed_size;
-+ AVPacket pkt;
-+ AVFrame *frame;
-+ int ret, samples_size, got_packet;
-+ av_init_packet(&pkt);
-+ pkt.data = temp_compressed + output_size;
-+ pkt.size = compressed_allocated - output_size;
-+ frame = av_frame_alloc();
-+ if(!frame) return AVERROR(ENOMEM);
-+ if(codec_context->frame_size) {
-+ frame->nb_samples = codec_context->frame_size;
-+ } else {
-+ /* if frame_size is not set, the number of samples must be
-+ * * calculated from the buffer size */
-+ int64_t nb_samples;
-+ if (!av_get_bits_per_sample(codec_context->codec_id)) {
-+ av_frame_free(&frame);
-+ return AVERROR(EINVAL);
-+ }
-+ nb_samples = (int64_t)(compressed_allocated - output_size) * 8 /
-+ (av_get_bits_per_sample(codec_context->codec_id) *
-+ codec_context->channels);
-+ if (nb_samples >= INT_MAX) {
-+ av_frame_free(&frame);
-+ return AVERROR(EINVAL);
-+ }
-+ frame->nb_samples = nb_samples;
-+ }
-+
-+ /* it is assumed that the samples buffer is large enough based on the
-+ * * relevant parameters */
-+ samples_size = av_samples_get_buffer_size(NULL, codec_context->channels,
-+ frame->nb_samples,
-+ codec_context->sample_fmt, 1);
-+ if ((ret = avcodec_fill_audio_frame(frame, codec_context->channels,
-+ codec_context->sample_fmt,
-+ (const uint8_t *)(temp_raw + current_sample * asset->channels),
-+ samples_size, 1)) < 0) {
-+ av_frame_free(&frame);
-+ return ret;
-+ }
-+
-+ ret = avcodec_encode_audio2(codec_context, &pkt, frame, &got_packet);
-+ output_size += pkt.size;
-+ /* free any side data since we cannot return it */
-+ av_packet_free_side_data(&pkt);
-+
-+ if (frame && frame->extended_data != frame->data)
-+ av_freep(&frame->extended_data);
-+
-+ av_frame_free(&frame);
- }
-
- // Shift buffer back
-Index: cinelerra-20140710/quicktime/mpeg4.c
-===================================================================
---- cinelerra-20140710.orig/quicktime/mpeg4.c
-+++ cinelerra-20140710/quicktime/mpeg4.c
-@@ -595,7 +595,7 @@ static int encode(quicktime_t *file, uns
- if(!codec->encode_initialized[current_field])
- {
- // Encore section
-- if(codec->ffmpeg_id == CODEC_ID_MPEG4 && codec->use_encore)
-+ if(codec->ffmpeg_id == AV_CODEC_ID_MPEG4 && codec->use_encore)
- {
- codec->encode_initialized[current_field] = 1;
- codec->encode_handle[current_field] = encode_handle++;
-@@ -647,7 +647,7 @@ static int encode(quicktime_t *file, uns
- context->width = width_i;
- context->height = height_i;
- context->gop_size = codec->gop_size;
-- context->pix_fmt = PIX_FMT_YUV420P;
-+ context->pix_fmt = AV_PIX_FMT_YUV420P;
- context->bit_rate = codec->bitrate / codec->total_fields;
- context->bit_rate_tolerance = codec->bitrate_tolerance;
- context->rc_eq = video_rc_eq;
-@@ -705,19 +705,19 @@ static int encode(quicktime_t *file, uns
- // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg...
-
- // Copyed from ffmpeg's mpegvideo.c... set 4MV only where it is supported
-- if(codec->ffmpeg_id == CODEC_ID_MPEG4 ||
-- codec->ffmpeg_id == CODEC_ID_H263 ||
-- codec->ffmpeg_id == CODEC_ID_H263P ||
-- codec->ffmpeg_id == CODEC_ID_FLV1)
-+ if(codec->ffmpeg_id == AV_CODEC_ID_MPEG4 ||
-+ codec->ffmpeg_id == AV_CODEC_ID_H263 ||
-+ codec->ffmpeg_id == AV_CODEC_ID_H263P ||
-+ codec->ffmpeg_id == AV_CODEC_ID_FLV1)
- context->flags |= CODEC_FLAG_4MV;
- // Not compatible with Win
- // context->flags |= CODEC_FLAG_QPEL;
-
- if(file->cpus > 1 &&
-- (codec->ffmpeg_id == CODEC_ID_MPEG4 ||
-- codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
-- codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
-- codec->ffmpeg_id == CODEC_ID_H263P ))
-+ (codec->ffmpeg_id == AV_CODEC_ID_MPEG4 ||
-+ codec->ffmpeg_id == AV_CODEC_ID_MPEG1VIDEO ||
-+ codec->ffmpeg_id == AV_CODEC_ID_MPEG2VIDEO ||
-+ codec->ffmpeg_id == AV_CODEC_ID_H263P ))
- {
- context->thread_count = file->cpus;
- }
-@@ -740,7 +740,7 @@ static int encode(quicktime_t *file, uns
- */
- avcodec_open2(context, codec->encoder[current_field], opts);
-
-- avcodec_get_frame_defaults(&codec->picture[current_field]);
-+ av_frame_unref(&codec->picture[current_field]);
-
- }
- }
-@@ -891,10 +891,18 @@ static int encode(quicktime_t *file, uns
- picture->quality = 0;
- picture->pts = vtrack->current_position * quicktime_frame_rate_d(file, track);
- picture->key_frame = 0;
-- bytes = avcodec_encode_video(context,
-- codec->work_buffer,
-- codec->buffer_size,
-- picture);
-+
-+ AVPacket pkt;
-+ int ret, got_pkt;
-+ av_init_packet(&pkt);
-+ pkt.data = codec->work_buffer;
-+ pkt.size = codec->buffer_size;
-+ ret = avcodec_encode_video2(context,
-+ &pkt,
-+ picture, &got_pkt);
-+ bytes = pkt.size;
-+ if(ret < 0 || !got_pkt) return 1;
-+
- is_keyframe = context->coded_frame && context->coded_frame->key_frame;
- /*
- * printf("encode current_position=%d is_keyframe=%d\n",
-@@ -1161,7 +1169,7 @@ void quicktime_init_codec_div3(quicktime
- QUICKTIME_DIV3,
- "DIVX",
- "Mike Row Soft MPEG4 Version 3");
-- result->ffmpeg_id = CODEC_ID_MSMPEG4V3;
-+ result->ffmpeg_id = AV_CODEC_ID_MSMPEG4V3;
- }
-
- void quicktime_init_codec_div5(quicktime_video_map_t *vtrack)
-@@ -1170,7 +1178,7 @@ void quicktime_init_codec_div5(quicktime
- QUICKTIME_DX50,
- "DIVX",
- "Mike Row Soft MPEG4 Version 5");
-- result->ffmpeg_id = CODEC_ID_MPEG4;
-+ result->ffmpeg_id = AV_CODEC_ID_MPEG4;
- }
-
- // Mike Rowe Soft MPEG-4
-@@ -1180,7 +1188,7 @@ void quicktime_init_codec_div3lower(quic
- QUICKTIME_DIV3_LOWER,
- "DIVX",
- "Mike Row Soft MPEG4 Version 3");
-- result->ffmpeg_id = CODEC_ID_MSMPEG4V3;
-+ result->ffmpeg_id = AV_CODEC_ID_MSMPEG4V3;
- }
-
- void quicktime_init_codec_div3v2(quicktime_video_map_t *vtrack)
-@@ -1189,7 +1197,7 @@ void quicktime_init_codec_div3v2(quickti
- QUICKTIME_MP42,
- "MP42",
- "Mike Row Soft MPEG4 Version 2");
-- result->ffmpeg_id = CODEC_ID_MSMPEG4V2;
-+ result->ffmpeg_id = AV_CODEC_ID_MSMPEG4V2;
- }
-
- // Generic MPEG-4
-@@ -1199,7 +1207,7 @@ void quicktime_init_codec_divx(quicktime
- QUICKTIME_DIVX,
- "MPEG-4",
- "Generic MPEG Four");
-- result->ffmpeg_id = CODEC_ID_MPEG4;
-+ result->ffmpeg_id = AV_CODEC_ID_MPEG4;
- result->use_encore = 1;
- }
-
-@@ -1209,7 +1217,7 @@ void quicktime_init_codec_mpg4(quicktime
- QUICKTIME_MPG4,
- "MPEG-4",
- "FFMPEG (msmpeg4)");
-- result->ffmpeg_id = CODEC_ID_MSMPEG4V1;
-+ result->ffmpeg_id = AV_CODEC_ID_MSMPEG4V1;
- }
-
- void quicktime_init_codec_dx50(quicktime_video_map_t *vtrack)
-@@ -1218,7 +1226,7 @@ void quicktime_init_codec_dx50(quicktime
- QUICKTIME_DX50,
- "MPEG-4",
- "FFMPEG (mpeg4)");
-- result->ffmpeg_id = CODEC_ID_MPEG4;
-+ result->ffmpeg_id = AV_CODEC_ID_MPEG4;
- }
-
- // Generic MPEG-4
-@@ -1228,7 +1236,7 @@ void quicktime_init_codec_mp4v(quicktime
- QUICKTIME_MP4V,
- "MPEG4",
- "Generic MPEG Four");
-- result->ffmpeg_id = CODEC_ID_MPEG4;
-+ result->ffmpeg_id = AV_CODEC_ID_MPEG4;
- // result->use_encore = 1;
- }
-
-@@ -1240,7 +1248,7 @@ void quicktime_init_codec_svq1(quicktime
- QUICKTIME_SVQ1,
- "Sorenson Version 1",
- "From the chearch of codecs of yesterday's sights");
-- result->ffmpeg_id = CODEC_ID_SVQ1;
-+ result->ffmpeg_id = AV_CODEC_ID_SVQ1;
- }
-
- void quicktime_init_codec_svq3(quicktime_video_map_t *vtrack)
-@@ -1249,7 +1257,7 @@ void quicktime_init_codec_svq3(quicktime
- QUICKTIME_SVQ3,
- "Sorenson Version 3",
- "From the chearch of codecs of yesterday's sights");
-- result->ffmpeg_id = CODEC_ID_SVQ3;
-+ result->ffmpeg_id = AV_CODEC_ID_SVQ3;
- }
-
- void quicktime_init_codec_h263(quicktime_video_map_t *vtrack)
-@@ -1258,7 +1266,7 @@ void quicktime_init_codec_h263(quicktime
- QUICKTIME_H263,
- "H.263",
- "H.263");
-- result->ffmpeg_id = CODEC_ID_H263;
-+ result->ffmpeg_id = AV_CODEC_ID_H263;
- }
-
- void quicktime_init_codec_xvid(quicktime_video_map_t *vtrack)
-@@ -1267,7 +1275,7 @@ void quicktime_init_codec_xvid(quicktime
- QUICKTIME_XVID,
- "XVID",
- "FFmpeg MPEG-4");
-- result->ffmpeg_id = CODEC_ID_MPEG4;
-+ result->ffmpeg_id = AV_CODEC_ID_MPEG4;
- }
-
- void quicktime_init_codec_dnxhd(quicktime_video_map_t *vtrack)
-@@ -1276,7 +1284,7 @@ void quicktime_init_codec_dnxhd(quicktim
- QUICKTIME_DNXHD,
- "DNXHD",
- "DNXHD");
-- result->ffmpeg_id = CODEC_ID_DNXHD;
-+ result->ffmpeg_id = AV_CODEC_ID_DNXHD;
- }
-
- // field based MPEG-4
-@@ -1287,7 +1295,7 @@ void quicktime_init_codec_hv60(quicktime
- "Dual MPEG-4",
- "MPEG 4 with alternating streams every other frame. (Not standardized)");
- result->total_fields = 2;
-- result->ffmpeg_id = CODEC_ID_MPEG4;
-+ result->ffmpeg_id = AV_CODEC_ID_MPEG4;
- }
-
-
-Index: cinelerra-20140710/quicktime/qtffmpeg.c
-===================================================================
---- cinelerra-20140710.orig/quicktime/qtffmpeg.c
-+++ cinelerra-20140710/quicktime/qtffmpeg.c
-@@ -39,7 +39,7 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg
- ptr->height = h;
- ptr->ffmpeg_id = ffmpeg_id;
- //printf("quicktime_new_ffmpeg 1 %d\n", ptr->ffmpeg_id);
-- if(ffmpeg_id == CODEC_ID_SVQ1)
-+ if(ffmpeg_id == AV_CODEC_ID_SVQ1)
- {
- ptr->width_i = quicktime_quantize32(ptr->width);
- ptr->height_i = quicktime_quantize32(ptr->height);
-@@ -86,10 +86,10 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg
- context->extradata_size = avcc->data_size;
- }
- if(cpus > 1 &&
-- (ffmpeg_id == CODEC_ID_MPEG4 ||
-- ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
-- ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
-- ffmpeg_id == CODEC_ID_H263P ))
-+ (ffmpeg_id == AV_CODEC_ID_MPEG4 ||
-+ ffmpeg_id == AV_CODEC_ID_MPEG1VIDEO ||
-+ ffmpeg_id == AV_CODEC_ID_MPEG2VIDEO ||
-+ ffmpeg_id == AV_CODEC_ID_H263P ))
- {
- context->thread_count = cpus;
- }
-@@ -224,16 +224,16 @@ static int get_chroma_factor(quicktime_f
- {
- switch(ffmpeg->decoder_context[current_field]->pix_fmt)
- {
-- case PIX_FMT_YUV420P:
-+ case AV_PIX_FMT_YUV420P:
- return 4;
- break;
-- case PIX_FMT_YUYV422:
-+ case AV_PIX_FMT_YUYV422:
- return 2;
- break;
-- case PIX_FMT_YUV422P:
-+ case AV_PIX_FMT_YUV422P:
- return 2;
- break;
-- case PIX_FMT_YUV410P:
-+ case AV_PIX_FMT_YUV410P:
- return 9;
- break;
- default:
-@@ -277,7 +277,7 @@ int quicktime_ffmpeg_decode(quicktime_ff
- //printf("quicktime_ffmpeg_decode 1 %d\n", ffmpeg->last_frame[current_field]);
-
- if(ffmpeg->last_frame[current_field] == -1 &&
-- ffmpeg->ffmpeg_id != CODEC_ID_H264)
-+ ffmpeg->ffmpeg_id != AV_CODEC_ID_H264)
- {
- int current_frame = vtrack->current_position;
- // For certain codecs,
-@@ -328,7 +328,7 @@ int quicktime_ffmpeg_decode(quicktime_ff
- // For MPEG-4, get another keyframe before first keyframe.
- // The Sanyo tends to glitch with only 1 keyframe.
- // Not enough memory.
-- if( 0 /* frame1 > 0 && ffmpeg->ffmpeg_id == CODEC_ID_MPEG4 */)
-+ if( 0 /* frame1 > 0 && ffmpeg->ffmpeg_id == AV_CODEC_ID_MPEG4 */)
- {
- do
- {
-@@ -423,16 +423,16 @@ int quicktime_ffmpeg_decode(quicktime_ff
- // Hopefully this setting will be left over if the cache was used.
- switch(ffmpeg->decoder_context[current_field]->pix_fmt)
- {
-- case PIX_FMT_YUV420P:
-+ case AV_PIX_FMT_YUV420P:
- input_cmodel = BC_YUV420P;
- break;
-- case PIX_FMT_YUYV422:
-+ case AV_PIX_FMT_YUYV422:
- input_cmodel = BC_YUV422;
- break;
-- case PIX_FMT_YUV422P:
-+ case AV_PIX_FMT_YUV422P:
- input_cmodel = BC_YUV422P;
- break;
-- case PIX_FMT_YUV410P:
-+ case AV_PIX_FMT_YUV410P:
- input_cmodel = BC_YUV9P;
- break;
- default:
-Index: cinelerra-20140710/quicktime/qth264.c
-===================================================================
---- cinelerra-20140710.orig/quicktime/qth264.c
-+++ cinelerra-20140710/quicktime/qth264.c
-@@ -370,7 +370,7 @@ static int decode(quicktime_t *file, uns
- if(!codec->decoder) codec->decoder = quicktime_new_ffmpeg(
- file->cpus,
- codec->total_fields,
-- CODEC_ID_H264,
-+ AV_CODEC_ID_H264,
- width,
- height,
- stsd_table);
-Index: cinelerra-20140710/quicktime/wma.c
-===================================================================
---- cinelerra-20140710.orig/quicktime/wma.c
-+++ cinelerra-20140710/quicktime/wma.c
-@@ -193,15 +193,38 @@ printf("decode 2 %x %llx %llx\n", chunk_
- codec->packet_buffer,
- chunk_size);
- #else
-- bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE;
- AVPacket pkt;
- av_init_packet( &pkt );
- pkt.data = codec->packet_buffer;
- pkt.size = chunk_size;
-- result = avcodec_decode_audio3(codec->decoder_context,
-- (int16_t*)(codec->work_buffer + codec->output_size * sample_size),
-- &bytes_decoded,
-+ AVFrame *frame = av_frame_alloc();
-+ int got_frame = 0;
-+
-+ result = avcodec_decode_audio4(codec->decoder_context,
-+ frame, &got_frame,
- &pkt);
-+
-+ if(result >= 0 && got_frame)
-+ {
-+ int ch, plane_size;
-+ int planar = av_sample_fmt_is_planar(codec->decoder_context->sample_fmt);
-+ int data_size = av_samples_get_buffer_size(&plane_size, codec->decoder_context->channels,
-+ frame->nb_samples,
-+ codec->decoder_context->sample_fmt, 1);
-+ memcpy(codec->work_buffer + codec->output_size * sample_size, frame->extended_data[0], plane_size);
-+
-+ if (planar && codec->decoder_context->channels > 1) {
-+ uint8_t *out = ((uint8_t *)(codec->work_buffer + codec->output_size * sample_size)) + plane_size;
-+ for (ch = 1; ch < codec->decoder_context->channels; ch++) {
-+ memcpy(out, frame->extended_data[ch], plane_size);
-+ out += plane_size;
-+ }
-+ }
-+ bytes_decoded = data_size;
-+ } else {
-+ bytes_decoded = 0;
-+ }
-+ av_frame_free(&frame);
- #endif
-
- pthread_mutex_unlock(&ffmpeg_lock);
-@@ -298,7 +321,7 @@ void quicktime_init_codec_wmav1(quicktim
- codec_base->title = "Win Media Audio 1";
- codec_base->desc = "Win Media Audio 1";
- codec_base->wav_id = 0x160;
-- codec->ffmpeg_id = CODEC_ID_WMAV1;
-+ codec->ffmpeg_id = AV_CODEC_ID_WMAV1;
- }
-
-
-@@ -313,5 +336,5 @@ void quicktime_init_codec_wmav2(quicktim
- codec_base->title = "Win Media Audio 2";
- codec_base->desc = "Win Media Audio 2";
- codec_base->wav_id = 0x161;
-- codec->ffmpeg_id = CODEC_ID_WMAV2;
-+ codec->ffmpeg_id = AV_CODEC_ID_WMAV2;
- }
-Index: cinelerra-20140710/cinelerra/fileyuv.C
-===================================================================
---- cinelerra-20140710.orig/cinelerra/fileyuv.C
-+++ cinelerra-20140710/cinelerra/fileyuv.C
-@@ -196,7 +196,7 @@ int FileYUV::write_frames(VFrame ***laye
- return stream->write_frame_raw(frame->get_data(), frame_size);
-
- // decode and write an encoded frame
-- if (FFMPEG::codec_id(incoming_asset->vcodec) != CODEC_ID_NONE)
-+ if (FFMPEG::codec_id(incoming_asset->vcodec) != AV_CODEC_ID_NONE)
- {
- if (! ffmpeg)
- {
-@@ -306,7 +306,7 @@ int FileYUV::can_copy_from(Edit *edit, i
- if (edit->asset->format == FILE_YUV) return 1;
-
- // if FFMPEG can decode it, we'll accept it
-- if (FFMPEG::codec_id(edit->asset->vcodec) != CODEC_ID_NONE) return 1;
-+ if (FFMPEG::codec_id(edit->asset->vcodec) != AV_CODEC_ID_NONE) return 1;
-
- incoming_asset = 0;
-
diff --git a/media-video/cinelerra/files/cinelerra-implicit_decls.patch b/media-video/cinelerra/files/cinelerra-implicit_decls.patch
deleted file mode 100644
index c806715e8c44..000000000000
--- a/media-video/cinelerra/files/cinelerra-implicit_decls.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: CinelerraCV-2.3/quicktime/graphics.c
-===================================================================
---- CinelerraCV-2.3.orig/quicktime/graphics.c
-+++ CinelerraCV-2.3/quicktime/graphics.c
-@@ -1,5 +1,6 @@
- #include "graphics.h"
-
-+#include <stdlib.h>
- #include <string.h>
-
- /* Graphics acceleration routines */
-Index: CinelerraCV-2.3/quicktime/libmjpeg.c
-===================================================================
---- CinelerraCV-2.3.orig/quicktime/libmjpeg.c
-+++ CinelerraCV-2.3/quicktime/libmjpeg.c
-@@ -17,6 +17,8 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
-+#include <strings.h>
- #include "colormodels.h"
- #include "libmjpeg.h"
-
-Index: CinelerraCV-2.3/quicktime/qtpng.c
-===================================================================
---- CinelerraCV-2.3.orig/quicktime/qtpng.c
-+++ CinelerraCV-2.3/quicktime/qtpng.c
-@@ -1,6 +1,7 @@
- #include "colormodels.h"
- #include "funcprotos.h"
- #include <png.h>
-+#include <string.h>
- #include "quicktime.h"
- #include "qtpng.h"
-
diff --git a/media-video/cinelerra/files/cinelerra-includes.patch b/media-video/cinelerra/files/cinelerra-includes.patch
deleted file mode 100644
index 45ac200310da..000000000000
--- a/media-video/cinelerra/files/cinelerra-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: CinelerraCV-2.3/cinelerra/audiodevice.C
-===================================================================
---- CinelerraCV-2.3.orig/cinelerra/audiodevice.C
-+++ CinelerraCV-2.3/cinelerra/audiodevice.C
-@@ -19,6 +19,7 @@
- *
- */
-
-+#include <cassert>
- #ifdef HAVE_FIREWIRE
- #include "audio1394.h"
- #endif
diff --git a/media-video/cinelerra/files/cinelerra-libav9.patch b/media-video/cinelerra/files/cinelerra-libav9.patch
deleted file mode 100644
index 47a4d6f231e1..000000000000
--- a/media-video/cinelerra/files/cinelerra-libav9.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -urN cinelerra-20120707/cinelerra/ffmpeg.C /tmp/cinelerra-20120707/cinelerra/ffmpeg.C
---- cinelerra-20120707/cinelerra/ffmpeg.C 2013-06-22 18:07:43.632978553 +0200
-+++ /tmp/cinelerra-20120707/cinelerra/ffmpeg.C 2013-06-22 18:07:21.668979334 +0200
-@@ -32,9 +32,9 @@
- return 1;
- }
-
-- context = avcodec_alloc_context();
-+ context = avcodec_alloc_context3(NULL);
-
-- if (avcodec_open(context, codec)) {
-+ if (avcodec_open2(context, codec, NULL)) {
- printf("FFMPEG::init avcodec_open() failed\n");
- }
-
-diff -urN cinelerra-20120707/cinelerra/fileac3.C /tmp/cinelerra-20120707/cinelerra/fileac3.C
---- cinelerra-20120707/cinelerra/fileac3.C 2013-06-22 18:07:43.632978553 +0200
-+++ /tmp/cinelerra-20120707/cinelerra/fileac3.C 2013-06-22 18:07:21.668979334 +0200
-@@ -91,11 +91,11 @@
- eprintf("codec not found.\n");
- return 1;
- }
-- codec_context = avcodec_alloc_context();
-+ codec_context = avcodec_alloc_context3(NULL);
- codec_context->bit_rate = asset->ac3_bitrate * 1000;
- codec_context->sample_rate = asset->sample_rate;
- codec_context->channels = asset->channels;
-- if(avcodec_open(codec_context, codec))
-+ if(avcodec_open2(codec_context, codec, NULL))
- {
- eprintf("failed to open codec.\n");
- return 1;
-diff -urN cinelerra-20120707/quicktime/mpeg4.c /tmp/cinelerra-20120707/quicktime/mpeg4.c
---- cinelerra-20120707/quicktime/mpeg4.c 2013-06-22 18:07:43.633978553 +0200
-+++ /tmp/cinelerra-20120707/quicktime/mpeg4.c 2013-06-22 18:07:21.690979334 +0200
-@@ -642,7 +642,7 @@
- return 1;
- }
-
-- codec->encoder_context[current_field] = avcodec_alloc_context();
-+ codec->encoder_context[current_field] = avcodec_alloc_context3(NULL);
- AVCodecContext *context = codec->encoder_context[current_field];
-
- context->width = width_i;
-@@ -676,8 +676,6 @@
- context->error_resilience = FF_ER_CAREFUL;
- #elif LIBAVCODEC_VERSION_INT < ((54<<16)+(0<<8)+0)
- context->error_recognition = FF_ER_CAREFUL;
--#else
-- context->err_recognition |= AV_EF_CAREFUL;
- #endif
- context->error_concealment = 3;
- context->frame_skip_cmp = FF_CMP_DCTMAX;
-diff -urN cinelerra-20120707/quicktime/qtffmpeg.c /tmp/cinelerra-20120707/quicktime/qtffmpeg.c
---- cinelerra-20120707/quicktime/qtffmpeg.c 2013-06-22 18:07:43.633978553 +0200
-+++ /tmp/cinelerra-20120707/quicktime/qtffmpeg.c 2013-06-22 18:07:21.690979334 +0200
-@@ -67,7 +67,7 @@
- return 0;
- }
-
-- AVCodecContext *context = ptr->decoder_context[i] = avcodec_alloc_context();
-+ AVCodecContext *context = ptr->decoder_context[i] = avcodec_alloc_context3(NULL);
- static char fake_data[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
- context->width = ptr->width_i;
- context->height = ptr->height_i;
-@@ -93,8 +93,8 @@
- {
- context->thread_count = cpus;
- }
-- if(avcodec_open(context,
-- ptr->decoder[i]) < 0)
-+ if(avcodec_open2(context,
-+ ptr->decoder[i], NULL) < 0)
- {
- printf("quicktime_new_ffmpeg: avcodec_open failed.\n");
- quicktime_delete_ffmpeg(ptr);
-diff -urN cinelerra-20120707/quicktime/wma.c /tmp/cinelerra-20120707/quicktime/wma.c
---- cinelerra-20120707/quicktime/wma.c 2013-06-22 18:07:43.634978553 +0200
-+++ /tmp/cinelerra-20120707/quicktime/wma.c 2013-06-22 18:07:21.690979334 +0200
-@@ -76,10 +76,10 @@
- printf("init_decode: avcodec_find_decoder returned NULL.\n");
- return 1;
- }
-- codec->decoder_context = avcodec_alloc_context();
-+ codec->decoder_context = avcodec_alloc_context3(NULL);
- codec->decoder_context->sample_rate = trak->mdia.minf.stbl.stsd.table[0].sample_rate;
- codec->decoder_context->channels = track_map->channels;
-- if(avcodec_open(codec->decoder_context, codec->decoder) < 0)
-+ if(avcodec_open2(codec->decoder_context, codec->decoder, NULL) < 0)
- {
- printf("init_decode: avcodec_open failed.\n");
- return 1;
-
diff --git a/media-video/cinelerra/files/cinelerra-pngtoh.patch b/media-video/cinelerra/files/cinelerra-pngtoh.patch
deleted file mode 100644
index 81a8432b8729..000000000000
--- a/media-video/cinelerra/files/cinelerra-pngtoh.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=526118
-http://bugs.cinelerra-cv.org/ticket/1005
-
-Author: Bernd Feige
-
---- guicast/pngtoh.c 2015-01-29 13:41:01 +0000
-+++ guicast/pngtoh.c 2015-01-29 13:41:07 +0000
-@@ -148,4 +148,6 @@
- fprintf(out, "};\n\n#endif\n");
- fclose(out);
- }
-+
-+ return 0;
- }
-
diff --git a/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch b/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch
deleted file mode 100644
index 646db9f25f05..000000000000
--- a/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=562208
-
-Index: cinelerra-20140710/toolame-02l/bitstream.c
-===================================================================
---- cinelerra-20140710.orig/toolame-02l/bitstream.c
-+++ cinelerra-20140710/toolame-02l/bitstream.c
-@@ -198,9 +198,6 @@ void put1bit (Bit_stream_struc * bs, int
- }
-
- /*write N bits into the bit stream */
--#if !defined(__clang__)
--INLINE
--#endif /* not __clang__ */
- void putbits (Bit_stream_struc * bs, unsigned int val, int N)
- {
- register int j = N;
-Index: cinelerra-20140710/toolame-02l/bitstream.h
-===================================================================
---- cinelerra-20140710.orig/toolame-02l/bitstream.h
-+++ cinelerra-20140710/toolame-02l/bitstream.h
-@@ -9,7 +9,7 @@ unsigned int get1bit (Bit_stream_struc *
- void put1bit (Bit_stream_struc *, int);
- unsigned long look_ahead (Bit_stream_struc *, int);
- unsigned long getbits (Bit_stream_struc *, int);
--INLINE void putbits (Bit_stream_struc *, unsigned int, int);
-+void putbits (Bit_stream_struc *, unsigned int, int);
- void byte_ali_putbits (Bit_stream_struc *, unsigned int, int);
- unsigned long byte_ali_getbits (Bit_stream_struc *, int);
- unsigned long sstell (Bit_stream_struc *);
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index e6c3a790f223..8aceb754662e 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,5 +1,5 @@
DIST totem-3.22.1.tar.xz 1982788 SHA256 10a509d7797b59cda57b324a426f77e567729545459a64afe4a5ac986bd7c53b SHA512 919f313d2af1d72256ccfa1fe41fe897427b7558c2308da8c257e5b5439f90af9a47a905dd692ab4cabec730a5be0e55710932f91bc6e2f63949f5d83c840e97 WHIRLPOOL 71d3785342f971727b78699e8597b94eb2f11fc47dc57848e72dc1d2d9866fe2243c41fb1dcf92b8880a10b8cd303aa28013b956c54ab2501f843dacef42933a
-DIST totem-3.24.0.tar.xz 1987260 SHA256 9bd78f7b940e886b5c809acdfe00a610a834de5080dd40272b92835528a58d01 SHA512 488db91e09b7f5947e81cb5474444c753367542820777faab561582707b012e664f232d3810d543dfbe0823adf3d8302c2fe6cc387f4225a362d15a6df8b4342 WHIRLPOOL 76a796632ce46db085602a54f1adb68bb269ca3d2c3007b4d3a801b4895c3a226666777884bda14f786b6d30ca8accc4f6822c2bd280d42a28cd5c1503db468c
+DIST totem-3.24.0.tar.xz 1987260 BLAKE2B 81cb8c359b2225148a18f7a5c6ae9990cbe2e2f3b9a6a31012c9c8c0920c0cea6bad0a5d9407a79530fadf00fb845fe9e6aa8dbc84d0f8d6e84fbc144d86bc9e SHA512 488db91e09b7f5947e81cb5474444c753367542820777faab561582707b012e664f232d3810d543dfbe0823adf3d8302c2fe6cc387f4225a362d15a6df8b4342
EBUILD totem-3.22.1-r1.ebuild 3878 BLAKE2B c448e18a99f1b5e1b249e066b2a4b4a3540aeafb1006665b493d91257aa728702f95f139ea1b3b3c63844c5a3231981eec52eb49eb0e6e8981b467f2a9a420e5 SHA512 b74fb308090d9dc823aab3e83d835c75aa462238a6ebec1f0257386424f15d57b36efdf66dd7ec52f77ecb5c5717d442dafff48ea49da1aeed2bfb2ca6a093e6
-EBUILD totem-3.24.0.ebuild 3880 BLAKE2B 506bd3d4b14c576e2cb1d14c65e749be218c800603d6eb0d4b7752f884693af04457c2274bedd74ae8e39b092daf9dad707181a8907962b18a68c88bbd94ba4f SHA512 a403eabdd774d6e5d2627fd8894b2f21cdc80231f235766acd5733a68774e3de06e444e50f630ca457ad635d2cf1732d50f1a0ab0b0dac756b889a2256c011d4
+EBUILD totem-3.24.0.ebuild 3884 BLAKE2B 06cbfaabbae47bb3c57b2d534c602a94166056b7c4ccd16e96ea887bd1814745d75dc7db0075175f50174e4fbe468ac3fa3b157a02682da99def0f4577b82ecc SHA512 98a05f734bd85f22987a6dc38bfe8c480a9e87730e6ee7eb9d254bd3bbf30a24734df89e060ed1f7a9e28919bfabd7a5794f842b807107e2c941df2fc08e3647
MISC metadata.xml 1203 BLAKE2B 17dbe39772d0e1e06ddc792e26344fa17d957c7fbc483030be4c48a3ebe262c23670f77f5ed811161f0419f020a435af791147f94276285b5c9e72b9fcf1e03f SHA512 d361035197d6ecbd6f2ad3cabc641cae06144148f468b5311c778950806fb0fffc9f2f4685ea557b64c7da67e08830b3ae4d11535849a01b9c06bb1c813b3b08
diff --git a/media-video/totem/totem-3.24.0.ebuild b/media-video/totem/totem-3.24.0.ebuild
index 34631fb0dd97..e1b273398547 100644
--- a/media-video/totem/totem-3.24.0.ebuild
+++ b/media-video/totem/totem-3.24.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
PYTHON_REQ_USE="threads"
inherit autotools gnome2 python-single-r1
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 0825ea42f141..a2ff9f19e53a 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,15 +1,4 @@
-AUX transcode-1.1.7-ffmpeg-0.10.patch 406 BLAKE2B 494099cff18b33f7ba9689bb038872017b2d52b1f92c273302212a4b2f1864361a25558674fb9aafe90a051f441cd6f243a85da9a19c63ac4dd842bce7feb4b0 SHA512 2a0607ddec6f2000ef51e82fa2ce5e8e2eb79b07ce7b6a43c0bd986825151f0d37ef4968ba1c960016239ca42f549e9311c201d73a087cb2d3b4ede8274c8810
-AUX transcode-1.1.7-ffmpeg-0.11.patch 12718 BLAKE2B 102f69c1b04e545e8a323aeb73cf830e384529d8a2507a9073b078cc545afa5ec396e03ed09b0e4710a2de324d23fd4735c3a6c28473f434b324a7ff41b0aeb5 SHA512 9b39f15d20830fb57f86750a54a5a7c6025ad69733d668df45a06fd1134e0a6ee76a495a883797b41870b156b4b8895a4dcedbd5e28712d69a98baa7b5934663
-AUX transcode-1.1.7-ffmpeg.patch 2286 BLAKE2B 430a6e637aa9b645cf3bc7d347f8562c9225f60b7078c9be97578c295016215aea1d9b1c52a0164c399ff740abcf7a6bbb5c21f7722f326af5e6340e34a860ee SHA512 6c8ca791aba58427f40792b7b24cc85e89951d84e5b77dff02125a3c00934fd0319e8fcab9199eafea604c06b6f5d86e2f296c16b45cc33a28d4e17cd26dc12d
-AUX transcode-1.1.7-ffmpeg2.patch 21823 BLAKE2B 5a2e6670f9f29be9de6f80e1f7ef7e819baee641a410efb0157a7a29c5d61e26e7bb2e1a5b07b8effbbf67ef1550aa2862ba60bc6773e807d4d62d3f865a6e60 SHA512 d1ee8c3d22a34930665857f63cef3925e0dfe50aef0bd15b0a1c835d182ec3e33c615915b4cb202fb201fad7edfe1c960466bb399803f4a9eb097b87d2b26605
-AUX transcode-1.1.7-ffmpeg24.patch 544 BLAKE2B aed3a2973304fab896caf2141bc7a0a8e60a2f2b500b83e088b3473874f7b7d4fb8d1678599f069b5e523c28f0f83b2b7b7af61c1d8a0ff5832bb334b091b8b8 SHA512 2d3a10b8022b8bc67678d303ecefea05e4fa95c4c376264e2ef45446b4e7b48485672cb370b5aff7127ad80c1331dd3e422dad17124b099b20e368d4d57259a1
-AUX transcode-1.1.7-ffmpeg29.patch 14716 BLAKE2B 70ecf1a5fae343ecc524cb9e771f2bd6ab2778209a9f552603e02aca5695f77dfc135cd31b05a2ee41f64d3cb668bbf0f66414b920dbb4b0d971f06796b9f8f0 SHA512 f581fb587331a45c54f5ef7463391c61af87a515af7c368720261d9ca0fff4a43081479a672801676ecf7fafd4c3b88226c681d4d624f5614d57927ef3b44692
-AUX transcode-1.1.7-freetype251.patch 273 BLAKE2B 4a65eda25023b79f38a51910bca9bc7cd7f5268a7a184f8755aaad4ad139db8623e5c800f726486fbdad9f79fee13239d97ab438694a2da90867b6a77046f4b5 SHA512 40b672e15de03d2f9f9150a3edb61de65f2d37f6fa9c8b0fc5f47d5a8c8dc6feb714163689947e8997ff4d6c243aa5a5ec860ef8c50bf4648166aa64a7396285
-AUX transcode-1.1.7-libav-10.patch 1187 BLAKE2B 9140856d85e30959455e8edec7b111ad1b188f17497dbd874397204424b4cd57796e30809e1f7e0f7c56c278b595b7d40527fabacf641353b6fa7731acb954c9 SHA512 19d64521bc08e1217234e32ec593b1af007b3af4c3728dcaef0ffb3dab2687c0b674b9c0c9fa9f0586422007548b37ada8a452ae5f97ac9a9460b52eaef4bae8
-AUX transcode-1.1.7-libav-9.patch 1251 BLAKE2B d913ad761f698f67d73647a10e4d6e7c11937b8d2f93048bcd9b69cfe074e5bd0833b1acad2b96d1ebb642c52b087faf1e1a3e0876c1e3b60fe50287f18c5e73 SHA512 dcdd541bcac70901bc9bd099429c0b1389bf2fdc6c36395133bfab0d6d21f75fb9e2d9b1b2affd510b76e6de4da0d47668ccbedff09fd06ad84f82a1936dfcb6
-AUX transcode-1.1.7-preset-force.patch 1199 BLAKE2B fb8025132d34a426d361926d1f42e94dec3025940a57a1775d59f405b92a2ea4e62aeeb691c24e6debf2ffc7cbe98195bfe25926f2c3823c5298ef847a06c8c9 SHA512 b2406841674b0d021b1a116e3ef1d16a7206db0930d10d98f3a86923040fbe306296acbac1e14020557c0e9b7e9b28bd0de1f9e1ce20c7fb2c190d15adc6decc
-AUX transcode-1.1.7-preset-free.patch 1370 BLAKE2B dbb20c892c9c44d901d5f4570e25beaa0538985a9b0c3a03e6a1f1664e75bdf38bd4ab43b857e31141e865fa8540e8b987d4e04602d8ad44d3565d282367d258 SHA512 46514728ea0970bf69ef0341ea64dae495a1a571a0416cf20cfaa7c922ded0ae8dcfd717c720c53e457a16585722973266e5cc0b509034ed2549338dc9bac912
-DIST transcode-1.1.7-imagemagick7.patch 34353 SHA256 4ede15540ea6932954ac332c12dde130bf48e7e4773d1e04d3c3f23038c6ac51 SHA512 4eface4bbeb41bf6b44f4efa9bb6e77a0dbb6e22d881261a5884ab843c98ffaf1f40c180d819db6fd48ff81046032b90d11f771d98ba366d2ee4fab94bb99b18 WHIRLPOOL dbd356b24c62d071f989f42969bacbc851782c5125f30724f673b2e50c0be56a15a38d2c63032ee96f0f184b4affe62ef11323a9ddb6fca0955160dec7cb96ba
-DIST transcode-1.1.7.tar.bz2 2183627 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f WHIRLPOOL ccd085b3a2638de92c2d589ff93038fed3d1a760d3513fde2946a805f7efed87813850f5e9eee306ed8efd3608ad9492d16f4c41bd6278379995deb22f92354e
-EBUILD transcode-1.1.7-r3.ebuild 3917 BLAKE2B dae2da657b4f15dcf79b5f115987974bd744de58582a0acf86dcbc96fb56ceed09b8565d30dd8b85c4180f0ba61a3a9c988cb4c24e09c81e4a448ef698784a8b SHA512 f7fc07a912413723b41f69039e66b13167ae5935a2b70878547c412d13e238ba45c1b9c4be9a686fd35ba3ea79aff3746eb19f081ef359c175344364aa667f61
+DIST transcode-1.1.7-patchset.tar.bz2 16379 BLAKE2B fbdc188bffeb8751814abfa7e119a1053e482f194bc1b87a721c48e2b66e107df146d38b3ea11a88d066c49d8862489b88b74f61fa36ce3f8a1a782da3762615 SHA512 bedc82aa4fbc17774e34d8fc24799d70b8460c6c1dd728549bcaa5c387492f56e520674fdf8bb976c0b5fcc9ccefb765f2ee26816e0d2b96a83402a21cee3f6d
+DIST transcode-1.1.7.tar.bz2 2183627 BLAKE2B 25001d4cae83d86e5295917bcd9e2e77dd61637e238394a2d603398baf810201dc61d8b0de5b54a7b8848ac3bcef5fb211e8f2b43ed7da4e56e335b8d4d2fbe1 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
+EBUILD transcode-1.1.7-r3.ebuild 4071 BLAKE2B 8a8bf3f3dd1a0a7ee347facbe3e0c9c20af5eea792f93479e1ec944ebb9d2243cfcfde99f8d94be6e8d2a638270b1065a8158a608ed3bc9e6584e611db2c5576 SHA512 b4ee2af0eed3e432e82b844e06cd6beac7843df0f872c0581758bee35c882609647d1e53db2b8af4b1605a92d1881df92d8ee7588a74b5a4999f7209202f0726
MISC metadata.xml 619 BLAKE2B fa440f0f00bd7afe2834108078f48dc93dfe5ea38d343587267e2b45f4c4187762fdf16e1f023e4fc3af69d181ec77cbedec4a39df98eb8d4a098b98248c7b56 SHA512 043d39001850f8088e33e7277a579af7cb45b6fd2b3fe4483eb7771340dae8eab14927184f0fab9aedc8934a6d2599ce6231726308079d0ae16e7710f826ad1b
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch
deleted file mode 100644
index 5879b24d2674..000000000000
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/401287
-
---- a/filter/filter_pp.c
-+++ b/filter/filter_pp.c
-@@ -38,8 +38,8 @@
-
- /* FIXME: these use the filter ID as an index--the ID can grow
- * arbitrarily large, so this needs to be fixed */
--static pp_mode_t *mode[100];
--static pp_context_t *context[100];
-+static pp_mode *mode[100];
-+static pp_context *context[100];
- static int width[100], height[100];
- static int pre[100];
-
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.11.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.11.patch
deleted file mode 100644
index 871d073feade..000000000000
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.11.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-Fix build with ffmpeg 0.11.
-https://bugs.gentoo.org/show_bug.cgi?id=419551
-Author: Brennan Shacklett
-
-diff -urN transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c
---- transcode-1.1.7-orig/encode/encode_lavc.c 2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/encode/encode_lavc.c 2012-07-03 10:47:03.528009149 -0700
-@@ -114,6 +114,7 @@
-
- AVFrame ff_venc_frame;
- AVCodecContext ff_vcontext;
-+ AVDictionary ** ff_opts;
-
- AVCodec *ff_vcodec;
-
-@@ -1036,14 +1037,10 @@
- SET_FLAG(pd, mv0);
- SET_FLAG(pd, cbp);
- SET_FLAG(pd, qpel);
-- SET_FLAG(pd, alt);
-- SET_FLAG(pd, vdpart);
- SET_FLAG(pd, naq);
- SET_FLAG(pd, ilme);
- SET_FLAG(pd, ildct);
- SET_FLAG(pd, aic);
-- SET_FLAG(pd, aiv);
-- SET_FLAG(pd, umv);
- SET_FLAG(pd, psnr);
- SET_FLAG(pd, trell);
- SET_FLAG(pd, gray);
-@@ -1064,6 +1061,18 @@
- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
- }
-+ if (pd->confdata.flags.alt) {
-+ av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
-+ }
-+ if (pd->confdata.flags.vdpart) {
-+ av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
-+ }
-+ if (pd->confdata.flags.umv) {
-+ av_dict_set(pd->ff_opts, "umv", "1", 0);
-+ }
-+ if (pd->confdata.flags.aiv) {
-+ av_dict_set(pd->ff_opts, "aiv", "1", 0);
-+ }
- }
-
- #undef SET_FLAG
-@@ -1184,18 +1193,18 @@
- { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
- { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
-- { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN },
-+ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
- { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
- { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
- { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
-- { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART },
-+ { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
- #else
- { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
- #endif
-- { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV },
-- { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV },
-+ { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
-+ { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
- { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
-@@ -1387,7 +1396,7 @@
- pd->confdata.thread_count,
- (pd->confdata.thread_count > 1) ?"s" :"");
- }
-- avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count);
-+ pd->ff_vcontext.thread_count = pd->confdata.thread_count;
-
- pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd));
- if (pd->ff_vcodec == NULL) {
-@@ -1397,11 +1406,11 @@
- }
-
- TC_LOCK_LIBAVCODEC;
-- ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec);
-+ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
- TC_UNLOCK_LIBAVCODEC;
-
- if (ret < 0) {
-- tc_log_error(MOD_NAME, "avcodec_open() failed");
-+ tc_log_error(MOD_NAME, "avcodec_open2() failed");
- goto failed;
- }
- /* finally, pass up the extradata, if any */
-diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
---- transcode-1.1.7-orig/export/export_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/export/export_ffmpeg.c 2012-07-03 13:15:23.918019415 -0700
-@@ -122,6 +122,7 @@
- static AVFrame *lavc_convert_frame = NULL;
-
- static AVCodec *lavc_venc_codec = NULL;
-+static AVDictionary **lavc_venc_opts = NULL;
- static AVFrame *lavc_venc_frame = NULL;
- static AVCodecContext *lavc_venc_context;
- static avi_t *avifile = NULL;
-@@ -180,7 +181,7 @@
-
-
- /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
--#include <libavcodec/opt.h>
-+#include <libavutil/opt.h>
- #include <libavutil/avstring.h>
- #include <libswscale/swscale.h>
-
-@@ -470,7 +471,6 @@
- }
-
- TC_LOCK_LIBAVCODEC;
-- avcodec_init();
- avcodec_register_all();
- TC_UNLOCK_LIBAVCODEC;
-
-@@ -634,7 +634,7 @@
- lavc_param_rc_max_rate = 2516;
- lavc_param_rc_buffer_size = 224 * 8;
- lavc_param_rc_buffer_aggressivity = 99;
-- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
-+ lavc_param_scan_offset = 1;
-
- break;
-
-@@ -674,7 +674,7 @@
-
- lavc_param_rc_buffer_size = 224 * 8;
- lavc_param_rc_buffer_aggressivity = 99;
-- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
-+ lavc_param_scan_offset = 1;
-
- break;
-
-@@ -887,7 +887,7 @@
- lavc_venc_context->thread_count);
- }
-
-- avcodec_thread_init(lavc_venc_context, lavc_param_threads);
-+ lavc_venc_context->thread_count = lavc_param_threads;
-
- if (lavc_param_intra_matrix) {
- char *tmp;
-@@ -1065,15 +1065,10 @@
- lavc_venc_context->flags |= lavc_param_closedgop;
- lavc_venc_context->flags |= lavc_param_trunc;
- lavc_venc_context->flags |= lavc_param_aic;
-- lavc_venc_context->flags |= lavc_param_umv;
- lavc_venc_context->flags |= lavc_param_v4mv;
-- lavc_venc_context->flags |= lavc_param_data_partitioning;
- lavc_venc_context->flags |= lavc_param_cbp;
- lavc_venc_context->flags |= lavc_param_mv0;
- lavc_venc_context->flags |= lavc_param_qp_rd;
-- lavc_venc_context->flags |= lavc_param_scan_offset;
-- lavc_venc_context->flags |= lavc_param_ss;
-- lavc_venc_context->flags |= lavc_param_alt;
- lavc_venc_context->flags |= lavc_param_ilme;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- lavc_venc_context->flags |= lavc_param_trell;
-@@ -1203,7 +1198,6 @@
-
- lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
-
--
- /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
- if (lavc_param_video_preset) {
- avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
-@@ -1241,20 +1235,39 @@
- }
- }
-
-+ if (lavc_param_scan_offset) {
-+ av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
-+ }
-+
-+ if (lavc_param_ss) {
-+ av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
-+ }
-+
-+ if (lavc_param_alt) {
-+ av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
-+ }
-+
-+ if (lavc_param_umv) {
-+ av_dict_set(lavc_venc_opts, "umv", "1", 0);
-+ }
-+
-+ if (lavc_param_data_partitioning) {
-+ av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
-+ }
-
- //-- open codec --
- //----------------
- TC_LOCK_LIBAVCODEC;
-- ret = avcodec_open(lavc_venc_context, lavc_venc_codec);
-+ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
- TC_UNLOCK_LIBAVCODEC;
- if (ret < 0) {
- tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
- return TC_EXPORT_ERROR;
- }
-
-- if (lavc_venc_context->codec->encode == NULL) {
-+ if (av_codec_is_encoder(lavc_venc_context->codec) == 0) {
- tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
-- "(lavc_venc_context->codec->encode == NULL)");
-+ "(av_codec_is_encoder(lavc_venc_context->codec) == 0)");
- return TC_EXPORT_ERROR;
- }
-
-diff -urN transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c
---- transcode-1.1.7-orig/export/ffmpeg_cfg.c 2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/export/ffmpeg_cfg.c 2012-07-03 10:09:25.011003254 -0700
-@@ -160,9 +160,9 @@
- {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
- {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
- {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
-- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
-+ {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
- // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
-- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
-+ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
- {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
- {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
- {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
-@@ -211,7 +211,7 @@
- #else
- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
- #endif
-- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
-+ {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
- {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
- {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
- {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
-@@ -223,9 +223,9 @@
- {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
- {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
- {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
-- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT},
-- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET},
-- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},
-+ {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
-+ {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
-+ {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
- {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
- {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
- {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-diff -urN transcode-1.1.7-orig/import/decode_lavc.c transcode-1.1.7/import/decode_lavc.c
---- transcode-1.1.7-orig/import/decode_lavc.c 2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/import/decode_lavc.c 2012-07-03 10:21:46.085005182 -0700
-@@ -181,7 +181,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- lavc_dec_context->error_resilience = 2;
- #else
-- lavc_dec_context->error_recognition = 2;
-+ lavc_dec_context->err_recognition = 2;
- #endif
- lavc_dec_context->error_concealment = 3;
- lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-diff -urN transcode-1.1.7-orig/import/import_ffmpeg.c transcode-1.1.7/import/import_ffmpeg.c
---- transcode-1.1.7-orig/import/import_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/import/import_ffmpeg.c 2012-07-03 10:19:36.936004841 -0700
-@@ -314,7 +314,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- lavc_dec_context->error_resilience = 2;
- #else
-- lavc_dec_context->error_recognition = 2;
-+ lavc_dec_context->err_recognition = 2;
- #endif
- lavc_dec_context->error_concealment = 3;
- lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-diff -urN transcode-1.1.7-orig/import/probe_ffmpeg.c transcode-1.1.7/import/probe_ffmpeg.c
---- transcode-1.1.7-orig/import/probe_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/import/probe_ffmpeg.c 2012-07-03 10:41:42.782008306 -0700
-@@ -99,8 +99,8 @@
-
- TC_INIT_LIBAVCODEC;
-
-- ret = av_open_input_file(&lavf_dmx_context, ipipe->name,
-- NULL, 0, NULL);
-+ ret = avformat_open_input(&lavf_dmx_context, ipipe->name,
-+ NULL, NULL);
- if (ret != 0) {
- tc_log_error(__FILE__, "unable to open '%s'"
- " (libavformat failure)",
-diff -urN transcode-1.1.7-orig/libtc/tcavcodec.h transcode-1.1.7/libtc/tcavcodec.h
---- transcode-1.1.7-orig/libtc/tcavcodec.h 2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/libtc/tcavcodec.h 2012-07-03 10:34:43.648007213 -0700
-@@ -53,7 +53,6 @@
-
- #define TC_INIT_LIBAVCODEC do { \
- TC_LOCK_LIBAVCODEC; \
-- avcodec_init(); \
- avcodec_register_all(); \
- TC_UNLOCK_LIBAVCODEC; \
- } while (0)
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch
deleted file mode 100644
index 1e7459830c16..000000000000
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/encode/encode_lavc.c
-+++ b/encode/encode_lavc.c
-@@ -955,8 +955,6 @@
- /*
- * context *transcode* (not libavcodec) defaults
- */
-- pd->ff_vcontext.mb_qmin = 2;
-- pd->ff_vcontext.mb_qmax = 31;
- pd->ff_vcontext.max_qdiff = 3;
- pd->ff_vcontext.max_b_frames = 0;
- pd->ff_vcontext.me_range = 0;
-@@ -1116,8 +1114,6 @@
- // handled by transcode core
- // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
- // handled by transcode core
-- { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
-- { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
- { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
- { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
- { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
---- a/export/ffmpeg_cfg.c
-+++ b/export/ffmpeg_cfg.c
-@@ -34,8 +34,6 @@
- //int lavc_param_vqscale = 0;
- //int lavc_param_vqmin = 2;
- //int lavc_param_vqmax = 31;
--int lavc_param_mb_qmin = 2;
--int lavc_param_mb_qmax = 31;
- int lavc_param_lmin = 2;
- int lavc_param_lmax = 31;
- int lavc_param_vqdiff = 3;
-@@ -143,8 +141,6 @@
- // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
- // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
- // {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
-- {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
-- {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
- {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
- {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
- {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
---- a/export/ffmpeg_cfg.h
-+++ b/export/ffmpeg_cfg.h
-@@ -13,8 +13,6 @@
- //extern int lavc_param_vqscale;
- //extern int lavc_param_vqmin;
- //extern int lavc_param_vqmax;
--extern int lavc_param_mb_qmin;
--extern int lavc_param_mb_qmax;
- extern int lavc_param_lmin;
- extern int lavc_param_lmax;
- extern int lavc_param_vqdiff;
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch
deleted file mode 100644
index 9a770a6a0def..000000000000
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch
+++ /dev/null
@@ -1,557 +0,0 @@
-Fix build with ffmpeg-2.0.
-Fix segfaults introduced by wrong usage of the av_dict API.
-Fix forgotten parts in the libav9 patch.
-
-Index: transcode-1.1.7/encode/encode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/encode/encode_lavc.c
-+++ transcode-1.1.7/encode/encode_lavc.c
-@@ -74,6 +74,9 @@ struct tclavcconfigdata_ {
- int lmin;
- int lmax;
- int me_method;
-+ int luma_elim_threshold;
-+ int chroma_elim_threshold;
-+ int quantizer_noise_shaping;
-
- /* same as above for flags */
- struct {
-@@ -114,7 +117,7 @@ struct tclavcprivatedata_ {
-
- AVFrame ff_venc_frame;
- AVCodecContext ff_vcontext;
-- AVDictionary ** ff_opts;
-+ AVDictionary * ff_opts;
-
- AVCodec *ff_vcodec;
-
-@@ -165,6 +168,7 @@ static const TCCodecID tc_lavc_codecs_ou
- TC_CODEC_ERROR
- };
-
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- static const enum CodecID tc_lavc_internal_codecs[] = {
- CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4,
- CODEC_ID_H263I, CODEC_ID_H263P,
-@@ -177,6 +181,20 @@ static const enum CodecID tc_lavc_intern
- CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3,
- CODEC_ID_NONE
- };
-+#else
-+static const enum AVCodecID tc_lavc_internal_codecs[] = {
-+ AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4,
-+ AV_CODEC_ID_H263I, AV_CODEC_ID_H263P,
-+ AV_CODEC_ID_H264,
-+ AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2,
-+ AV_CODEC_ID_RV10,
-+ AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1,
-+ AV_CODEC_ID_DVVIDEO,
-+ AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG,
-+ AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3,
-+ AV_CODEC_ID_NONE
-+};
-+#endif
-
- static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR };
-
-@@ -938,7 +956,11 @@ static int tc_lavc_settings_from_vob(TCL
- static void tc_lavc_config_defaults(TCLavcPrivateData *pd)
- {
- /* first of all reinitialize lavc data */
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- avcodec_get_context_defaults(&pd->ff_vcontext);
-+#else
-+ avcodec_get_context_defaults3(&pd->ff_vcontext, NULL);
-+#endif
-
- pd->confdata.thread_count = 1;
-
-@@ -976,8 +998,8 @@ static void tc_lavc_config_defaults(TCLa
- pd->ff_vcontext.mpeg_quant = 0;
- pd->ff_vcontext.rc_initial_cplx = 0.0;
- pd->ff_vcontext.rc_qsquish = 1.0;
-- pd->ff_vcontext.luma_elim_threshold = 0;
-- pd->ff_vcontext.chroma_elim_threshold = 0;
-+ pd->confdata.luma_elim_threshold = 0;
-+ pd->confdata.chroma_elim_threshold = 0;
- pd->ff_vcontext.strict_std_compliance = 0;
- pd->ff_vcontext.dct_algo = FF_DCT_AUTO;
- pd->ff_vcontext.idct_algo = FF_IDCT_AUTO;
-@@ -1001,7 +1023,7 @@ static void tc_lavc_config_defaults(TCLa
- pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
- pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
- pd->ff_vcontext.noise_reduction = 0;
-- pd->ff_vcontext.quantizer_noise_shaping = 0;
-+ pd->confdata.quantizer_noise_shaping = 0;
- pd->ff_vcontext.flags = 0;
- }
-
-@@ -1033,7 +1055,6 @@ static void tc_lavc_dispatch_settings(TC
-
- pd->ff_vcontext.flags = 0;
- SET_FLAG(pd, mv0);
-- SET_FLAG(pd, cbp);
- SET_FLAG(pd, qpel);
- SET_FLAG(pd, naq);
- SET_FLAG(pd, ilme);
-@@ -1060,17 +1081,29 @@ static void tc_lavc_dispatch_settings(TC
- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
- }
- if (pd->confdata.flags.alt) {
-- av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
-+ av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
- }
- if (pd->confdata.flags.vdpart) {
-- av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
-+ av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0);
- }
- if (pd->confdata.flags.umv) {
-- av_dict_set(pd->ff_opts, "umv", "1", 0);
-+ av_dict_set(&(pd->ff_opts), "umv", "1", 0);
- }
- if (pd->confdata.flags.aiv) {
-- av_dict_set(pd->ff_opts, "aiv", "1", 0);
-+ av_dict_set(&(pd->ff_opts), "aiv", "1", 0);
- }
-+ if (pd->confdata.flags.cbp) {
-+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
-+ }
-+
-+ char buf[1024];
-+#define set_dict_opt(val, opt) \
-+ snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
-+ av_dict_set(&(pd->ff_opts), opt, buf, 0)
-+
-+ set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
-+ set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
-+ set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
- }
-
- #undef SET_FLAG
-@@ -1155,8 +1188,8 @@ static int tc_lavc_read_config(TCLavcPri
- { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
- // { "vrc_init_occupancy", }, // not yet supported
- { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
-- { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-- { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-+ { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-+ { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
- { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
- { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 },
- { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
-@@ -1182,12 +1215,12 @@ static int tc_lavc_read_config(TCLavcPri
- { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
- { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
- { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
-- { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
-+ { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
- { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
- { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
-
- { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
-- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
-+ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
- { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
- { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
- { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
-@@ -1350,6 +1383,8 @@ static int tc_lavc_configure(TCModuleIns
-
- pd = self->userdata;
-
-+ pd->ff_opts = NULL;
-+
- pd->flush_flag = vob->encoder_flush;
-
- /* FIXME: move into core? */
-@@ -1402,7 +1437,7 @@ static int tc_lavc_configure(TCModuleIns
- }
-
- TC_LOCK_LIBAVCODEC;
-- ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
-+ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts));
- TC_UNLOCK_LIBAVCODEC;
-
- if (ret < 0) {
-Index: transcode-1.1.7/export/export_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/export/export_ffmpeg.c
-+++ transcode-1.1.7/export/export_ffmpeg.c
-@@ -122,7 +122,7 @@ static uint8_t *img_buffer =
- static AVFrame *lavc_convert_frame = NULL;
-
- static AVCodec *lavc_venc_codec = NULL;
--static AVDictionary **lavc_venc_opts = NULL;
-+static AVDictionary *lavc_venc_opts = NULL;
- static AVFrame *lavc_venc_frame = NULL;
- static AVCodecContext *lavc_venc_context;
- static avi_t *avifile = NULL;
-@@ -486,7 +486,7 @@ MOD_init
- codec->name, codec->fourCC, codec->comments);
- }
-
-- lavc_venc_context = avcodec_alloc_context();
-+ lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
- lavc_venc_frame = avcodec_alloc_frame();
-
- lavc_convert_frame= avcodec_alloc_frame();
-@@ -838,8 +838,13 @@ MOD_init
- lavc_venc_context->rc_strategy = lavc_param_vrc_strategy;
- lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy;
- lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset;
-- lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold;
-- lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold;
-+
-+ char buf[1024];
-+#define set_dict_opt(val, opt) \
-+ snprintf(buf, sizeof(buf), "%i", val); \
-+ av_dict_set(&lavc_venc_opts, opt, buf, 0)
-+ set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
-+ set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
- lavc_venc_context->rtp_payload_size = lavc_param_packet_size;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- if (lavc_param_packet_size)
-@@ -870,7 +875,7 @@ MOD_init
- lavc_venc_context->context_model = lavc_param_context;
- lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
- lavc_venc_context->noise_reduction = lavc_param_noise_reduction;
-- lavc_venc_context->inter_threshold = lavc_param_inter_threshold;
-+ set_dict_opt(lavc_param_inter_threshold, "inter_threshold");
- lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision;
- lavc_venc_context->skip_top = lavc_param_skip_top;
- lavc_venc_context->skip_bottom = lavc_param_skip_bottom;
-@@ -1066,9 +1071,11 @@ MOD_init
- lavc_venc_context->flags |= lavc_param_trunc;
- lavc_venc_context->flags |= lavc_param_aic;
- lavc_venc_context->flags |= lavc_param_v4mv;
-- lavc_venc_context->flags |= lavc_param_cbp;
-+ if(lavc_param_cbp)
-+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0);
- lavc_venc_context->flags |= lavc_param_mv0;
-- lavc_venc_context->flags |= lavc_param_qp_rd;
-+ if(lavc_param_qp_rd)
-+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
- lavc_venc_context->flags |= lavc_param_ilme;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- lavc_venc_context->flags |= lavc_param_trell;
-@@ -1238,29 +1245,29 @@ MOD_init
- }
-
- if (lavc_param_scan_offset) {
-- av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
-+ av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0);
- }
-
- if (lavc_param_ss) {
-- av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
-+ av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0);
- }
-
- if (lavc_param_alt) {
-- av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
-+ av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0);
- }
-
- if (lavc_param_umv) {
-- av_dict_set(lavc_venc_opts, "umv", "1", 0);
-+ av_dict_set(&lavc_venc_opts, "umv", "1", 0);
- }
-
- if (lavc_param_data_partitioning) {
-- av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
-+ av_dict_set(&lavc_venc_opts, "vdpart", "1", 0);
- }
-
- //-- open codec --
- //----------------
- TC_LOCK_LIBAVCODEC;
-- ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
-+ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, &lavc_venc_opts);
- TC_UNLOCK_LIBAVCODEC;
- if (ret < 0) {
- tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
-Index: transcode-1.1.7/export/ffmpeg_cfg.c
-===================================================================
---- transcode-1.1.7.orig/export/ffmpeg_cfg.c
-+++ transcode-1.1.7/export/ffmpeg_cfg.c
-@@ -214,10 +214,10 @@ TCConfigEntry lavcopts_conf[]={
- {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
- {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
- {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
-- {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD},
-+ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
- {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
- {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
-- {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
-+ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
- {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
-Index: transcode-1.1.7/export/aud_aux.c
-===================================================================
---- transcode-1.1.7.orig/export/aud_aux.c
-+++ transcode-1.1.7/export/aud_aux.c
-@@ -326,10 +326,18 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec)
-
- switch (o_codec) {
- case 0x50:
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- codeid = CODEC_ID_MP2;
-+#else
-+ codeid = AV_CODEC_ID_MP2;
-+#endif
- break;
- case 0x2000:
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- codeid = CODEC_ID_AC3;
-+#else
-+ codeid = AV_CODEC_ID_AC3;
-+#endif
- break;
- default:
- tc_warn("cannot init ffmpeg with %x", o_codec);
-@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
-
- //-- set parameters (bitrate, channels and sample-rate) --
- //--------------------------------------------------------
-- avcodec_get_context_defaults(&mpa_ctx);
-+ avcodec_get_context_defaults3(&mpa_ctx, mpa_codec);
- #if LIBAVCODEC_VERSION_MAJOR < 53
- mpa_ctx.codec_type = CODEC_TYPE_AUDIO;
- #else
-@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
- //-- open codec --
- //----------------
- TC_LOCK_LIBAVCODEC;
-- ret = avcodec_open(&mpa_ctx, mpa_codec);
-+ ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL);
- TC_UNLOCK_LIBAVCODEC;
- if (ret < 0) {
- tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
-@@ -371,7 +371,12 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec)
- TC_UNLOCK_LIBAVCODEC;
- if (ret < 0) {
- tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
-- (codeid == CODEC_ID_MP2) ?"mpa" :"ac3");
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-+ (codeid == CODEC_ID_MP2)
-+#else
-+ (codeid == AV_CODEC_ID_MP2)
-+#endif
-+ ?"mpa" :"ac3");
- return(TC_EXPORT_ERROR);
- }
-
-Index: transcode-1.1.7/import/import_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/import_ffmpeg.c
-+++ transcode-1.1.7/import/import_ffmpeg.c
-@@ -58,6 +58,7 @@ struct ffmpeg_codec {
- };
-
- // fourCC to ID mapping taken from MPlayer's codecs.conf
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- static struct ffmpeg_codec ffmpeg_codecs[] = {
- {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
- {"MP41", "DIV1", ""}},
-@@ -106,6 +107,56 @@ static struct ffmpeg_codec ffmpeg_codecs[] = {
- {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
- {"Y42B", ""}},
- {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#else
-+static struct ffmpeg_codec ffmpeg_codecs[] = {
-+ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
-+ {"MP41", "DIV1", ""}},
-+ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
-+ {"MP42", "DIV2", ""}},
-+ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
-+ {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
-+ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
-+ {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
-+ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
-+ {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
-+ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video",
-+ {"MPG1", ""}},
-+ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
-+ {"DVSD", ""}},
-+ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
-+ {"WMV1", ""}},
-+ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
-+ {"WMV2", ""}},
-+ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
-+ {"HFYU", ""}},
-+ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
-+ {"I263", ""}},
-+ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
-+ {"H263", "U263", "VIV1", ""}},
-+ {AV_CODEC_ID_H264, TC_CODEC_H264, "h264",
-+ {"H264", "h264", "X264", "x264", "avc1", ""}},
-+ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
-+ {"RV10", "RV13", ""}},
-+ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
-+ {"SVQ1", ""}},
-+ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
-+ {"SVQ3", ""}},
-+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
-+ {"MPG2", ""}},
-+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video",
-+ {"MPG2", ""}},
-+ {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1",
-+ {"ASV1", ""}},
-+ {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2",
-+ {"ASV2", ""}},
-+ {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1",
-+ {"FFV1", ""}},
-+ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw",
-+ {"I420", "IYUV", ""}},
-+ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
-+ {"Y42B", ""}},
-+ {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#endif
-
- #define BUFFER_SIZE SIZE_RGB_FRAME
-
-@@ -302,7 +302,7 @@ do_avi:
-
- // Set these to the expected values so that ffmpeg's decoder can
- // properly detect interlaced input.
-- lavc_dec_context = avcodec_alloc_context();
-+ lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec);
- if (lavc_dec_context == NULL) {
- tc_log_error(MOD_NAME, "Could not allocate enough memory.");
- return TC_IMPORT_ERROR;
-@@ -324,6 +375,7 @@ do_avi:
- // XXX: some codecs need extra data
- switch (codec->id)
- {
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- case CODEC_ID_MJPEG: extra_data_size = 28; break;
- case CODEC_ID_LJPEG: extra_data_size = 28; break;
- case CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
-@@ -331,6 +383,15 @@ do_avi:
- case CODEC_ID_ASV2: extra_data_size = 8; break;
- case CODEC_ID_WMV1: extra_data_size = 4; break;
- case CODEC_ID_WMV2: extra_data_size = 4; break;
-+#else
-+ case AV_CODEC_ID_MJPEG: extra_data_size = 28; break;
-+ case AV_CODEC_ID_LJPEG: extra_data_size = 28; break;
-+ case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
-+ case AV_CODEC_ID_ASV1: extra_data_size = 8; break;
-+ case AV_CODEC_ID_ASV2: extra_data_size = 8; break;
-+ case AV_CODEC_ID_WMV1: extra_data_size = 4; break;
-+ case AV_CODEC_ID_WMV2: extra_data_size = 4; break;
-+#endif
- default: extra_data_size = 0; break;
- }
-
-@@ -344,7 +344,7 @@ do_avi:
- }
-
- TC_LOCK_LIBAVCODEC;
-- ret = avcodec_open(lavc_dec_context, lavc_dec_codec);
-+ ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL);
- TC_UNLOCK_LIBAVCODEC;
- if (ret < 0) {
- tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.",
-@@ -360,7 +421,11 @@ do_avi:
- frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim);
-
- // we adapt the color space
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- if(codec->id == CODEC_ID_MJPEG) {
-+#else
-+ if(codec->id == AV_CODEC_ID_MJPEG) {
-+#endif
- enable_levels_filter();
- }
- break;
-@@ -434,7 +499,11 @@ do_dv:
- }
-
- // we adapt the color space
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- if(codec->id == CODEC_ID_MJPEG) {
-+#else
-+ if(codec->id == AV_CODEC_ID_MJPEG) {
-+#endif
- enable_levels_filter();
- }
-
-@@ -504,13 +573,25 @@ MOD_decode {
- int bkey = 0;
-
- // check for keyframes
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- if (codec->id == CODEC_ID_MSMPEG4V3) {
-+#else
-+ if (codec->id == AV_CODEC_ID_MSMPEG4V3) {
-+#endif
- if (divx3_is_key(buffer)) bkey = 1;
- }
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- else if (codec->id == CODEC_ID_MPEG4) {
-+#else
-+ else if (codec->id == AV_CODEC_ID_MPEG4) {
-+#endif
- if (mpeg4_is_key(buffer, bytes_read)) bkey = 1;
- }
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- else if (codec->id == CODEC_ID_MJPEG) {
-+#else
-+ else if (codec->id == AV_CODEC_ID_MJPEG) {
-+#endif
- bkey = 1;
- }
-
---- a/import/decode_lavc.c
-+++ b/import/decode_lavc.c
-@@ -57,6 +57,7 @@ struct ffmpeg_codec {
- };
-
- // fourCC to ID mapping taken from MPlayer's codecs.conf
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- static struct ffmpeg_codec ffmpeg_codecs[] = {
- {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
- {"MP41", "DIV1", ""}},
-@@ -91,6 +92,42 @@ static struct ffmpeg_codec ffmpeg_codecs[] = {
- {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
- {"MPG2", ""}},
- {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#else
-+static struct ffmpeg_codec ffmpeg_codecs[] = {
-+ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
-+ {"MP41", "DIV1", ""}},
-+ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
-+ {"MP42", "DIV2", ""}},
-+ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
-+ {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
-+ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
-+ {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
-+ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
-+ {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
-+ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video",
-+ {"MPG1", ""}},
-+ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
-+ {"DVSD", ""}},
-+ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
-+ {"WMV1", ""}},
-+ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
-+ {"WMV2", ""}},
-+ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
-+ {"HFYU", ""}},
-+ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
-+ {"I263", ""}},
-+ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
-+ {"H263", "U263", "VIV1", ""}},
-+ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
-+ {"RV10", "RV13", ""}},
-+ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
-+ {"SVQ1", ""}},
-+ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
-+ {"SVQ3", ""}},
-+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
-+ {"MPG2", ""}},
-+ {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#endif
-
-
- static struct ffmpeg_codec *find_ffmpeg_codec_id(unsigned int transcode_id)
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg24.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg24.patch
deleted file mode 100644
index 57a91774abc5..000000000000
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg24.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=520190
-
-Index: transcode-1.1.7/import/probe_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/probe_ffmpeg.c
-+++ transcode-1.1.7/import/probe_ffmpeg.c
-@@ -120,7 +120,11 @@ void probe_ffmpeg(info_t *ipipe)
-
- translate_info(lavf_dmx_context, ipipe->probe_info);
-
-+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0)
-+ avformat_close_input(&lavf_dmx_context);
-+#else
- av_close_input_file(lavf_dmx_context);
-+#endif
- return;
- }
-
diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg29.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg29.patch
deleted file mode 100644
index 7901fc3cc341..000000000000
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg29.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-Index: transcode-1.1.7/encode/encode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/encode/encode_lavc.c
-+++ transcode-1.1.7/encode/encode_lavc.c
-@@ -233,7 +233,7 @@ static void pre_encode_video_yuv420p(TCL
- vframe_list_t *vframe)
- {
- avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf,
-- PIX_FMT_YUV420P,
-+ AV_PIX_FMT_YUV420P,
- pd->ff_vcontext.width, pd->ff_vcontext.height);
- }
-
-@@ -247,7 +247,7 @@ static void pre_encode_video_yuv420p_huf
- IMG_YUV_DEFAULT,
- pd->ff_vcontext.width, pd->ff_vcontext.height);
- avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
-- PIX_FMT_YUV422P,
-+ AV_PIX_FMT_YUV422P,
- pd->ff_vcontext.width, pd->ff_vcontext.height);
- ac_imgconvert(src, IMG_YUV_DEFAULT,
- pd->ff_venc_frame.data, IMG_YUV422P,
-@@ -263,7 +263,7 @@ static void pre_encode_video_yuv422p(TCL
- IMG_YUV422P,
- pd->ff_vcontext.width, pd->ff_vcontext.height);
- avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
-- PIX_FMT_YUV420P,
-+ AV_PIX_FMT_YUV420P,
- pd->ff_vcontext.width, pd->ff_vcontext.height);
- ac_imgconvert(src, IMG_YUV422P,
- pd->ff_venc_frame.data, IMG_YUV420P,
-@@ -275,7 +275,7 @@ static void pre_encode_video_yuv422p_huf
- vframe_list_t *vframe)
- {
- avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf,
-- PIX_FMT_YUV422P,
-+ AV_PIX_FMT_YUV422P,
- pd->ff_vcontext.width, pd->ff_vcontext.height);
-
- }
-@@ -285,7 +285,7 @@ static void pre_encode_video_rgb24(TCLav
- vframe_list_t *vframe)
- {
- avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
-- PIX_FMT_YUV420P,
-+ AV_PIX_FMT_YUV420P,
- pd->ff_vcontext.width, pd->ff_vcontext.height);
- ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT,
- pd->ff_venc_frame.data, IMG_YUV420P,
-@@ -610,21 +610,21 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
- case CODEC_YUV:
- if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
- pd->tc_pix_fmt = TC_CODEC_YUV422P;
-- pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P;
-+ pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P;
- pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv;
- } else {
- pd->tc_pix_fmt = TC_CODEC_YUV420P;
- pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG)
-- ? PIX_FMT_YUVJ420P
-- : PIX_FMT_YUV420P;
-+ ? AV_PIX_FMT_YUVJ420P
-+ : AV_PIX_FMT_YUV420P;
- pd->pre_encode_video = pre_encode_video_yuv420p;
- }
- break;
- case CODEC_YUV422:
- pd->tc_pix_fmt = TC_CODEC_YUV422P;
- pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG)
-- ? PIX_FMT_YUVJ422P
-- : PIX_FMT_YUV422P;
-+ ? AV_PIX_FMT_YUVJ422P
-+ : AV_PIX_FMT_YUV422P;
- if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
- pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv;
- } else {
-@@ -634,10 +634,10 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
- case CODEC_RGB:
- pd->tc_pix_fmt = TC_CODEC_RGB;
- pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV)
-- ? PIX_FMT_YUV422P
-+ ? AV_PIX_FMT_YUV422P
- : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG)
-- ? PIX_FMT_YUVJ420P
-- : PIX_FMT_YUV420P;
-+ ? AV_PIX_FMT_YUVJ420P
-+ : AV_PIX_FMT_YUV420P;
- pd->pre_encode_video = pre_encode_video_rgb24;
- break;
- default:
-@@ -1390,7 +1390,7 @@ static int tc_lavc_configure(TCModuleIns
- /* FIXME: move into core? */
- TC_INIT_LIBAVCODEC;
-
-- avcodec_get_frame_defaults(&pd->ff_venc_frame);
-+ av_frame_unref(&pd->ff_venc_frame);
- /*
- * auxiliary config data needs to be blanked too
- * before any other operation
-@@ -1523,6 +1523,8 @@ static int tc_lavc_encode_video(TCModule
- vframe_list_t *outframe)
- {
- TCLavcPrivateData *pd = NULL;
-+ AVPacket pkt;
-+ int ret, got_packet = 0;
-
- TC_MODULE_SELF_CHECK(self, "encode_video");
-
-@@ -1537,12 +1539,15 @@ static int tc_lavc_encode_video(TCModule
-
- pd->pre_encode_video(pd, inframe);
-
-+ av_init_packet(&pkt);
-+ pkt.data = outframe->video_buf;
-+ pkt.size = inframe->video_size;
-+
- TC_LOCK_LIBAVCODEC;
-- outframe->video_len = avcodec_encode_video(&pd->ff_vcontext,
-- outframe->video_buf,
-- inframe->video_size,
-- &pd->ff_venc_frame);
-+ ret = avcodec_encode_video2(&pd->ff_vcontext, &pkt,
-+ &pd->ff_venc_frame, &got_packet);
- TC_UNLOCK_LIBAVCODEC;
-+ outframe->video_len = ret ? ret : pkt.size;
-
- if (outframe->video_len < 0) {
- tc_log_warn(MOD_NAME, "encoder error: size (%i)",
-Index: transcode-1.1.7/export/export_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/export/export_ffmpeg.c
-+++ transcode-1.1.7/export/export_ffmpeg.c
-@@ -250,9 +250,9 @@ int opt_default(const char *opt, const c
- for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){
- /* GLUE: +if */
- if (type == AVMEDIA_TYPE_VIDEO) {
-- const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
-- if(o2)
-- ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o);
-+ o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
-+ if(o)
-+ ret = av_opt_set(avcodec_opts[type], opt, arg, 0);
- /* GLUE: +if */
- }
- }
-@@ -267,7 +267,10 @@ int opt_default(const char *opt, const c
- if(opt[0] == 'a')
- ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o);
- else */ if(opt[0] == 'v')
-- ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o);
-+ {
-+ o = av_opt_find(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, NULL, 0, 0);
-+ ret = av_opt_set(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 0);
-+ }
- /* GLUE: disabling
- else if(opt[0] == 's')
- ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o);
-@@ -487,10 +490,10 @@ MOD_init
- }
-
- lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
-- lavc_venc_frame = avcodec_alloc_frame();
-+ lavc_venc_frame = av_frame_alloc();
-
-- lavc_convert_frame= avcodec_alloc_frame();
-- size = avpicture_get_size(PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height);
-+ lavc_convert_frame= av_frame_alloc();
-+ size = avpicture_get_size(AV_PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height);
- enc_buffer = tc_malloc(size);
-
- if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) {
-@@ -1114,7 +1117,7 @@ MOD_init
- lavc_venc_context->prediction_method = lavc_param_prediction_method;
-
- if(is_huffyuv)
-- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;
-+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P;
- else
- {
- switch(pix_fmt)
-@@ -1123,18 +1126,18 @@ MOD_init
- case CODEC_RGB:
- {
- if(is_mjpeg)
-- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P;
-+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ420P;
- else
-- lavc_venc_context->pix_fmt = PIX_FMT_YUV420P;
-+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV420P;
- break;
- }
-
- case CODEC_YUV422:
- {
- if(is_mjpeg)
-- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ422P;
-+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ422P;
- else
-- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;
-+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P;
- break;
- }
-
-@@ -1596,6 +1599,8 @@ MOD_encode
-
- int out_size;
- const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'};
-+ AVPacket pkt;
-+ int ret, got_packet = 0;
-
- if (param->flag == TC_VIDEO) {
-
-@@ -1620,7 +1625,7 @@ MOD_encode
- YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT,
- lavc_venc_context->width, lavc_venc_context->height);
- avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
-- PIX_FMT_YUV422P, lavc_venc_context->width,
-+ AV_PIX_FMT_YUV422P, lavc_venc_context->width,
- lavc_venc_context->height);
- /* FIXME: can't use tcv_convert (see decode_lavc.c) */
- ac_imgconvert(src, IMG_YUV_DEFAULT,
-@@ -1650,7 +1655,7 @@ MOD_encode
- lavc_venc_context->width,
- lavc_venc_context->height);
- avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
-- PIX_FMT_YUV420P, lavc_venc_context->width,
-+ AV_PIX_FMT_YUV420P, lavc_venc_context->width,
- lavc_venc_context->height);
- ac_imgconvert(src, IMG_YUV422P,
- lavc_venc_frame->data, IMG_YUV420P,
-@@ -1661,7 +1666,7 @@ MOD_encode
-
- case CODEC_RGB:
- avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
-- PIX_FMT_YUV420P, lavc_venc_context->width,
-+ AV_PIX_FMT_YUV420P, lavc_venc_context->width,
- lavc_venc_context->height);
- ac_imgconvert(&param->buffer, IMG_RGB_DEFAULT,
- lavc_venc_frame->data, IMG_YUV420P,
-@@ -1674,13 +1679,17 @@ MOD_encode
- return TC_EXPORT_ERROR;
- }
-
-+ av_init_packet(&pkt);
-+ pkt.data = enc_buffer;
-+ pkt.size = size;
-
- TC_LOCK_LIBAVCODEC;
-- out_size = avcodec_encode_video(lavc_venc_context,
-- enc_buffer, size,
-- lavc_venc_frame);
-+ ret = avcodec_encode_video2(lavc_venc_context, &pkt,
-+ lavc_venc_frame, &got_packet);
- TC_UNLOCK_LIBAVCODEC;
-
-+ out_size = ret ? ret : pkt.size;
-+
- if (out_size < 0) {
- tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size);
- return TC_EXPORT_ERROR;
-Index: transcode-1.1.7/import/decode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/import/decode_lavc.c
-+++ transcode-1.1.7/import/decode_lavc.c
-@@ -327,8 +327,8 @@ void decode_lavc(decode_t *decode)
-
- // Convert avcodec image to the requested YUV or RGB format
- switch (lavc_dec_context->pix_fmt) {
-- case PIX_FMT_YUVJ420P:
-- case PIX_FMT_YUV420P:
-+ case AV_PIX_FMT_YUVJ420P:
-+ case AV_PIX_FMT_YUV420P:
- // Remove "dead space" at right edge of planes, if any
- if (picture.linesize[0] != lavc_dec_context->width) {
- int y;
-@@ -352,7 +352,7 @@ void decode_lavc(decode_t *decode)
- pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
- lavc_dec_context->width, lavc_dec_context->height);
- break;
-- case PIX_FMT_YUV411P:
-+ case AV_PIX_FMT_YUV411P:
- if (picture.linesize[0] != lavc_dec_context->width) {
- int y;
- for (y = 0; y < lavc_dec_context->height; y++) {
-@@ -371,8 +371,8 @@ void decode_lavc(decode_t *decode)
- pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
- lavc_dec_context->width, lavc_dec_context->height);
- break;
-- case PIX_FMT_YUVJ422P:
-- case PIX_FMT_YUV422P:
-+ case AV_PIX_FMT_YUVJ422P:
-+ case AV_PIX_FMT_YUV422P:
- if (picture.linesize[0] != lavc_dec_context->width) {
- int y;
- for (y = 0; y < lavc_dec_context->height; y++) {
-@@ -391,8 +391,8 @@ void decode_lavc(decode_t *decode)
- pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
- lavc_dec_context->width, lavc_dec_context->height);
- break;
-- case PIX_FMT_YUVJ444P:
-- case PIX_FMT_YUV444P:
-+ case AV_PIX_FMT_YUVJ444P:
-+ case AV_PIX_FMT_YUV444P:
- if (picture.linesize[0] != lavc_dec_context->width) {
- int y;
- for (y = 0; y < lavc_dec_context->height; y++) {
-Index: transcode-1.1.7/import/import_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/import_ffmpeg.c
-+++ transcode-1.1.7/import/import_ffmpeg.c
-@@ -661,8 +661,8 @@ retry:
-
- // Convert avcodec image to our internal YUV or RGB format
- switch (lavc_dec_context->pix_fmt) {
-- case PIX_FMT_YUVJ420P:
-- case PIX_FMT_YUV420P:
-+ case AV_PIX_FMT_YUVJ420P:
-+ case AV_PIX_FMT_YUV420P:
- src_fmt = IMG_YUV420P;
- YUV_INIT_PLANES(src_planes, frame, src_fmt,
- lavc_dec_context->width, lavc_dec_context->height);
-@@ -693,7 +693,7 @@ retry:
- }
- break;
-
-- case PIX_FMT_YUV411P:
-+ case AV_PIX_FMT_YUV411P:
- src_fmt = IMG_YUV411P;
- YUV_INIT_PLANES(src_planes, frame, src_fmt,
- lavc_dec_context->width, lavc_dec_context->height);
-@@ -721,8 +721,8 @@ retry:
- }
- break;
-
-- case PIX_FMT_YUVJ422P:
-- case PIX_FMT_YUV422P:
-+ case AV_PIX_FMT_YUVJ422P:
-+ case AV_PIX_FMT_YUV422P:
- src_fmt = IMG_YUV422P;
- YUV_INIT_PLANES(src_planes, frame, src_fmt,
- lavc_dec_context->width, lavc_dec_context->height);
-@@ -750,8 +750,8 @@ retry:
- }
- break;
-
-- case PIX_FMT_YUVJ444P:
-- case PIX_FMT_YUV444P:
-+ case AV_PIX_FMT_YUVJ444P:
-+ case AV_PIX_FMT_YUV444P:
- src_fmt = IMG_YUV444P;
- YUV_INIT_PLANES(src_planes, frame, src_fmt,
- lavc_dec_context->width, lavc_dec_context->height);
diff --git a/media-video/transcode/files/transcode-1.1.7-freetype251.patch b/media-video/transcode/files/transcode-1.1.7-freetype251.patch
deleted file mode 100644
index 59c6ab35a514..000000000000
--- a/media-video/transcode/files/transcode-1.1.7-freetype251.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- transcode-1.1.7/filter/subtitler/load_font.c
-+++ transcode-1.1.7/filter/subtitler/load_font.c
-@@ -47,8 +47,8 @@
- // FreeType specific includes
- #include <ft2build.h>
- #include FT_FREETYPE_H
-+#include FT_GLYPH_H
-
--#include <freetype/ftglyph.h>
-
- /**
- * @file bswap.h
diff --git a/media-video/transcode/files/transcode-1.1.7-libav-10.patch b/media-video/transcode/files/transcode-1.1.7-libav-10.patch
deleted file mode 100644
index 1f4a24039d79..000000000000
--- a/media-video/transcode/files/transcode-1.1.7-libav-10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-fix building w/libav-10
-
-https://wiki.libav.org/Migration/10
-
---- a/filter/filter_resample.c
-+++ b/filter/filter_resample.c
-@@ -37,6 +37,7 @@
- #include "libtc/optstr.h"
- #include "libtc/tcavcodec.h"
- #include "libtc/tcmodule-plugin.h"
-+#include <libavresample/avresample.h>
-
-
- typedef struct {
-@@ -45,7 +46,7 @@ typedef struct {
-
- int bytes_per_sample;
-
-- ReSampleContext *resample_ctx;
-+ AVAudioResampleContext *resample_ctx;
- } ResamplePrivateData;
-
- static const char resample_help[] = ""
---- a/import/probe_ffmpeg.c
-+++ b/import/probe_ffmpeg.c
-@@ -51,8 +51,8 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info)
- info->bitrate = st->codec->bit_rate / 1000;
- info->width = st->codec->width;
- info->height = st->codec->height;
-- if (st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0) {
-- info->fps = av_q2d(st->r_frame_rate);
-+ if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) {
-+ info->fps = av_q2d(st->avg_frame_rate);
- } else {
- /* watch out here */
- info->fps = 1.0/av_q2d(st->codec->time_base);
diff --git a/media-video/transcode/files/transcode-1.1.7-libav-9.patch b/media-video/transcode/files/transcode-1.1.7-libav-9.patch
deleted file mode 100644
index a67fb68c6986..000000000000
--- a/media-video/transcode/files/transcode-1.1.7-libav-9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/import/probe_ffmpeg.c
-+++ b/import/probe_ffmpeg.c
-@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe)
- return;
- }
-
-- ret = av_find_stream_info(lavf_dmx_context);
-+ ret = avformat_find_stream_info(lavf_dmx_context, NULL);
- if (ret < 0) {
- tc_log_error(__FILE__, "unable to fetch informations from '%s'"
- " (libavformat failure)",
---- a/import/decode_lavc.c
-+++ b/import/decode_lavc.c
-@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode)
-
- // Set these to the expected values so that ffmpeg's decoder can
- // properly detect interlaced input.
-- lavc_dec_context = avcodec_alloc_context();
-+ lavc_dec_context = avcodec_alloc_context3(NULL);
- if (lavc_dec_context == NULL) {
- tc_log_error(__FILE__, "Could not allocate enough memory.");
- goto decoder_error;
-@@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode)
- lavc_dec_context->error_concealment = 3;
- lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-
-- if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) {
-+ if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) {
- tc_log_error(__FILE__, "Could not initialize the '%s' codec.",
- codec->name);
- goto decoder_error;
diff --git a/media-video/transcode/files/transcode-1.1.7-preset-force.patch b/media-video/transcode/files/transcode-1.1.7-preset-force.patch
deleted file mode 100644
index 0d1da8b4f666..000000000000
--- a/media-video/transcode/files/transcode-1.1.7-preset-force.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Do not force using a preset. Do not try to open non-existant preset by default.
-
-Index: transcode-1.1.7/export/export_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/export/export_ffmpeg.c
-+++ transcode-1.1.7/export/export_ffmpeg.c
-@@ -1206,7 +1206,7 @@ MOD_init
- lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
-
- /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
-- if (lavc_param_video_preset) {
-+ if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
- avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
- video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
-
-Index: transcode-1.1.7/export/ffmpeg_cfg.c
-===================================================================
---- transcode-1.1.7.orig/export/ffmpeg_cfg.c
-+++ transcode-1.1.7/export/ffmpeg_cfg.c
-@@ -124,7 +124,7 @@ int lavc_param_gmc = 0;
- //int lavc_param_atag = 0;
- //int lavc_param_abitrate = 224;
-
--char *lavc_param_video_preset = "medium";
-+char *lavc_param_video_preset = "none";
- char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg";
-
- TCConfigEntry lavcopts_conf[]={
diff --git a/media-video/transcode/files/transcode-1.1.7-preset-free.patch b/media-video/transcode/files/transcode-1.1.7-preset-free.patch
deleted file mode 100644
index 00494b94ba9f..000000000000
--- a/media-video/transcode/files/transcode-1.1.7-preset-free.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix invalid free when preset file not found
-https://bugs.gentoo.org/show_bug.cgi?id=322945
-Author: Brennan Shacklett
-
-diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
---- transcode-1.1.7-orig/export/export_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/export/export_ffmpeg.c 2012-07-03 20:07:05.669083945 -0700
-@@ -321,7 +321,7 @@
- }
-
- if(!f){
-- fprintf(stderr, "File for preset '%s' not found\n", arg);
-+ tc_log_error(MOD_NAME, "File for preset '%s' not found", arg);
- av_exit(1);
- }
-
-@@ -1207,7 +1207,7 @@
- /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
- if (lavc_param_video_preset) {
- avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
-- video_codec_name = ffmpeg_codec_name(codec->name);
-+ video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
-
- const char *preset_start = lavc_param_video_preset;
- while (preset_start) {
-@@ -1225,6 +1225,8 @@
- if (opt_preset("vpre", preset_name) != 0) {
- tc_log_warn(MOD_NAME, "Parsing ffmpeg preset '%s' failed", preset_name);
- }
-+ av_free(video_codec_name);
-+ video_codec_name = NULL;
- if (verbose) {
- int i;
- tc_log_info(MOD_NAME, "After parsing preset '%s', %i options are overridden:", preset_name, opt_name_count);
diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r3.ebuild
index 3c0ba6e98ecf..a5df574512db 100644
--- a/media-video/transcode/transcode-1.1.7-r3.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r3.ebuild
@@ -7,7 +7,7 @@ inherit autotools libtool multilib
DESCRIPTION="A suite of utilities for transcoding video and audio codecs in different containers"
HOMEPAGE="http://www.transcoding.org/ https://bitbucket.org/france/transcode-tcforge"
SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2
- https://dev.gentoo.org/~polynomial-c/${P}-imagemagick7.patch"
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -56,26 +56,26 @@ REQUIRED_USE="
"
PATCHES=(
- "${FILESDIR}"/${P}-ffmpeg.patch
- "${FILESDIR}"/${P}-ffmpeg-0.10.patch
- "${FILESDIR}"/${P}-ffmpeg-0.11.patch
- "${FILESDIR}"/${P}-preset-free.patch
- "${FILESDIR}"/${P}-libav-9.patch
- "${FILESDIR}"/${P}-libav-10.patch
- "${FILESDIR}"/${P}-preset-force.patch
- "${FILESDIR}"/${P}-ffmpeg2.patch
- "${FILESDIR}"/${P}-freetype251.patch
- "${FILESDIR}"/${P}-ffmpeg24.patch
+ "${WORKDIR}"/${P}-patchset/${P}-ffmpeg.patch
+ "${WORKDIR}"/${P}-patchset/${P}-ffmpeg-0.10.patch
+ "${WORKDIR}"/${P}-patchset/${P}-ffmpeg-0.11.patch
+ "${WORKDIR}"/${P}-patchset/${P}-preset-free.patch
+ "${WORKDIR}"/${P}-patchset/${P}-libav-9.patch
+ "${WORKDIR}"/${P}-patchset/${P}-libav-10.patch
+ "${WORKDIR}"/${P}-patchset/${P}-preset-force.patch
+ "${WORKDIR}"/${P}-patchset/${P}-ffmpeg2.patch
+ "${WORKDIR}"/${P}-patchset/${P}-freetype251.patch
+ "${WORKDIR}"/${P}-patchset/${P}-ffmpeg24.patch
)
src_prepare() {
if has_version '>=media-video/ffmpeg-2.8' ||
has_version '>=media-video/libav-12'; then
- PATCHES+=( "${FILESDIR}"/${P}-ffmpeg29.patch )
+ PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-ffmpeg29.patch )
fi
if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
- PATCHES+=( "${DISTDIR}"/${P}-imagemagick7.patch )
+ PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-imagemagick7.patch )
fi
default
diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest
index a4d4c585765b..754d2157bba2 100644
--- a/media-video/vcdimager/Manifest
+++ b/media-video/vcdimager/Manifest
@@ -1,3 +1,4 @@
-DIST vcdimager-0.7.24.tar.gz 1066815 SHA256 075d7a67353ff3004745da781435698b6bc4a053838d0d4a3ce0516d7d974694 SHA512 162f361d3c871c85887f0b25e70c207c511dcf597f337633be3ce925e8c589a8ba26275b8378d1002b8c5eb56995eda017f5f1cf52e52a38e9ff900acba7a214 WHIRLPOOL b94f3937415ec1b178484adfc653b1846e9f52ed95fd0677fa5f7b077b345f4cbd3b11526bb9b9011b76f74a916644e9d60dec3ce37571ed97523db04cb5ec42
-EBUILD vcdimager-0.7.24.ebuild 1423 BLAKE2B b6293723049acbcf806cbd8f9dde69c9eb3f6b6747a9dae5cc5d2ec285f8dc0a0085dda12b4b704570fb9fc0b816c67abf9be92f2e0e6e964c1bbe750a916298 SHA512 1377de57d124ebea3bfece0603ad1c213d708f7309e28177c01e8f2add398e9c1128d3a4e20942682ba8af7f32dca134025671276f1de56c520cc8757b0550a1
+AUX vcdimager-0.7.24-libcdio-1.0.0.patch 7545 BLAKE2B 58426bd919e0c0cbe9703a33fc99f9aaaac6b4fa5130d8b39fab505d309741e7c301b2ace213e927a4399cb5b215b1a38b761c3d6ac9a25ddb32cfc7626844b4 SHA512 b49e8742627b6e0d56efd455230f78cb49a3337a376da39d9b77869835c1d34b8f4a826ae0f888fe0f81ce011a3f0e6dcf52479c34813594129fb2916c782c57
+DIST vcdimager-0.7.24.tar.gz 1066815 BLAKE2B b58648a4ab54b3151448c2aa17306105ada45d9708375c7461c7f9087b851339f8288855c0d38d1521317b303c79b432b5e99b39ca7b8f59da8ae7aff7238582 SHA512 162f361d3c871c85887f0b25e70c207c511dcf597f337633be3ce925e8c589a8ba26275b8378d1002b8c5eb56995eda017f5f1cf52e52a38e9ff900acba7a214
+EBUILD vcdimager-0.7.24.ebuild 1494 BLAKE2B d6d71aa03fef4ee2af9c7f160a8218448b4b2eb2f84b64726e5d38ac1a4a0a5f36ca5c69d896354ced7f2cf11b73324c9157ce917413d519b9dd96599c2bb781 SHA512 5800c746da2facc0537f54b40d3a66ed1b9065ae4e2e05cd6713712f366d435c3fe7c5b180642948d97eabd3950b4045ce1652891f69e26fe5a5f8223e72b072
MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-video/vcdimager/files/vcdimager-0.7.24-libcdio-1.0.0.patch b/media-video/vcdimager/files/vcdimager-0.7.24-libcdio-1.0.0.patch
new file mode 100644
index 000000000000..477e400f6304
--- /dev/null
+++ b/media-video/vcdimager/files/vcdimager-0.7.24-libcdio-1.0.0.patch
@@ -0,0 +1,230 @@
+diff --git a/frontends/xml/vcd_xml_rip.c b/frontends/xml/vcd_xml_rip.c
+index 3d28065..f1be95d 100644
+--- a/frontends/xml/vcd_xml_rip.c
++++ b/frontends/xml/vcd_xml_rip.c
+@@ -769,7 +769,7 @@ _visit_lot (pbc_ctx_t *p_pbc_ctx)
+ _visit_pbc (p_pbc_ctx, n + 1, tmp, true);
+
+ _vcd_list_sort (p_pbc_ctx->offset_list,
+- (_cdio_list_cmp_func) vcdinf_lid_t_cmp);
++ (_cdio_list_cmp_func_t) vcdinf_lid_t_cmp);
+ }
+
+ static int
+diff --git a/include/libvcd/info.h b/include/libvcd/info.h
+index 2d70940..b62d541 100644
+--- a/include/libvcd/info.h
++++ b/include/libvcd/info.h
+@@ -455,12 +455,12 @@ extern "C" {
+ /*!
+ Get the VCD info list.
+ */
+- CdioList *vcdinfo_get_offset_list(const vcdinfo_obj_t *p_vcdinfo);
++ CdioList_t *vcdinfo_get_offset_list(const vcdinfo_obj_t *p_vcdinfo);
+
+ /*!
+ Get the VCD info extended offset list.
+ */
+- CdioList *vcdinfo_get_offset_x_list(const vcdinfo_obj_t *p_vcdinfo);
++ CdioList_t *vcdinfo_get_offset_x_list(const vcdinfo_obj_t *p_vcdinfo);
+
+ /*!
+ Get the VCD info offset multiplier.
+diff --git a/lib/data_structures.c b/lib/data_structures.c
+index 4415ae1..cef7381 100644
+--- a/lib/data_structures.c
++++ b/lib/data_structures.c
+@@ -58,7 +58,7 @@ struct _CdioListNode
+ /* impl */
+
+ static bool
+-_bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func cmp_func)
++_bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func_t cmp_func)
+ {
+ CdioListNode_t **pp_node;
+ bool changed = false;
+@@ -86,7 +86,7 @@ _bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func cmp_func)
+ return changed;
+ }
+
+-void _vcd_list_sort (CdioList_t *list, _cdio_list_cmp_func cmp_func)
++void _vcd_list_sort (CdioList_t *list, _cdio_list_cmp_func_t cmp_func)
+ {
+ /* fixme -- this is bubble sort -- worst sorting algo... */
+
+@@ -263,7 +263,7 @@ _vcd_tree_node_sort_children (VcdTreeNode_t *p_node,
+ vcd_assert (p_node != NULL);
+
+ if (p_node->children)
+- _vcd_list_sort (p_node->children, (_cdio_list_cmp_func) cmp_func);
++ _vcd_list_sort (p_node->children, (_cdio_list_cmp_func_t) cmp_func);
+ }
+
+ void
+diff --git a/lib/data_structures.h b/lib/data_structures.h
+index d0932a9..eb5ba48 100644
+--- a/lib/data_structures.h
++++ b/lib/data_structures.h
+@@ -28,7 +28,7 @@
+
+ CdioListNode_t *_vcd_list_at (CdioList_t *list, int idx);
+
+-void _vcd_list_sort (CdioList_t *p_list, _cdio_list_cmp_func cmp_func);
++void _vcd_list_sort (CdioList_t *p_list, _cdio_list_cmp_func_t cmp_func);
+
+ /* n-way tree */
+
+diff --git a/lib/dict.h b/lib/dict.h
+index c3e2ce3..fa003f6 100644
+--- a/lib/dict.h
++++ b/lib/dict.h
+@@ -88,7 +88,7 @@ _dict_get_bykey (VcdObj_t *obj, const char key[])
+ vcd_assert (key != NULL);
+
+ node = _cdio_list_find (obj->buffer_dict_list,
+- (_cdio_list_iterfunc) _dict_key_cmp,
++ (_cdio_list_iterfunc_t) _dict_key_cmp,
+ (char *) key);
+
+ if (node)
+@@ -106,7 +106,7 @@ _dict_get_bysector (VcdObj_t *obj, uint32_t sector)
+ vcd_assert (sector != SECTOR_NIL);
+
+ node = _cdio_list_find (obj->buffer_dict_list,
+- (_cdio_list_iterfunc) _dict_sector_cmp,
++ (_cdio_list_iterfunc_t) _dict_sector_cmp,
+ &sector);
+
+ if (node)
+diff --git a/lib/files.c b/lib/files.c
+index 79fa8fe..61e8077 100644
+--- a/lib/files.c
++++ b/lib/files.c
+@@ -634,7 +634,7 @@ get_search_dat_size (const VcdObj_t *p_vcdobj)
+ + (_get_scanpoint_count (p_vcdobj) * sizeof (msf_t));
+ }
+
+-static CdioList *
++static CdioList_t *
+ _make_track_scantable (const VcdObj_t *p_vcdobj)
+ {
+ CdioList_t *p_all_aps = _cdio_list_new ();
+diff --git a/lib/image_bincue.c b/lib/image_bincue.c
+index 69091b3..4e4d460 100644
+--- a/lib/image_bincue.c
++++ b/lib/image_bincue.c
+@@ -88,7 +88,7 @@ _sink_free (void *user_data)
+ }
+
+ static int
+-_set_cuesheet (void *user_data, const CdioList *vcd_cue_list)
++_set_cuesheet (void *user_data, const CdioList_t *vcd_cue_list)
+ {
+ _img_bincue_snk_t *_obj = user_data;
+ CdioListNode_t *node;
+@@ -102,7 +102,7 @@ _set_cuesheet (void *user_data, const CdioList *vcd_cue_list)
+
+ track_no = 0;
+ index_no = 0;
+- _CDIO_LIST_FOREACH (node, (CdioList *) vcd_cue_list)
++ _CDIO_LIST_FOREACH (node, (CdioList_t *) vcd_cue_list)
+ {
+ const vcd_cue_t *_cue = _cdio_list_node_data (node);
+ char *psz_msf;
+diff --git a/lib/info_private.c b/lib/info_private.c
+index 648ef27..53edff7 100644
+--- a/lib/info_private.c
++++ b/lib/info_private.c
+@@ -136,7 +136,7 @@ vcdinf_visit_lot (struct _vcdinf_pbc_ctx *obj)
+ ret &= vcdinf_visit_pbc (obj, n + 1, tmp, true);
+
+ _vcd_list_sort (obj->extended ? obj->offset_x_list : obj->offset_list,
+- (_cdio_list_cmp_func) vcdinf_lid_t_cmp);
++ (_cdio_list_cmp_func_t) vcdinf_lid_t_cmp);
+
+ /* Now really complete the offset table with LIDs. This routine
+ might obviate the need for vcdinf_visit_pbc() or some of it which is
+diff --git a/lib/mpeg.h b/lib/mpeg.h
+index 0425db6..7df668a 100644
+--- a/lib/mpeg.h
++++ b/lib/mpeg.h
+@@ -103,7 +103,7 @@ typedef struct {
+ unsigned vbvsize;
+ bool constrained_flag;
+
+- CdioList *aps_list; /* filled up by vcd_mpeg_source */
++ CdioList_t *aps_list; /* filled up by vcd_mpeg_source */
+ double last_aps_pts; /* temp, see ->packet */
+
+ } shdr[3];
+diff --git a/lib/mpeg_stream.c b/lib/mpeg_stream.c
+index 8384780..2ee3f41 100644
+--- a/lib/mpeg_stream.c
++++ b/lib/mpeg_stream.c
+@@ -270,7 +270,7 @@ vcd_mpeg_source_scan (VcdMpegSource_t *obj, bool strict_aps, bool fix_scan_info,
+ }
+
+ static double
+-_approx_pts (CdioList *aps_list, uint32_t packet_no)
++_approx_pts (CdioList_t *aps_list, uint32_t packet_no)
+ {
+ double retval = 0;
+ CdioListNode_t *node;
+@@ -324,7 +324,7 @@ _set_scan_msf (msf_t *_msf, long lsn)
+
+ static void
+ _fix_scan_info (struct vcd_mpeg_scan_data_t *scan_data_ptr,
+- unsigned packet_no, double pts, CdioList *aps_list)
++ unsigned packet_no, double pts, CdioList_t *aps_list)
+ {
+ CdioListNode_t *node;
+ long _next = -1, _prev = -1, _forw = -1, _back = -1;
+diff --git a/lib/vcd.c b/lib/vcd.c
+index 4936c09..b1545a0 100644
+--- a/lib/vcd.c
++++ b/lib/vcd.c
+@@ -583,7 +583,7 @@ vcd_obj_add_sequence_pause (VcdObj_t *obj, const char sequence_id[],
+ }
+
+ _vcd_list_sort (p_sequence->pause_list,
+- (_cdio_list_cmp_func) _pause_cmp);
++ (_cdio_list_cmp_func_t) _pause_cmp);
+
+ vcd_debug ("added autopause point at %f", pause_time);
+
+@@ -623,7 +623,7 @@ vcd_obj_add_segment_pause (VcdObj_t *p_obj, const char segment_id[],
+ }
+
+ _vcd_list_sort (_segment->pause_list,
+- (_cdio_list_cmp_func) _pause_cmp);
++ (_cdio_list_cmp_func_t) _pause_cmp);
+
+ vcd_debug ("added autopause point at %f", pause_time);
+
+@@ -685,7 +685,7 @@ vcd_obj_add_sequence_entry (VcdObj_t *p_obj, const char sequence_id[],
+ }
+
+ _vcd_list_sort (p_sequence->entry_list,
+- (_cdio_list_cmp_func) _entry_cmp);
++ (_cdio_list_cmp_func_t) _entry_cmp);
+
+ return 0;
+ }
+@@ -1001,7 +1001,7 @@ vcd_obj_add_dir (VcdObj_t *p_obj, const char iso_pathname[])
+ _cdio_list_append (p_obj->custom_dir_list, _iso_pathname);
+
+ _vcd_list_sort (p_obj->custom_dir_list,
+- (_cdio_list_cmp_func) strcmp);
++ (_cdio_list_cmp_func_t) strcmp);
+
+ return 0;
+ }
+@@ -2290,7 +2290,7 @@ vcd_obj_write_image (VcdObj_t *p_obj, VcdImageSink_t *p_image_sink,
+ /* start with meta info */
+
+ {
+- CdioList *p_cue_list;
++ CdioList_t *p_cue_list;
+ vcd_cue_t *p_cue;
+
+ p_cue_list = _cdio_list_new ();
diff --git a/media-video/vcdimager/vcdimager-0.7.24.ebuild b/media-video/vcdimager/vcdimager-0.7.24.ebuild
index 9de4050771a7..7b2ce51b663b 100644
--- a/media-video/vcdimager/vcdimager-0.7.24.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.24.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils multilib-minimal
+EAPI=6
+
+inherit multilib-minimal
DESCRIPTION="GNU VCDimager"
HOMEPAGE="http://www.vcdimager.org/"
@@ -22,9 +23,13 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
-DOCS="AUTHORS BUGS ChangeLog FAQ HACKING NEWS README THANKS TODO"
+DOCS=( AUTHORS BUGS ChangeLog FAQ HACKING NEWS README THANKS TODO )
+
+PATCHES=( "${FILESDIR}/${P}-libcdio-1.0.0.patch" )
src_prepare() {
+ default
+
# Avoid building useless programs. Bug #226249
sed -i \
-e 's/check_PROGRAMS =/check_PROGRAMS +=/' \
@@ -50,6 +55,6 @@ multilib_src_configure() {
}
multilib_src_install_all() {
- prune_libtool_files
+ find "${D}" -name '*.la' -delete
einstalldocs
}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 0a79d236ad61..8a8284b10370 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,11 +9,15 @@ AUX vlc-2.2.4-ffmpeg3.patch 6377 BLAKE2B 2cd08b9058914fd899f515f434e0f93d06ae671
AUX vlc-2.2.4-libav-11.7.patch 291 BLAKE2B 9ad8bac7897976ba50b98ce1063baab311f0ad8e267cbad751b1378280b2f8238e22096448889b4eb69bbec34d08225269c7d2f653676828dc7a7d755fe676bf SHA512 f216833dc1ad5ddbf6a19b497238e9c850582f16eae452862a4c7c9acd110a0033879b3e3555177ac0ef30663cdd3f72d1a1020999c44e1f577ef665dd658315
AUX vlc-2.2.4-relax_ffmpeg.patch 1686 BLAKE2B f802c5ae95962036fe3fcfa67e725ac5a5d5466e614e892e7e617b5a972ab9e204bcb4096822412c68a7ad43133ed230f6dcdecc9bf0a1737126ada8b54ccaf7 SHA512 a15862d6ac60575c0c338faff6052e3c28c4bd75f86f37ff8fbe36a64bc1a82689c56b2dc19f05109fc0913b85aab7ba28a94bfdd5fdd0e3c87cb7e6e58d1caa
AUX vlc-2.2.6-decoder-lock-scope.patch 973 BLAKE2B 7fb92001311b61d35b4f029da55e308c248d1e052178769eb106739b86a6c4d45a01ca5e111a2d710a5676b5437c81a481fb0125038da33eed43eb9c1d05dc4f SHA512 b6d360f4eb6923332a67605118c5a47ed2e54bedcc68625eb5f78313e971da66ab19998f3037dcc0ce588287da1510c93cf68247c47ae25d0b1305af931794e3
+AUX vlc-2.2.8-libupnp-compat.patch 815 BLAKE2B 059a1f572e39d09dc206a6af36bc5e50b800f089929456560663a631baf6b30d21b1d0234999d9f90de12a520e377c4578472b00b81f80a5f8a6c6b52c26b3e5 SHA512 befe64c5595bebbfd033db6c586e4cdf2092c3e691acc034b9aa499e462a5542fa3de21afd0953c74858bdce99db4339dd41414b96aeac1ccb60d7edcb24a964
+AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
AUX vlc-9999-libva-1.2.1-compat.patch 291 BLAKE2B ed2e146e43ab65474d8e20f87f79b97b6a504a762375347223d759b605e20d210fd62d967160ba43cc10a1730409d7d06d71ad95c0aaf37bb05caa320ad35213 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968
DIST vlc-2.2.6.tar.xz 22198720 BLAKE2B a3d5d75551908a92c894ca18b36fd165ea0d6a99d1729c311f2051dfe1dd5eb7bf5045b08652e7a1d335212416a3e2d077f37157c7ae4773a5ecc2c49e39f5a6 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d
+DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
EBUILD vlc-2.2.6-r2.ebuild 14784 BLAKE2B 8212c8d850ed6e18bce445a822430162e54ed627d0096c2220bac6d7acf25b57fd72259dafa7d195e8de6d91772c95a294dd71af9099cfa6e0cd77d48cb61506 SHA512 a8477ed01d2873c678a273f7d3422623fdea76757a92d5d5f352f6e5a7a48181b5ccfda2d5acafbba5abb4125a3004a07486c8134e55860579eff2a8d047ceeb
EBUILD vlc-2.2.6.ebuild 15519 BLAKE2B cbc55f76288176d91b8e53b188778aa1f50b42942a60aafe9c9fc0278a6da13a04b8acaa0d7dcd76b0f1b54ad23b7048c76f07cca0ccd478659fb94492a6257a SHA512 ba381af8546d8d55b4394dd0db2859146f3fc0c015ac50767f945a38c3abb3034d1ff98b5a0793d4a201e694477ac8d1fd3d092b8274e09170a200a49ff13e94
-EBUILD vlc-2.2.9999.ebuild 14996 BLAKE2B 1c1ad7d5a425cc9a2ca3a863a29753e681e961c3882fd78ad23fae24be810f066a6e9b0e9d2298fe08b84a7cb4b6ebdfd2bb453a428e66d8f487dcd49c39b12e SHA512 f52b224bf2b1a8e7e6e72195bbdf0c60b77f3a7859402f695ee5e67b301e21278c89a0ed8f3064001fd4a7e1bcc6a0fb2a1871c5e0a1037fa7f38e549f586d39
-EBUILD vlc-3.0.9999.ebuild 13205 BLAKE2B 8551cc524e8931b47744f4727a251006c43c159748bcf668fdf78b966b49bc8e355c4c2d16a418558495742cb16f167aab445b92c573623945d016d62614d251 SHA512 c298e87670eb6dfdf2e94d24a695fd2edefb5229a3d90355333e7be9c43f56c9ed653df29e5960c092033c373c27225ce597a6ae8a500ba0be69073d185aa793
-EBUILD vlc-9999.ebuild 13205 BLAKE2B 8551cc524e8931b47744f4727a251006c43c159748bcf668fdf78b966b49bc8e355c4c2d16a418558495742cb16f167aab445b92c573623945d016d62614d251 SHA512 c298e87670eb6dfdf2e94d24a695fd2edefb5229a3d90355333e7be9c43f56c9ed653df29e5960c092033c373c27225ce597a6ae8a500ba0be69073d185aa793
+EBUILD vlc-2.2.8.ebuild 14352 BLAKE2B a1bc94e0c65cb87716a84163d06dd6f498954c131b312eff183b251292636bb0cf97b6b59263f36852c62eec9315a21d0060918bf103e896188852a137b93a90 SHA512 5883867833eda6e1a5c5c424c94120861f27f87959303d381bc125106007bb67d5ad835d34ca744d61de94f0b2330bd33edb4dfa564e25a778327581f6cc4db8
+EBUILD vlc-2.2.9999.ebuild 14359 BLAKE2B 5c345a996df8637de04388ed69979c20851ded661216b62615fa8e95b43e43d8c8693233d0f65f9ac0d79c9deb5f3ce7d4a745273e17668fd489b63ec5e8617a SHA512 f66d44da93f8026eebecb64351021c366fb8a5e279e806722896be8119699a35812daf186372841c835c61fdef8f0f3d2f2d754caf55a146e9fe619a21cfe7a7
+EBUILD vlc-3.0.9999.ebuild 13315 BLAKE2B 270a5bffdd953c471d87c8cab04b8b4298a3707e1eeac0c9776d8d3ee118bea5783d44e60bcbda7997caeeda6c045dc5a09857da1e38bf08c762ea21a884f545 SHA512 0d9a2337529c07000cb1d400eb46215ab742ed6d5e6ddc9f4b14fa013799940c1e9ed533952361d93ceeeb07fa765ea71239f8a01b7e810e6908c3f7b6d33687
+EBUILD vlc-9999.ebuild 13315 BLAKE2B 270a5bffdd953c471d87c8cab04b8b4298a3707e1eeac0c9776d8d3ee118bea5783d44e60bcbda7997caeeda6c045dc5a09857da1e38bf08c762ea21a884f545 SHA512 0d9a2337529c07000cb1d400eb46215ab742ed6d5e6ddc9f4b14fa013799940c1e9ed533952361d93ceeeb07fa765ea71239f8a01b7e810e6908c3f7b6d33687
MISC metadata.xml 6560 BLAKE2B 7a079c7b3d008646d49c8669834fccb7e78cf2ab88e0eb2671c571f91f012ab8b33989ef2035e35b55c585c1bdc930e9a5fd7d26c7f1a2fc7cab819fca54f21f SHA512 ed19d0f4e3349e13ef9967911c16a4b6569cefa97169ad79d7a9510ca88965c9e8fefcd593ceb2e5b0c31e82ad92e9513ff36460eddf3605d2250d285b19530f
diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch
new file mode 100644
index 000000000000..57b66685ede0
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch
@@ -0,0 +1,28 @@
+From f9c5a343f1a8cad9c2c153f9c05e4e7201675a43 Mon Sep 17 00:00:00 2001
+From: Tristan Matthews <tmatth@videolan.org>
+Date: Wed, 29 Nov 2017 10:45:04 -0500
+Subject: [PATCH] upnp: don't clash with libupnp's own compat code
+
+Fixes build for upnp >= 1.6.23 and less than 1.8.
+
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+---
+ modules/services_discovery/upnp.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
+index bdd3c55ee5..82d43632f4 100644
+--- a/modules/services_discovery/upnp.cpp
++++ b/modules/services_discovery/upnp.cpp
+@@ -38,7 +38,7 @@
+ #include <set>
+ #include <string>
+
+-#if UPNP_VERSION < 10800
++#if UPNP_VERSION < 10623
+ /*
+ * Compat functions and typedefs for libupnp prior to 1.8
+ */
+--
+2.11.0
+
diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch b/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch
new file mode 100644
index 000000000000..ab501e4e67a5
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch
@@ -0,0 +1,24 @@
+--- a/modules/services_discovery/upnp.hpp 2015-05-19 15:32:38.000000000 +0200
++++ b/modules/services_discovery/upnp.hpp 2017-12-09 14:07:08.551654458 +0100
+@@ -28,8 +28,8 @@
+ #include <vector>
+ #include <string>
+
+-#include <upnp/upnp.h>
+-#include <upnp/upnptools.h>
++#include <upnp-1.8/upnp.h>
++#include <upnp-1.8/upnptools.h>
+
+ #include <vlc_common.h>
+
+--- a/configure.ac 2017-12-09 14:09:12.956370304 +0100
++++ b/configure.ac 2017-12-09 14:13:25.236710362 +0100
+@@ -4046,7 +4046,7 @@
+ dnl
+ dnl UPnP Plugin (Intel SDK)
+ dnl
+-PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPNP SDK],[auto])
++PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp-1.8], [Intel UPNP SDK],[auto])
+
+ EXTEND_HELP_STRING([Misc options:])
+
diff --git a/media-video/vlc/vlc-2.2.8.ebuild b/media-video/vlc/vlc-2.2.8.ebuild
new file mode 100644
index 000000000000..4ce203a79994
--- /dev/null
+++ b/media-video/vlc/vlc-2.2.8.ebuild
@@ -0,0 +1,464 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+ if [[ ${PV%.9999} != ${PV} ]] ; then
+ EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+ else
+ EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+ fi
+ SCM="git-r3"
+else
+ if [[ ${MY_P} = ${P} ]] ; then
+ SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+ else
+ SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+ fi
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+fi
+inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
+
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-8" # vlc - vlccore
+
+IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda
+ cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2
+ elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme
+ gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav
+ libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua
+ macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
+ matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg
+ omxil opencv opengl optimisememory opus png postproc projectm pulseaudio
+ +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout
+ sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype
+ twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X
+ x264 x265 +xcb xml xv zeroconf zvbi
+"
+REQUIRED_USE="
+ aalib? ( X )
+ bidi? ( truetype )
+ cddb? ( cdda )
+ dvb? ( dvbpsi )
+ dxva2? ( avcodec )
+ ffmpeg? ( avcodec avformat swscale )
+ fontconfig? ( truetype )
+ gnutls? ( gcrypt )
+ httpd? ( lua )
+ libcaca? ( X )
+ libtar? ( skins )
+ libtiger? ( kate )
+ qt5? ( X )
+ sdl? ( X )
+ skins? ( qt5 truetype X xml )
+ vaapi? ( avcodec X )
+ vdpau? ( X )
+ vlm? ( encode )
+ xv? ( xcb )
+"
+RDEPEND="
+ dev-libs/libgpg-error:0
+ net-dns/libidn:0
+ sys-libs/zlib:0[minizip]
+ virtual/libintl:0
+ a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
+ aalib? ( media-libs/aalib:0 )
+ alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+ avcodec? (
+ !libav? ( media-video/ffmpeg:0= )
+ libav? ( media-video/libav:0= )
+ )
+ avformat? (
+ !libav? ( media-video/ffmpeg:0= )
+ libav? ( media-video/libav:0= )
+ )
+ bidi? ( dev-libs/fribidi:0 )
+ bluray? ( >=media-libs/libbluray-0.3:0= )
+ cddb? ( >=media-libs/libcddb-1.2:0 )
+ chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+ dbus? ( >=sys-apps/dbus-1.6:0 )
+ dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
+ directfb? ( dev-libs/DirectFB:0 )
+ dts? ( >=media-libs/libdca-0.0.5:0 )
+ dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
+ dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
+ elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
+ faad? ( >=media-libs/faad2-2.6.1:0 )
+ fdk? ( media-libs/fdk-aac:0 )
+ flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
+ fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+ fontconfig? ( media-libs/fontconfig:1.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
+ gme? ( media-libs/game-music-emu:0 )
+ gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
+ gnutls? ( >=net-libs/gnutls-3.0.20:0 )
+ gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+ ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
+ jack? ( virtual/jack )
+ jpeg? ( virtual/jpeg:0 )
+ kate? ( >=media-libs/libkate-0.3:0 )
+ libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 )
+ libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+ libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
+ libsamplerate? ( media-libs/libsamplerate:0 )
+ libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
+ libtiger? ( >=media-libs/libtiger-0.3.1:0 )
+ linsys? ( >=media-libs/zvbi-0.2.28:0 )
+ lirc? ( app-misc/lirc:0 )
+ live? ( >=media-plugins/live-2011.12.23:0 )
+ lua? ( >=dev-lang/lua-5.1:0 )
+ matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
+ modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
+ mp3? ( media-libs/libmad:0 )
+ mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
+ mtp? ( >=media-libs/libmtp-1:0 )
+ musepack? ( >=media-sound/musepack-tools-444:0 )
+ ncurses? ( sys-libs/ncurses:0=[unicode] )
+ ogg? ( >=media-libs/libogg-1:0 )
+ opencv? ( >media-libs/opencv-2:0= )
+ opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
+ opus? ( >=media-libs/opus-1.0.3:0 )
+ png? ( media-libs/libpng:0= )
+ postproc? (
+ !libav? ( >=media-video/ffmpeg-2.2:0= )
+ libav? ( media-libs/libpostproc:0= )
+ )
+ projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
+ pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+ qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+ rdp? ( =net-misc/freerdp-1*:0=[client] )
+ samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+ schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+ sdl? ( >=media-libs/libsdl-1.2.10:0
+ sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) )
+ sftp? ( net-libs/libssh2:0 )
+ shout? ( >=media-libs/libshout-2.1:0 )
+ sid? ( media-libs/libsidplay:2 )
+ skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
+ speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 )
+ svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
+ swscale? (
+ !libav? ( media-video/ffmpeg:0= )
+ libav? ( media-video/libav:0= )
+ )
+ taglib? ( >=media-libs/taglib-1.9:0 )
+ theora? ( >=media-libs/libtheora-1.0_beta3:0 )
+ tremor? ( media-libs/tremor:0 )
+ truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+ !fontconfig? ( media-fonts/dejavu:0 ) )
+ twolame? ( media-sound/twolame:0 )
+ udev? ( >=virtual/udev-142:0 )
+ upnp? ( net-libs/libupnp:= )
+ v4l? ( media-libs/libv4l:0 )
+ vaapi? (
+ x11-libs/libva:0[X,drm]
+ !libav? ( media-video/ffmpeg:0=[vaapi] )
+ libav? ( media-video/libav:0=[vaapi] )
+ )
+ vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
+ vdpau? (
+ x11-libs/libvdpau:0
+ !libav? ( media-video/ffmpeg:0= )
+ libav? ( >=media-video/libav-10:0= )
+ )
+ vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+ vorbis? ( media-libs/libvorbis:0 )
+ vpx? ( media-libs/libvpx:0= )
+ X? ( x11-libs/libX11:0 )
+ x264? ( media-libs/x264:0= )
+ x265? ( media-libs/x265:0= )
+ xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 )
+ xml? ( dev-libs/libxml2:2 )
+ zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
+ zvbi? ( media-libs/zvbi:0 )
+"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils:0
+ >=sys-devel/gettext-0.18.3:*
+ virtual/pkgconfig:*
+ amd64? ( dev-lang/yasm:* )
+ x86? ( dev-lang/yasm:* )
+ xcb? ( x11-proto/xproto:0 )
+"
+
+PATCHES=(
+ # Fix build system mistake.
+ "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
+
+ # Bug #541678
+ "${FILESDIR}"/qt4-select.patch
+
+ # Allow QT5.5 since Gentoo has a patched QTwidgets
+ "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
+
+ # Bug #575072
+ "${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch
+ "${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch
+
+ # Bug #589396
+ "${FILESDIR}"/${PN}-2.2.4-cxx0x.patch
+
+ # Bug #594126, #629294
+ "${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch
+ "${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch
+
+ # Bug #593460
+ "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
+
+ "${FILESDIR}"/${P}-libupnp-compat.patch
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
+
+ # Bootstrap when we are on a git checkout.
+ if [[ ${PV} = *9999 ]] ; then
+ ./bootstrap
+ fi
+
+ # Make it build with libtool 1.5
+ rm -f m4/lt* m4/libtool.m4 || die
+
+ # We are not in a real git checkout due to the absence of a .git directory.
+ touch src/revision.txt || die
+
+ # Don't use --started-from-file when not using dbus.
+ if ! use dbus ; then
+ sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+ fi
+
+ eautoreconf
+
+ # Disable automatic running of tests.
+ find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+
+ # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt
+ # version may be used. Setting QT_SELECT environment variable will enforce correct binaries.
+ if use qt5; then
+ export QT_SELECT=qt5
+ fi
+}
+
+src_configure() {
+ local myconf
+
+ # Compatibility fix for Samba 4.
+ use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+ # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+ use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+ # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+ append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+ if use truetype || use projectm ; then
+ local dejavu="/usr/share/fonts/dejavu/"
+ myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
+ --with-default-font-family=Sans \
+ --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+ --with-default-monospace-font-family=Monospace"
+ fi
+
+ if use qt5 ; then
+ myconf+=" --enable-qt=5"
+ else
+ myconf+=" --disable-qt"
+ fi
+
+ econf \
+ ${myconf} \
+ --enable-vlc \
+ --docdir=/usr/share/doc/${PF} \
+ --disable-dependency-tracking \
+ --disable-optimizations \
+ --disable-update-check \
+ --enable-fast-install \
+ --enable-screen \
+ $(use_enable a52) \
+ $(use_enable aalib aa) \
+ $(use_enable alsa) \
+ $(use_enable altivec) \
+ $(use_enable atmo) \
+ $(use_enable audioqueue) \
+ $(use_enable avcodec) \
+ $(use_enable avformat) \
+ $(use_enable bidi fribidi) \
+ $(use_enable bluray) \
+ $(use_enable cdda vcd) \
+ $(use_enable cddb libcddb) \
+ $(use_enable chromaprint) \
+ $(use_enable dbus) \
+ $(use_enable directfb) \
+ $(use_enable directx) \
+ $(use_enable dc1394) \
+ $(use_enable debug) \
+ $(use_enable dts dca) \
+ $(use_enable dvbpsi) \
+ $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+ $(use_enable dxva2) \
+ $(use_enable encode sout) \
+ $(use_enable faad) \
+ $(use_enable fdk fdkaac) \
+ $(use_enable flac) \
+ $(use_enable fluidsynth) \
+ $(use_enable fontconfig) \
+ $(use_enable gcrypt libgcrypt) \
+ $(use_enable gme) \
+ $(use_enable gnome gnomevfs) \
+ $(use_enable gnutls) \
+ $(use_enable growl) \
+ $(use_enable gstreamer gst-decode) \
+ $(use_enable httpd) \
+ $(use_enable ieee1394 dv1394) \
+ $(use_enable jack) \
+ $(use_enable jpeg) \
+ $(use_enable kate) \
+ $(use_enable libass) \
+ $(use_enable libcaca caca) \
+ $(use_enable libnotify notify) \
+ $(use_enable libsamplerate samplerate) \
+ $(use_enable libtar) \
+ $(use_enable libtiger tiger) \
+ $(use_enable linsys) \
+ $(use_enable lirc) \
+ $(use_enable live live555) \
+ $(use_enable lua) \
+ $(use_enable macosx-dialog-provider) \
+ $(use_enable macosx-eyetv) \
+ $(use_enable macosx-qtkit) \
+ $(use_enable macosx-quartztext) \
+ $(use_enable matroska mkv) \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ $(use_enable modplug mod) \
+ $(use_enable mp3 mad) \
+ $(use_enable mpeg libmpeg2) \
+ $(use_enable mtp) \
+ $(use_enable musepack mpc) \
+ $(use_enable ncurses) \
+ $(use_enable neon) \
+ $(use_enable ogg) $(use_enable ogg mux_ogg) \
+ $(use_enable omxil) \
+ $(use_enable omxil omxil-vout) \
+ $(use_enable opencv) \
+ $(use_enable opengl glspectrum) \
+ $(use_enable opus) \
+ $(use_enable optimisememory optimize-memory) \
+ $(use_enable png) \
+ $(use_enable postproc) \
+ $(use_enable projectm) \
+ $(use_enable pulseaudio pulse) \
+ $(use_enable rdp freerdp) \
+ $(use_enable rtsp realrtsp) \
+ $(use_enable run-as-root) \
+ $(use_enable samba smbclient) \
+ $(use_enable schroedinger) \
+ $(use_enable sdl) \
+ $(use_enable sdl-image) \
+ $(use_enable sid) \
+ $(use_enable sftp) \
+ $(use_enable shout) \
+ $(use_enable skins skins2) \
+ $(use_enable speex) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable svg) \
+ $(use_enable svg svgdec) \
+ $(use_enable swscale) \
+ $(use_enable taglib) \
+ $(use_enable theora) \
+ $(use_enable tremor) \
+ $(use_enable truetype freetype) \
+ $(use_enable twolame) \
+ $(use_enable udev) \
+ $(use_enable upnp) \
+ $(use_enable v4l v4l2) \
+ $(use_enable vaapi libva) \
+ $(use_enable vcdx) \
+ $(use_enable vdpau) \
+ $(use_enable vlm) \
+ $(use_enable vnc) \
+ $(use_enable vorbis) \
+ $(use_enable vpx) \
+ $(use_enable wma-fixed) \
+ $(use_with X x) \
+ $(use_enable x264) \
+ $(use_enable x265) \
+ $(use_enable xcb) \
+ $(use_enable xml libxml2) \
+ $(use_enable xv xvideo) \
+ $(use_enable zeroconf bonjour) \
+ $(use_enable zvbi) $(use_enable !zvbi telx) \
+ --disable-asdcp \
+ --disable-coverage \
+ --disable-cprof \
+ --disable-crystalhd \
+ --disable-decklink \
+ --disable-gles1 \
+ --disable-gles2 \
+ --disable-goom \
+ --disable-kai \
+ --disable-kva \
+ --disable-maintainer-mode \
+ --disable-merge-ffmpeg \
+ --disable-mfx \
+ --disable-mmal-codec \
+ --disable-mmal-vout \
+ --disable-opensles \
+ --disable-oss \
+ --disable-quicktime \
+ --disable-rpi-omxil \
+ --disable-shine \
+ --disable-sndio \
+ --disable-vda \
+ --disable-vsxu \
+ --disable-wasapi
+
+ # ^ We don't have these disabled libraries in the Portage tree yet.
+
+ # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+ # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+ # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+ sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
+}
+
+src_test() {
+ virtx emake check-TESTS
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+ einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+ "/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
+ else
+ ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+ ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+ ewarn "If you do not do it, vlc will take a long time to load."
+ fi
+
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 10af743665ee..443d35b4c454 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -37,7 +37,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdd
macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg
omxil opencv opengl optimisememory opus png postproc projectm pulseaudio
- qt4 +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout
+ +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout
sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype
twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X
x264 x265 +xcb xml xv zeroconf zvbi
@@ -55,10 +55,9 @@ REQUIRED_USE="
libcaca? ( X )
libtar? ( skins )
libtiger? ( kate )
- qt4? ( X )
qt5? ( X )
sdl? ( X )
- skins? ( truetype X xml || ( qt4 qt5 ) )
+ skins? ( qt5 truetype X xml )
vaapi? ( avcodec X )
vdpau? ( X )
vlm? ( encode )
@@ -86,7 +85,7 @@ RDEPEND="
chromaprint? ( >=media-libs/chromaprint-0.6:0 )
dbus? ( >=sys-apps/dbus-1.6:0 )
dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
- directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
+ directfb? ( dev-libs/DirectFB:0 )
dts? ( >=media-libs/libdca-0.0.5:0 )
dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
@@ -126,20 +125,19 @@ RDEPEND="
opencv? ( >media-libs/opencv-2:0= )
opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
opus? ( >=media-libs/opus-1.0.3:0 )
- png? ( media-libs/libpng:0= sys-libs/zlib:0 )
+ png? ( media-libs/libpng:0= )
postproc? (
!libav? ( >=media-video/ffmpeg-2.2:0= )
libav? ( media-libs/libpostproc:0= )
)
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
pulseaudio? ( >=media-sound/pulseaudio-1:0 )
- !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) )
qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
rdp? ( =net-misc/freerdp-1*:0=[client] )
- samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] )
+ samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
sdl? ( >=media-libs/libsdl-1.2.10:0
- sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
+ sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) )
sftp? ( net-libs/libssh2:0 )
shout? ( >=media-libs/libshout-2.1:0 )
sid? ( media-libs/libsidplay:2 )
@@ -150,14 +148,14 @@ RDEPEND="
!libav? ( media-video/ffmpeg:0= )
libav? ( media-video/libav:0= )
)
- taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
+ taglib? ( >=media-libs/taglib-1.9:0 )
theora? ( >=media-libs/libtheora-1.0_beta3:0 )
tremor? ( media-libs/tremor:0 )
truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
!fontconfig? ( media-fonts/dejavu:0 ) )
twolame? ( media-sound/twolame:0 )
udev? ( >=virtual/udev-142:0 )
- upnp? ( net-libs/libupnp:0 )
+ upnp? ( net-libs/libupnp:= )
v4l? ( media-libs/libv4l:0 )
vaapi? (
x11-libs/libva:0[X,drm]
@@ -213,33 +211,18 @@ PATCHES=(
# Bug #593460
"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
+
+ "${FILESDIR}"/${P}-libupnp-compat.patch
)
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
S="${WORKDIR}/${MY_P}"
-src_unpack() {
- if [[ ${PV} = *9999 ]] ; then
- git-r3_src_unpack
- else
- unpack ${A}
- fi
-}
-
src_prepare() {
default
- # Remove unnecessary warnings about unimplemented pragmas on gcc for now.
- # Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
- #
- # config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
- # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
- #
- # https://gcc.gnu.org/c99status.html
- if tc-is-gcc ; then
- sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
- fi
+ has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
# Bootstrap when we are on a git checkout.
if [[ ${PV} = *9999 ]] ; then
@@ -266,8 +249,6 @@ src_prepare() {
# version may be used. Setting QT_SELECT environment variable will enforce correct binaries.
if use qt5; then
export QT_SELECT=qt5
- elif use qt4; then
- export QT_SELECT=qt4
fi
}
@@ -294,11 +275,7 @@ src_configure() {
if use qt5 ; then
myconf+=" --enable-qt=5"
else
- if use qt4 ; then
- myconf+=" --enable-qt=4"
- else
- myconf+=" --disable-qt"
- fi
+ myconf+=" --disable-qt"
fi
econf \
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index a91223922ac3..69d4f900c985 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -166,7 +166,7 @@ RDEPEND="
X? ( dev-qt/qtx11extras:5 )
)
rdp? ( =net-misc/freerdp-1*:0=[client] )
- samba? ( >=net-fs/samba-4.0.0:0[client] )
+ samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
sdl-image? ( >=media-libs/sdl-image-1.2.10:0 )
sftp? ( net-libs/libssh2:0 )
@@ -199,7 +199,7 @@ RDEPEND="
)
twolame? ( media-sound/twolame:0 )
udev? ( virtual/udev:0 )
- upnp? ( net-libs/libupnp:0 )
+ upnp? ( net-libs/libupnp:= )
v4l? ( media-libs/libv4l:0 )
vaapi? (
x11-libs/libva:0[X,drm]
@@ -251,6 +251,8 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
default
+ has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
# Bootstrap when we are on a git checkout.
if [[ ${PV} = *9999 ]] ; then
./bootstrap
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index a91223922ac3..69d4f900c985 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -166,7 +166,7 @@ RDEPEND="
X? ( dev-qt/qtx11extras:5 )
)
rdp? ( =net-misc/freerdp-1*:0=[client] )
- samba? ( >=net-fs/samba-4.0.0:0[client] )
+ samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
sdl-image? ( >=media-libs/sdl-image-1.2.10:0 )
sftp? ( net-libs/libssh2:0 )
@@ -199,7 +199,7 @@ RDEPEND="
)
twolame? ( media-sound/twolame:0 )
udev? ( virtual/udev:0 )
- upnp? ( net-libs/libupnp:0 )
+ upnp? ( net-libs/libupnp:= )
v4l? ( media-libs/libv4l:0 )
vaapi? (
x11-libs/libva:0[X,drm]
@@ -251,6 +251,8 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
default
+ has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
# Bootstrap when we are on a git checkout.
if [[ ${PV} = *9999 ]] ; then
./bootstrap