commit: 9d9faecbcd7a5c18b363f37359f268b68d68ab0b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Nov 10 22:22:14 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=9d9faecb
media-video/avidemux: drop 2.8.1 Closes: https://bugs.gentoo.org/955254 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/avidemux/Manifest | 2 - media-video/avidemux/avidemux-2.8.1.ebuild | 147 --------------------- .../avidemux/files/avidemux-2.7.4-qt-5.15.patch | 11 -- 3 files changed, 160 deletions(-) diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest index ff56c3c39056..3edfd8bd63da 100644 --- a/media-video/avidemux/Manifest +++ b/media-video/avidemux/Manifest @@ -1,4 +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 -DIST avidemux-i18n-2.8.1.tar.gz 2765272 BLAKE2B ecca8a3d6f278e02e37059c1c1dce4d8164661548f29d5e51273d76e46434bc349d93701209fd6a009364244540d75cae09ce456e968d1761ca5540acc4ba678 SHA512 aa93add0d72170abf009e5bd86eeb5198907ee8961e366ad396d85315b9908f8f94bf920ba2a0cf9c351dd9c50f7ef883480d88e7475f48d085648bfbfa1f4d4 DIST avidemux-i18n-2.8.1_p20251019.tar.gz 2997536 BLAKE2B 445cc5b531397e6852f466c049fb406a9d22e87dd7bda577c15fd361f0a66f7712da5646d70eb88f41ce2d3d2005a2402c71ce9146c390e38a845a573c7dfb6f SHA512 f9a78ee9089fe69fe378b3e1c673ad82415511ff6a0f3f5309efc830595e843cc7863312a01c4f8fedee05d5faf420fce4f5030e13011622bdfd0b7b0ee7264c diff --git a/media-video/avidemux/avidemux-2.8.1.ebuild b/media-video/avidemux/avidemux-2.8.1.ebuild deleted file mode 100644 index 34a39f9e96d5..000000000000 --- a/media-video/avidemux/avidemux-2.8.1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake desktop flag-o-matic qmake-utils xdg - -DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks" -HOMEPAGE="http://fixounet.free.fr/avidemux"; -SRC_URI=" - https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/mean00/avidemux2_i18n/archive/${PV}.tar.gz -> ${PN}-i18n-${PV}.tar.gz -" - -# Multiple licenses because of all the bundled stuff. -# See License.txt. -LICENSE="GPL-2 MIT PSF-2 LGPL-2 OFL-1.1" -SLOT="2.7" -KEYWORDS="~amd64 ~x86" -IUSE="debug nls opengl gui sdl vaapi vdpau xv" - -BDEPEND=" - dev-lang/yasm - gui? ( dev-qt/linguist-tools:5 ) -" -DEPEND=" - ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?] - opengl? ( virtual/opengl ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - vaapi? ( media-libs/libva:= ) -" -RDEPEND=" - ${DEPEND} - nls? ( virtual/libintl ) - !<media-video/avidemux-${PV} -" - -PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,gui?]" - -S="${WORKDIR}/avidemux2-${PV}" - -src_unpack() { - default - mv -f -T avidemux2_i18n-"${PV}" "${S}"/avidemux/qt4/i18n >/dev/null || die -} - -src_prepare() { - eapply "${FILESDIR}/${PN}-2.7.4-qt-5.15.patch" - - processes="buildCli:avidemux/cli" - use gui && processes+=" buildQt4:avidemux/qt4" - - for process in ${processes} ; do - CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare - done - - if use gui; then - # Fix icon name -> avidemux-2.7 - sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/"${PN}".desktop || die "Icon name fix failed." - - # The desktop file is broken. It uses avidemux3_portable instead of avidemux3_qt5 - sed -i -re '/^Exec/ s:(avidemux3_)portable:\1qt5:' appImage/"${PN}".desktop || die "Desktop file fix failed." - - # QA warnings: missing trailing ';' and 'Application' is deprecated. - sed -i -e 's/Application;AudioVideo/AudioVideo;/g' appImage/"${PN}".desktop || die "Desktop file fix failed." - - # Now rename the desktop file to not collide with 2.6. - mv appImage/"${PN}".desktop "${PN}-${SLOT}".desktop || die "Collision rename failed." - fi - - # Remove "Build Option" dialog because it doesn't reflect - # what the GUI can or has been built with. (Bug #463628) - sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog." -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/915773 - # - # Upstream has abandoned sourceforge for github. And doesn't enable github issues. - # Message received, no bug reported. - filter-lto - - # See bug 432322. - use x86 && replace-flags -O0 -O1 - - # The build relies on an avidemux-core header that uses 'nullptr' - # which is from >=C++11. Let's use the GCC-6 default C++ dialect. - append-cxxflags -std=c++14 - - local mycmakeargs=( - -DGETTEXT="$(usex nls)" - -DSDL="$(usex sdl)" - -DLibVA="$(usex vaapi)" - -DOPENGL="$(usex opengl)" - -DVDPAU="$(usex vdpau)" - -DXVIDEO="$(usex xv)" - -DENABLE_QT4=OFF - -DENABLE_QT6=OFF - ) - - use gui && mycmakeargs+=( - -DENABLE_QT5="$(usex gui)" - -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" - ) - - use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 ) - - for process in ${processes} ; do - local build="${WORKDIR}/${P}_build/${process%%:*}" - CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure - done -} - -src_compile() { - for process in ${processes} ; do - local build="${WORKDIR}/${P}_build/${process%%:*}" - BUILD_DIR="${build}" cmake_src_compile - done -} - -src_test() { - for process in ${processes} ; do - local build="${WORKDIR}/${P}_build/${process%%:*}" - BUILD_DIR="${build}" cmake_src_test - done -} - -src_install() { - for process in ${processes} ; do - local build="${WORKDIR}/${P}_build/${process%%:*}" - BUILD_DIR="${build}" cmake_src_install - done - - if use gui; then - cd "${S}" || die "Can't enter source folder" - newicon "${PN}"_icon.png "${PN}-${SLOT}".png - domenu "${PN}-${SLOT}".desktop - fi -} diff --git a/media-video/avidemux/files/avidemux-2.7.4-qt-5.15.patch b/media-video/avidemux/files/avidemux-2.7.4-qt-5.15.patch deleted file mode 100644 index 5c92a561fd7c..000000000000 --- a/media-video/avidemux/files/avidemux-2.7.4-qt-5.15.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur avidemux2-2.7.4.orig/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp avidemux2-2.7.4/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp ---- a/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp 2019-08-14 19:11:18.000000000 +0200 -+++ b/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp 2020-05-30 20:45:53.304702855 +0200 -@@ -8,6 +8,7 @@ - ***************************************************************************/// - - #include <QPainter> -+#include <QPainterPath> - #include <QRubberBand> - #include <QBoxLayout> - #include <QSizeGrip>
