media-video/ffdiaporama: Drop old

Closes: https://bugs.gentoo.org/640448
Package-Manager: Portage-2.3.20, Repoman-2.3.6

7 files changed, 0 insertions, 487 deletions

diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index d6d3a6eda98a..7fa86918d6e8 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -1,9 +1,5 @@
-DIST ffdiaporama-2.1-libav10.patch 24734 BLAKE2B bc12266f69f10990b4a74b8fd93da31fd55530e1ff3a41a030e865da5154452f58f5aca03c6bc2ebff8200ded02c115f1bda0ffc9d0412010b8a3eed181e1e54 SHA512 635dd967792159bfb5986eb97715aa46222029cbf3bcd5b58779b8894272728f2a422b4e73645ddc80f5d4cb1bc9a12ceccc06e160c72140571d2233e029b38b
 DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 000816945e74033b2620f635f59e762e82988ef60740ac14bfee02850cc6299ec0934a7f48afe03009a94bbb531e9668c9d16fe230db34d03ba54b0c42249348 SHA512 958025fee8df94a600fa4919fe9aa5574556c163a771b36213e90f116c13d0448a86e99a49b2ac4631c1b845ffb8c87789ac00cb8462fed1abbe9233e49a47fc
 DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9 SHA512 f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e
-DIST ffdiaporama_bin_2.1.2014.0209.tar.gz 16063604 BLAKE2B e0915c578f48e23d42e50db77af8a4d8733f6e8914d49e2d0da57f5c1fff84aea584a8f3df94fe9a66acbb1c1bf69efcf3a6140089ab15f59753e7920ab342b6 SHA512 40fc40ae8f09d311dc615051bd0bc4573f1f9ab5abe06032e161b759194c772b43c337902baf9c5a1eb027796fcdecc2fc20dce5d998091e6ccf8f696149223d
 DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedfccb769562c9b763f642058d2fc8bf4a3c4a81b1ce857398ee759ce2cf269c31527cece2c18a48505ad46b197e10da8444cbf2131ffb3e1130 SHA512 6531381137c47d3fd2954d09fe922086de1b69638ed4b092faeb9e2982b463c6614314bda56512f6a315bd02b8600d815efb19dca3dae89947df9a48a2ae7b86
-DIST ffdiaporama_rsc_2.1.2014.0209.tar.gz 17669845 BLAKE2B 7155ec3b6b0a6ded2dc5ac079fe65f6d562942fb10c00d85bf109757b4bf7f8c334b51e2e19cb80aa57426ffddc28592d207cc60dad0726675862caac5c7d85f SHA512 910b2139eb1b97a86c8d795b65255f723e346b3b4ce805878835813f9b21c7b606f811488f9099003a0e0951006df6d32663f1d8be2ffe1c355cf9311ac4be19
 DIST ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz 18390602 BLAKE2B 58c38d1f62ec04b217add232873556cf57d13cd17ef672f2087b44c0aac9ee7bc890de3bb812cb1c57093565b06de51ed0ddb0465d9b7fce21311fedf51042a3 SHA512 73faafe54d7d9a3d8d91719ac56cec7323e0a497f77e0c9f243d84782aa6040677236d9e41d3b539c45d6aca2448d737912ec59bd2a7e417749ee548cd68652d
 DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B af558994a811508ff6b0f1dc34f33c60fca0a4f40c1cf675e08925b40c8312444a20ea95b0a0c9316225806096e9bbb209faf3e48b74041604c6d81be0175aba SHA512 e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5
-DIST openclipart-0.18-svgonly.tar.bz2 82108957 BLAKE2B 25c13f7fc05898daef78fbc09e8d1506331677bac2a0fb1b9646fe7d8dff92927325faf2e2fd9e9d91d7f1136de91159124152d5e8dd55b63e3184998180fe0a SHA512 71ad11fd2e94f4c3d560ff0fa6e0cee70ec2c8506fd4c4d7a4b7a0db25480aaca9b36d0e91862cf05347be5caa614bfb528bdfdb151342e28efba31d9a8b0473
diff --git a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
deleted file mode 100644
index da652736f010..000000000000
--- a/media-video/ffdiaporama/ffdiaporama-2.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fdo-mime gnome2-utils qt4-r2
-
-BIN_PV=${PV}.2014.0209
-RSC_PV=${PV}.2014.0209
-TMT_PV=1.0.2014.0125
-OPENCLI_PV=0.18
-OPENCLI_P=openclipart-${OPENCLI_PV}
-DESCRIPTION="Movie creator from photos and video clips"
-HOMEPAGE="http://ffdiaporama.tuxfamily.org"
-SRC_URI="http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_bin_${BIN_PV}.tar.gz -> ${PN}_bin_${BIN_PV}.tar.gz
-	http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_rsc_${RSC_PV}.tar.gz -> ${PN}_rsc_${RSC_PV}.tar.gz
-	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.1-libav10.patch
-	openclipart? ( http://openclipart.org/downloads/${OPENCLI_PV}/${OPENCLI_P}-svgonly.tar.bz2 )
-	texturemate? ( http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_texturemate_${TMT_PV}.tar.gz -> ${PN}_texturemate_${TMT_PV}.tar.gz )"
-
-LICENSE="GPL-2
-	openclipart? ( CC0-1.0 )
-	texturemate? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libav openclipart texturemate"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qthelp:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtsvg:4
-	media-gfx/exiv2
-	media-libs/libsdl[sound]
-	media-libs/taglib
-	!libav? ( >media-video/ffmpeg-1.2:0=[encode] )
-	libav? ( >=media-video/libav-9:0=[encode] )"
-DEPEND="${RDEPEND}"
-
-DOCS=( authors.txt )
-PATCHES=( "${DISTDIR}"/${P}-libav10.patch "${FILESDIR}"/${P}-{ffmpeg-2.4,ffmpeg-3.0}.patch )
-
-S="${WORKDIR}/ffDiaporama"
-
-src_prepare() {
-	echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
-	if use texturemate; then
-		echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die
-	fi
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	qt4-r2_src_install
-	doicon -s 32 ffdiaporama.png
-	if use openclipart; then
-		dodir /usr/share/ffDiaporama/clipart/openclipart
-		cd "${WORKDIR}"/${OPENCLI_P}-svgonly/clipart || die
-		find . -type d -maxdepth 1 -not -name . -exec cp -R '{}' "${D}"/usr/share/ffDiaporama/clipart/openclipart \; || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/ffdiaporama/ffdiaporama-2.1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.1.ebuild
deleted file mode 100644
index 48456601fcbe..000000000000
--- a/media-video/ffdiaporama/ffdiaporama-2.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fdo-mime gnome2-utils qt4-r2
-
-BIN_PV=${PV}.2014.0209
-RSC_PV=${PV}.2014.0209
-TMT_PV=1.0.2014.0125
-OPENCLI_PV=0.18
-OPENCLI_P=openclipart-${OPENCLI_PV}
-DESCRIPTION="Movie creator from photos and video clips"
-HOMEPAGE="http://ffdiaporama.tuxfamily.org"
-SRC_URI="http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_bin_${BIN_PV}.tar.gz -> ${PN}_bin_${BIN_PV}.tar.gz
-	http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_rsc_${RSC_PV}.tar.gz -> ${PN}_rsc_${RSC_PV}.tar.gz
-	openclipart? ( http://openclipart.org/downloads/${OPENCLI_PV}/${OPENCLI_P}-svgonly.tar.bz2 )
-	texturemate? ( http://ffdiaporama.tuxfamily.org/script/GetPackage.php?f=${PN}_texturemate_${TMT_PV}.tar.gz -> ${PN}_texturemate_${TMT_PV}.tar.gz )"
-
-LICENSE="GPL-2
-	openclipart? ( CC0-1.0 )
-	texturemate? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libav openclipart texturemate"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qthelp:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtsvg:4
-	media-gfx/exiv2
-	media-libs/libsdl[sound]
-	media-libs/taglib
-	!libav? ( >media-video/ffmpeg-1.2:0=[encode] )
-	libav? ( >=media-video/libav-9:0=[encode] )"
-DEPEND="${RDEPEND}"
-
-DOCS=( authors.txt )
-PATCHES=( "${FILESDIR}"/${P}-ffmpeg-2.4.patch )
-
-S="${WORKDIR}/ffDiaporama"
-
-src_prepare() {
-	echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
-	if use texturemate; then
-		echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die
-	fi
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	qt4-r2_src_install
-	doicon -s 32 ffdiaporama.png
-	if use openclipart; then
-		dodir /usr/share/ffDiaporama/clipart/openclipart
-		cd "${WORKDIR}"/${OPENCLI_P}-svgonly/clipart || die
-		find . -type d -maxdepth 1 -not -name . -exec cp -R '{}' "${D}"/usr/share/ffDiaporama/clipart/openclipart \; || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild
deleted file mode 100644
index 1d9d671b5400..000000000000
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils gnome2-utils qmake-utils
-
-MY_PV=${PV%_pre20140701}
-BIN_PV=${MY_PV}.devel.2014.0701
-RSC_PV=${MY_PV}.devel.2014.0503
-TMT_PV=1.0.2014.0125
-DESCRIPTION="Movie creator from photos and video clips"
-HOMEPAGE="http://ffdiaporama.tuxfamily.org"
-SRC_URI="http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz
-	http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_rsc_${RSC_PV}.tar.gz
-	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch
-	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch
-	texturemate? ( http://download.tuxfamily.org/${PN}/Packages/Stable/${PN}_texturemate_${TMT_PV}.tar.gz )"
-
-LICENSE="GPL-2
-	texturemate? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libav openclipart qt5 texturemate"
-
-RDEPEND="
-	media-gfx/exiv2
-	media-libs/taglib
-	openclipart? ( media-gfx/openclipart[svg,-gzip] )
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtsvg:5
-		dev-qt/qtxml:5
-	)
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qthelp:4
-		dev-qt/qtmultimedia:4
-		dev-qt/qtsql:4[sqlite]
-		dev-qt/qtsvg:4
-	)
-	libav? ( >=media-video/libav-11:0=[encode] )
-	!libav? ( >=media-video/ffmpeg-2.8:0=[encode] )"
-DEPEND="${RDEPEND}"
-
-DOCS=( authors.txt )
-PATCHES=( "${DISTDIR}"/${PN}-${MY_PV}-{ffmpeg-3.0,libav11}.patch "${FILESDIR}"/${PN}-${MY_PV}-qt4multimedia.patch )
-
-S="${WORKDIR}/ffDiaporama"
-
-src_prepare() {
-	echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
-	if use texturemate; then
-		echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die
-	fi
-	default_src_prepare
-}
-
-src_configure() {
-	use qt5 && eqmake5 QMAKE_CFLAGS_ISYSTEM=
-	! use qt5 && eqmake4 QMAKE_CFLAGS_ISYSTEM=
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	if use openclipart; then
-		dosym ../../clipart/openclipart /usr/share/ffDiaporama/clipart/openclipart
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch b/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch
deleted file mode 100644
index 7a8e664add37..000000000000
--- a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-2.4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/ffDiaporama/engine/cDeviceModelDef.h	2015-02-14 10:02:12.592365100 +0100
-+++ src/ffDiaporama/engine/cDeviceModelDef.h	2015-02-14 10:01:59.202463800 +0100
-@@ -84,7 +84,12 @@
- #elif (LIBAVUTIL_VERSION_MICRO>=100)&&(LIBAVCODEC_VERSION_MICRO>=100)&&(LIBAVFORMAT_VERSION_MICRO>=100)&&(LIBAVDEVICE_VERSION_MICRO>=100)&&(LIBAVFILTER_VERSION_MICRO>=100)&&(LIBSWSCALE_VERSION_MICRO>=100)
-     #define FFMPEG
-     #include "libswresample/swresample.h"
--    #define RESAMPLE_MAX_CHANNELS SWR_CH_MAX
-+    #ifdef SWR_CH_MAX
-+      #define RESAMPLE_MAX_CHANNELS SWR_CH_MAX
-+    #else
-+      #define RESAMPLE_MAX_CHANNELS 32
-+    #endif
-+    
-     #include "libavfilter/avcodec.h"
-     #include "libavfilter/buffersink.h"
-     #include "libavfilter/buffersrc.h"
diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch b/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch
deleted file mode 100644
index 4eb8c9704235..000000000000
--- a/media-video/ffdiaporama/files/ffdiaporama-2.1-ffmpeg-3.0.patch
+++ /dev/null
@@ -1,196 +0,0 @@
---- src/ffDiaporama/engine/cBaseMediaFile.cpp	2014-02-09 10:48:04.000000000 +0100
-+++ src/ffDiaporama/engine/cBaseMediaFile.cpp	2016-02-21 19:00:43.129114600 +0100
-@@ -113,10 +113,23 @@
- #define VC_USERDATA     0x00000008
- #define VC_FLUSHED      0x00000010
- 
--#define PIXFMT          PIX_FMT_RGB24
-+#if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+  #define PIXELFORMAT AVPixelFormat
-+  #define PIXFMT AV_PIX_FMT_RGB24
-+#else
-+  #define PIXELFORMAT PixelFormat
-+  #define PIXFMT PIX_FMT_RGB24
-+#endif
- #define QTPIXFMT        QImage::Format_RGB888
- 
--AVFrame *ALLOCFRAME()           { return avcodec_alloc_frame(); }
-+AVFrame *ALLOCFRAME()           { return 
-+  #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+    av_frame_alloc();
-+  #else
-+    avcodec_alloc_frame();
-+  #endif
-+}
-+
- void    FREEFRAME(AVFrame **Buf){ avcodec_free_frame(Buf); *Buf=NULL; }
- 
- //****************************************************************************************************************************************************************
-@@ -2402,7 +2415,7 @@
-                             AVFrame *FrameRGB=ALLOCFRAME();
-                             if ((FrameRGB)&&(!Thumbnail.isNull())) {
-                                 avpicture_fill((AVPicture *)FrameRGB,Thumbnail.bits(),PIXFMT,RealW,RealH);
--                                struct SwsContext *img_convert_ctx=sws_getContext(FrameYUV->width,FrameYUV->height,(PixelFormat)FrameYUV->format,RealW,RealH,PIXFMT,SWS_FAST_BILINEAR,NULL,NULL,NULL);
-+                                struct SwsContext *img_convert_ctx=sws_getContext(FrameYUV->width,FrameYUV->height,(PIXELFORMAT)FrameYUV->format,RealW,RealH,PIXFMT,SWS_FAST_BILINEAR,NULL,NULL,NULL);
-                                 if (img_convert_ctx!=NULL) {
-                                     int ret = sws_scale(img_convert_ctx,FrameYUV->data,FrameYUV->linesize,0,FrameYUV->height,FrameRGB->data,FrameRGB->linesize);
-                                     if (ret>0) {
-@@ -3482,7 +3495,7 @@
-         struct SwsContext *img_convert_ctx=sws_getContext(
-             Frame->width,                                                     // Src width
-             Frame->height,                                                    // Src height
--            (PixelFormat)Frame->format,                                       // Src Format
-+            (PIXELFORMAT)Frame->format,                                       // Src Format
-             W,                                                                // Destination width
-             H,                                                                // Destination height
-             PIXFMT,                                                           // Destination Format
---- src/ffDiaporama/engine/cDeviceModelDef.h	2016-02-21 19:53:00.487286000 +0100
-+++ src/ffDiaporama/engine/cDeviceModelDef.h	2016-02-21 19:52:47.623287800 +0100
-@@ -53,7 +53,9 @@
- 
- #include <libavutil/mathematics.h>
- #include <libavutil/pixdesc.h>
--#include <libavutil/audioconvert.h>
-+#if (LIBAVUTIL_VERSION_INT<AV_VERSION_INT(54,31,100))
-+    #include <libavutil/audioconvert.h>
-+#endif
- 
- #include <libavcodec/avcodec.h>
- 
-@@ -90,10 +92,10 @@
-       #define RESAMPLE_MAX_CHANNELS 32
-     #endif
-     
--    #include "libavfilter/avcodec.h"
--    #include "libavfilter/buffersink.h"
--    #include "libavfilter/buffersrc.h"
--    #if     ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,48,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,39,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,19,104))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,5,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,90,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,5,101))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,104)))
-+    #if     ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(55,17,103))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(57,24,102))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(57,25,100))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(57,0,101))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(6,31,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(4,0,100))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(2,0,101)))
-+        #define FFMPEGVERSIONINT    300
-+        #define FFMPEGVERSION       "FFmpeg 3.0 or higher"
-+    #elif     ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,48,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,39,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,19,104))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,5,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,90,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,5,101))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,104)))
-         #define FFMPEGVERSIONINT    210
-         #define FFMPEGVERSION       "FFmpeg 2.1 or higher"
-     #elif   ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,38,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,18,102))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,12,100))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,3,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,79,101))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,3,100))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,102)))
-@@ -108,6 +110,13 @@
-     #else
-         // unsupported version
-     #endif
-+    #if (FFMPEGVERSIONINT<300)
-+      #include "libavfilter/avcodec.h"
-+    #else
-+      #include "libavcodec/avcodec.h"
-+    #endif
-+    #include "libavfilter/buffersink.h"
-+    #include "libavfilter/buffersrc.h"
- #endif
- }
- 
---- src/ffDiaporama/engine/_EncodeVideo.cpp	2016-02-22 08:19:13.935794200 +0100
-+++ src/ffDiaporama/engine/_EncodeVideo.cpp	2016-02-22 08:33:52.928215900 +0100
-@@ -20,7 +20,11 @@
- 
- #include "_EncodeVideo.h"
- 
--#define PIXFMT      PIX_FMT_RGB24
-+#if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+  #define PIXFMT AV_PIX_FMT_RGB24
-+#else
-+  #define PIXFMT PIX_FMT_RGB24
-+#endif
- #define QTPIXFMT    QImage::Format_RGB888
- 
- //*************************************************************************************************************************************************
-@@ -410,8 +414,13 @@
-     // Setup codec parameters
-     VideoStream->codec->width               =ImageWidth;
-     VideoStream->codec->height              =ImageHeight;
-+    #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+    VideoStream->codec->pix_fmt             =AV_PIX_FMT_YUV420P;
-+    #else
-     VideoStream->codec->pix_fmt             =PIX_FMT_YUV420P;
-+    #endif
-     VideoStream->codec->time_base           =VideoFrameRate;
-+    VideoStream->time_base                  =VideoFrameRate;
-     VideoStream->codec->sample_aspect_ratio =PixelAspectRatio;
-     VideoStream->sample_aspect_ratio        =PixelAspectRatio;
-     if ((codec->id!=AV_CODEC_ID_H264)||(!VBR)) {
-@@ -434,7 +443,11 @@
- 
-     } else if (codec->id==AV_CODEC_ID_MJPEG) {
-         //-qscale 2 -qmin 2 -qmax 2
-+        #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+        VideoStream->codec->pix_fmt             =AV_PIX_FMT_YUVJ420P;
-+        #else
-         VideoStream->codec->pix_fmt             =PIX_FMT_YUVJ420P;
-+        #endif
-         VideoStream->codec->qmin                =2;
-         VideoStream->codec->qmax                =2;
-         VideoStream->codec->bit_rate_tolerance  =(ImageWidth*ImageHeight*2*VideoFrameRate.den/VideoFrameRate.num)*2;
-@@ -564,7 +577,11 @@
-     #endif
- 
-     // Create and prepare VideoFrame and VideoFrameBuf
--    VideoFrame=avcodec_alloc_frame();  // Allocate structure for RGB image
-+    #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+    VideoFrame=av_frame_alloc();
-+    #else
-+    VideoFrame=avcodec_alloc_frame();
-+    #endif
-     if (!VideoFrame) {
-         ToLog(LOGMSG_CRITICAL,"EncodeVideo-OpenVideoStream: avcodec_alloc_frame() failed");
-         return false;
-@@ -654,7 +671,11 @@
-         return false;
-     }
- 
-+    #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+    AudioFrame=av_frame_alloc();
-+    #else
-     AudioFrame=avcodec_alloc_frame();
-+    #endif
-     if (AudioFrame==NULL) {
-         ToLog(LOGMSG_CRITICAL,QString("EncodeVideo-OpenAudioStream:: avcodec_alloc_frame failed"));
-         return false;
-@@ -1095,7 +1116,11 @@
-             if (Continue) {
-                 // Init AudioFrame
-                 AVRational AVR;
-+                #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+                av_frame_unref(AudioFrame);
-+                #else
-                 avcodec_get_frame_defaults(AudioFrame);
-+                #endif
-                 AVR.num                     =1;
-                 AVR.den                     =AudioStream->codec->sample_rate;
-                 AudioFrame->nb_samples      =DestPacketSize/DestSampleSize;
-@@ -1180,7 +1205,11 @@
-     int     errcode;
- 
-     if (Image) {
--        avcodec_get_frame_defaults(VideoFrame);
-+        #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=300))
-+        av_frame_unref(AudioFrame);
-+        #else
-+        avcodec_get_frame_defaults(AudioFrame);
-+        #endif
-         if (avpicture_fill(
-             (AVPicture *)VideoFrame,            // Frame to prepare
-             VideoFrameBuf,                      // Buffer which will contain the image data
-@@ -1225,9 +1254,14 @@
-         }
-     }
- 
--    if ((VideoFrameNbr%VideoStream->codec->gop_size)==0) VideoFrame->pict_type=AV_PICTURE_TYPE_I;
--        else VideoFrame->pict_type=(AVPictureType)0;
-+    if ((VideoFrameNbr%VideoStream->codec->gop_size)==0)
-+        VideoFrame->pict_type=AV_PICTURE_TYPE_I;
-+    else
-+        VideoFrame->pict_type=(AVPictureType)0;
-     VideoFrame->pts=VideoFrameNbr;
-+    VideoFrame->format=VideoStream->codec->pix_fmt;
-+    VideoFrame->width=VideoStream->codec->width;
-+    VideoFrame->height=VideoStream->codec->height;
- 
-     if ((Continue)&&(!StopProcessWanted)) {
- 
diff --git a/media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch b/media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch
deleted file mode 100644
index 6dd0367337e2..000000000000
--- a/media-video/ffdiaporama/files/ffdiaporama-2.2-qt4multimedia.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ffDiaporama.ori/src/ffDiaporama/ffDiaporama.pro	2014-05-04 10:33:56.000000000 +0200
-+++ ffDiaporama/src/ffDiaporama/ffDiaporama.pro	2016-12-06 00:03:27.392114339 +0100
-@@ -26,19 +26,13 @@
- 
- greaterThan(QT_MAJOR_VERSION,4) {
-     # QT5 version
--    QT += widgets concurrent help multimedia
-+    QT += widgets concurrent help
- } else {
-     # QT4 version
--    CONFIG += help mobility
--    MOBILITY = multimedia
--
--    unix {
--        INCLUDEPATH += /usr/include/QtMultimediaKit
--        INCLUDEPATH += /usr/include/QtMobility
--    }
-+    CONFIG += help multimedia
- }
- 
--QT          += core gui xml network svg sql
-+QT          += core gui xml multimedia network svg sql
- QMAKE_STRIP  = echo
- APPFOLDER    = ffDiaporama
- TARGET       = ffDiaporama