* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2016-05-06 7:49 Patrick Lauer
0 siblings, 0 replies; 28+ messages in thread
From: Patrick Lauer @ 2016-05-06 7:49 UTC (permalink / raw
To: gentoo-commits
commit: caa47959e3295d1e0ad2a48233bec617b076b65d
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 07:42:02 2016 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Fri May 6 07:49:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa47959
media-libs/avidemux-core: Remove unneeded useflag descriptions from metadata.xml
Package-Manager: portage-2.2.28
media-libs/avidemux-core/metadata.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/media-libs/avidemux-core/metadata.xml b/media-libs/avidemux-core/metadata.xml
index 851c183..422c7c7 100644
--- a/media-libs/avidemux-core/metadata.xml
+++ b/media-libs/avidemux-core/metadata.xml
@@ -6,8 +6,6 @@
<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="system-ffmpeg">Use the ffmpeg provided by the system.</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2017-06-23 5:58 Alexis Ballier
0 siblings, 0 replies; 28+ messages in thread
From: Alexis Ballier @ 2017-06-23 5:58 UTC (permalink / raw
To: gentoo-commits
commit: 9c931322fcf42e5aea876defa760a82cef7afeb2
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Fri Jun 2 02:18:34 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 05:35:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c931322
media-libs/avidemux-core: Update EGIT_REPO_URI to GitHub
Gitorious is dead. The project appears to have moved to GitHub.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/avidemux-core/avidemux-core-2.6.8.ebuild | 2 +-
media-libs/avidemux-core/avidemux-core-9999.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
index f7dde42a475..7f039651d76 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
MY_PN="${PN/-core/}"
if [[ ${PV} == *9999* ]] ; then
KEYWORDS=""
- EGIT_REPO_URI="git://gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git https://git.gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git"
+ EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
inherit git-2
else
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index 914e5acbb15..ce548ea31ba 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
MY_PN="${PN/-core/}"
if [[ ${PV} == *9999* ]] ; then
KEYWORDS=""
- EGIT_REPO_URI="git://gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git https://git.gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git"
+ EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
inherit git-2
else
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2017-06-23 5:58 Alexis Ballier
0 siblings, 0 replies; 28+ messages in thread
From: Alexis Ballier @ 2017-06-23 5:58 UTC (permalink / raw
To: gentoo-commits
commit: 8cfb17422ddbf5abd3184f4b1f0152057bb8be59
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Fri Jun 2 03:13:07 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 05:35:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cfb1742
media-libs/avidemux-core: Add support for NVIDIA Encoder (NVENC)
media-video/ffmpeg already uses it and latest media-libs/avidemux-core now supports it.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/avidemux-core/avidemux-core-9999.ebuild | 3 ++-
media-libs/avidemux-core/metadata.xml | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index 420ac6ab9db..3a659ab182e 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://fixounet.free.fr/avidemux"
# Multiple licenses because of all the bundled stuff.
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="debug nls sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv"
+IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv"
KEYWORDS="~amd64 ~x86"
MY_PN="${PN/-core/}"
@@ -93,6 +93,7 @@ src_configure() {
$(cmake-utils_use vdpau VDPAU)
$(cmake-utils_use video_cards_fglrx XVBA)
$(cmake-utils_use xv XVIDEO)
+ $(cmake-utils_use nvenc NVENC)
)
if use debug ; then
diff --git a/media-libs/avidemux-core/metadata.xml b/media-libs/avidemux-core/metadata.xml
index 422c7c72ff3..efad95d3100 100644
--- a/media-libs/avidemux-core/metadata.xml
+++ b/media-libs/avidemux-core/metadata.xml
@@ -6,6 +6,7 @@
<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>
<flag name="system-ffmpeg">Use the ffmpeg provided by the system.</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2017-06-23 5:58 Alexis Ballier
0 siblings, 0 replies; 28+ messages in thread
From: Alexis Ballier @ 2017-06-23 5:58 UTC (permalink / raw
To: gentoo-commits
commit: b33b8402e02ad3d4e0a92ef77e4105e11a1c79cb
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Fri Jun 2 04:41:16 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 05:35:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33b8402
media-libs/avidemux-core: Add avidemux-core-2.6.20
Upgrade avidemux-core-9999 to EAPI 6 and add an ebuild for avidemux-core-2.6.20.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/avidemux-core/Manifest | 1 +
...ore-9999.ebuild => avidemux-core-2.6.20.ebuild} | 45 ++++++++++------------
media-libs/avidemux-core/avidemux-core-9999.ebuild | 45 ++++++++++------------
3 files changed, 41 insertions(+), 50 deletions(-)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 418a7523584..6f017f59f92 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/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-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild
similarity index 78%
copy from media-libs/avidemux-core/avidemux-core-9999.ebuild
copy to media-libs/avidemux-core/avidemux-core-2.6.20.ebuild
index 3a659ab182e..e09688e05bf 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild
@@ -1,29 +1,28 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="6"
-inherit cmake-utils eutils flag-o-matic
-
-SLOT="2.6"
+inherit cmake-utils
DESCRIPTION="Core libraries for a 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 sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv"
-KEYWORDS="~amd64 ~x86"
-MY_PN="${PN/-core/}"
if [[ ${PV} == *9999* ]] ; then
- KEYWORDS=""
EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
+ EGIT_CHECKOUT_DIR=${WORKDIR}
- inherit git-2
+ inherit git-r3
else
+ MY_PN="${PN/-core/}"
MY_P="${MY_PN}_${PV}"
SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
fi
# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
@@ -52,13 +51,9 @@ DEPEND="
"
S="${WORKDIR}/${MY_P}"
-BUILD_DIR="${S}/buildCore"
-
-DOCS=( AUTHORS README )
+CMAKE_USE_DIR="${S}/${PN/-/_}"
src_prepare() {
- mkdir "${BUILD_DIR}" || die "Can't create build folder."
-
cmake-utils_src_prepare
if use system-ffmpeg ; then
@@ -71,10 +66,12 @@ src_prepare() {
sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}"
else
# Avoid existing avidemux installations from making the build process fail, bug #461496.
- sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \
+ sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${WORKDIR}/${P}_build/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \
|| die "Failed to avoid existing avidemux installation from making the build fail."
fi
+}
+src_configure() {
# Add lax vector typing for PowerPC.
if use ppc || use ppc64 ; then
append-cflags -flax-vector-conversions
@@ -82,25 +79,23 @@ src_prepare() {
# See bug 432322.
use x86 && replace-flags -O0 -O1
-}
-src_configure() {
local mycmakeargs=(
-DAVIDEMUX_SOURCE_DIR='${S}'
- $(cmake-utils_use nls GETTEXT)
- $(cmake-utils_use sdl SDL)
- $(cmake-utils_use vaapi LIBVA)
- $(cmake-utils_use vdpau VDPAU)
- $(cmake-utils_use video_cards_fglrx XVBA)
- $(cmake-utils_use xv XVIDEO)
- $(cmake-utils_use nvenc NVENC)
+ -DGETTEXT="$(usex nls)"
+ -DSDL="$(usex sdl)"
+ -DLIBVA="$(usex vaapi)"
+ -DVDPAU="$(usex vdpau)"
+ -DXVBA="$(usex video_cards_fglrx)"
+ -DXVIDEO="$(usex xv)"
+ -DNVENC="$(usex nvenc)"
)
if use debug ; then
- mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 )
+ mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
fi
- CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure
+ cmake-utils_src_configure
}
src_compile() {
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index 3a659ab182e..e09688e05bf 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -1,29 +1,28 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="6"
-inherit cmake-utils eutils flag-o-matic
-
-SLOT="2.6"
+inherit cmake-utils
DESCRIPTION="Core libraries for a 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 sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv"
-KEYWORDS="~amd64 ~x86"
-MY_PN="${PN/-core/}"
if [[ ${PV} == *9999* ]] ; then
- KEYWORDS=""
EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
+ EGIT_CHECKOUT_DIR=${WORKDIR}
- inherit git-2
+ inherit git-r3
else
+ MY_PN="${PN/-core/}"
MY_P="${MY_PN}_${PV}"
SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
fi
# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
@@ -52,13 +51,9 @@ DEPEND="
"
S="${WORKDIR}/${MY_P}"
-BUILD_DIR="${S}/buildCore"
-
-DOCS=( AUTHORS README )
+CMAKE_USE_DIR="${S}/${PN/-/_}"
src_prepare() {
- mkdir "${BUILD_DIR}" || die "Can't create build folder."
-
cmake-utils_src_prepare
if use system-ffmpeg ; then
@@ -71,10 +66,12 @@ src_prepare() {
sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}"
else
# Avoid existing avidemux installations from making the build process fail, bug #461496.
- sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \
+ sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${WORKDIR}/${P}_build/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \
|| die "Failed to avoid existing avidemux installation from making the build fail."
fi
+}
+src_configure() {
# Add lax vector typing for PowerPC.
if use ppc || use ppc64 ; then
append-cflags -flax-vector-conversions
@@ -82,25 +79,23 @@ src_prepare() {
# See bug 432322.
use x86 && replace-flags -O0 -O1
-}
-src_configure() {
local mycmakeargs=(
-DAVIDEMUX_SOURCE_DIR='${S}'
- $(cmake-utils_use nls GETTEXT)
- $(cmake-utils_use sdl SDL)
- $(cmake-utils_use vaapi LIBVA)
- $(cmake-utils_use vdpau VDPAU)
- $(cmake-utils_use video_cards_fglrx XVBA)
- $(cmake-utils_use xv XVIDEO)
- $(cmake-utils_use nvenc NVENC)
+ -DGETTEXT="$(usex nls)"
+ -DSDL="$(usex sdl)"
+ -DLIBVA="$(usex vaapi)"
+ -DVDPAU="$(usex vdpau)"
+ -DXVBA="$(usex video_cards_fglrx)"
+ -DXVIDEO="$(usex xv)"
+ -DNVENC="$(usex nvenc)"
)
if use debug ; then
- mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 )
+ mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
fi
- CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure
+ cmake-utils_src_configure
}
src_compile() {
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2017-06-23 5:58 Alexis Ballier
0 siblings, 0 replies; 28+ messages in thread
From: Alexis Ballier @ 2017-06-23 5:58 UTC (permalink / raw
To: gentoo-commits
commit: 22d22cfbd076474406f5068ac6c79da78336395a
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Fri Jun 2 02:45:59 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 05:35:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22d22cfb
media-libs/avidemux-core: Declare 'mycmakeargs' as an array
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/avidemux-core/avidemux-core-2.6.8.ebuild | 6 +++---
media-libs/avidemux-core/avidemux-core-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
index 7f039651d76..c47717b8c3d 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
@@ -85,7 +85,7 @@ src_prepare() {
}
src_configure() {
- local mycmakeargs="
+ local mycmakeargs=(
-DAVIDEMUX_SOURCE_DIR='${S}'
$(cmake-utils_use nls GETTEXT)
$(cmake-utils_use sdl SDL)
@@ -93,10 +93,10 @@ src_configure() {
$(cmake-utils_use vdpau 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"
+ mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 )
fi
CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index ce548ea31ba..420ac6ab9db 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -85,7 +85,7 @@ src_prepare() {
}
src_configure() {
- local mycmakeargs="
+ local mycmakeargs=(
-DAVIDEMUX_SOURCE_DIR='${S}'
$(cmake-utils_use nls GETTEXT)
$(cmake-utils_use sdl SDL)
@@ -93,10 +93,10 @@ src_configure() {
$(cmake-utils_use vdpau 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"
+ mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 )
fi
CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2017-06-30 5:28 Alexis Ballier
0 siblings, 0 replies; 28+ messages in thread
From: Alexis Ballier @ 2017-06-30 5:28 UTC (permalink / raw
To: gentoo-commits
commit: 5f54c512e72cd0a101fbe1b90feaed4f47e6c013
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat Jun 24 05:39:30 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 05:22:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f54c512
media-libs/avidemux-core: Undo changes from bug #461496
Undo the hardcoding of the build path in an installable cmake module.
Causes failure in the configure phase of media-video/avidemux-2.6.20 and doesn't appear
to be neccesary anymore. Revbump avidemux-core-2.6.20.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../{avidemux-core-9999.ebuild => avidemux-core-2.6.20-r1.ebuild} | 4 ----
media-libs/avidemux-core/avidemux-core-9999.ebuild | 4 ----
2 files changed, 8 deletions(-)
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild
similarity index 89%
copy from media-libs/avidemux-core/avidemux-core-9999.ebuild
copy to media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild
index 3a7af781cc1..16e22ff152f 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild
@@ -65,10 +65,6 @@ src_prepare() {
sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}"
sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}"
sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}"
- else
- # Avoid existing avidemux installations from making the build process fail, bug #461496.
- sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${WORKDIR}/${P}_build/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \
- || die "Failed to avoid existing avidemux installation from making the build fail."
fi
}
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index 3a7af781cc1..16e22ff152f 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -65,10 +65,6 @@ src_prepare() {
sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}"
sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}"
sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}"
- else
- # Avoid existing avidemux installations from making the build process fail, bug #461496.
- sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${WORKDIR}/${P}_build/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \
- || die "Failed to avoid existing avidemux installation from making the build fail."
fi
}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2017-06-30 5:28 Alexis Ballier
0 siblings, 0 replies; 28+ messages in thread
From: Alexis Ballier @ 2017-06-30 5:28 UTC (permalink / raw
To: gentoo-commits
commit: 15d683f464769a7be6172c6ca7412b40b77c68e6
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat Jun 24 04:57:33 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 05:22:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15d683f4
media-libs/avidemux-core: nvenc use flag requires media-video/nvidia_video_sdk
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/avidemux-core/avidemux-core-2.6.20.ebuild | 1 +
media-libs/avidemux-core/avidemux-core-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild
index e09688e05bf..3a7af781cc1 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild
@@ -34,6 +34,7 @@ DEPEND="
xv? ( x11-libs/libXv:0 )
vaapi? ( x11-libs/libva:0 )
vdpau? ( x11-libs/libvdpau:0 )
+ nvenc? ( media-video/nvidia_video_sdk )
video_cards_fglrx? (
|| ( >=x11-drivers/ati-drivers-14.12-r3
x11-libs/xvba-video:0 )
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index e09688e05bf..3a7af781cc1 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -34,6 +34,7 @@ DEPEND="
xv? ( x11-libs/libXv:0 )
vaapi? ( x11-libs/libva:0 )
vdpau? ( x11-libs/libvdpau:0 )
+ nvenc? ( media-video/nvidia_video_sdk )
video_cards_fglrx? (
|| ( >=x11-drivers/ati-drivers-14.12-r3
x11-libs/xvba-video:0 )
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2017-10-04 8:02 Alexis Ballier
0 siblings, 0 replies; 28+ messages in thread
From: Alexis Ballier @ 2017-10-04 8:02 UTC (permalink / raw
To: gentoo-commits
commit: 4f43b26cd4c4eb0414ad67ab25f976201b1165e8
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Oct 1 08:38:08 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=4f43b26c
media-libs/avidemux-core: Remove support for x11-drivers/ati-drivers
Package-Manager: Portage-2.3.10, Repoman-2.3.3
media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild | 7 +------
media-libs/avidemux-core/avidemux-core-9999.ebuild | 7 +------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild
index 64d78546cff..1fad3f21b9f 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild
@@ -11,7 +11,7 @@ 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 sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv"
+IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
@@ -35,10 +35,6 @@ DEPEND="
vaapi? ( x11-libs/libva:0 )
vdpau? ( x11-libs/libvdpau:0 )
nvenc? ( media-video/nvidia_video_sdk )
- video_cards_fglrx? (
- || ( >=x11-drivers/ati-drivers-14.12-r3
- x11-libs/xvba-video:0 )
- )
"
RDEPEND="
$DEPEND
@@ -85,7 +81,6 @@ src_configure() {
-DSDL="$(usex sdl)"
-DLIBVA="$(usex vaapi)"
-DVDPAU="$(usex vdpau)"
- -DXVBA="$(usex video_cards_fglrx)"
-DXVIDEO="$(usex xv)"
-DNVENC="$(usex nvenc)"
)
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index 16e22ff152f..9b4fbca2cef 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -11,7 +11,7 @@ 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 sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv"
+IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
@@ -35,10 +35,6 @@ DEPEND="
vaapi? ( x11-libs/libva:0 )
vdpau? ( x11-libs/libvdpau:0 )
nvenc? ( media-video/nvidia_video_sdk )
- video_cards_fglrx? (
- || ( >=x11-drivers/ati-drivers-14.12-r3
- x11-libs/xvba-video:0 )
- )
"
RDEPEND="
$DEPEND
@@ -83,7 +79,6 @@ src_configure() {
-DSDL="$(usex sdl)"
-DLIBVA="$(usex vaapi)"
-DVDPAU="$(usex vdpau)"
- -DXVBA="$(usex video_cards_fglrx)"
-DXVIDEO="$(usex xv)"
-DNVENC="$(usex nvenc)"
)
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2017-10-08 10:24 Alexis Ballier
0 siblings, 0 replies; 28+ messages in thread
From: Alexis Ballier @ 2017-10-08 10:24 UTC (permalink / raw
To: gentoo-commits
commit: 358d2b6e9d337e814e8027796e37f60947f34218
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat Oct 7 21:39:00 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 10:24:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358d2b6e
media-libs/avidemux-core: Revbump needed for PR-5835
Bug: https://bugs.gentoo.org/625930
Package-Manager: Portage-2.3.10, Repoman-2.3.3
.../{avidemux-core-2.6.20-r1.ebuild => avidemux-core-2.6.20-r2.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20-r2.ebuild
similarity index 100%
rename from media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild
rename to media-libs/avidemux-core/avidemux-core-2.6.20-r2.ebuild
^ permalink raw reply [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2017-10-29 9:34 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2017-10-29 9:34 UTC (permalink / raw
To: gentoo-commits
commit: ef4acc928833734f894dff8713ca92e3bdeee100
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 23:01:34 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 09:34:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef4acc92
media-libs/avidemux-core: Drop 2.6.20 (r0)
Package-Manager: Portage-2.3.13, Repoman-2.3.4
.../avidemux-core/avidemux-core-2.6.20.ebuild | 108 ---------------------
1 file changed, 108 deletions(-)
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild
deleted file mode 100644
index 3a7af781cc1..00000000000
--- a/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-DESCRIPTION="Core libraries for a 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 sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv"
-
-if [[ ${PV} == *9999* ]] ; then
- EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
- EGIT_CHECKOUT_DIR=${WORKDIR}
-
- inherit git-r3
-else
- MY_PN="${PN/-core/}"
- MY_P="${MY_PN}_${PV}"
- SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="
- !<media-video/avidemux-${PV}:${SLOT}
- dev-db/sqlite:3
- sdl? ( media-libs/libsdl:0 )
- system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
- xv? ( x11-libs/libXv:0 )
- vaapi? ( x11-libs/libva:0 )
- vdpau? ( x11-libs/libvdpau:0 )
- nvenc? ( media-video/nvidia_video_sdk )
- video_cards_fglrx? (
- || ( >=x11-drivers/ati-drivers-14.12-r3
- x11-libs/xvba-video:0 )
- )
-"
-RDEPEND="
- $DEPEND
- nls? ( virtual/libintl:0 )
-"
-DEPEND="
- $DEPEND
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/${MY_P}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-src_prepare() {
- cmake-utils_src_prepare
-
- if use system-ffmpeg ; then
- # Preparations to support the system ffmpeg. Currently fails because it depends on files the system ffmpeg doesn't install.
- local error="Failed to remove ffmpeg."
-
- rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
- sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}"
- else
- # Avoid existing avidemux installations from making the build process fail, bug #461496.
- sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${WORKDIR}/${P}_build/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \
- || die "Failed to avoid existing avidemux installation from making the build fail."
- fi
-}
-
-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
-
- 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)"
- -DNVENC="$(usex nvenc)"
- )
-
- if use debug ; then
- mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile -j1
-}
-
-src_install() {
- cmake-utils_src_install -j1
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2017-12-08 18:32 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2017-12-08 18:32 UTC (permalink / raw
To: gentoo-commits
commit: 299c8310d117049c68b636fbd21d4e9340995d11
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 8 17:38:16 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 8 18:30:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=299c8310
media-libs/avidemux-core: Sort and fix DEPENDs
Package-Manager: Portage-2.3.17, Repoman-2.3.6
media-libs/avidemux-core/avidemux-core-9999.ebuild | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index 9b4fbca2cef..6d3d4eb7d5f 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-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
inherit cmake-utils
@@ -26,22 +26,20 @@ else
fi
# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="
- !<media-video/avidemux-${PV}:${SLOT}
+COMMON_DEPEND="
dev-db/sqlite:3
+ nvenc? ( media-video/nvidia_video_sdk )
sdl? ( media-libs/libsdl:0 )
system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
- xv? ( x11-libs/libXv:0 )
vaapi? ( x11-libs/libva:0 )
vdpau? ( x11-libs/libvdpau:0 )
- nvenc? ( media-video/nvidia_video_sdk )
+ xv? ( x11-libs/libXv:0 )
"
-RDEPEND="
- $DEPEND
+RDEPEND="${COMMON_DEPEND}
+ !<media-video/avidemux-${PV}:${SLOT}
nls? ( virtual/libintl:0 )
"
-DEPEND="
- $DEPEND
+DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )
!system-ffmpeg? ( dev-lang/yasm[nls=] )
@@ -76,11 +74,11 @@ src_configure() {
local mycmakeargs=(
-DAVIDEMUX_SOURCE_DIR='${S}'
-DGETTEXT="$(usex nls)"
+ -DNVENC="$(usex nvenc)"
-DSDL="$(usex sdl)"
-DLIBVA="$(usex vaapi)"
-DVDPAU="$(usex vdpau)"
-DXVIDEO="$(usex xv)"
- -DNVENC="$(usex nvenc)"
)
if use debug ; then
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2018-01-09 17:33 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2018-01-09 17:33 UTC (permalink / raw
To: gentoo-commits
commit: d4c7e46a79cb8e529a2512e22852a0750392c595
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 23:06:56 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 9 17:28:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4c7e46a
media-libs/avidemux-core: Sorting, fix DESCRIPTION
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-libs/avidemux-core/avidemux-core-9999.ebuild | 39 +++++++++++-----------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index 6d3d4eb7d5f..b99cdefa450 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -1,22 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Core libraries for a 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 sdl system-ffmpeg vaapi vdpau xv"
-
if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
EGIT_CHECKOUT_DIR=${WORKDIR}
-
inherit git-r3
else
MY_PN="${PN/-core/}"
@@ -24,6 +13,15 @@ else
SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
+inherit cmake-utils
+
+DESCRIPTION="Core libraries for simple video 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 sdl system-ffmpeg vaapi vdpau xv"
# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
COMMON_DEPEND="
@@ -52,13 +50,16 @@ src_prepare() {
cmake-utils_src_prepare
if use system-ffmpeg ; then
- # Preparations to support the system ffmpeg. Currently fails because it depends on files the system ffmpeg doesn't install.
- local error="Failed to remove ffmpeg."
-
- rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
- sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}"
+ # Preparations to support the system ffmpeg. Currently fails because
+ # it depends on files the system ffmpeg doesn't install.
+ local error="Failed to remove bundled ffmpeg."
+
+ rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
+ buildCore/ffmpeg || die "${error}"
+ sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
+ -i avidemux/commonCmakeApplication.cmake || die "${error}"
+ sed -e 's/include(admFFmpegBuild)//g' \
+ -i avidemux_core/CMakeLists.txt || die "${error}"
fi
}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2018-01-09 17:33 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2018-01-09 17:33 UTC (permalink / raw
To: gentoo-commits
commit: c253f112ec169460f0f7a9c51becedbe3bfdc0f0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 9 16:36:00 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 9 17:28:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c253f112
media-libs/avidemux-core: 2.7.0 version bump
Add x11-libs/libva slot operator.
Closes: https://bugs.gentoo.org/641636
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-libs/avidemux-core/Manifest | 1 +
.../{avidemux-core-9999.ebuild => avidemux-core-2.7.0.ebuild} | 4 ++--
media-libs/avidemux-core/avidemux-core-9999.ebuild | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index ae61dc9d907..c86d53e23df 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/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-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild
similarity index 98%
copy from media-libs/avidemux-core/avidemux-core-9999.ebuild
copy to media-libs/avidemux-core/avidemux-core-2.7.0.ebuild
index b99cdefa450..92f9f8ec068 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild
@@ -20,7 +20,7 @@ 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 sdl system-ffmpeg vaapi vdpau xv"
# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
@@ -29,7 +29,7 @@ COMMON_DEPEND="
nvenc? ( media-video/nvidia_video_sdk )
sdl? ( media-libs/libsdl:0 )
system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
- vaapi? ( x11-libs/libva:0 )
+ vaapi? ( x11-libs/libva:0= )
vdpau? ( x11-libs/libvdpau:0 )
xv? ( x11-libs/libXv:0 )
"
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index b99cdefa450..92f9f8ec068 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -20,7 +20,7 @@ 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 sdl system-ffmpeg vaapi vdpau xv"
# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
@@ -29,7 +29,7 @@ COMMON_DEPEND="
nvenc? ( media-video/nvidia_video_sdk )
sdl? ( media-libs/libsdl:0 )
system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
- vaapi? ( x11-libs/libva:0 )
+ vaapi? ( x11-libs/libva:0= )
vdpau? ( x11-libs/libvdpau:0 )
xv? ( x11-libs/libXv:0 )
"
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2019-07-06 10:25 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2019-07-06 10:25 UTC (permalink / raw
To: gentoo-commits
commit: a8d947695fd76ec9d8a9a0d7b2a41ae0dfdac285
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 6 09:07:21 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=a8d94769
media-libs/avidemux-core: 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-libs/avidemux-core/avidemux-core-9999.ebuild | 99 ----------------------
1 file changed, 99 deletions(-)
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
deleted file mode 100644
index d1169d3d75c..00000000000
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]] ; then
- EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
- EGIT_CHECKOUT_DIR=${WORKDIR}
- inherit git-r3
-else
- MY_PN="${PN/-core/}"
- MY_P="${MY_PN}_${PV}"
- SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake-utils
-
-DESCRIPTION="Core libraries for simple video 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 sdl system-ffmpeg vaapi vdpau xv"
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-COMMON_DEPEND="
- dev-db/sqlite:3
- nvenc? ( media-video/nvidia_video_sdk )
- sdl? ( media-libs/libsdl:0 )
- system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
- vaapi? ( x11-libs/libva:0= )
- vdpau? ( x11-libs/libvdpau:0 )
- xv? ( x11-libs/libXv:0 )
-"
-RDEPEND="${COMMON_DEPEND}
- !<media-libs/avidemux-core-${PV}
- !<media-video/avidemux-${PV}
- nls? ( virtual/libintl:0 )
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/${MY_P}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-src_prepare() {
- cmake-utils_src_prepare
-
- if use system-ffmpeg ; then
- # Preparations to support the system ffmpeg. Currently fails because
- # it depends on files the system ffmpeg doesn't install.
- local error="Failed to remove bundled ffmpeg."
-
- rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
- buildCore/ffmpeg || die "${error}"
- sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
- -i avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -e 's/include(admFFmpegBuild)//g' \
- -i avidemux_core/CMakeLists.txt || die "${error}"
- fi
-}
-
-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
-
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -DGETTEXT="$(usex nls)"
- -DNVENC="$(usex nvenc)"
- -DSDL="$(usex sdl)"
- -DLIBVA="$(usex vaapi)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- )
-
- if use debug ; then
- mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile -j1
-}
-
-src_install() {
- cmake-utils_src_install -j1
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2019-08-14 4:35 Stefan Strogin
0 siblings, 0 replies; 28+ messages in thread
From: Stefan Strogin @ 2019-08-14 4:35 UTC (permalink / raw
To: gentoo-commits
commit: 60841897def5a15300ce3887adc351148e2cf1fb
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 04:13:38 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 04:34:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60841897
media-libs/avidemux-core: fix bad tarball filename
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
media-libs/avidemux-core/Manifest | 2 +-
media-libs/avidemux-core/avidemux-core-2.7.3.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index e9ad4687cc9..7e55a202857 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/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-libs/avidemux-core/avidemux-core-2.7.3.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild
index f8fec3c0f4e..5f88c831da3 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils
DESCRIPTION="Core libraries for simple video 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 -> avidemux-${PV}.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] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2019-08-25 20:52 Stefan Strogin
0 siblings, 0 replies; 28+ messages in thread
From: Stefan Strogin @ 2019-08-25 20:52 UTC (permalink / raw
To: gentoo-commits
commit: 6a14be60dab509d0a717c2e1b36293becb55fea7
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 20:46:09 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 20:50:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a14be60
media-libs/avidemux-core: drop old 2.7.0
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
media-libs/avidemux-core/Manifest | 1 -
.../avidemux-core/avidemux-core-2.7.0.ebuild | 99 ----------------------
2 files changed, 100 deletions(-)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 4113f7cd25d..7d6012ce4fc 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,3 +1,2 @@
DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
-DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild
deleted file mode 100644
index d1169d3d75c..00000000000
--- a/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]] ; then
- EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
- EGIT_CHECKOUT_DIR=${WORKDIR}
- inherit git-r3
-else
- MY_PN="${PN/-core/}"
- MY_P="${MY_PN}_${PV}"
- SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake-utils
-
-DESCRIPTION="Core libraries for simple video 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 sdl system-ffmpeg vaapi vdpau xv"
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-COMMON_DEPEND="
- dev-db/sqlite:3
- nvenc? ( media-video/nvidia_video_sdk )
- sdl? ( media-libs/libsdl:0 )
- system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
- vaapi? ( x11-libs/libva:0= )
- vdpau? ( x11-libs/libvdpau:0 )
- xv? ( x11-libs/libXv:0 )
-"
-RDEPEND="${COMMON_DEPEND}
- !<media-libs/avidemux-core-${PV}
- !<media-video/avidemux-${PV}
- nls? ( virtual/libintl:0 )
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/${MY_P}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-src_prepare() {
- cmake-utils_src_prepare
-
- if use system-ffmpeg ; then
- # Preparations to support the system ffmpeg. Currently fails because
- # it depends on files the system ffmpeg doesn't install.
- local error="Failed to remove bundled ffmpeg."
-
- rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
- buildCore/ffmpeg || die "${error}"
- sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
- -i avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -e 's/include(admFFmpegBuild)//g' \
- -i avidemux_core/CMakeLists.txt || die "${error}"
- fi
-}
-
-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
-
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -DGETTEXT="$(usex nls)"
- -DNVENC="$(usex nvenc)"
- -DSDL="$(usex sdl)"
- -DLIBVA="$(usex vaapi)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- )
-
- if use debug ; then
- mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile -j1
-}
-
-src_install() {
- cmake-utils_src_install -j1
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2019-08-25 20:52 Stefan Strogin
0 siblings, 0 replies; 28+ messages in thread
From: Stefan Strogin @ 2019-08-25 20:52 UTC (permalink / raw
To: gentoo-commits
commit: 91dcea3172562b6c0d2e0194ab2f2b0d83033777
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 20:18:10 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=91dcea31
media-libs/avidemux-core: 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-libs/avidemux-core/Manifest | 1 +
.../avidemux-core/avidemux-core-2.7.4.ebuild | 84 ++++++++++++++++++++++
2 files changed, 85 insertions(+)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 7e55a202857..4113f7cd25d 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/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-libs/avidemux-core/avidemux-core-2.7.4.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild
new file mode 100644
index 00000000000..b47c3bc0164
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild
@@ -0,0 +1,84 @@
+# 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
+
+DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${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 sdl system-ffmpeg vaapi vdpau xv"
+
+# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
+DEPEND="dev-db/sqlite:3
+ nvenc? ( media-video/nvidia_video_sdk )
+ sdl? ( media-libs/libsdl:0 )
+ system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
+ vaapi? ( x11-libs/libva:0= )
+ vdpau? ( x11-libs/libvdpau:0 )
+ xv? ( x11-libs/libXv:0 )
+"
+RDEPEND="${DEPEND}
+ !<media-libs/avidemux-core-${PV}
+ !<media-video/avidemux-${PV}
+ nls? ( virtual/libintl:0 )
+"
+BDEPEND="virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ !system-ffmpeg? ( dev-lang/yasm[nls=] )
+"
+
+S="${WORKDIR}/avidemux2-${PV}"
+CMAKE_USE_DIR="${S}/${PN/-/_}"
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ if use system-ffmpeg ; then
+ # Preparations to support the system ffmpeg. Currently fails because
+ # it depends on files the system ffmpeg doesn't install.
+ local error="Failed to remove bundled ffmpeg."
+
+ rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
+ buildCore/ffmpeg || die "${error}"
+ sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
+ -i avidemux/commonCmakeApplication.cmake || die "${error}"
+ sed -e 's/include(admFFmpegBuild)//g' \
+ -i avidemux_core/CMakeLists.txt || die "${error}"
+ fi
+}
+
+src_configure() {
+ # See bug 432322.
+ use x86 && replace-flags -O0 -O1
+
+ local mycmakeargs=(
+ -DAVIDEMUX_SOURCE_DIR='${S}'
+ -DGETTEXT="$(usex nls)"
+ -DNVENC="$(usex nvenc)"
+ -DSDL="$(usex sdl)"
+ -DLIBVA="$(usex vaapi)"
+ -DVDPAU="$(usex vdpau)"
+ -DXVIDEO="$(usex xv)"
+ )
+
+ use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2020-04-26 10:35 David Seifert
0 siblings, 0 replies; 28+ messages in thread
From: David Seifert @ 2020-04-26 10:35 UTC (permalink / raw
To: gentoo-commits
commit: ac05f0348703769c529991fb5bfcebeeb700c6a7
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 10:34:50 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 10:34:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac05f034
media-libs/avidemux-core: Replace virtual/ffmpeg
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../{avidemux-core-2.7.3.ebuild => avidemux-core-2.7.3-r1.ebuild} | 4 ++--
.../{avidemux-core-2.7.4.ebuild => avidemux-core-2.7.4-r1.ebuild} | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild
similarity index 95%
rename from media-libs/avidemux-core/avidemux-core-2.7.3.ebuild
rename to media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild
index 1ed1591e1a5..1b987f4d1e1 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
DEPEND="dev-db/sqlite:3
nvenc? ( media-video/nvidia_video_sdk )
sdl? ( media-libs/libsdl:0 )
- system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
+ system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
vaapi? ( x11-libs/libva:0= )
vdpau? ( x11-libs/libvdpau:0 )
xv? ( x11-libs/libXv:0 )
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild
similarity index 95%
rename from media-libs/avidemux-core/avidemux-core-2.7.4.ebuild
rename to media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild
index 1143e35d737..631c18906fe 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
DEPEND="dev-db/sqlite:3
nvenc? ( media-video/nvidia_video_sdk )
sdl? ( media-libs/libsdl:0 )
- system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
+ system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
vaapi? ( x11-libs/libva:0= )
vdpau? ( x11-libs/libvdpau:0 )
xv? ( x11-libs/libXv:0 )
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2020-10-31 11:11 David Seifert
0 siblings, 0 replies; 28+ messages in thread
From: David Seifert @ 2020-10-31 11:11 UTC (permalink / raw
To: gentoo-commits
commit: 9bc0b0d442d7f53ac7645f2047de5149ff17f7e7
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 11:11:11 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 11:11:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bc0b0d4
media-libs/avidemux-core: [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-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild | 2 +-
media-libs/avidemux-core/avidemux-core-2.7.6.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild
index 631c18906fe..b069b81af16 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake
+inherit cmake flag-o-matic
DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
HOMEPAGE="http://fixounet.free.fr/avidemux"
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
index ac6eace06eb..a43ad8aca26 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake toolchain-funcs
+inherit cmake flag-o-matic toolchain-funcs
DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
HOMEPAGE="http://fixounet.free.fr/avidemux"
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2021-01-01 1:06 Michał Górny
0 siblings, 0 replies; 28+ messages in thread
From: Michał Górny @ 2021-01-01 1:06 UTC (permalink / raw
To: gentoo-commits
commit: 9dabe2ec1384260578dc7dad0c3fdb972873b9f5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 1 01:02:55 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 1 01:02:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dabe2ec
media-libs/avidemux-core: Remove old (py3.6)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/avidemux-core/Manifest | 1 -
.../avidemux-core/avidemux-core-2.7.4-r1.ebuild | 84 ----------------------
2 files changed, 85 deletions(-)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 20c2b9ff2f2..d9b9b78a2a0 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,2 +1 @@
-DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild
deleted file mode 100644
index b069b81af16..00000000000
--- a/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild
+++ /dev/null
@@ -1,84 +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 flag-o-matic
-
-DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${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 sdl system-ffmpeg vaapi vdpau xv"
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="dev-db/sqlite:3
- nvenc? ( media-video/nvidia_video_sdk )
- sdl? ( media-libs/libsdl:0 )
- system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
- vaapi? ( x11-libs/libva:0= )
- vdpau? ( x11-libs/libvdpau:0 )
- xv? ( x11-libs/libXv:0 )
-"
-RDEPEND="${DEPEND}
- !<media-libs/avidemux-core-${PV}
- !<media-video/avidemux-${PV}
- nls? ( virtual/libintl:0 )
-"
-BDEPEND="virtual/pkgconfig
- nls? ( sys-devel/gettext )
- !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/avidemux2-${PV}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-src_prepare() {
- cmake_src_prepare
-
- if use system-ffmpeg ; then
- # Preparations to support the system ffmpeg. Currently fails because
- # it depends on files the system ffmpeg doesn't install.
- local error="Failed to remove bundled ffmpeg."
-
- rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
- buildCore/ffmpeg || die "${error}"
- sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
- -i avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -e 's/include(admFFmpegBuild)//g' \
- -i avidemux_core/CMakeLists.txt || die "${error}"
- fi
-}
-
-src_configure() {
- # See bug 432322.
- use x86 && replace-flags -O0 -O1
-
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -DGETTEXT="$(usex nls)"
- -DNVENC="$(usex nvenc)"
- -DSDL="$(usex sdl)"
- -DLIBVA="$(usex vaapi)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- )
-
- use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-}
-
-src_install() {
- cmake_src_install
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2021-05-22 4:27 Andrew Savchenko
0 siblings, 0 replies; 28+ messages in thread
From: Andrew Savchenko @ 2021-05-22 4:27 UTC (permalink / raw
To: gentoo-commits
commit: 17be1ab306e3682d789cad94c6195b8999af8acf
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sat May 22 04:24:20 2021 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat May 22 04:27:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17be1ab3
media-libs/avidemux-core: fix build with gcc-11
Stay on C++14 stardard (GNU variant)
Closes: https://bugs.gentoo.org/768210
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
media-libs/avidemux-core/avidemux-core-2.7.6.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
index a43ad8aca26..6f2b5d5eb4b 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -75,6 +75,8 @@ src_prepare() {
src_configure() {
# See bug 432322.
use x86 && replace-flags -O0 -O1
+ # Bug 768210
+ append-cxxflags -std=gnu++14
local mycmakeargs=(
-DAVIDEMUX_SOURCE_DIR='${S}'
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2021-11-07 0:01 Sam James
0 siblings, 0 replies; 28+ messages in thread
From: Sam James @ 2021-11-07 0:01 UTC (permalink / raw
To: gentoo-commits
commit: 4f0450984b3a5827e10e3701c40e9f75b992a301
Author: Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Sun Jun 20 18:21:00 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 7 00:01:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f045098
media-libs/avidemux-core: bump to 2.7.8
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/avidemux-core/Manifest | 1 +
.../avidemux-core/avidemux-core-2.7.8.ebuild | 99 ++++++++++++++++++++++
2 files changed, 100 insertions(+)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index d9b9b78a2a0..9fc07834baa 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1 +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
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
new file mode 100644
index 00000000000..f1b9a125c6c
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic toolchain-funcs
+
+DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${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 sdl system-ffmpeg vaapi vdpau xv"
+
+# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
+DEPEND="
+ dev-db/sqlite:3
+ nvenc? ( media-video/nvidia_video_sdk )
+ sdl? ( media-libs/libsdl:0 )
+ system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
+ vaapi? ( x11-libs/libva:0= )
+ vdpau? ( x11-libs/libvdpau:0 )
+ xv? ( x11-libs/libXv:0 )
+"
+RDEPEND="
+ ${DEPEND}
+ !<media-libs/avidemux-core-${PV}
+ !<media-video/avidemux-${PV}
+ nls? ( virtual/libintl:0 )
+"
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ !system-ffmpeg? ( dev-lang/yasm[nls=] )
+"
+
+PATCHES=( "${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.patch )
+
+S="${WORKDIR}/avidemux2-${PV}"
+CMAKE_USE_DIR="${S}/${PN/-/_}"
+
+src_prepare() {
+ cmake_src_prepare
+
+ if use system-ffmpeg ; then
+ # Preparations to support the system ffmpeg. Currently fails because
+ # it depends on files the system ffmpeg doesn't install.
+ local error="Failed to remove bundled ffmpeg."
+
+ rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
+ sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' -i avidemux/commonCmakeApplication.cmake || die "${error}"
+ sed -e 's/include(admFFmpegBuild)//g' -i avidemux_core/CMakeLists.txt || die "${error}"
+ else
+ local ffmpeg_args=(
+ --cc=$(tc-getCC)
+ --cxx=$(tc-getCXX)
+ --ar=$(tc-getAR)
+ --nm=$(tc-getNM)
+ --ranlib=$(tc-getRANLIB)
+ "--optflags='${CFLAGS}'"
+ )
+
+ sed -i -e "s/@@GENTOO_FFMPEG_FLAGS@@/${ffmpeg_args[*]}/" cmake/ffmpeg_configure.sh.cmake || die
+ fi
+}
+
+src_configure() {
+ # See bug 432322.
+ use x86 && replace-flags -O0 -O1
+ # Bug 768210
+ append-cxxflags -std=gnu++14
+
+ local mycmakeargs=(
+ -DAVIDEMUX_SOURCE_DIR='${S}'
+ -DGETTEXT="$(usex nls)"
+ -DNVENC="$(usex nvenc)"
+ -DSDL="$(usex sdl)"
+ -DLIBVA="$(usex vaapi)"
+ -DVDPAU="$(usex vdpau)"
+ -DXVIDEO="$(usex xv)"
+ )
+
+ use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+}
+
+src_install() {
+ cmake_src_install
+}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2022-03-09 12:37 Sam James
0 siblings, 0 replies; 28+ messages in thread
From: Sam James @ 2022-03-09 12:37 UTC (permalink / raw
To: gentoo-commits
commit: 30d1592af36a0bca5129e85a013caf7f2b492023
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 12:28:27 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 12:28:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d1592a
media-libs/avidemux-core: drop 2.7.6
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/avidemux-core/Manifest | 1 -
.../avidemux-core/avidemux-core-2.7.6.ebuild | 102 ---------------------
2 files changed, 103 deletions(-)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 9fc07834baab..f4c59a24eb9f 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,2 +1 @@
-DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
deleted file mode 100644
index 6f2b5d5eb4bf..000000000000
--- a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic toolchain-funcs
-
-DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${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 sdl system-ffmpeg vaapi vdpau xv"
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="dev-db/sqlite:3
- nvenc? ( media-video/nvidia_video_sdk )
- sdl? ( media-libs/libsdl:0 )
- system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
- vaapi? ( x11-libs/libva:0= )
- vdpau? ( x11-libs/libvdpau:0 )
- xv? ( x11-libs/libXv:0 )
-"
-RDEPEND="${DEPEND}
- !<media-libs/avidemux-core-${PV}
- !<media-video/avidemux-${PV}
- nls? ( virtual/libintl:0 )
-"
-BDEPEND="virtual/pkgconfig
- nls? ( sys-devel/gettext )
- !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-PATCHES=( "${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.patch )
-
-S="${WORKDIR}/avidemux2-${PV}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-src_prepare() {
- cmake_src_prepare
-
- if use system-ffmpeg ; then
- # Preparations to support the system ffmpeg. Currently fails because
- # it depends on files the system ffmpeg doesn't install.
- local error="Failed to remove bundled ffmpeg."
-
- rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
- buildCore/ffmpeg || die "${error}"
- sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
- -i avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -e 's/include(admFFmpegBuild)//g' \
- -i avidemux_core/CMakeLists.txt || die "${error}"
- else
- local ffmpeg_args=(
- --cc=$(tc-getCC)
- --cxx=$(tc-getCXX)
- --ar=$(tc-getAR)
- --nm=$(tc-getNM)
- --ranlib=$(tc-getRANLIB)
- "--optflags='${CFLAGS}'"
- )
-
- sed -i \
- -e "s/@@GENTOO_FFMPEG_FLAGS@@/${ffmpeg_args[*]}/" \
- cmake/ffmpeg_configure.sh.cmake \
- || die
- fi
-}
-
-src_configure() {
- # See bug 432322.
- use x86 && replace-flags -O0 -O1
- # Bug 768210
- append-cxxflags -std=gnu++14
-
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -DGETTEXT="$(usex nls)"
- -DNVENC="$(usex nvenc)"
- -DSDL="$(usex sdl)"
- -DLIBVA="$(usex vaapi)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- )
-
- use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-}
-
-src_install() {
- cmake_src_install
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2022-06-19 9:06 Jakov Smolić
0 siblings, 0 replies; 28+ messages in thread
From: Jakov Smolić @ 2022-06-19 9:06 UTC (permalink / raw
To: gentoo-commits
commit: 33373ca70bed174d18255f023f5404ac8351084a
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 08:56:41 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 08:56:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33373ca7
media-libs/avidemux-core: Remove nvenc flag
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
media-libs/avidemux-core/avidemux-core-2.7.8.ebuild | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
index f1b9a125c6c1..7d5a2d52c24c 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-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
@@ -15,12 +15,11 @@ SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
SLOT="2.7"
KEYWORDS="~amd64 ~x86"
-IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
+IUSE="debug nls sdl system-ffmpeg vaapi vdpau xv"
# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
DEPEND="
dev-db/sqlite:3
- nvenc? ( media-video/nvidia_video_sdk )
sdl? ( media-libs/libsdl:0 )
system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
vaapi? ( x11-libs/libva:0= )
@@ -78,7 +77,7 @@ src_configure() {
local mycmakeargs=(
-DAVIDEMUX_SOURCE_DIR='${S}'
-DGETTEXT="$(usex nls)"
- -DNVENC="$(usex nvenc)"
+ -DNVENC=no
-DSDL="$(usex sdl)"
-DLIBVA="$(usex vaapi)"
-DVDPAU="$(usex vdpau)"
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2023-01-07 7:17 Sam James
0 siblings, 0 replies; 28+ messages in thread
From: Sam James @ 2023-01-07 7:17 UTC (permalink / raw
To: gentoo-commits
commit: fc1c6f99d95dd2e6004e1b07af6f1bd28c50bc31
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 07:00:53 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 07:17:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1c6f99
media-libs/avidemux-core: add 2.8.1
Closes: https://bugs.gentoo.org/830464
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/avidemux-core/Manifest | 1 +
.../avidemux-core/avidemux-core-2.8.1.ebuild | 98 ++++++++++++++++++++++
2 files changed, 99 insertions(+)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index f4c59a24eb9f..5e1a60fccafb 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1 +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
diff --git a/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild b/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild
new file mode 100644
index 000000000000..6dda81dfe7ae
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake flag-o-matic toolchain-funcs
+
+DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${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 sdl system-ffmpeg vaapi vdpau xv"
+
+# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
+DEPEND="
+ dev-db/sqlite:3
+ sys-libs/zlib
+ sdl? ( media-libs/libsdl )
+ system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
+ vaapi? ( media-libs/libva:= )
+ vdpau? ( x11-libs/libvdpau )
+ xv? ( x11-libs/libXv )
+"
+RDEPEND="
+ ${DEPEND}
+ !<media-libs/avidemux-core-${PV}
+ !<media-video/avidemux-${PV}
+ nls? ( virtual/libintl )
+"
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ !system-ffmpeg? ( dev-lang/yasm[nls=] )
+"
+
+PATCHES=( "${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.patch )
+
+S="${WORKDIR}/avidemux2-${PV}"
+CMAKE_USE_DIR="${S}/${PN/-/_}"
+
+src_prepare() {
+ cmake_src_prepare
+
+ if use system-ffmpeg ; then
+ # Preparations to support the system ffmpeg. Currently fails because
+ # it depends on files the system ffmpeg doesn't install.
+ local error="Failed to remove bundled ffmpeg."
+
+ rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
+ sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' -i avidemux/commonCmakeApplication.cmake || die "${error}"
+ sed -e 's/include(admFFmpegBuild)//g' -i avidemux_core/CMakeLists.txt || die "${error}"
+ else
+ local ffmpeg_args=(
+ --cc=$(tc-getCC)
+ --cxx=$(tc-getCXX)
+ --ar=$(tc-getAR)
+ --nm=$(tc-getNM)
+ --ranlib=$(tc-getRANLIB)
+ "--optflags='${CFLAGS}'"
+ )
+
+ sed -i -e "s/@@GENTOO_FFMPEG_FLAGS@@/${ffmpeg_args[*]}/" cmake/ffmpeg_configure.sh.cmake || die
+ fi
+}
+
+src_configure() {
+ # See bug 432322.
+ use x86 && replace-flags -O0 -O1
+ # Bug 768210
+ append-cxxflags -std=gnu++14
+
+ local mycmakeargs=(
+ -DAVIDEMUX_SOURCE_DIR='${S}'
+ -DGETTEXT="$(usex nls)"
+ -DNVENC=no
+ -DSDL="$(usex sdl)"
+ -DLIBVA="$(usex vaapi)"
+ -DVDPAU="$(usex vdpau)"
+ -DXVIDEO="$(usex xv)"
+ )
+
+ use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+}
+
+src_install() {
+ cmake_src_install
+}
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2023-01-09 7:27 Sam James
0 siblings, 0 replies; 28+ messages in thread
From: Sam James @ 2023-01-09 7:27 UTC (permalink / raw
To: gentoo-commits
commit: c1a9af137c542159f3fe1c7782f454309163bbb6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 07:24:38 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=c1a9af13
media-libs/avidemux-core: fix LICENSE
Closes: https://bugs.gentoo.org/890040
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/avidemux-core/avidemux-core-2.8.1.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild b/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild
index 6dda81dfe7ae..eb19d053c01b 100644
--- a/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild
@@ -11,7 +11,8 @@ HOMEPAGE="http://fixounet.free.fr/avidemux"
SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
# 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 sdl system-ffmpeg vaapi vdpau xv"
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2023-01-10 9:00 Sam James
0 siblings, 0 replies; 28+ messages in thread
From: Sam James @ 2023-01-10 9:00 UTC (permalink / raw
To: gentoo-commits
commit: bcdef46f12abd95afb297cdf9485de862d555e30
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 08:56:42 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 09:00:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcdef46f
media-libs/avidemux-core: add nvenc support
Closes: https://bugs.gentoo.org/890332
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{avidemux-core-2.8.1.ebuild => avidemux-core-2.8.1-r1.ebuild} | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild b/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild
similarity index 94%
rename from media-libs/avidemux-core/avidemux-core-2.8.1.ebuild
rename to media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild
index eb19d053c01b..bc742a9bb980 100644
--- a/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild
@@ -15,12 +15,13 @@ SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${
LICENSE="GPL-2 MIT PSF-2 LGPL-2 OFL-1.1"
SLOT="2.7"
KEYWORDS="~amd64 ~x86"
-IUSE="debug nls sdl system-ffmpeg vaapi vdpau xv"
+IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
DEPEND="
dev-db/sqlite:3
sys-libs/zlib
+ nvenc? ( amd64? ( media-libs/nv-codec-headers ) )
sdl? ( media-libs/libsdl )
system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
vaapi? ( media-libs/libva:= )
@@ -81,6 +82,7 @@ src_configure() {
-DNVENC=no
-DSDL="$(usex sdl)"
-DLIBVA="$(usex vaapi)"
+ -DNVENC="$(usex nvenc)"
-DVDPAU="$(usex vdpau)"
-DXVIDEO="$(usex xv)"
)
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
@ 2023-01-28 11:49 Andreas Sturmlechner
0 siblings, 0 replies; 28+ messages in thread
From: Andreas Sturmlechner @ 2023-01-28 11:49 UTC (permalink / raw
To: gentoo-commits
commit: 9442a594090d26bdb67baeccf9d1e48913aafa60
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 21:54:12 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 11:48:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9442a594
media-libs/avidemux-core: drop 2.7.8
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/avidemux-core/Manifest | 1 -
.../avidemux-core/avidemux-core-2.7.8.ebuild | 98 ----------------------
2 files changed, 99 deletions(-)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 5e1a60fccafb..49e9b54b3bbf 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,2 +1 @@
-DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
DIST avidemux-2.8.1.tar.gz 23207741 BLAKE2B 766ae9b159d2e48a3d14bdfccf9c665b95ed056831b515d53837bf2bae20baf9b01d15d551b62fb96f3c0cf50b0138448a133bc62e6202af744de558e0fbfe4f SHA512 e7105e555e04dd6768336bdb246037e91045de2e1f572ae362d985424def65499c7f25d92d376ea98af09b436d89e9eb4a5424e93b11df14f2d67ac35661a8a3
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
deleted file mode 100644
index 062fa0231f9c..000000000000
--- a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
+++ /dev/null
@@ -1,98 +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 flag-o-matic toolchain-funcs
-
-DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${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 sdl system-ffmpeg vaapi vdpau xv"
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="
- dev-db/sqlite:3
- sdl? ( media-libs/libsdl:0 )
- system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
- vaapi? ( media-libs/libva:0= )
- vdpau? ( x11-libs/libvdpau:0 )
- xv? ( x11-libs/libXv:0 )
-"
-RDEPEND="
- ${DEPEND}
- !<media-libs/avidemux-core-${PV}
- !<media-video/avidemux-${PV}
- nls? ( virtual/libintl:0 )
-"
-BDEPEND="
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-PATCHES=( "${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.patch )
-
-S="${WORKDIR}/avidemux2-${PV}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-src_prepare() {
- cmake_src_prepare
-
- if use system-ffmpeg ; then
- # Preparations to support the system ffmpeg. Currently fails because
- # it depends on files the system ffmpeg doesn't install.
- local error="Failed to remove bundled ffmpeg."
-
- rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
- sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' -i avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -e 's/include(admFFmpegBuild)//g' -i avidemux_core/CMakeLists.txt || die "${error}"
- else
- local ffmpeg_args=(
- --cc=$(tc-getCC)
- --cxx=$(tc-getCXX)
- --ar=$(tc-getAR)
- --nm=$(tc-getNM)
- --ranlib=$(tc-getRANLIB)
- "--optflags='${CFLAGS}'"
- )
-
- sed -i -e "s/@@GENTOO_FFMPEG_FLAGS@@/${ffmpeg_args[*]}/" cmake/ffmpeg_configure.sh.cmake || die
- fi
-}
-
-src_configure() {
- # See bug 432322.
- use x86 && replace-flags -O0 -O1
- # Bug 768210
- append-cxxflags -std=gnu++14
-
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -DGETTEXT="$(usex nls)"
- -DNVENC=no
- -DSDL="$(usex sdl)"
- -DLIBVA="$(usex vaapi)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- )
-
- use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-}
-
-src_install() {
- cmake_src_install
-}
^ permalink raw reply related [flat|nested] 28+ messages in thread
end of thread, other threads:[~2023-01-28 11:49 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-23 5:58 [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2023-01-28 11:49 Andreas Sturmlechner
2023-01-10 9:00 Sam James
2023-01-09 7:27 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-05-22 4:27 Andrew Savchenko
2021-01-01 1:06 Michał Górny
2020-10-31 11:11 David Seifert
2020-04-26 10:35 David Seifert
2019-08-25 20:52 Stefan Strogin
2019-08-25 20:52 Stefan Strogin
2019-08-14 4:35 Stefan Strogin
2019-07-06 10:25 Andreas Sturmlechner
2018-01-09 17:33 Andreas Sturmlechner
2018-01-09 17:33 Andreas Sturmlechner
2017-12-08 18:32 Andreas Sturmlechner
2017-10-29 9:34 Andreas Sturmlechner
2017-10-08 10:24 Alexis Ballier
2017-10-04 8:02 Alexis Ballier
2017-06-30 5:28 Alexis Ballier
2017-06-30 5:28 Alexis Ballier
2017-06-23 5:58 Alexis Ballier
2017-06-23 5:58 Alexis Ballier
2017-06-23 5:58 Alexis Ballier
2016-05-06 7:49 Patrick Lauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox