commit:     7a19c4a80f5ba84a3740e06383b19d95f664090c
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Sun Nov  9 06:09:56 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 22:24:47 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a19c4a8

media-libs/avidemux-plugins: add 2.8.1_p20251019

* add CMAKE_QA_COMPAT_SKIP=1 for unused file
* remove debug, a52, w/o effect
* deps :
    add optional libaom
    rm cpu_flags_x86_mmx, unused
    align nvenc, vdpau, vaapi with avidemux-core, options are forced by
    core in /usr/include/avidemux/2.8/ADM_coreConfig.h
    rm useflags for fontconfig, truetype and fribidi used w/ libass (required)
    rm libxml2, no longer trace in code
    rm xv, not relevant for plugins
    mp4v2 is no longer built, the content is commented (see adf3f56)
    opus handles encoder too
    vpx handles encoder only, decoder is ffmpeg
    make libsamplerate optional
    remove python(!), scriptengine uses tinypy

Thanks to MeisterP/Poncho:
* add snapshot, switch to qt6

Closes: https://bugs.gentoo.org/930937
Closes: https://bugs.gentoo.org/958025
Co-Authored-by: Poncho <poncho <AT> spahan.ch>
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/44572
Closes: https://github.com/gentoo/gentoo/pull/44572
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/avidemux-plugins/Manifest               |   1 +
 .../avidemux-plugins-2.8.1_p20251019.ebuild        | 181 +++++++++++++++++++++
 .../avidemux-plugins-2.8.1_p20251019-include.patch |  18 ++
 ...ns-2.8.1_p20251019-optional-libsamplerate.patch |  12 ++
 ...ux-plugins-2.8.1_p20251019-optional-pulse.patch |  29 ++++
 media-libs/avidemux-plugins/metadata.xml           |   1 +
 .../avidemux/avidemux-2.8.1_p20251019.ebuild       |   1 -
 7 files changed, 242 insertions(+), 1 deletion(-)

diff --git a/media-libs/avidemux-plugins/Manifest 
b/media-libs/avidemux-plugins/Manifest
index 49e9b54b3bbf..0f2afc1b081f 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1 +1,2 @@
 DIST avidemux-2.8.1.tar.gz 23207741 BLAKE2B 
766ae9b159d2e48a3d14bdfccf9c665b95ed056831b515d53837bf2bae20baf9b01d15d551b62fb96f3c0cf50b0138448a133bc62e6202af744de558e0fbfe4f
 SHA512 
e7105e555e04dd6768336bdb246037e91045de2e1f572ae362d985424def65499c7f25d92d376ea98af09b436d89e9eb4a5424e93b11df14f2d67ac35661a8a3
+DIST avidemux-2.8.1_p20251019.tar.gz 25080573 BLAKE2B 
a9c25bf6549ceeefc4259a5483de74edc87e30e6c6c0cbc739df254e7e1b5a07b5cb364073c642a2a64d384725ce84a88c5e4178a3d06007e4b697460223ac02
 SHA512 
ef28dc79b6fd2ab0492132292f066c2b0985364bbd9b3555d9813b0919ff63ba0b05b2c15419037fa67345831068bb2a85a1778b10cff5a40407a64aed114878

diff --git 
a/media-libs/avidemux-plugins/avidemux-plugins-2.8.1_p20251019.ebuild 
b/media-libs/avidemux-plugins/avidemux-plugins-2.8.1_p20251019.ebuild
new file mode 100644
index 000000000000..31d4158bb1f9
--- /dev/null
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.8.1_p20251019.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+# skip warning for ADM_demuxers/NativeAvisynth/CMakeLists.txt, unused (win)
+CMAKE_QA_COMPAT_SKIP=1
+
+inherit cmake flag-o-matic
+
+MY_COMMIT="376c1469eebedcc724dbbcc0d45030f32c9d13f5"
+DESCRIPTION="Plugins for Avidemux video editor"
+HOMEPAGE="http://fixounet.free.fr/avidemux/";
+SRC_URI="https://github.com/mean00/avidemux2/archive/${MY_COMMIT}.tar.gz -> 
avidemux-${PV}.tar.gz"
+S="${WORKDIR}/avidemux2-${MY_COMMIT}"
+CMAKE_USE_DIR="${S}/avidemux_plugins"
+
+# 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"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac aften alsa amr dcaenc dts fdk gui jack lame libaom libsamplerate 
nvenc opengl opus oss pulseaudio twolame vaapi vdpau vorbis vpx x264 x265 xvid"
+
+COMMON_DEPEND="
+       ~media-libs/avidemux-core-${PV}:${SLOT}[nvenc=,vaapi=,vdpau=]
+       ~media-video/avidemux-${PV}:${SLOT}[opengl?,gui?]
+       dev-libs/fribidi
+       media-libs/a52dec
+       media-libs/fontconfig:1.0
+       media-libs/freetype:2
+       media-libs/libass:=
+       media-libs/libmad
+       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= )
+       jack? (
+               virtual/jack
+               libsamplerate? ( media-libs/libsamplerate )
+       )
+       lame? ( media-sound/lame )
+       libaom? ( media-libs/libaom:= )
+       nvenc? ( media-libs/nv-codec-headers )
+       opengl? ( media-libs/libglvnd )
+       opus? ( media-libs/opus )
+       pulseaudio? ( media-libs/libpulse )
+       gui? ( dev-qt/qtbase:6[gui,opengl,widgets] )
+       twolame? ( media-sound/twolame )
+       vaapi? ( media-libs/libva:= )
+       vorbis? ( media-libs/libvorbis )
+       vpx? ( media-libs/libvpx:0= )
+       x264? ( media-libs/x264:0= )
+       x265? ( media-libs/x265:0= )
+       xvid? ( media-libs/xvid )
+"
+DEPEND="
+       ${COMMON_DEPEND}
+       oss? ( virtual/os-headers )
+"
+RDEPEND="
+       ${COMMON_DEPEND}
+       !<media-libs/avidemux-plugins-${PV}
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-2.8.1_p20251019-optional-pulse.patch"
+       "${FILESDIR}/${PN}-2.8.1_p20251019-optional-libsamplerate.patch"
+       "${FILESDIR}/${PN}-2.8.1_p20251019-include.patch"
+)
+
+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
+
+       PLUGINDIRS=(
+               buildPluginsCommon
+               buildPluginsCli
+               $(usev gui buildPluginsQt4)
+       )
+
+       # checked by Common/Cli/Qt4
+       local all_mycmakeargs=(
+               -DVERBOSE=ON
+               -DX264="$(usex x264)"
+               -DX265="$(usex x265)"
+       )
+
+       # buildPluginsCommon
+       local common_mycmakeargs=(
+               -DPLUGIN_UI=COMMON
+               "${all_mycmakeargs[@]}"
+               -DAVIDEMUX_SOURCE_DIR='${S}'
+               -DFAAC="$(usex aac)"
+               -DFAAD="$(usex aac)"
+               -DAFTEN="$(usex aften)"
+               -DALSA="$(usex alsa)"
+               -DOPENCORE_AMRNB="$(usex amr)"
+               -DOPENCORE_AMRWB="$(usex amr)"
+               -DDCAENC="$(usex dcaenc)"
+               -DLIBDCA="$(usex dts)"
+               -DFDK_AAC="$(usex fdk)"
+               -DJACK="$(usex jack)"
+               $(usev jack -DSRC=$(usex libsamplerate))
+               -DLAME="$(usex lame)"
+               -DAOM="$(usex libaom)"
+               -DOPUS="$(usex opus)"
+               -DOPUS_ENCODER="$(usex opus)"
+               -DOSS="$(usex oss)"
+               -DPULSEAUDIO="$(usex pulseaudio)"
+               -DTWOLAME="$(usex twolame)"
+               -DLIBVORBIS="$(usex vorbis)"
+               -DVORBIS="$(usex vorbis)"
+               -DVPXENC="$(usex vpx)"
+               -DXVID="$(usex xvid)"
+               -DUSE_EXTERNAL_LIBA52=yes
+               -DUSE_EXTERNAL_LIBMAD=yes
+       )
+
+       # buildPluginsCli
+       local cli_mycmakeargs=(
+               -DPLUGIN_UI=CLI
+               "${all_mycmakeargs[@]}"
+       )
+
+       # buildPluginsQt4
+       local gui_mycmakeargs=(
+               -DPLUGIN_UI=QT4
+               "${all_mycmakeargs[@]}"
+               -DENABLE_QT4=OFF
+               -DENABLE_QT5=OFF
+               -DENABLE_QT6=ON
+               -DOPENGL="$(usex opengl)"
+       )
+
+       local plugin
+       local mycmakeargs
+       for plugin in "${PLUGINDIRS[@]}" ; do
+               case "${plugin}" in
+                       "buildPluginsCommon")
+                               mycmakeargs=( "${common_mycmakeargs[@]}" ) ;;
+                       "buildPluginsCli")
+                               mycmakeargs=( "${cli_mycmakeargs[@]}" ) ;;
+                       "buildPluginsQt4")
+                               mycmakeargs=( "${gui_mycmakeargs[@]}" ) ;;
+                       *)
+                               die "plugin not available" ;;
+               esac
+               BUILD_DIR="${WORKDIR}/${P}_build/${plugin}" cmake_src_configure
+       done
+}
+
+multi_plugins() {
+       local plugin
+       for plugin in "${PLUGINDIRS[@]}" ; do
+               BUILD_DIR="${WORKDIR}/${P}_build/${plugin}" "${@}"
+       done
+}
+
+src_compile() {
+       multi_plugins cmake_src_compile
+}
+
+src_install() {
+       multi_plugins cmake_src_install
+}

diff --git 
a/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1_p20251019-include.patch
 
b/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1_p20251019-include.patch
new file mode 100644
index 000000000000..ad6670cbf808
--- /dev/null
+++ 
b/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1_p20251019-include.patch
@@ -0,0 +1,18 @@
+From 9813c56c6b90de85dda29a83b94aba02a6e1c819 Mon Sep 17 00:00:00 2001
+From: Poncho <[email protected]>
+Date: Sun, 26 Oct 2025 09:15:35 +0100
+Subject: [PATCH 3/3] avidemux_plugins/CMakeLists.txt: add missing includ
+
+--- a/avidemux_plugins/CMakeLists.txt
++++ b/avidemux_plugins/CMakeLists.txt
+@@ -20,6 +20,7 @@ MESSAGE("")
+ MESSAGE(STATUS "Checking for avidemux development files ..")
+ 
+ LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
++LIST(APPEND CMAKE_MODULE_PATH 
${CMAKE_CURRENT_SOURCE_DIR}/../avidemux/qt4/cmake)
+ IF(NOT FAKEROOT)
+   SET(AVIDEMUX_FAKEROOT "")
+ ELSE()
+-- 
+2.51.0
+

diff --git 
a/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1_p20251019-optional-libsamplerate.patch
 
b/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1_p20251019-optional-libsamplerate.patch
new file mode 100644
index 000000000000..551bce7f1b14
--- /dev/null
+++ 
b/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1_p20251019-optional-libsamplerate.patch
@@ -0,0 +1,12 @@
+make libsamplerate optional
+--- a/avidemux_plugins/cmake/admCheckAudioDeviceLibs.cmake
++++ b/avidemux_plugins/cmake/admCheckAudioDeviceLibs.cmake
+@@ -116,7 +116,7 @@ IF(JACK_FOUND)
+       FIND_HEADER_AND_LIB(SRC samplerate.h samplerate src_get_version)
+       PRINT_LIBRARY_INFO("Secret Rabbit Code" SRC_FOUND "${SRC_INCLUDE_DIR}" 
"${SRC_LIBRARY_DIR}")
+ 
+-      IF(SRC_FOUND)
++      IF(SRC AND SRC_FOUND)
+               SET(USE_SRC 1)
+       ENDIF()
+ 

diff --git 
a/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1_p20251019-optional-pulse.patch
 
b/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1_p20251019-optional-pulse.patch
new file mode 100644
index 000000000000..9f7db8a2b956
--- /dev/null
+++ 
b/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1_p20251019-optional-pulse.patch
@@ -0,0 +1,29 @@
+From 9994594ceb56cce6973717524ea131fd629908ed Mon Sep 17 00:00:00 2001
+From: Poncho <[email protected]>
+Date: Sun, 26 Oct 2025 09:12:30 +0100
+Subject: [PATCH 2/3] avidemux_plugins/cmake/admCheckAudioDeviceLibs.cmake:
+ optional pulseaudio
+
+--- a/avidemux_plugins/cmake/admCheckAudioDeviceLibs.cmake
++++ b/avidemux_plugins/cmake/admCheckAudioDeviceLibs.cmake
+@@ -194,6 +194,7 @@ IF(UNIX AND NOT APPLE)
+               APPEND_SUMMARY_LIST("Audio Device" "PulseAudioS" 
"${USE_PULSE_SIMPLE}")
+ ]]
+     OPTION(PULSEAUDIO "" ON)
++    IF (PULSEAUDIO)
+     MESSAGE(STATUS "Checking for PulseAudio")
+     include(FindPkgConfig)
+     pkg_check_modules(PULSEAUDIO libpulse)
+@@ -203,6 +204,9 @@ IF(UNIX AND NOT APPLE)
+     ELSE()
+         MESSAGE(STATUS "Could not find PulseAudio")
+     ENDIF()
++    ELSE ()
++        MESSAGE("${MSG_DISABLE_OPTION}")
++    ENDIF ()
+     APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE}")
+ ELSE()
+       SET(PULSEAUDIOSIMPLE_CAPABLE FALSE)
+-- 
+2.51.0
+

diff --git a/media-libs/avidemux-plugins/metadata.xml 
b/media-libs/avidemux-plugins/metadata.xml
index 656454924dba..8845a4490e79 100644
--- a/media-libs/avidemux-plugins/metadata.xml
+++ b/media-libs/avidemux-plugins/metadata.xml
@@ -11,6 +11,7 @@
     <flag name="dcaenc">Enable DTS Coherent Acoustics audio encoder support 
via <pkg>media-sound/dcaenc</pkg>.</flag>
     <flag name="fdk">Adds support for encoding AAC using 
<pkg>media-libs/fdk-aac</pkg>.</flag>
     <flag name="fribidi">Enable unicode bidirectional algorithm support via 
<pkg>dev-libs/fribidi</pkg>.</flag>
+    <flag name="libaom">Enable AV1 de/encoding via 
<pkg>media-libs/libaom</pkg>.</flag>
     <flag name="twolame">Enable TwoLAME support via 
<pkg>media-sound/twolame</pkg>, an optimised MPEG Audio Layer 2 (MP2) 
encoder.</flag>
     <flag name="x265">Enables HEVC support with 
<pkg>media-libs/x265</pkg>.</flag>
   </use>

diff --git a/media-video/avidemux/avidemux-2.8.1_p20251019.ebuild 
b/media-video/avidemux/avidemux-2.8.1_p20251019.ebuild
index aed0e8fefd08..3f2ab6d9541d 100644
--- a/media-video/avidemux/avidemux-2.8.1_p20251019.ebuild
+++ b/media-video/avidemux/avidemux-2.8.1_p20251019.ebuild
@@ -97,7 +97,6 @@ src_configure() {
        local all_mycmakeargs=(
                -DVERBOSE=ON
                -DGETTEXT="$(usex nls)"
-               -DNVENC="$(usex nvenc)"
        )
 
        # buildCli

Reply via email to