commit: 2b4d55d3f322a2774811ea8b261ad11d39457249
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 20:48:26 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 20:50:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b4d55d3
media-video/avidemux: drop old 2.7.0
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
media-video/avidemux/Manifest | 1 -
media-video/avidemux/avidemux-2.7.0.ebuild | 175 ---------------------
.../avidemux/files/avidemux-2.7.0-glibc-2.27.patch | 22 ---
.../avidemux/files/avidemux-2.7.0-qt-5.11.patch | 48 ------
4 files changed, 246 deletions(-)
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 4113f7cd25d..7d6012ce4fc 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,3 +1,2 @@
DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B
f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d
SHA512
d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B
3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265
SHA512
36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
-DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B
c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96
SHA512
7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
diff --git a/media-video/avidemux/avidemux-2.7.0.ebuild
b/media-video/avidemux/avidemux-2.7.0.ebuild
deleted file mode 100644
index 3a66ade975e..00000000000
--- a/media-video/avidemux/avidemux-2.7.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding
tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux";
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
-
-COMMON_DEPEND="
-
~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
- nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
- opengl? ( virtual/opengl:0 )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- )
- vaapi? ( x11-libs/libva:0= )
-"
-DEPEND="${COMMON_DEPEND}
- qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="${COMMON_DEPEND}
- nls? ( virtual/libintl:0 )
- !<media-video/avidemux-${PV}
-"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-
- 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 ||
\
- 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."
-
- # Now rename the desktop file to not collide with 2.6.
- mv ${PN}2.desktop ${PN}-${SLOT}.desktop || die "Collision rename
failed."
-
- # Remove "Build Option" dialog because it doesn't reflect
- # what the GUI can or has been built with. (Bug #463628)
- sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h ||
\
- die "Couldn't remove \"Build Option\" dialog."
-}
-
-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
-
- # The build relies on an avidemux-core header that uses 'nullptr'
- # which is from >=C++11. Let's use the GCC-6 default C++ dialect.
- append-cxxflags -std=c++14
-
- local mycmakeargs=(
- -DGETTEXT="$(usex nls)"
- -DSDL="$(usex sdl)"
- -DLibVA="$(usex vaapi)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- )
-
- if use qt5 ; then
- mycmakeargs+=(
- -DENABLE_QT5="$(usex qt5)"
- -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
- )
- fi
-
- if use debug ; then
- mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
- fi
-
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}"
cmake-utils_src_configure
- done
-}
-
-src_compile() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake-utils_src_compile
- done
-}
-
-src_test() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake-utils_src_test
- done
-}
-
-src_install() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- 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
- 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 166791f4774..00000000000
--- 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 <[email protected]>
-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 8ac9bbc3b4a..00000000000
--- 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 <[email protected]>
-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
