commit: 088fa7c22f094bdc22539365bc1d54dbcbc02bda Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Nov 10 22:22:48 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=088fa7c2
media-libs/avidemux-plugins: drop 2.8.1-r3 Closes: https://bugs.gentoo.org/955254 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/avidemux-plugins/Manifest | 1 - .../avidemux-plugins-2.8.1-r3.ebuild | 177 --------------------- .../avidemux-plugins-2.8.1-optional-pulse.patch | 20 --- .../files/avidemux-plugins-2.8.1-x265-4.1.patch | 48 ------ media-libs/avidemux-plugins/metadata.xml | 1 - 5 files changed, 247 deletions(-) diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest index 0f2afc1b081f..5d3a6e32a52c 100644 --- a/media-libs/avidemux-plugins/Manifest +++ b/media-libs/avidemux-plugins/Manifest @@ -1,2 +1 @@ -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-r3.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.8.1-r3.ebuild deleted file mode 100644 index d15d0657edcf..000000000000 --- a/media-libs/avidemux-plugins/avidemux-plugins-2.8.1-r3.ebuild +++ /dev/null @@ -1,177 +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_{11..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" - "${FILESDIR}/${PN}-2.8.1-x265-4.1.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 -} diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1-optional-pulse.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1-optional-pulse.patch deleted file mode 100644 index 29926c59efde..000000000000 --- a/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1-optional-pulse.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/cmake/admCheckAudioDeviceLibs.cmake -+++ b/cmake/admCheckAudioDeviceLibs.cmake -@@ -194,6 +194,7 @@ - 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 @@ - ELSE (PULSEAUDIO_FOUND) - MESSAGE(STATUS "Could not find PulseAudio") - ENDIF (PULSEAUDIO_FOUND) -+ ELSE (PULSEAUDIO) -+ MESSAGE("${MSG_DISABLE_OPTION}") -+ ENDIF (PULSEAUDIO) - APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE}") - ELSE (UNIX AND NOT APPLE) - SET(PULSEAUDIOSIMPLE_CAPABLE FALSE) diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1-x265-4.1.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1-x265-4.1.patch deleted file mode 100644 index 9803cd14985a..000000000000 --- a/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1-x265-4.1.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://bugs.gentoo.org/964704 -https://github.com/mean00/avidemux2/commit/c16d32a67cdb012db093472ad3776713939a30d1.patch - -From c16d32a67cdb012db093472ad3776713939a30d1 Mon Sep 17 00:00:00 2001 -From: eumagga0x2a <[email protected]> -Date: Sat, 4 Jan 2025 23:34:14 +0100 -Subject: [PATCH] [x265] Fix build with x265 4.1 - ---- - .../ADM_videoEncoder/x265/ADM_x265Setup.cpp | 19 ++++++++++++++++++- - 1 file changed, 18 insertions(+), 1 deletion(-) - -diff --git a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp -index 55816a713..0bc330b6e 100644 ---- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp -+++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265Setup.cpp -@@ -216,13 +216,30 @@ bool x265Encoder::setup(void) - { - param.rc.bStatWrite=1; - param.rc.bStatRead=0; -+#if X265_BUILD > 213 -+ if (strlen(logFile) >= X265_MAX_STRING_SIZE) -+ { -+ ADM_error("Logfile filename length %d out of bounds, must be less than %d\n", strlen(logFile), X265_MAX_STRING_SIZE); -+ return false; -+ } -+ snprintf(param.rc.statFileName, X265_MAX_STRING_SIZE, "%s", logFile); -+#else - param.rc.statFileName=strdup(logFile); -- -+#endif - }else - { - param.rc.bStatWrite=0; - param.rc.bStatRead=1; -+#if X265_BUILD > 213 -+ if (strlen(logFile) >= X265_MAX_STRING_SIZE) -+ { -+ ADM_error("Logfile filename length %d out of bounds, must be less than %d\n", strlen(logFile), X265_MAX_STRING_SIZE); -+ return false; -+ } -+ snprintf(param.rc.statFileName, X265_MAX_STRING_SIZE, "%s", logFile); -+#else - param.rc.statFileName=strdup(logFile); -+#endif - if(!ADM_fileExist(logFile)) - { - ADM_error("Logfile %s does not exist \n",logFile); diff --git a/media-libs/avidemux-plugins/metadata.xml b/media-libs/avidemux-plugins/metadata.xml index 8845a4490e79..9304c2e6e997 100644 --- a/media-libs/avidemux-plugins/metadata.xml +++ b/media-libs/avidemux-plugins/metadata.xml @@ -10,7 +10,6 @@ <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag> <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>
