commit: bf8bdd533ebe22af0075673fc129b26ed9b48c32 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jun 8 05:11:28 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 8 05:11:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf8bdd53
media-libs/avidemux-plugins: fold in py compat revbump We don't need a revbump here so fold it in to -r2. Bug: https://bugs.gentoo.org/952530 Signed-off-by: Sam James <sam <AT> gentoo.org> .../avidemux-plugins-2.8.1-r2.ebuild | 4 +- .../avidemux-plugins-2.8.1-r3.ebuild | 174 --------------------- 2 files changed, 2 insertions(+), 176 deletions(-) diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.8.1-r2.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.8.1-r2.ebuild index eb408334f269..2e7a00d81887 100644 --- a/media-libs/avidemux-plugins/avidemux-plugins-2.8.1-r2.ebuild +++ b/media-libs/avidemux-plugins/avidemux-plugins-2.8.1-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 CMAKE_MAKEFILE_GENERATOR="emake" -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake flag-o-matic python-single-r1 diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.8.1-r3.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.8.1-r3.ebuild deleted file mode 100644 index 2e7a00d81887..000000000000 --- a/media-libs/avidemux-plugins/avidemux-plugins-2.8.1-r3.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_MAKEFILE_GENERATOR="emake" -PYTHON_COMPAT=( python3_{10..13} ) - -inherit cmake flag-o-matic python-single-r1 - -DESCRIPTION="Plugins for the video editor media-video/avidemux" -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. -# See License.txt. -LICENSE="GPL-2 MIT PSF-2 LGPL-2 OFL-1.1" -SLOT="2.7" -IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio gui truetype twolame vdpau vorbis vpx x264 x265 xv xvid" -KEYWORDS="~amd64 ~x86" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# dev-lang/spidermonkey is not required anymore -# see https://github.com/mean00/avidemux2/blob/master/avidemux_plugins/ADM_scriptEngines/CMakeLists.txt -COMMON_DEPEND=" - ${PYTHON_DEPS} - ~media-libs/avidemux-core-${PV}:${SLOT}[nvenc?,vdpau?] - ~media-video/avidemux-${PV}:${SLOT}[opengl?,gui?] - dev-libs/libxml2:2 - media-libs/a52dec - media-libs/libass:0= - media-libs/libmad - media-libs/libmp4v2 - media-libs/libpng:0= - virtual/libiconv - aac? ( - media-libs/faac - media-libs/faad2 - ) - aften? ( media-libs/aften ) - alsa? ( media-libs/alsa-lib ) - amr? ( media-libs/opencore-amr ) - dcaenc? ( media-sound/dcaenc ) - dts? ( media-libs/libdca ) - fdk? ( media-libs/fdk-aac:0= ) - fontconfig? ( media-libs/fontconfig:1.0 ) - fribidi? ( dev-libs/fribidi ) - jack? ( - virtual/jack - libsamplerate? ( media-libs/libsamplerate ) - ) - lame? ( media-sound/lame ) - nvenc? ( amd64? ( media-libs/nv-codec-headers ) ) - opus? ( media-libs/opus ) - pulseaudio? ( media-libs/libpulse ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - truetype? ( media-libs/freetype:2 ) - twolame? ( media-sound/twolame ) - vorbis? ( media-libs/libvorbis ) - vpx? ( media-libs/libvpx:0= ) - x264? ( media-libs/x264:0= ) - x265? ( media-libs/x265:0= ) - xv? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXv - ) - xvid? ( media-libs/xvid ) -" -DEPEND=" - ${COMMON_DEPEND} - oss? ( virtual/os-headers ) -" -RDEPEND=" - ${COMMON_DEPEND} - !<media-libs/avidemux-plugins-${PV} -" - -S="${WORKDIR}/avidemux2-${PV}" - -PATCHES=( "${FILESDIR}/${PN}-2.8.1-optional-pulse.patch" ) - -src_prepare() { - default - - # Don't reapply PATCHES during cmake_src_prepare - unset PATCHES - - processes="buildPluginsCommon:avidemux_plugins - buildPluginsCLI:avidemux_plugins" - use gui && processes+=" buildPluginsQt4:avidemux_plugins" - - for process in ${processes} ; do - CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare - done -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/859829 - # - # 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 - - for process in ${processes} ; do - local build="${WORKDIR}/${P}_build/${process%%:*}" - - local mycmakeargs=( - -DAVIDEMUX_SOURCE_DIR='${S}' - -DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]') - -DFAAC="$(usex aac)" - -DFAAD="$(usex aac)" - -DALSA="$(usex alsa)" - -DAFTEN="$(usex aften)" - -DDCAENC="$(usex dcaenc)" - -DFDK_AAC="$(usex fdk)" - -DOPENCORE_AMRWB="$(usex amr)" - -DOPENCORE_AMRNB="$(usex amr)" - -DLIBDCA="$(usex dts)" - -DFONTCONFIG="$(usex fontconfig)" - -DJACK="$(usex jack)" - -DLAME="$(usex lame)" - -DNVENC="$(usex nvenc)" - -DOPENGL="$(usex opengl)" - -DOPUS="$(usex opus)" - -DOSS="$(usex oss)" - -DPULSEAUDIO="$(usex pulseaudio)" - -DENABLE_QT4=OFF - -DENABLE_QT6=OFF - -DFREETYPE2="$(usex truetype)" - -DTWOLAME="$(usex twolame)" - -DX264="$(usex x264)" - -DX265="$(usex x265)" - -DXVIDEO="$(usex xv)" - -DXVID="$(usex xvid)" - -DVDPAU="$(usex vdpau)" - -DVORBIS="$(usex vorbis)" - -DLIBVORBIS="$(usex vorbis)" - -DVPXDEC="$(usex vpx)" - -DUSE_EXTERNAL_LIBA52=yes - -DUSE_EXTERNAL_LIBASS=yes - -DUSE_EXTERNAL_LIBMAD=yes - -DUSE_EXTERNAL_LIBMP4V2=yes - ) - - use gui && mycmakeargs+=( -DENABLE_QT5=True ) - use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 ) - - 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_install() { - for process in ${processes} ; do - local build="${WORKDIR}/${P}_build/${process%%:*}" - BUILD_DIR="${build}" cmake_src_install - done -}
