* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2016-05-05 19:48 Michał Górny
0 siblings, 0 replies; 37+ messages in thread
From: Michał Górny @ 2016-05-05 19:48 UTC (permalink / raw
To: gentoo-commits
commit: 37503fa10d6d5b5b48ba784bcd257d307b9c6d4e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 5 19:45:54 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 5 19:48:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37503fa1
media-video/avidemux: Fix global scope 'use' calls, #566542
media-video/avidemux/avidemux-2.6.8.ebuild | 6 +++---
media-video/avidemux/avidemux-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.8.ebuild b/media-video/avidemux/avidemux-2.6.8.ebuild
index c978ae6..d404c59 100644
--- a/media-video/avidemux/avidemux-2.6.8.ebuild
+++ b/media-video/avidemux/avidemux-2.6.8.ebuild
@@ -42,9 +42,6 @@ PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
S="${WORKDIR}/${MY_P}"
-processes="buildCli:avidemux/cli"
-use qt4 && processes+=" buildQt4:avidemux/qt4"
-
src_prepare() {
cmake-utils_src_prepare
@@ -81,6 +78,9 @@ src_configure() {
mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
fi
+ processes="buildCli:avidemux/cli"
+ use qt4 && processes+=" buildQt4:avidemux/qt4"
+
for process in ${processes} ; do
local build="${process%%:*}"
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index c978ae6..d404c59 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -42,9 +42,6 @@ PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
S="${WORKDIR}/${MY_P}"
-processes="buildCli:avidemux/cli"
-use qt4 && processes+=" buildQt4:avidemux/qt4"
-
src_prepare() {
cmake-utils_src_prepare
@@ -81,6 +78,9 @@ src_configure() {
mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
fi
+ processes="buildCli:avidemux/cli"
+ use qt4 && processes+=" buildQt4:avidemux/qt4"
+
for process in ${processes} ; do
local build="${process%%:*}"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2016-05-07 13:59 Sergei Trofimovich
0 siblings, 0 replies; 37+ messages in thread
From: Sergei Trofimovich @ 2016-05-07 13:59 UTC (permalink / raw
To: gentoo-commits
commit: 51f95ebbb678aff6576f21e39c694946324086d7
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 13:51:03 2016 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat May 7 13:51:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51f95ebb
media-video/avidemux: drop unused local IUSEs
Package-Manager: portage-2.2.28
media-video/avidemux/metadata.xml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index 2080ce6..00c928c 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -5,11 +5,6 @@
<email>media-video@gentoo.org</email>
<name>Gentoo Video project</name>
</maintainer>
- <use>
- <flag name="aften">Enable A/52 (AC-3) audio encoder support.</flag>
- <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag>
- <flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg>.</flag>
- </use>
<upstream>
<remote-id type="sourceforge">avidemux</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2017-06-30 5:28 Alexis Ballier
0 siblings, 0 replies; 37+ messages in thread
From: Alexis Ballier @ 2017-06-30 5:28 UTC (permalink / raw
To: gentoo-commits
commit: c330374e4b92071fd464bcd3f29db3c42c02c6ec
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Thu Jun 29 06:25:24 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 05:22:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c330374e
media-video/avidemux: Bump avidemux-2.6.20 and update to EAPI 6
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-video/avidemux/Manifest | 1 +
...avidemux-9999.ebuild => avidemux-2.6.20.ebuild} | 110 ++++++++++++---------
media-video/avidemux/avidemux-9999.ebuild | 110 ++++++++++++---------
media-video/avidemux/metadata.xml | 3 +
4 files changed, 134 insertions(+), 90 deletions(-)
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 418a7523584..6f017f59f92 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1 +1,2 @@
+DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
similarity index 62%
copy from media-video/avidemux/avidemux-9999.ebuild
copy to media-video/avidemux/avidemux-2.6.20.ebuild
index d31c66fd897..2ad1ffeee1b 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20.ebuild
@@ -1,48 +1,59 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="6"
PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
-inherit cmake-utils eutils flag-o-matic l10n
-
-SLOT="2.6"
+inherit cmake-utils l10n
DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
HOMEPAGE="http://fixounet.free.fr/${PN}"
# Multiple licenses because of all the bundled stuff.
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="debug opengl nls qt4 sdl vaapi vdpau video_cards_fglrx xv"
-KEYWORDS="~amd64 ~x86"
+SLOT="2.6"
+IUSE="debug opengl nls nvenc qt4 qt5 sdl vaapi vdpau video_cards_fglrx xv"
if [[ ${PV} == *9999* ]] ; then
- KEYWORDS=""
- EGIT_REPO_URI="git://gitorious.org/${PN}2-6/${PN}2-6.git https://git.gitorious.org/${PN}2-6/${PN}2-6.git"
+ MY_P="${P}"
+ EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
- inherit git-2
+ inherit git-r3
else
MY_P="${PN}_${PV}"
SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
fi
DEPEND="
- ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?]
+ ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,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 ) )
video_cards_fglrx? (
|| ( >=x11-drivers/ati-drivers-14.12-r3
x11-libs/xvba-video:0 )
)"
-RDEPEND="$DEPEND"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
+RDEPEND="
+ $DEPEND
+ nls? ( virtual/libintl:0 )
+"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?,qt5?]"
S="${WORKDIR}/${MY_P}"
src_prepare() {
- cmake-utils_src_prepare
+ default
+
+ processes="buildCli:avidemux/cli"
+ use qt4 && processes+=" buildQt4:avidemux/qt4"
+
+ for process in ${processes} ; do
+ CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+ done
# Fix icon name -> avidemux-2.6.png
sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
@@ -50,7 +61,7 @@ src_prepare() {
# The desktop file is broken. It uses avidemux2 instead of avidemux3
# so it will actually launch avidemux-2.5 if it is installed.
sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
- sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}2.desktop || die "Desktop file fix failed."
+ sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt'$(usex qt5 5 4)':' ${PN}2.desktop || die "Desktop file fix failed."
# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed."
@@ -63,31 +74,6 @@ src_prepare() {
}
src_configure() {
- local mycmakeargs="
- -DAVIDEMUX_SOURCE_DIR='${S}'
- $(cmake-utils_use nls GETTEXT)
- $(cmake-utils_use sdl)
- $(cmake-utils_use vaapi LIBVA)
- $(cmake-utils_use vdpau)
- $(cmake-utils_use video_cards_fglrx XVBA)
- $(cmake-utils_use xv XVIDEO)
- "
-
- if use debug ; then
- mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
- fi
-
- processes="buildCli:avidemux/cli"
- use qt4 && processes+=" buildQt4:avidemux/qt4"
-
- for process in ${processes} ; do
- local build="${process%%:*}"
-
- mkdir "${S}"/${build} || die "Can't create build folder."
- cd "${S}"/${build} || die "Can't enter build folder."
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
- done
-
# Add lax vector typing for PowerPC.
if use ppc || use ppc64 ; then
append-cflags -flax-vector-conversions
@@ -95,19 +81,42 @@ src_configure() {
# See bug 432322.
use x86 && replace-flags -O0 -O1
+
+ local mycmakeargs=(
+ -DAVIDEMUX_SOURCE_DIR='${S}'
+ -DGETTEXT="$(usex nls)"
+ -DSDL="$(usex sdl)"
+ -DLIBVA="$(usex vaapi)"
+ -DVDPAU="$(usex vdpau)"
+ -DXVBA="$(usex video_cards_fglrx)"
+ -DXVIDEO="$(usex xv)"
+ )
+
+ if use qt5 ; then
+ mycmakeargs+=( -DENABLE_QT5="$(usex qt5)" )
+ 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
- BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
+ local build="${WORKDIR}/${P}_build/${process%%:*}"
+ BUILD_DIR="${build}" cmake-utils_src_compile
done
}
-DOCS=( AUTHORS README )
-
src_install() {
for process in ${processes} ; do
- BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_install
+ local build="${WORKDIR}/${P}_build/${process%%:*}"
+ BUILD_DIR="${build}" cmake-utils_src_install
done
if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
@@ -121,8 +130,19 @@ src_install() {
cd "${S}" || die "Can't enter source folder."
newicon ${PN}_icon.png ${PN}-2.6.png
- if use qt4 ; then
+ 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
+
+ if [[ -f "${ED}"/usr/bin/avidemux3_jobs_qt5 ]] ; then
+ fperms +x /usr/bin/avidemux3_jobs_qt5
+ fi
+
+ if use qt4 || use qt5 ; then
domenu ${PN}-2.6.desktop
fi
}
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index d31c66fd897..2ad1ffeee1b 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -1,48 +1,59 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="6"
PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
-inherit cmake-utils eutils flag-o-matic l10n
-
-SLOT="2.6"
+inherit cmake-utils l10n
DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
HOMEPAGE="http://fixounet.free.fr/${PN}"
# Multiple licenses because of all the bundled stuff.
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="debug opengl nls qt4 sdl vaapi vdpau video_cards_fglrx xv"
-KEYWORDS="~amd64 ~x86"
+SLOT="2.6"
+IUSE="debug opengl nls nvenc qt4 qt5 sdl vaapi vdpau video_cards_fglrx xv"
if [[ ${PV} == *9999* ]] ; then
- KEYWORDS=""
- EGIT_REPO_URI="git://gitorious.org/${PN}2-6/${PN}2-6.git https://git.gitorious.org/${PN}2-6/${PN}2-6.git"
+ MY_P="${P}"
+ EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
- inherit git-2
+ inherit git-r3
else
MY_P="${PN}_${PV}"
SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
fi
DEPEND="
- ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?]
+ ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,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 ) )
video_cards_fglrx? (
|| ( >=x11-drivers/ati-drivers-14.12-r3
x11-libs/xvba-video:0 )
)"
-RDEPEND="$DEPEND"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
+RDEPEND="
+ $DEPEND
+ nls? ( virtual/libintl:0 )
+"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?,qt5?]"
S="${WORKDIR}/${MY_P}"
src_prepare() {
- cmake-utils_src_prepare
+ default
+
+ processes="buildCli:avidemux/cli"
+ use qt4 && processes+=" buildQt4:avidemux/qt4"
+
+ for process in ${processes} ; do
+ CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+ done
# Fix icon name -> avidemux-2.6.png
sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
@@ -50,7 +61,7 @@ src_prepare() {
# The desktop file is broken. It uses avidemux2 instead of avidemux3
# so it will actually launch avidemux-2.5 if it is installed.
sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
- sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}2.desktop || die "Desktop file fix failed."
+ sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt'$(usex qt5 5 4)':' ${PN}2.desktop || die "Desktop file fix failed."
# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed."
@@ -63,31 +74,6 @@ src_prepare() {
}
src_configure() {
- local mycmakeargs="
- -DAVIDEMUX_SOURCE_DIR='${S}'
- $(cmake-utils_use nls GETTEXT)
- $(cmake-utils_use sdl)
- $(cmake-utils_use vaapi LIBVA)
- $(cmake-utils_use vdpau)
- $(cmake-utils_use video_cards_fglrx XVBA)
- $(cmake-utils_use xv XVIDEO)
- "
-
- if use debug ; then
- mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
- fi
-
- processes="buildCli:avidemux/cli"
- use qt4 && processes+=" buildQt4:avidemux/qt4"
-
- for process in ${processes} ; do
- local build="${process%%:*}"
-
- mkdir "${S}"/${build} || die "Can't create build folder."
- cd "${S}"/${build} || die "Can't enter build folder."
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
- done
-
# Add lax vector typing for PowerPC.
if use ppc || use ppc64 ; then
append-cflags -flax-vector-conversions
@@ -95,19 +81,42 @@ src_configure() {
# See bug 432322.
use x86 && replace-flags -O0 -O1
+
+ local mycmakeargs=(
+ -DAVIDEMUX_SOURCE_DIR='${S}'
+ -DGETTEXT="$(usex nls)"
+ -DSDL="$(usex sdl)"
+ -DLIBVA="$(usex vaapi)"
+ -DVDPAU="$(usex vdpau)"
+ -DXVBA="$(usex video_cards_fglrx)"
+ -DXVIDEO="$(usex xv)"
+ )
+
+ if use qt5 ; then
+ mycmakeargs+=( -DENABLE_QT5="$(usex qt5)" )
+ 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
- BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
+ local build="${WORKDIR}/${P}_build/${process%%:*}"
+ BUILD_DIR="${build}" cmake-utils_src_compile
done
}
-DOCS=( AUTHORS README )
-
src_install() {
for process in ${processes} ; do
- BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_install
+ local build="${WORKDIR}/${P}_build/${process%%:*}"
+ BUILD_DIR="${build}" cmake-utils_src_install
done
if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
@@ -121,8 +130,19 @@ src_install() {
cd "${S}" || die "Can't enter source folder."
newicon ${PN}_icon.png ${PN}-2.6.png
- if use qt4 ; then
+ 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
+
+ if [[ -f "${ED}"/usr/bin/avidemux3_jobs_qt5 ]] ; then
+ fperms +x /usr/bin/avidemux3_jobs_qt5
+ fi
+
+ if use qt4 || use qt5 ; then
domenu ${PN}-2.6.desktop
fi
}
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index 00c928c5b60..ad0bd2cc0b7 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -5,6 +5,9 @@
<email>media-video@gentoo.org</email>
<name>Gentoo Video project</name>
</maintainer>
+ <use>
+ <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
+ </use>
<upstream>
<remote-id type="sourceforge">avidemux</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2017-10-04 8:02 Alexis Ballier
0 siblings, 0 replies; 37+ messages in thread
From: Alexis Ballier @ 2017-10-04 8:02 UTC (permalink / raw
To: gentoo-commits
commit: 88a9c6eecdbd9def8694de02a90a1d7454b0cbe3
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Oct 1 08:02:48 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 08:01:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88a9c6ee
media-video/avidemux: Add src_test phase
Relying on default src_test behavior ends up setting _RESPECT_CMAKE_BUILD_DIR=1 which cascades further problems in src_install.
Package-Manager: Portage-2.3.10, Repoman-2.3.3
media-video/avidemux/avidemux-2.6.20.ebuild | 7 +++++++
media-video/avidemux/avidemux-9999.ebuild | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
index 2ad1ffeee1b..3edaa3aa169 100644
--- a/media-video/avidemux/avidemux-2.6.20.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20.ebuild
@@ -113,6 +113,13 @@ 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%%:*}"
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index 2ad1ffeee1b..3edaa3aa169 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -113,6 +113,13 @@ 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%%:*}"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2017-10-04 8:02 Alexis Ballier
0 siblings, 0 replies; 37+ messages in thread
From: Alexis Ballier @ 2017-10-04 8:02 UTC (permalink / raw
To: gentoo-commits
commit: bf684c2818e3338beb6ec6729ac266c99bfd681f
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Oct 1 08:39:01 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 08:01:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf684c28
media-video/avidemux: Remove support for x11-drivers/ati-drivers
Package-Manager: Portage-2.3.10, Repoman-2.3.3
media-video/avidemux/avidemux-2.6.20.ebuild | 10 +++-------
media-video/avidemux/avidemux-9999.ebuild | 10 +++-------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
index d1ab08ed694..750cdb2350a 100644
--- a/media-video/avidemux/avidemux-2.6.20.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20.ebuild
@@ -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 video_cards_fglrx xv"
+IUSE="debug opengl nls nvenc qt4 qt5 sdl vaapi vdpau xv"
if [[ ${PV} == *9999* ]] ; then
MY_P="${P}"
@@ -27,16 +27,13 @@ else
fi
DEPEND="
- ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?,nvenc?]
+ ~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 ) )
- video_cards_fglrx? (
- || ( >=x11-drivers/ati-drivers-14.12-r3
- x11-libs/xvba-video:0 )
- )"
+"
RDEPEND="
$DEPEND
nls? ( virtual/libintl:0 )
@@ -88,7 +85,6 @@ src_configure() {
-DSDL="$(usex sdl)"
-DLIBVA="$(usex vaapi)"
-DVDPAU="$(usex vdpau)"
- -DXVBA="$(usex video_cards_fglrx)"
-DXVIDEO="$(usex xv)"
)
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index d1ab08ed694..750cdb2350a 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -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 video_cards_fglrx xv"
+IUSE="debug opengl nls nvenc qt4 qt5 sdl vaapi vdpau xv"
if [[ ${PV} == *9999* ]] ; then
MY_P="${P}"
@@ -27,16 +27,13 @@ else
fi
DEPEND="
- ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?,nvenc?]
+ ~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 ) )
- video_cards_fglrx? (
- || ( >=x11-drivers/ati-drivers-14.12-r3
- x11-libs/xvba-video:0 )
- )"
+"
RDEPEND="
$DEPEND
nls? ( virtual/libintl:0 )
@@ -88,7 +85,6 @@ src_configure() {
-DSDL="$(usex sdl)"
-DLIBVA="$(usex vaapi)"
-DVDPAU="$(usex vdpau)"
- -DXVBA="$(usex video_cards_fglrx)"
-DXVIDEO="$(usex xv)"
)
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2017-10-04 8:02 Alexis Ballier
0 siblings, 0 replies; 37+ messages in thread
From: Alexis Ballier @ 2017-10-04 8:02 UTC (permalink / raw
To: gentoo-commits
commit: c4b55af209d0d462e917d437f19633169004af57
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Oct 1 21:25:52 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 08:01:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b55af2
media-video/avidemux: Fix missing QT5 binaries
Bug: https://bugs.gentoo.org/623346
Package-Manager: Portage-2.3.10, Repoman-2.3.3
media-video/avidemux/avidemux-2.6.20.ebuild | 4 +++-
media-video/avidemux/avidemux-9999.ebuild | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
index 750cdb2350a..5227e4fdf24 100644
--- a/media-video/avidemux/avidemux-2.6.20.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20.ebuild
@@ -46,7 +46,9 @@ src_prepare() {
default
processes="buildCli:avidemux/cli"
- use qt4 && processes+=" buildQt4:avidemux/qt4"
+ if use qt4 || use qt5 ; then
+ processes+=" buildQt4:avidemux/qt4"
+ fi
for process in ${processes} ; do
CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index 750cdb2350a..5227e4fdf24 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -46,7 +46,9 @@ src_prepare() {
default
processes="buildCli:avidemux/cli"
- use qt4 && processes+=" buildQt4:avidemux/qt4"
+ if use qt4 || use qt5 ; then
+ processes+=" buildQt4:avidemux/qt4"
+ fi
for process in ${processes} ; do
CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2017-10-04 8:02 Alexis Ballier
0 siblings, 0 replies; 37+ messages in thread
From: Alexis Ballier @ 2017-10-04 8:02 UTC (permalink / raw
To: gentoo-commits
commit: 6ea12cf9e252157816d694373249cec6ee2447ae
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Oct 1 08:12:10 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 08:01:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea12cf9
media-video/avidemux: Run xdg_desktop_database_update
Package-Manager: Portage-2.3.10, Repoman-2.3.3
media-video/avidemux/avidemux-2.6.20.ebuild | 10 +++++++++-
media-video/avidemux/avidemux-9999.ebuild | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
index 3edaa3aa169..d1ab08ed694 100644
--- a/media-video/avidemux/avidemux-2.6.20.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
-inherit cmake-utils l10n
+inherit cmake-utils l10n xdg-utils
DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
HOMEPAGE="http://fixounet.free.fr/${PN}"
@@ -153,3 +153,11 @@ src_install() {
domenu ${PN}-2.6.desktop
fi
}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index 3edaa3aa169..d1ab08ed694 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
-inherit cmake-utils l10n
+inherit cmake-utils l10n xdg-utils
DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
HOMEPAGE="http://fixounet.free.fr/${PN}"
@@ -153,3 +153,11 @@ src_install() {
domenu ${PN}-2.6.desktop
fi
}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2017-10-04 8:02 Alexis Ballier
0 siblings, 0 replies; 37+ messages in thread
From: Alexis Ballier @ 2017-10-04 8:02 UTC (permalink / raw
To: gentoo-commits
commit: 94d0465a437d2bc1e54a7e93da4b1b6eda354d31
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Oct 1 23:56:04 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 08:01:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d0465a
media-video/avidemux: Fix building with GCC-5
Force -std=c++14 since the build uses a header with 'nullptr' which is invalid in GCC-5's default -std=c++98 dialect.
Package-Manager: Portage-2.3.10, Repoman-2.3.3
media-video/avidemux/avidemux-2.6.20.ebuild | 4 ++++
media-video/avidemux/avidemux-9999.ebuild | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
index 5227e4fdf24..72ad632f696 100644
--- a/media-video/avidemux/avidemux-2.6.20.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20.ebuild
@@ -81,6 +81,10 @@ src_configure() {
# 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=(
-DAVIDEMUX_SOURCE_DIR='${S}'
-DGETTEXT="$(usex nls)"
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index 5227e4fdf24..72ad632f696 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -81,6 +81,10 @@ src_configure() {
# 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=(
-DAVIDEMUX_SOURCE_DIR='${S}'
-DGETTEXT="$(usex nls)"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2017-10-29 9:34 Andreas Sturmlechner
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2017-10-29 9:34 UTC (permalink / raw
To: gentoo-commits
commit: f8664bfdc8b232f64ed1b5907559aeb5feeec879
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 22:56:20 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 09:34:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8664bfd
media-video/avidemux: Drop 2.6.8
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-video/avidemux/Manifest | 1 -
media-video/avidemux/avidemux-2.6.8.ebuild | 128 -----------------------------
2 files changed, 129 deletions(-)
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 6f017f59f92..4bf6be8c5b5 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,2 +1 @@
DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
-DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6
diff --git a/media-video/avidemux/avidemux-2.6.8.ebuild b/media-video/avidemux/avidemux-2.6.8.ebuild
deleted file mode 100644
index d31c66fd897..00000000000
--- a/media-video/avidemux/avidemux-2.6.8.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
-
-inherit cmake-utils eutils flag-o-matic l10n
-
-SLOT="2.6"
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/${PN}"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="debug opengl nls qt4 sdl vaapi vdpau video_cards_fglrx xv"
-KEYWORDS="~amd64 ~x86"
-
-if [[ ${PV} == *9999* ]] ; then
- KEYWORDS=""
- EGIT_REPO_URI="git://gitorious.org/${PN}2-6/${PN}2-6.git https://git.gitorious.org/${PN}2-6/${PN}2-6.git"
-
- inherit git-2
-else
- MY_P="${PN}_${PV}"
- SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-DEPEND="
- ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?]
- opengl? ( virtual/opengl:0 )
- qt4? ( >=dev-qt/qtgui-4.8.3:4 )
- vaapi? ( x11-libs/libva:0 )
- video_cards_fglrx? (
- || ( >=x11-drivers/ati-drivers-14.12-r3
- x11-libs/xvba-video:0 )
- )"
-RDEPEND="$DEPEND"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # Fix icon name -> avidemux-2.6.png
- sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${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.5 if it is installed.
- sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
- sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}2.desktop || die "Desktop file fix failed."
-
- # Fix QA warnings that complain a trailing ; is missing 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.5.
- mv ${PN}2.desktop ${PN}-2.6.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() {
- local mycmakeargs="
- -DAVIDEMUX_SOURCE_DIR='${S}'
- $(cmake-utils_use nls GETTEXT)
- $(cmake-utils_use sdl)
- $(cmake-utils_use vaapi LIBVA)
- $(cmake-utils_use vdpau)
- $(cmake-utils_use video_cards_fglrx XVBA)
- $(cmake-utils_use xv XVIDEO)
- "
-
- if use debug ; then
- mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
- fi
-
- processes="buildCli:avidemux/cli"
- use qt4 && processes+=" buildQt4:avidemux/qt4"
-
- for process in ${processes} ; do
- local build="${process%%:*}"
-
- mkdir "${S}"/${build} || die "Can't create build folder."
- cd "${S}"/${build} || die "Can't enter build folder."
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
- done
-
- # 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
-}
-
-src_compile() {
- for process in ${processes} ; do
- BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
- done
-}
-
-DOCS=( AUTHORS README )
-
-src_install() {
- for process in ${processes} ; do
- BUILD_DIR="${S}/${process%%:*}" 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}-2.6.png
-
- if use qt4 ; then
- fperms +x /usr/bin/avidemux3_qt4
- domenu ${PN}-2.6.desktop
- fi
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2017-12-08 18:32 Andreas Sturmlechner
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2017-12-08 18:32 UTC (permalink / raw
To: gentoo-commits
commit: bba32a6a6eb78b10a501caeb829a7839797f8641
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 8 17:45:48 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 8 18:30:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba32a6a
media-video/avidemux: Drop USE=qt4
Bug: https://bugs.gentoo.org/549818
Package-Manager: Portage-2.3.17, Repoman-2.3.6
media-video/avidemux/avidemux-9999.ebuild | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index 72ad632f696..cd242925e7a 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.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
}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2017-12-08 18:32 Andreas Sturmlechner
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2017-12-08 18:32 UTC (permalink / raw
To: gentoo-commits
commit: 9a3ce33ae0bf2f9ce1a55a4fe33476f62ac5109a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 8 18:26:55 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 8 18:30:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a3ce33a
media-video/avidemux: Sort DEPENDs
Package-Manager: Portage-2.3.17, Repoman-2.3.6
media-video/avidemux/avidemux-9999.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index cd242925e7a..752f66972be 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -28,13 +28,12 @@ fi
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/qtgui:5 )
vaapi? ( x11-libs/libva:0 )
- nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
"
-RDEPEND="
- $DEPEND
+RDEPEND="${DEPEND}
nls? ( virtual/libintl:0 )
"
PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2017-12-09 13:52 Andreas Sturmlechner
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2017-12-09 13:52 UTC (permalink / raw
To: gentoo-commits
commit: 9e84e6512ff8639f870499208ddf40608cc8d4d4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 13:45:54 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 13:52:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e84e651
media-video/avidemux: Drop USE=qt4
Bug: https://bugs.gentoo.org/549818
Closes: https://bugs.gentoo.org/558166
Closes: https://bugs.gentoo.org/572070
Package-Manager: Portage-2.3.17, Repoman-2.3.6
media-video/avidemux/avidemux-2.6.20.ebuild | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
index 72ad632f696..cd242925e7a 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
}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2017-12-21 15:37 Andreas Sturmlechner
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2017-12-21 15:37 UTC (permalink / raw
To: gentoo-commits
commit: d7490ea21861adbe15705a84193013c7031d01d0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 15:31:47 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 15:31:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7490ea2
media-video/avidemux: Override LRELEASE_EXECUTABLE
Closes: https://bugs.gentoo.org/640652
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-video/avidemux/avidemux-2.6.20.ebuild | 7 +++++--
media-video/avidemux/avidemux-9999.ebuild | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
index cd242925e7a..be6bab95655 100644
--- a/media-video/avidemux/avidemux-2.6.20.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20.ebuild
@@ -5,7 +5,7 @@ EAPI=6
PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
-inherit cmake-utils l10n xdg-utils
+inherit cmake-utils l10n qmake-utils xdg-utils
DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
HOMEPAGE="http://fixounet.free.fr/${PN}"
@@ -94,7 +94,10 @@ src_configure() {
)
if use qt5 ; then
- mycmakeargs+=( -DENABLE_QT5="$(usex qt5)" )
+ mycmakeargs+=(
+ -DENABLE_QT5="$(usex qt5)"
+ -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+ )
fi
if use debug ; then
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index 752f66972be..9d80d4bdfe6 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
-inherit cmake-utils l10n xdg-utils
+inherit cmake-utils l10n qmake-utils xdg-utils
DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
HOMEPAGE="http://fixounet.free.fr/${PN}"
@@ -93,7 +93,10 @@ src_configure() {
)
if use qt5 ; then
- mycmakeargs+=( -DENABLE_QT5="$(usex qt5)" )
+ mycmakeargs+=(
+ -DENABLE_QT5="$(usex qt5)"
+ -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+ )
fi
if use debug ; then
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2017-12-21 17:39 Andreas Sturmlechner
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2017-12-21 17:39 UTC (permalink / raw
To: gentoo-commits
commit: 770827684b55090d7e83febf16a8dd927b9ca62b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 17:38:28 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 17:38:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77082768
media-video/avidemux: USE=qt5 needs dev-qt/linguist-tools:5
Obviously.
Closes: https://bugs.gentoo.org/641958
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-video/avidemux/avidemux-2.6.20.ebuild | 8 +++++---
media-video/avidemux/avidemux-9999.ebuild | 7 +++++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
index be6bab95655..fe1b48bfcfb 100644
--- a/media-video/avidemux/avidemux-2.6.20.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20.ebuild
@@ -26,15 +26,17 @@ else
KEYWORDS="~amd64 ~x86"
fi
-DEPEND="
+COMMON_DEPEND="
~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
opengl? ( virtual/opengl:0 )
qt5? ( dev-qt/qtgui:5 )
vaapi? ( x11-libs/libva:0 )
nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
"
-RDEPEND="
- $DEPEND
+DEPEND="${COMMON_DEPEND}
+ qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="${COMMON_DEPEND}
nls? ( virtual/libintl:0 )
"
PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index 9d80d4bdfe6..6f2df9f42a3 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -26,14 +26,17 @@ else
KEYWORDS="~amd64 ~x86"
fi
-DEPEND="
+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/qtgui:5 )
vaapi? ( x11-libs/libva:0 )
"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="${COMMON_DEPEND}
nls? ( virtual/libintl:0 )
"
PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2018-01-05 15:38 Ulrich Müller
0 siblings, 0 replies; 37+ messages in thread
From: Ulrich Müller @ 2018-01-05 15:38 UTC (permalink / raw
To: gentoo-commits
commit: 7bdd62c570cb5d43fe5f70dcf788d719782b365e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 13:57:09 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 15:38:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bdd62c5
media-video/avidemux: Do not inherit l10n.eclass.
No l10n_* functions are being called, and the eclass does not contain
any code in global scope any more.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-video/avidemux/avidemux-2.6.20.ebuild | 6 ++----
media-video/avidemux/avidemux-9999.ebuild | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
index fe1b48bfcfb..59807f05643 100644
--- a/media-video/avidemux/avidemux-2.6.20.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
-
-inherit cmake-utils l10n qmake-utils xdg-utils
+inherit cmake-utils qmake-utils xdg-utils
DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
HOMEPAGE="http://fixounet.free.fr/${PN}"
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index 6f2df9f42a3..2e985fe5726 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
-
-inherit cmake-utils l10n qmake-utils xdg-utils
+inherit cmake-utils qmake-utils xdg-utils
DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
HOMEPAGE="http://fixounet.free.fr/${PN}"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2018-01-09 17:33 Andreas Sturmlechner
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2018-01-09 17:33 UTC (permalink / raw
To: gentoo-commits
commit: e499cf4db05f0128b30e7eb528c65ea472dc2c0d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 9 17:31:01 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 9 17:31:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e499cf4d
media-video/avidemux: Drop 2.6.0 (r0)
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-video/avidemux/avidemux-2.6.20.ebuild | 163 ----------------------------
1 file changed, 163 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
deleted file mode 100644
index 59807f05643..00000000000
--- a/media-video/avidemux/avidemux-2.6.20.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils qmake-utils xdg-utils
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-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 qt5 sdl vaapi vdpau xv"
-
-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
-
-COMMON_DEPEND="
- ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
- opengl? ( virtual/opengl:0 )
- qt5? ( dev-qt/qtgui:5 )
- vaapi? ( x11-libs/libva:0 )
- nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
-"
-DEPEND="${COMMON_DEPEND}
- qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="${COMMON_DEPEND}
- nls? ( virtual/libintl:0 )
-"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- 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.6.png
- sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${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.5 if it is installed.
- sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
- sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt'$(usex qt5 5 4)':' ${PN}2.desktop || die "Desktop file fix failed."
-
- # Fix QA warnings that complain a trailing ; is missing 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.5.
- mv ${PN}2.desktop ${PN}-2.6.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=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -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}-2.6.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}-2.6.desktop
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2018-01-09 17:33 Andreas Sturmlechner
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2018-01-09 17:33 UTC (permalink / raw
To: gentoo-commits
commit: ed3f9f1643b2a79b26f2b13ceadff172e7754cc1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 9 15:49:03 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 9 17:28:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed3f9f16
media-video/avidemux: Only sed avidemux2.desktop if USE=qt5
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-video/avidemux/avidemux-2.6.20-r1.ebuild | 166 +++++++++++++++++++++++++
1 file changed, 166 insertions(+)
diff --git a/media-video/avidemux/avidemux-2.6.20-r1.ebuild b/media-video/avidemux/avidemux-2.6.20-r1.ebuild
new file mode 100644
index 00000000000..75412c73705
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.6.20-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils qmake-utils xdg-utils
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
+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 qt5 sdl vaapi vdpau xv"
+
+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
+
+COMMON_DEPEND="
+ ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
+ opengl? ( virtual/opengl:0 )
+ qt5? ( dev-qt/qtgui:5 )
+ vaapi? ( x11-libs/libva:0 )
+ nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
+"
+DEPEND="${COMMON_DEPEND}
+ qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ nls? ( virtual/libintl:0 )
+"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ 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.6.png
+ sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${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.5 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
+
+ # Fix QA warnings that complain a trailing ; is missing 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.5.
+ mv ${PN}2.desktop ${PN}-2.6.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=(
+ -DAVIDEMUX_SOURCE_DIR='${S}'
+ -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}-2.6.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}-2.6.desktop
+ fi
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2018-01-09 17:33 Andreas Sturmlechner
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2018-01-09 17:33 UTC (permalink / raw
To: gentoo-commits
commit: 4404a6dab80b61ab4d99c1cb132884a9e3dbcb07
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 9 16:57:39 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 9 17:29:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4404a6da
media-video/avidemux: 2.7.0 version bump
Add x11-libs/libva slot operator.
Closes: https://bugs.gentoo.org/549818
Closes: https://bugs.gentoo.org/641636
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-video/avidemux/Manifest | 1 +
media-video/avidemux/avidemux-2.6.20-r1.ebuild | 2 +-
...{avidemux-9999.ebuild => avidemux-2.7.0.ebuild} | 30 ++++++++++++----------
media-video/avidemux/avidemux-9999.ebuild | 30 ++++++++++++----------
4 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index ae61dc9d907..c86d53e23df 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1 +1,2 @@
DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103
+DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
diff --git a/media-video/avidemux/avidemux-2.6.20-r1.ebuild b/media-video/avidemux/avidemux-2.6.20-r1.ebuild
index 75412c73705..0dfaecb51ea 100644
--- a/media-video/avidemux/avidemux-2.6.20-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20-r1.ebuild
@@ -91,7 +91,7 @@ src_configure() {
-DAVIDEMUX_SOURCE_DIR='${S}'
-DGETTEXT="$(usex nls)"
-DSDL="$(usex sdl)"
- -DLIBVA="$(usex vaapi)"
+ -DLibVA="$(usex vaapi)"
-DVDPAU="$(usex vdpau)"
-DXVIDEO="$(usex xv)"
)
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-2.7.0.ebuild
similarity index 86%
copy from media-video/avidemux/avidemux-9999.ebuild
copy to media-video/avidemux/avidemux-2.7.0.ebuild
index 6b3b95e51a5..d1ae46fc076 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-2.7.0.ebuild
@@ -19,15 +19,20 @@ 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.6"
+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/qtgui:5 )
- vaapi? ( x11-libs/libva: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 )
@@ -51,12 +56,12 @@ src_prepare() {
CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
done
- # Fix icon name -> avidemux-2.6.png
- sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || \
+ # 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.5 if it is installed.
+ # 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
@@ -68,8 +73,8 @@ src_prepare() {
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.5.
- mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename 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)
@@ -87,14 +92,13 @@ src_configure() {
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.
+ # which is from >=C++11. Let's use the GCC-6 default C++ dialect.
append-cxxflags -std=c++14
local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
-DGETTEXT="$(usex nls)"
-DSDL="$(usex sdl)"
- -DLIBVA="$(usex vaapi)"
+ -DLibVA="$(usex vaapi)"
-DVDPAU="$(usex vdpau)"
-DXVIDEO="$(usex xv)"
)
@@ -145,7 +149,7 @@ src_install() {
fi
cd "${S}" || die "Can't enter source folder."
- newicon ${PN}_icon.png ${PN}-2.6.png
+ newicon ${PN}_icon.png ${PN}-${SLOT}.png
if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
fperms +x /usr/bin/avidemux3_qt5
@@ -156,7 +160,7 @@ src_install() {
fi
if use qt5 ; then
- domenu ${PN}-2.6.desktop
+ domenu ${PN}-${SLOT}.desktop
fi
}
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index 6b3b95e51a5..d1ae46fc076 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -19,15 +19,20 @@ 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.6"
+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/qtgui:5 )
- vaapi? ( x11-libs/libva: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 )
@@ -51,12 +56,12 @@ src_prepare() {
CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
done
- # Fix icon name -> avidemux-2.6.png
- sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || \
+ # 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.5 if it is installed.
+ # 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
@@ -68,8 +73,8 @@ src_prepare() {
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.5.
- mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename 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)
@@ -87,14 +92,13 @@ src_configure() {
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.
+ # which is from >=C++11. Let's use the GCC-6 default C++ dialect.
append-cxxflags -std=c++14
local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
-DGETTEXT="$(usex nls)"
-DSDL="$(usex sdl)"
- -DLIBVA="$(usex vaapi)"
+ -DLibVA="$(usex vaapi)"
-DVDPAU="$(usex vdpau)"
-DXVIDEO="$(usex xv)"
)
@@ -145,7 +149,7 @@ src_install() {
fi
cd "${S}" || die "Can't enter source folder."
- newicon ${PN}_icon.png ${PN}-2.6.png
+ newicon ${PN}_icon.png ${PN}-${SLOT}.png
if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
fperms +x /usr/bin/avidemux3_qt5
@@ -156,7 +160,7 @@ src_install() {
fi
if use qt5 ; then
- domenu ${PN}-2.6.desktop
+ domenu ${PN}-${SLOT}.desktop
fi
}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2018-01-09 17:33 Andreas Sturmlechner
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2018-01-09 17:33 UTC (permalink / raw
To: gentoo-commits
commit: e6408e70b2daa530fdb49e3d9f62a00eb4a94891
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 23:08:47 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 9 17:28:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6408e70
media-video/avidemux: Sorting, line breaks
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-video/avidemux/avidemux-9999.ebuild | 42 ++++++++++++++++++-------------
1 file changed, 24 insertions(+), 18 deletions(-)
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index 2e985fe5726..6b3b95e51a5 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -3,26 +3,24 @@
EAPI=6
-inherit cmake-utils qmake-utils xdg-utils
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-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 qt5 sdl vaapi vdpau xv"
-
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.6"
+IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
COMMON_DEPEND="
~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
@@ -54,21 +52,29 @@ src_prepare() {
done
# Fix icon name -> avidemux-2.6.png
- sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
+ sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${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.5 if it is installed.
- sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
- sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt'$(usex qt5 5 4)':' ${PN}2.desktop || die "Desktop file fix failed."
+ 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
- # Fix QA warnings that complain a trailing ; is missing 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' ${PN}2.desktop || \
+ die "Desktop file fix failed."
# Now rename the desktop file to not collide with 2.5.
mv ${PN}2.desktop ${PN}-2.6.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."
+ # 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() {
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2019-07-06 10:25 Andreas Sturmlechner
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2019-07-06 10:25 UTC (permalink / raw
To: gentoo-commits
commit: a25a3be5941a7e827717e40eb264e7e9929c4b19
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 6 09:06:11 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 6 10:22:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a25a3be5
media-video/avidemux: No one is maintaining this, drop 9999
Bug: https://bugs.gentoo.org/689342
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/avidemux/avidemux-9999.ebuild | 172 ------------------------------
1 file changed, 172 deletions(-)
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
deleted file mode 100644
index 6d44aea9bcd..00000000000
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ /dev/null
@@ -1,172 +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() {
- 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
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2019-07-06 10:25 Andreas Sturmlechner
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2019-07-06 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 10f53781b37195ec782395eed9780ac99179ec60
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 6 09:09:48 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 6 10:22:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f53781
media-video/avidemux: Drop 2.6.20-r1
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/avidemux/Manifest | 1 -
media-video/avidemux/avidemux-2.6.20-r1.ebuild | 166 -------------------------
2 files changed, 167 deletions(-)
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index c86d53e23df..281d961cf75 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,2 +1 @@
-DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103
DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
diff --git a/media-video/avidemux/avidemux-2.6.20-r1.ebuild b/media-video/avidemux/avidemux-2.6.20-r1.ebuild
deleted file mode 100644
index 0dfaecb51ea..00000000000
--- a/media-video/avidemux/avidemux-2.6.20-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils qmake-utils xdg-utils
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-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 qt5 sdl vaapi vdpau xv"
-
-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
-
-COMMON_DEPEND="
- ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
- opengl? ( virtual/opengl:0 )
- qt5? ( dev-qt/qtgui:5 )
- vaapi? ( x11-libs/libva:0 )
- nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
-"
-DEPEND="${COMMON_DEPEND}
- qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="${COMMON_DEPEND}
- nls? ( virtual/libintl:0 )
-"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- 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.6.png
- sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${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.5 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
-
- # Fix QA warnings that complain a trailing ; is missing 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.5.
- mv ${PN}2.desktop ${PN}-2.6.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=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -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}-2.6.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}-2.6.desktop
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2019-08-14 4:35 Stefan Strogin
0 siblings, 0 replies; 37+ messages in thread
From: Stefan Strogin @ 2019-08-14 4:35 UTC (permalink / raw
To: gentoo-commits
commit: 764135e1be48658b38b5965c62a611ac59bbe12d
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 04:15:22 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 04:34:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=764135e1
media-video/avidemux: fix bad tarball filename
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
media-video/avidemux/Manifest | 2 +-
media-video/avidemux/avidemux-2.7.3.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index e9ad4687cc9..7e55a202857 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,2 +1,2 @@
-DIST 2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
+DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
diff --git a/media-video/avidemux/avidemux-2.7.3.ebuild b/media-video/avidemux/avidemux-2.7.3.ebuild
index 753377cf0f3..40f4f5d8b22 100644
--- a/media-video/avidemux/avidemux-2.7.3.ebuild
+++ b/media-video/avidemux/avidemux-2.7.3.ebuild
@@ -9,7 +9,7 @@ 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"
+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"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2019-08-25 20:52 Stefan Strogin
0 siblings, 0 replies; 37+ messages in thread
From: Stefan Strogin @ 2019-08-25 20:52 UTC (permalink / raw
To: gentoo-commits
commit: d1dc0500e372a34c1107254df774ffb9d4208d8b
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 20:21:05 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 20:50:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1dc0500
media-video/avidemux: bump version to 2.7.4
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.4.ebuild | 129 +++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 7e55a202857..4113f7cd25d 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,2 +1,3 @@
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.4.ebuild b/media-video/avidemux/avidemux-2.7.4.ebuild
new file mode 100644
index 00000000000..8e047a6a29c
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.7.4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="
+ ~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/qtnetwork: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}/avidemux2-${PV}"
+
+src_prepare() {
+ processes="buildCli:avidemux/cli"
+ 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
+ sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/${PN}.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:" appImage/${PN}.desktop || \
+ die "Desktop file fix failed."
+ use qt5 && sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' appImage/${PN}.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 appImage/${PN}.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() {
+ # 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)"
+ )
+
+ use qt5 && mycmakeargs+=(
+ -DENABLE_QT5="$(usex qt5)"
+ -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+ )
+
+ use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+
+ 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
+
+ cd "${S}" || die "Can't enter source folder"
+ newicon ${PN}_icon.png ${PN}-${SLOT}.png
+
+ use qt5 && domenu ${PN}-${SLOT}.desktop
+}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2019-08-28 22:08 Stefan Strogin
0 siblings, 0 replies; 37+ messages in thread
From: Stefan Strogin @ 2019-08-28 22:08 UTC (permalink / raw
To: gentoo-commits
commit: 7e2eb99fb1941a72a2779b954c2c71feb87af107
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 21:51:20 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 22:06:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2eb99f
media-video/avidemux: fix .desktop file
Reported-by: Toralf Förster <toralf <AT> gentoo.org>
Reported-by: Bernd Feige <bernd.feige <AT> gmx.net>
Closes: https://bugs.gentoo.org/692898
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
...demux-2.7.4.ebuild => avidemux-2.7.4-r1.ebuild} | 36 +++++++++++-----------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.7.4.ebuild b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
similarity index 74%
rename from media-video/avidemux/avidemux-2.7.4.ebuild
rename to media-video/avidemux/avidemux-2.7.4-r1.ebuild
index 8e047a6a29c..8bf214ecf0b 100644
--- a/media-video/avidemux/avidemux-2.7.4.ebuild
+++ b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
@@ -49,23 +49,22 @@ src_prepare() {
CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
done
- # Fix icon name -> avidemux-2.7
- sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/${PN}.desktop || \
- die "Icon name fix failed."
+ if use qt5; then
+ # 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 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:" appImage/${PN}.desktop || \
- die "Desktop file fix failed."
- use qt5 && sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' appImage/${PN}.desktop || \
- die "Desktop file 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."
- # QA warnings: missing trailing ';' and 'Application' is deprecated.
- sed -i -e 's/Application;AudioVideo/AudioVideo;/g' appImage/${PN}.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 appImage/${PN}.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)
@@ -122,8 +121,9 @@ src_install() {
BUILD_DIR="${build}" cmake-utils_src_install
done
- cd "${S}" || die "Can't enter source folder"
- newicon ${PN}_icon.png ${PN}-${SLOT}.png
-
- use qt5 && domenu ${PN}-${SLOT}.desktop
+ if use qt5; then
+ cd "${S}" || die "Can't enter source folder"
+ newicon ${PN}_icon.png ${PN}-${SLOT}.png
+ domenu ${PN}-${SLOT}.desktop
+ fi
}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2019-08-28 22:52 Stefan Strogin
0 siblings, 0 replies; 37+ messages in thread
From: Stefan Strogin @ 2019-08-28 22:52 UTC (permalink / raw
To: gentoo-commits
commit: 06a204eaf47f82501e506350860c3100329c5359
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 22:46:22 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 22:46:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a204ea
media-video/avidemux: respect USE=opengl
Reported-by: Bernd Feige <bernd.feige <AT> gmx.net>
Closes: https://bugs.gentoo.org/692348
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
media-video/avidemux/avidemux-2.7.4-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-video/avidemux/avidemux-2.7.4-r1.ebuild b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
index 8bf214ecf0b..16632727c8d 100644
--- a/media-video/avidemux/avidemux-2.7.4-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
@@ -84,6 +84,7 @@ src_configure() {
-DGETTEXT="$(usex nls)"
-DSDL="$(usex sdl)"
-DLibVA="$(usex vaapi)"
+ -DOPENGL="$(usex opengl)"
-DVDPAU="$(usex vdpau)"
-DXVIDEO="$(usex xv)"
)
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2020-08-11 23:10 Thomas Deutschmann
0 siblings, 0 replies; 37+ messages in thread
From: Thomas Deutschmann @ 2020-08-11 23:10 UTC (permalink / raw
To: gentoo-commits
commit: ae405a5723a6f7db0ad20309f49f9bb5c5ec0754
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 23:07:57 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 23:10:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae405a57
media-video/avidemux: bump to v2.7.6
Closes: https://bugs.gentoo.org/735568
Closes: https://bugs.gentoo.org/693112
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-video/avidemux/avidemux-2.7.6.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.7.6.ebuild b/media-video/avidemux/avidemux-2.7.6.ebuild
index ce223b81cf3..8808e2507b9 100644
--- a/media-video/avidemux/avidemux-2.7.6.ebuild
+++ b/media-video/avidemux/avidemux-2.7.6.ebuild
@@ -16,7 +16,8 @@ SLOT="2.7"
KEYWORDS="~amd64 ~x86"
IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
-BDEPEND="qt5? ( dev-qt/linguist-tools:5 )"
+BDEPEND="dev-lang/yasm
+ qt5? ( dev-qt/linguist-tools:5 )"
DEPEND="
~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
@@ -39,7 +40,7 @@ PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
S="${WORKDIR}/avidemux2-${PV}"
src_prepare() {
- eapply "${FILESDIR}"/${P}-qt-5.15.patch
+ eapply "${FILESDIR}"/${PN}-2.7.4-qt-5.15.patch
processes="buildCli:avidemux/cli"
use qt5 && processes+=" buildQt4:avidemux/qt4"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2020-08-13 0:53 Stefan Strogin
0 siblings, 0 replies; 37+ messages in thread
From: Stefan Strogin @ 2020-08-13 0:53 UTC (permalink / raw
To: gentoo-commits
commit: 939c523fdea7b0cdbe25f7f4f438e299d63c6e1e
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 00:50:02 2020 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 00:52:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=939c523f
media-video/avidemux: add i18n tarball to fix compilation
Since https://github.com/mean00/avidemux2/commit/0100e4b4
"[i18n] Move TS.cmake to submodule" a git submodule i18n is used get
translation files which are moved to a separate repository.
Download the release tarball with the translation files and unpack them
to the i18n submodule directory, where cmake expects it.
Closes: https://bugs.gentoo.org/736820
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
media-video/avidemux/Manifest | 1 +
.../avidemux/{avidemux-2.7.6.ebuild => avidemux-2.7.6-r1.ebuild} | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 20c2b9ff2f2..8b053b938cb 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,2 +1,3 @@
DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
+DIST avidemux-i18n-2.7.6.tar.gz 2268693 BLAKE2B dedf6d015e6bbd58f432e05e72c4d8d175ce4f5567331b5e51e7a14d2a8180e92211efc172a4d7001a2947f46c2e910a485d42970b99df05c1ba12002974cfbf SHA512 26ada29c4b7c23739ddcc4ca1dc9819bbc64fa2b6472fd7ff5706905dbd9b382e7a7d69ba78f72afa6f3db55cf3c5373a5e2d244f1cf189aeb187984dd1f4187
diff --git a/media-video/avidemux/avidemux-2.7.6.ebuild b/media-video/avidemux/avidemux-2.7.6-r1.ebuild
similarity index 94%
rename from media-video/avidemux/avidemux-2.7.6.ebuild
rename to media-video/avidemux/avidemux-2.7.6-r1.ebuild
index 8808e2507b9..33583b343b9 100644
--- a/media-video/avidemux/avidemux-2.7.6.ebuild
+++ b/media-video/avidemux/avidemux-2.7.6-r1.ebuild
@@ -8,7 +8,8 @@ inherit cmake 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"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/mean00/avidemux2_i18n/archive/${PV}.tar.gz -> ${PN}-i18n-${PV}.tar.gz"
# Multiple licenses because of all the bundled stuff.
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
@@ -39,6 +40,11 @@ PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
S="${WORKDIR}/avidemux2-${PV}"
+src_unpack() {
+ default
+ mv -f -T avidemux2_i18n-${PV} "${S}"/avidemux/qt4/i18n >/dev/null || die
+}
+
src_prepare() {
eapply "${FILESDIR}"/${PN}-2.7.4-qt-5.15.patch
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2020-10-31 11:11 David Seifert
0 siblings, 0 replies; 37+ messages in thread
From: David Seifert @ 2020-10-31 11:11 UTC (permalink / raw
To: gentoo-commits
commit: 6173a05c3668a52eeae39ab3ed145a31af893661
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 11:11:23 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 11:11:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6173a05c
media-video/avidemux: [QA] Inherit flag-o-matic.eclass explicitly
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-video/avidemux/avidemux-2.7.4-r1.ebuild | 2 +-
media-video/avidemux/avidemux-2.7.6-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.7.4-r1.ebuild b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
index ce223b81cf3..bf85cfccc4e 100644
--- a/media-video/avidemux/avidemux-2.7.4-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake desktop qmake-utils xdg
+inherit cmake desktop flag-o-matic qmake-utils xdg
DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
HOMEPAGE="http://fixounet.free.fr/avidemux"
diff --git a/media-video/avidemux/avidemux-2.7.6-r1.ebuild b/media-video/avidemux/avidemux-2.7.6-r1.ebuild
index 33583b343b9..b1fce24ef0a 100644
--- a/media-video/avidemux/avidemux-2.7.6-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.7.6-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake desktop qmake-utils xdg
+inherit cmake desktop flag-o-matic qmake-utils xdg
DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
HOMEPAGE="http://fixounet.free.fr/avidemux"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2021-01-01 1:06 Michał Górny
0 siblings, 0 replies; 37+ messages in thread
From: Michał Górny @ 2021-01-01 1:06 UTC (permalink / raw
To: gentoo-commits
commit: eaf2ef2b3a2e5f4d6913893cb14c1336426e775b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 1 01:02:36 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 1 01:02:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf2ef2b
media-video/avidemux: Remove old (py3.6)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-video/avidemux/Manifest | 1 -
media-video/avidemux/avidemux-2.7.4-r1.ebuild | 129 --------------------------
2 files changed, 130 deletions(-)
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 8b053b938cb..1024821da92 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,3 +1,2 @@
-DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
DIST avidemux-i18n-2.7.6.tar.gz 2268693 BLAKE2B dedf6d015e6bbd58f432e05e72c4d8d175ce4f5567331b5e51e7a14d2a8180e92211efc172a4d7001a2947f46c2e910a485d42970b99df05c1ba12002974cfbf SHA512 26ada29c4b7c23739ddcc4ca1dc9819bbc64fa2b6472fd7ff5706905dbd9b382e7a7d69ba78f72afa6f3db55cf3c5373a5e2d244f1cf189aeb187984dd1f4187
diff --git a/media-video/avidemux/avidemux-2.7.4-r1.ebuild b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
deleted file mode 100644
index bf85cfccc4e..00000000000
--- a/media-video/avidemux/avidemux-2.7.4-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake desktop flag-o-matic 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"
-
-BDEPEND="qt5? ( dev-qt/linguist-tools:5 )"
-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/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- )
- vaapi? ( x11-libs/libva:0= )
-"
-RDEPEND="${DEPEND}
- nls? ( virtual/libintl:0 )
- !<media-video/avidemux-${PV}
-"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
-
-S="${WORKDIR}/avidemux2-${PV}"
-
-src_prepare() {
- eapply "${FILESDIR}"/${P}-qt-5.15.patch
-
- processes="buildCli:avidemux/cli"
- use qt5 && processes+=" buildQt4:avidemux/qt4"
-
- for process in ${processes} ; do
- CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
- done
-
- if use qt5; then
- # 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."
-
- # 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 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)
- sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || \
- die "Couldn't remove \"Build Option\" dialog."
-}
-
-src_configure() {
- # 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)"
- -DOPENGL="$(usex opengl)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- )
-
- use qt5 && mycmakeargs+=(
- -DENABLE_QT5="$(usex qt5)"
- -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
- )
-
- use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
- done
-}
-
-src_compile() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_compile
- done
-}
-
-src_test() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_test
- done
-}
-
-src_install() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_install
- done
-
- if use qt5; then
- cd "${S}" || die "Can't enter source folder"
- newicon ${PN}_icon.png ${PN}-${SLOT}.png
- domenu ${PN}-${SLOT}.desktop
- fi
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2021-11-07 0:01 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2021-11-07 0:01 UTC (permalink / raw
To: gentoo-commits
commit: 470bb0df103817c725ab7a1045de5a688d8a7ab6
Author: Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Sun Jun 20 18:21:30 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 7 00:01:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=470bb0df
media-video/avidemux: bump to 2.7.8
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
Closes: https://github.com/gentoo/gentoo/pull/21347
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/avidemux/Manifest | 2 +
media-video/avidemux/avidemux-2.7.8.ebuild | 139 +++++++++++++++++++++++++++++
2 files changed, 141 insertions(+)
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 1024821da92..48945364b67 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,2 +1,4 @@
DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
+DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
DIST avidemux-i18n-2.7.6.tar.gz 2268693 BLAKE2B dedf6d015e6bbd58f432e05e72c4d8d175ce4f5567331b5e51e7a14d2a8180e92211efc172a4d7001a2947f46c2e910a485d42970b99df05c1ba12002974cfbf SHA512 26ada29c4b7c23739ddcc4ca1dc9819bbc64fa2b6472fd7ff5706905dbd9b382e7a7d69ba78f72afa6f3db55cf3c5373a5e2d244f1cf189aeb187984dd1f4187
+DIST avidemux-i18n-2.7.8.tar.gz 2488165 BLAKE2B 9e6bfb10e938c880d372570cfe35ba9422a8c0081b116230d831bd421b205a555415350be96b0e3149beb164a0151e04205bded403354d7052aa24884a068407 SHA512 a62b06a3d95577cf805be36f991ccb63d044b7c3633ada65bd5810f0e7d8eb41aa874ef5dd63de4fcacc0be073935bed827b2f0bceba77ab735ac8673c1ad39f
diff --git a/media-video/avidemux/avidemux-2.7.8.ebuild b/media-video/avidemux/avidemux-2.7.8.ebuild
new file mode 100644
index 00000000000..b251f2f0460
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.7.8.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake desktop flag-o-matic 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
+ https://github.com/mean00/avidemux2_i18n/archive/${PV}.tar.gz -> ${PN}-i18n-${PV}.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"
+
+BDEPEND="
+ dev-lang/yasm
+ qt5? ( dev-qt/linguist-tools:5 )
+"
+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/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ )
+ vaapi? ( x11-libs/libva:0= )
+"
+RDEPEND="
+ ${DEPEND}
+ nls? ( virtual/libintl:0 )
+ !<media-video/avidemux-${PV}
+"
+
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
+
+S="${WORKDIR}/avidemux2-${PV}"
+
+src_unpack() {
+ default
+ mv -f -T avidemux2_i18n-"${PV}" "${S}"/avidemux/qt4/i18n >/dev/null || die
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-2.7.4-qt-5.15.patch"
+
+ processes="buildCli:avidemux/cli"
+ use qt5 && processes+=" buildQt4:avidemux/qt4"
+
+ for process in ${processes} ; do
+ CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
+ done
+
+ if use qt5; then
+ # 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."
+
+ # 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 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)
+ sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
+}
+
+src_configure() {
+ # 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)"
+ -DOPENGL="$(usex opengl)"
+ -DVDPAU="$(usex vdpau)"
+ -DXVIDEO="$(usex xv)"
+ )
+
+ use qt5 && mycmakeargs+=(
+ -DENABLE_QT5="$(usex qt5)"
+ -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+ )
+
+ use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+
+ for process in ${processes} ; do
+ local build="${WORKDIR}/${P}_build/${process%%:*}"
+ CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
+ done
+}
+
+src_compile() {
+ for process in ${processes} ; do
+ local build="${WORKDIR}/${P}_build/${process%%:*}"
+ BUILD_DIR="${build}" cmake_src_compile
+ done
+}
+
+src_test() {
+ for process in ${processes} ; do
+ local build="${WORKDIR}/${P}_build/${process%%:*}"
+ BUILD_DIR="${build}" cmake_src_test
+ done
+}
+
+src_install() {
+ for process in ${processes} ; do
+ local build="${WORKDIR}/${P}_build/${process%%:*}"
+ BUILD_DIR="${build}" cmake_src_install
+ done
+
+ if use qt5; then
+ cd "${S}" || die "Can't enter source folder"
+ newicon "${PN}"_icon.png "${PN}-${SLOT}".png
+ domenu "${PN}-${SLOT}".desktop
+ fi
+}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2022-03-09 12:37 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2022-03-09 12:37 UTC (permalink / raw
To: gentoo-commits
commit: efdaee4ffa085a95e9560133c7fe1a767ad39dc3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 12:28:43 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 12:28:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efdaee4f
media-video/avidemux: drop 2.7.6-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/avidemux/Manifest | 2 -
media-video/avidemux/avidemux-2.7.6-r1.ebuild | 136 --------------------------
2 files changed, 138 deletions(-)
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 48945364b673..0201016418c0 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,4 +1,2 @@
-DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
-DIST avidemux-i18n-2.7.6.tar.gz 2268693 BLAKE2B dedf6d015e6bbd58f432e05e72c4d8d175ce4f5567331b5e51e7a14d2a8180e92211efc172a4d7001a2947f46c2e910a485d42970b99df05c1ba12002974cfbf SHA512 26ada29c4b7c23739ddcc4ca1dc9819bbc64fa2b6472fd7ff5706905dbd9b382e7a7d69ba78f72afa6f3db55cf3c5373a5e2d244f1cf189aeb187984dd1f4187
DIST avidemux-i18n-2.7.8.tar.gz 2488165 BLAKE2B 9e6bfb10e938c880d372570cfe35ba9422a8c0081b116230d831bd421b205a555415350be96b0e3149beb164a0151e04205bded403354d7052aa24884a068407 SHA512 a62b06a3d95577cf805be36f991ccb63d044b7c3633ada65bd5810f0e7d8eb41aa874ef5dd63de4fcacc0be073935bed827b2f0bceba77ab735ac8673c1ad39f
diff --git a/media-video/avidemux/avidemux-2.7.6-r1.ebuild b/media-video/avidemux/avidemux-2.7.6-r1.ebuild
deleted file mode 100644
index b1fce24ef0a5..000000000000
--- a/media-video/avidemux/avidemux-2.7.6-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake desktop flag-o-matic 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
- https://github.com/mean00/avidemux2_i18n/archive/${PV}.tar.gz -> ${PN}-i18n-${PV}.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"
-
-BDEPEND="dev-lang/yasm
- qt5? ( dev-qt/linguist-tools:5 )"
-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/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- )
- vaapi? ( x11-libs/libva:0= )
-"
-RDEPEND="${DEPEND}
- nls? ( virtual/libintl:0 )
- !<media-video/avidemux-${PV}
-"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
-
-S="${WORKDIR}/avidemux2-${PV}"
-
-src_unpack() {
- default
- mv -f -T avidemux2_i18n-${PV} "${S}"/avidemux/qt4/i18n >/dev/null || die
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-2.7.4-qt-5.15.patch
-
- processes="buildCli:avidemux/cli"
- use qt5 && processes+=" buildQt4:avidemux/qt4"
-
- for process in ${processes} ; do
- CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
- done
-
- if use qt5; then
- # 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."
-
- # 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 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)
- sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || \
- die "Couldn't remove \"Build Option\" dialog."
-}
-
-src_configure() {
- # 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)"
- -DOPENGL="$(usex opengl)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- )
-
- use qt5 && mycmakeargs+=(
- -DENABLE_QT5="$(usex qt5)"
- -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
- )
-
- use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
- done
-}
-
-src_compile() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_compile
- done
-}
-
-src_test() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_test
- done
-}
-
-src_install() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_install
- done
-
- if use qt5; then
- cd "${S}" || die "Can't enter source folder"
- newicon ${PN}_icon.png ${PN}-${SLOT}.png
- domenu ${PN}-${SLOT}.desktop
- fi
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2022-06-19 9:06 Jakov Smolić
0 siblings, 0 replies; 37+ messages in thread
From: Jakov Smolić @ 2022-06-19 9:06 UTC (permalink / raw
To: gentoo-commits
commit: a64bd948d4b04cce7e28345b25fc130dc03f231c
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 08:57:50 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 08:57:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64bd948
media-video/avidemux: Remove nvenc flag
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
media-video/avidemux/avidemux-2.7.8.ebuild | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.7.8.ebuild b/media-video/avidemux/avidemux-2.7.8.ebuild
index b251f2f04609..2bad184b4aed 100644
--- a/media-video/avidemux/avidemux-2.7.8.ebuild
+++ b/media-video/avidemux/avidemux-2.7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,15 +18,14 @@ SRC_URI="
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"
+IUSE="debug nls opengl qt5 sdl vaapi vdpau xv"
BDEPEND="
dev-lang/yasm
qt5? ( dev-qt/linguist-tools:5 )
"
DEPEND="
- ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
- nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
+ ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?]
opengl? ( virtual/opengl:0 )
qt5? (
dev-qt/qtcore:5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2023-01-07 7:17 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2023-01-07 7:17 UTC (permalink / raw
To: gentoo-commits
commit: 8c210ba94fee710f73ba4b7881e9ac33f3b9de37
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 07:14:03 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 07:17:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c210ba9
media-video/avidemux: add 2.8.1
Bug: https://bugs.gentoo.org/830464
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/avidemux/Manifest | 2 +
media-video/avidemux/avidemux-2.8.1.ebuild | 139 +++++++++++++++++++++++++++++
2 files changed, 141 insertions(+)
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 0201016418c0..c627393e12a4 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,2 +1,4 @@
DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
+DIST avidemux-2.8.1.tar.gz 23207741 BLAKE2B 766ae9b159d2e48a3d14bdfccf9c665b95ed056831b515d53837bf2bae20baf9b01d15d551b62fb96f3c0cf50b0138448a133bc62e6202af744de558e0fbfe4f SHA512 e7105e555e04dd6768336bdb246037e91045de2e1f572ae362d985424def65499c7f25d92d376ea98af09b436d89e9eb4a5424e93b11df14f2d67ac35661a8a3
DIST avidemux-i18n-2.7.8.tar.gz 2488165 BLAKE2B 9e6bfb10e938c880d372570cfe35ba9422a8c0081b116230d831bd421b205a555415350be96b0e3149beb164a0151e04205bded403354d7052aa24884a068407 SHA512 a62b06a3d95577cf805be36f991ccb63d044b7c3633ada65bd5810f0e7d8eb41aa874ef5dd63de4fcacc0be073935bed827b2f0bceba77ab735ac8673c1ad39f
+DIST avidemux-i18n-2.8.1.tar.gz 2765272 BLAKE2B ecca8a3d6f278e02e37059c1c1dce4d8164661548f29d5e51273d76e46434bc349d93701209fd6a009364244540d75cae09ce456e968d1761ca5540acc4ba678 SHA512 aa93add0d72170abf009e5bd86eeb5198907ee8961e366ad396d85315b9908f8f94bf920ba2a0cf9c351dd9c50f7ef883480d88e7475f48d085648bfbfa1f4d4
diff --git a/media-video/avidemux/avidemux-2.8.1.ebuild b/media-video/avidemux/avidemux-2.8.1.ebuild
new file mode 100644
index 000000000000..865b4fd3dd09
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.8.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake desktop flag-o-matic 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
+ https://github.com/mean00/avidemux2_i18n/archive/${PV}.tar.gz -> ${PN}-i18n-${PV}.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 opengl gui sdl vaapi vdpau xv"
+
+BDEPEND="
+ dev-lang/yasm
+ gui? ( dev-qt/linguist-tools:5 )
+"
+DEPEND="
+ ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?]
+ opengl? ( virtual/opengl )
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ )
+ vaapi? ( media-libs/libva:= )
+"
+RDEPEND="
+ ${DEPEND}
+ nls? ( virtual/libintl )
+ !<media-video/avidemux-${PV}
+"
+
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,gui?]"
+
+S="${WORKDIR}/avidemux2-${PV}"
+
+src_unpack() {
+ default
+ mv -f -T avidemux2_i18n-"${PV}" "${S}"/avidemux/qt4/i18n >/dev/null || die
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-2.7.4-qt-5.15.patch"
+
+ processes="buildCli:avidemux/cli"
+ use gui && processes+=" buildQt4:avidemux/qt4"
+
+ for process in ${processes} ; do
+ CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
+ done
+
+ if use gui; then
+ # 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."
+
+ # 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 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)
+ sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
+}
+
+src_configure() {
+ # 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)"
+ -DOPENGL="$(usex opengl)"
+ -DVDPAU="$(usex vdpau)"
+ -DXVIDEO="$(usex xv)"
+ -DENABLE_QT4=OFF
+ -DENABLE_QT6=OFF
+ )
+
+ use gui && mycmakeargs+=(
+ -DENABLE_QT5="$(usex gui)"
+ -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+ )
+
+ use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+
+ for process in ${processes} ; do
+ local build="${WORKDIR}/${P}_build/${process%%:*}"
+ CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
+ done
+}
+
+src_compile() {
+ for process in ${processes} ; do
+ local build="${WORKDIR}/${P}_build/${process%%:*}"
+ BUILD_DIR="${build}" cmake_src_compile
+ done
+}
+
+src_test() {
+ for process in ${processes} ; do
+ local build="${WORKDIR}/${P}_build/${process%%:*}"
+ BUILD_DIR="${build}" cmake_src_test
+ done
+}
+
+src_install() {
+ for process in ${processes} ; do
+ local build="${WORKDIR}/${P}_build/${process%%:*}"
+ BUILD_DIR="${build}" cmake_src_install
+ done
+
+ if use gui; then
+ cd "${S}" || die "Can't enter source folder"
+ newicon "${PN}"_icon.png "${PN}-${SLOT}".png
+ domenu "${PN}-${SLOT}".desktop
+ fi
+}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2023-01-07 7:20 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2023-01-07 7:20 UTC (permalink / raw
To: gentoo-commits
commit: ee425f85df3cdd3338b1a1fbf0b6765db9d5c4a0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 07:19:36 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 07:19:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee425f85
media-video/avidemux: add github upstream metadata
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/avidemux/metadata.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index 3d2492c5401f..31629dc2528b 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="sourceforge">avidemux</remote-id>
+ <remote-id type="github">mean00/avidemux2</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2023-01-09 7:27 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2023-01-09 7:27 UTC (permalink / raw
To: gentoo-commits
commit: d8ea4a8809f0750aaef489433c827d39710f8887
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 07:23:52 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 07:26:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ea4a88
media-video/avidemux: fix LICENSE
Closes: https://bugs.gentoo.org/890040
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/avidemux/avidemux-2.8.1.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-video/avidemux/avidemux-2.8.1.ebuild b/media-video/avidemux/avidemux-2.8.1.ebuild
index 865b4fd3dd09..d21a6585b04e 100644
--- a/media-video/avidemux/avidemux-2.8.1.ebuild
+++ b/media-video/avidemux/avidemux-2.8.1.ebuild
@@ -14,7 +14,8 @@ SRC_URI="
"
# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+# See License.txt.
+LICENSE="GPL-2 MIT PSF-2 LGPL-2 OFL-1.1"
SLOT="2.7"
KEYWORDS="~amd64 ~x86"
IUSE="debug nls opengl gui sdl vaapi vdpau xv"
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2023-01-28 11:49 Andreas Sturmlechner
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Sturmlechner @ 2023-01-28 11:49 UTC (permalink / raw
To: gentoo-commits
commit: 5db0c9593286d5772f9142ef362c102cec75cb54
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 21:53:07 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 11:48:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5db0c959
media-video/avidemux: drop 2.7.8
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/avidemux/Manifest | 2 -
media-video/avidemux/avidemux-2.7.8.ebuild | 138 -----------------------------
2 files changed, 140 deletions(-)
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index c627393e12a4..f5f42f32459c 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,4 +1,2 @@
-DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
DIST avidemux-2.8.1.tar.gz 23207741 BLAKE2B 766ae9b159d2e48a3d14bdfccf9c665b95ed056831b515d53837bf2bae20baf9b01d15d551b62fb96f3c0cf50b0138448a133bc62e6202af744de558e0fbfe4f SHA512 e7105e555e04dd6768336bdb246037e91045de2e1f572ae362d985424def65499c7f25d92d376ea98af09b436d89e9eb4a5424e93b11df14f2d67ac35661a8a3
-DIST avidemux-i18n-2.7.8.tar.gz 2488165 BLAKE2B 9e6bfb10e938c880d372570cfe35ba9422a8c0081b116230d831bd421b205a555415350be96b0e3149beb164a0151e04205bded403354d7052aa24884a068407 SHA512 a62b06a3d95577cf805be36f991ccb63d044b7c3633ada65bd5810f0e7d8eb41aa874ef5dd63de4fcacc0be073935bed827b2f0bceba77ab735ac8673c1ad39f
DIST avidemux-i18n-2.8.1.tar.gz 2765272 BLAKE2B ecca8a3d6f278e02e37059c1c1dce4d8164661548f29d5e51273d76e46434bc349d93701209fd6a009364244540d75cae09ce456e968d1761ca5540acc4ba678 SHA512 aa93add0d72170abf009e5bd86eeb5198907ee8961e366ad396d85315b9908f8f94bf920ba2a0cf9c351dd9c50f7ef883480d88e7475f48d085648bfbfa1f4d4
diff --git a/media-video/avidemux/avidemux-2.7.8.ebuild b/media-video/avidemux/avidemux-2.7.8.ebuild
deleted file mode 100644
index e4407a08f6d6..000000000000
--- a/media-video/avidemux/avidemux-2.7.8.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake desktop flag-o-matic 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
- https://github.com/mean00/avidemux2_i18n/archive/${PV}.tar.gz -> ${PN}-i18n-${PV}.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 opengl qt5 sdl vaapi vdpau xv"
-
-BDEPEND="
- dev-lang/yasm
- qt5? ( dev-qt/linguist-tools:5 )
-"
-DEPEND="
- ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?]
- opengl? ( virtual/opengl:0 )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- )
- vaapi? ( media-libs/libva:0= )
-"
-RDEPEND="
- ${DEPEND}
- nls? ( virtual/libintl:0 )
- !<media-video/avidemux-${PV}
-"
-
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
-
-S="${WORKDIR}/avidemux2-${PV}"
-
-src_unpack() {
- default
- mv -f -T avidemux2_i18n-"${PV}" "${S}"/avidemux/qt4/i18n >/dev/null || die
-}
-
-src_prepare() {
- eapply "${FILESDIR}/${PN}-2.7.4-qt-5.15.patch"
-
- processes="buildCli:avidemux/cli"
- use qt5 && processes+=" buildQt4:avidemux/qt4"
-
- for process in ${processes} ; do
- CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
- done
-
- if use qt5; then
- # 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."
-
- # 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 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)
- sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
-}
-
-src_configure() {
- # 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)"
- -DOPENGL="$(usex opengl)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- )
-
- use qt5 && mycmakeargs+=(
- -DENABLE_QT5="$(usex qt5)"
- -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
- )
-
- use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
- done
-}
-
-src_compile() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_compile
- done
-}
-
-src_test() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_test
- done
-}
-
-src_install() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_install
- done
-
- if use qt5; then
- cd "${S}" || die "Can't enter source folder"
- newicon "${PN}"_icon.png "${PN}-${SLOT}".png
- domenu "${PN}-${SLOT}".desktop
- fi
-}
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
@ 2024-04-26 12:50 Sam James
0 siblings, 0 replies; 37+ messages in thread
From: Sam James @ 2024-04-26 12:50 UTC (permalink / raw
To: gentoo-commits
commit: 531656b9e614afc8078c6ddf34810ee8ed1a8baf
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Fri Apr 26 06:55:43 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 12:48:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=531656b9
media-video/avidemux: mark as LTO-unsafe
Upstream disables bug reports. Message received, no bug report
submitted. Do not expect this to ever be fixed...
Closes: https://bugs.gentoo.org/915773
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/avidemux/avidemux-2.8.1.ebuild | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/media-video/avidemux/avidemux-2.8.1.ebuild b/media-video/avidemux/avidemux-2.8.1.ebuild
index d21a6585b04e..34a39f9e96d5 100644
--- a/media-video/avidemux/avidemux-2.8.1.ebuild
+++ b/media-video/avidemux/avidemux-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -81,6 +81,13 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/915773
+ #
+ # Upstream has abandoned sourceforge for github. And doesn't enable github issues.
+ # Message received, no bug reported.
+ filter-lto
+
# See bug 432322.
use x86 && replace-flags -O0 -O1
^ permalink raw reply related [flat|nested] 37+ messages in thread
end of thread, other threads:[~2024-04-26 12:50 UTC | newest]
Thread overview: 37+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-11 23:10 [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2024-04-26 12:50 Sam James
2023-01-28 11:49 Andreas Sturmlechner
2023-01-09 7:27 Sam James
2023-01-07 7:20 Sam James
2023-01-07 7:17 Sam James
2022-06-19 9:06 Jakov Smolić
2022-03-09 12:37 Sam James
2021-11-07 0:01 Sam James
2021-01-01 1:06 Michał Górny
2020-10-31 11:11 David Seifert
2020-08-13 0:53 Stefan Strogin
2019-08-28 22:52 Stefan Strogin
2019-08-28 22:08 Stefan Strogin
2019-08-25 20:52 Stefan Strogin
2019-08-14 4:35 Stefan Strogin
2019-07-06 10:25 Andreas Sturmlechner
2019-07-06 10:25 Andreas Sturmlechner
2018-01-09 17:33 Andreas Sturmlechner
2018-01-09 17:33 Andreas Sturmlechner
2018-01-09 17:33 Andreas Sturmlechner
2018-01-09 17:33 Andreas Sturmlechner
2018-01-05 15:38 Ulrich Müller
2017-12-21 17:39 Andreas Sturmlechner
2017-12-21 15:37 Andreas Sturmlechner
2017-12-09 13:52 Andreas Sturmlechner
2017-12-08 18:32 Andreas Sturmlechner
2017-12-08 18:32 Andreas Sturmlechner
2017-10-29 9:34 Andreas Sturmlechner
2017-10-04 8:02 Alexis Ballier
2017-10-04 8:02 Alexis Ballier
2017-10-04 8:02 Alexis Ballier
2017-10-04 8:02 Alexis Ballier
2017-10-04 8:02 Alexis Ballier
2017-06-30 5:28 Alexis Ballier
2016-05-07 13:59 Sergei Trofimovich
2016-05-05 19:48 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox