gentoo resync : 06.08.2019

4 files changed, 31 insertions, 148 deletions

diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 388c79387757..a16109db27cf 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,8 +1,6 @@
-AUX avidemux-2.7.0-glibc-2.27.patch 872 BLAKE2B 2edd751aa7de1d6b4ed6d6dc12bff1f02e54e4950b8402cd531776bba7be1481c205ee3b11249addfe759c2d730db0831280e6bdcafb470a683220242ee79937 SHA512 3bf0bc7b15cb50141b5ec771dcee97971d2889af8913c9d825a3d6cc929143eabf04af76d033257722cb6be90f966a34e3ba2c069470cfb6097bc959bb0feead
-AUX avidemux-2.7.0-qt-5.11.patch 1664 BLAKE2B 080497a678e869e143eb350ecdca2b77d5e5906a8a469e24f16fc58853665791dbbd94880418b492df6816b8f420d54ee7ecd06c805b0aab16e8d05ab43f545d SHA512 49186e7648db60e081f78e1257ea788313cac6e991c995249701189ab344744f0c410203b39b49e5530a8dd33de937582099eb8b615d19fe7d0e3731254d535c
 AUX avidemux-2.7.3-desktop.patch 678 BLAKE2B f903203996fddbe798f990b3092f4a0c578407933df153e05da19aa0a6bbfaa1bbd96f25b61787514c4272f94a0525e5fc5c0171744c2f87b04effc1a2907974 SHA512 68e6a0d3272ecf00aec63f513f50d39b7702eb59ecd85190483a93b03e7461964e9533656f2279bc00312c95418f415d159e15646790a1b0b9eb2ebd7f520b4f
 DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
-DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
-EBUILD avidemux-2.7.0.ebuild 4518 BLAKE2B 6eb480a6467eb5a734891ffeefbbb0a37abbb83469ca12a090c18502e3a3836701ef43439681e51ac5f3259af368f6b045c830207b05b5df7febbbf70a534b66 SHA512 5d7c46c56e237386d0c9e8c74ddfe5f25aa3e510a0e7683c91880a863fe40d51e3d5d4661cb670af25c6ff7a43264a303f74e9a7c9033bf0daa3d3d55968a8d0
+DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
 EBUILD avidemux-2.7.3.ebuild 3866 BLAKE2B 63c7cdc7d023d62356ae47198a6e22236b45199b1d1dfad06ce7d0343a76e51e379f69871ce4ed2018d74da92806639c975deeead8fe1900070bb4341de2e4c1 SHA512 2b579a10245f6fa062ee88b6d991ded8c77ef3fa5713387836ccb19dbe9270667875716baa48cd6fd10e4570f7d60151c45a6df17ca8b4879dc536c76d21a111
+EBUILD avidemux-2.7.4-r1.ebuild 3676 BLAKE2B 259d76cf3e50e6733645538959732cf4be512b326d3d5fe5c34be1c16532c8979d1113a5deb9e18d55271d689c2bfd61e34b37dbe9f57429d7358da146ac4a93 SHA512 077e1f9950fbb6e88c74bf6c9687f72bb39b56dbd2b17ba96f4b37d35ad5ad03af0595403f68992ccfd961f3726bdbdec4dbb95db55dab6a48233ddb04ce85cf
 MISC metadata.xml 489 BLAKE2B 51c28e4d932facf14fe99d0d18e736f16c754961e8fde468505f03c989e8ec3cb9afab9c916752468a5f9f0a07ad8d25da01e64cb987cfed1db835f657512b1e SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d
diff --git a/media-video/avidemux/avidemux-2.7.0.ebuild b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
index 3a66ade975eb..16632727c8d9 100644
--- a/media-video/avidemux/avidemux-2.7.0.ebuild
+++ b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
@@ -1,25 +1,20 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-if [[ ${PV} == *9999* ]] ; then
-	MY_P="${P}"
-	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
-	inherit git-r3
-else
-	MY_P="${PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake-utils qmake-utils xdg-utils
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-utils desktop qmake-utils xdg
 
 DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 SLOT="2.7"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
 
 COMMON_DEPEND="
@@ -29,6 +24,7 @@ COMMON_DEPEND="
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
 		dev-qt/qtopengl:5
 		dev-qt/qtwidgets:5
 	)
@@ -43,40 +39,32 @@ RDEPEND="${COMMON_DEPEND}
 "
 PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/avidemux2-${PV}"
 
 src_prepare() {
-	eapply "${FILESDIR}/${P}-glibc-2.27.patch"
-	eapply "${FILESDIR}/${P}-qt-5.11.patch"
-
 	processes="buildCli:avidemux/cli"
-	if use qt5 ; then
-		processes+=" buildQt4:avidemux/qt4"
-	fi
+	use qt5 && processes+=" buildQt4:avidemux/qt4"
 
 	for process in ${processes} ; do
 		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
 	done
 
-	# Fix icon name -> avidemux-2.7.png
-	sed -i -e "/^Icon/ s:${PN}:${PN}-${SLOT}:" ${PN}2.desktop || \
-		die "Icon name fix failed."
-
-	# The desktop file is broken. It uses avidemux2 instead of avidemux3
-	# so it will actually launch avidemux-2.7 if it is installed.
-	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || \
-		die "Desktop file fix failed."
 	if use qt5; then
-		sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' ${PN}2.desktop || \
+		# Fix icon name -> avidemux-2.7
+		sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/${PN}.desktop || \
+			die "Icon name fix failed."
+
+		# The desktop file is broken. It uses avidemux3_portable instead of avidemux3_qt5
+		sed -i -re '/^Exec/ s:(avidemux3_)portable:\1qt5:' appImage/${PN}.desktop || \
 			die "Desktop file fix failed."
-	fi
 
-	# QA warnings: missing trailing ';' and 'Application' is deprecated.
-	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || \
-		die "Desktop file fix failed."
+		# QA warnings: missing trailing ';' and 'Application' is deprecated.
+		sed -i -e 's/Application;AudioVideo/AudioVideo;/g' appImage/${PN}.desktop || \
+			die "Desktop file fix failed."
 
-	# Now rename the desktop file to not collide with 2.6.
-	mv ${PN}2.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed."
+		# Now rename the desktop file to not collide with 2.6.
+		mv appImage/${PN}.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed."
+	fi
 
 	# Remove "Build Option" dialog because it doesn't reflect
 	# what the GUI can or has been built with. (Bug #463628)
@@ -85,11 +73,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# Add lax vector typing for PowerPC.
-	if use ppc || use ppc64 ; then
-		append-cflags -flax-vector-conversions
-	fi
-
 	# See bug 432322.
 	use x86 && replace-flags -O0 -O1
 
@@ -101,20 +84,17 @@ src_configure() {
 		-DGETTEXT="$(usex nls)"
 		-DSDL="$(usex sdl)"
 		-DLibVA="$(usex vaapi)"
+		-DOPENGL="$(usex opengl)"
 		-DVDPAU="$(usex vdpau)"
 		-DXVIDEO="$(usex xv)"
 	)
 
-	if use qt5 ; then
-		mycmakeargs+=(
+	use qt5 && mycmakeargs+=(
 			-DENABLE_QT5="$(usex qt5)"
 			-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-		)
-	fi
+	)
 
-	if use debug ; then
-		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-	fi
+	use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
@@ -142,34 +122,9 @@ src_install() {
 		BUILD_DIR="${build}" cmake-utils_src_install
 	done
 
-	if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
-		fperms +x /usr/bin/avidemux3_cli
-	fi
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
-		fperms +x /usr/bin/avidemux3_jobs
-	fi
-
-	cd "${S}" || die "Can't enter source folder."
-	newicon ${PN}_icon.png ${PN}-${SLOT}.png
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
-		fperms +x /usr/bin/avidemux3_qt5
-	fi
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_jobs_qt5 ]] ; then
-		fperms +x /usr/bin/avidemux3_jobs_qt5
-	fi
-
-	if use qt5 ; then
+	if use qt5; then
+		cd "${S}" || die "Can't enter source folder"
+		newicon ${PN}_icon.png ${PN}-${SLOT}.png
 		domenu ${PN}-${SLOT}.desktop
 	fi
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-video/avidemux/files/avidemux-2.7.0-glibc-2.27.patch b/media-video/avidemux/files/avidemux-2.7.0-glibc-2.27.patch
deleted file mode 100644
index 166791f4774a..000000000000
--- a/media-video/avidemux/files/avidemux-2.7.0-glibc-2.27.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From afdd9c4b876d77a4974d3fa7d9f25caeffbdf13d Mon Sep 17 00:00:00 2001
-From: eumagga0x2a <eumagga0x2a@users.noreply.github.com>
-Date: Fri, 29 Sep 2017 15:53:14 +0200
-Subject: [PATCH] [build] Fix compilation with glibc >= 2.27
-
----
- avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp b/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
-index c6cb43bb6..269c2d2e3 100644
---- a/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
-+++ b/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
-@@ -35,7 +35,7 @@
- #elif defined(ADM_BSD_FAMILY) || defined(__sun__)
- #define POW10(x) powf(10.0,x)
- #else
--#define POW10(x)  pow10f(x)
-+#define POW10(x) exp10f(x)
- #endif
- 
- #define LINEAR_TO_DB(x) (20.*log10(x))
diff --git a/media-video/avidemux/files/avidemux-2.7.0-qt-5.11.patch b/media-video/avidemux/files/avidemux-2.7.0-qt-5.11.patch
deleted file mode 100644
index 8ac9bbc3b4ac..000000000000
--- a/media-video/avidemux/files/avidemux-2.7.0-qt-5.11.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ba667da44fcb88ee660339e52859bb90dc1b00d3 Mon Sep 17 00:00:00 2001
-From: mean <fixounet@free.fr>
-Date: Wed, 30 May 2018 07:31:03 +0200
-Subject: [PATCH] [Qt] Compatibilty patch with newer qt (>=5.11), patch by
- Chris Clayton
-
----
- avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp         | 1 +
- avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp               | 1 +
- avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-index 256f69d5e..54b0ac639 100644
---- a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-+++ b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-@@ -17,6 +17,7 @@
- #include "ADM_coreJobs.h"
- #include "DIA_coreToolkit.h"
- #include <QtCore/QDir>
-+#include <QAction>
- 
- extern void loadTranslator(void);
- extern void initTranslator(void);
-diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
-index 85cec5f9a..f537995ca 100644
---- a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
-+++ b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
-@@ -21,6 +21,7 @@
- #include "ADM_memsupport.h"
- #include "ADM_crashdump.h"
- #include "ADM_win32.h"
-+#include <QAction>
- 
- void onexit( void );
- 
-diff --git a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
-index 94bdd577e..b2a01e54b 100644
---- a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
-+++ b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
-@@ -17,6 +17,7 @@
- #include "Q_eq2.h"
- #include "ADM_toolkitQt.h"
- #include <QSignalMapper>
-+#include <QAction>
- 
- //
- //	Video is in YV12 Colorspace
\ No newline at end of file