mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
media-libs/avidemux-core: drop 2.8.1-r1
Closes: https://bugs.gentoo.org/955254 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -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
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
# Copyright 1999-2025 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.
|
||||
# See License.txt.
|
||||
LICENSE="GPL-2 MIT PSF-2 LGPL-2 OFL-1.1"
|
||||
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
|
||||
virtual/zlib:=
|
||||
nvenc? ( amd64? ( media-libs/nv-codec-headers ) )
|
||||
sdl? ( media-libs/libsdl )
|
||||
system-ffmpeg? ( media-video/ffmpeg:=[lame(-),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
|
||||
"${FILESDIR}"/avidemux-core-2.8.1-ffmpeg-2.41.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)"
|
||||
-DNVENC="$(usex nvenc)"
|
||||
-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
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
--- a/cmake/ffmpeg_configure.sh.cmake
|
||||
+++ b/cmake/ffmpeg_configure.sh.cmake
|
||||
@@ -1,2 +1,2 @@
|
||||
export PATH=${FF_ENV_PATH}:$PATH
|
||||
-${FFMPEG_SOURCE_DIR}/configure ${FFMPEG_FLAGS}
|
||||
\ No newline at end of file
|
||||
+${FFMPEG_SOURCE_DIR}/configure ${FFMPEG_FLAGS} @@GENTOO_FFMPEG_FLAGS@@
|
||||
\ No newline at end of file
|
||||
@@ -1,84 +0,0 @@
|
||||
diff --git a/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h_binutils_241.patch b/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h_binutils_241.patch
|
||||
new file mode 100644
|
||||
index 0000000..633b4b6
|
||||
--- /dev/null
|
||||
+++ b/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h_binutils_241.patch
|
||||
@@ -0,0 +1,76 @@
|
||||
+https://bugs.gentoo.org/911582
|
||||
+https://trac.ffmpeg.org/ticket/10405
|
||||
+https://git.videolan.org/?p=ffmpeg.git;a=commit;h=25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e
|
||||
+https://sourceware.org/PR30578
|
||||
+https://gcc.gnu.org/PR108941
|
||||
+
|
||||
+From 25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e Mon Sep 17 00:00:00 2001
|
||||
+From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
|
||||
+Date: Sun, 16 Jul 2023 18:18:02 +0300
|
||||
+Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
|
||||
+ instructions within inline assembly
|
||||
+
|
||||
+Fixes assembling with binutil as >= 2.41
|
||||
+
|
||||
+Signed-off-by: James Almer <jamrial@gmail.com>
|
||||
+(cherry picked from commit effadce6c756247ea8bae32dc13bb3e6f464f0eb)
|
||||
+--- libavcodec/x86/mathops.h
|
||||
++++ libavcodec/x86/mathops.h
|
||||
+@@ -35,12 +35,20 @@
|
||||
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
|
||||
+ {
|
||||
+ int rt, dummy;
|
||||
++ if (__builtin_constant_p(shift))
|
||||
+ __asm__ (
|
||||
+ "imull %3 \n\t"
|
||||
+ "shrdl %4, %%edx, %%eax \n\t"
|
||||
+ :"=a"(rt), "=d"(dummy)
|
||||
+- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
|
||||
++ :"a"(a), "rm"(b), "i"(shift & 0x1F)
|
||||
+ );
|
||||
++ else
|
||||
++ __asm__ (
|
||||
++ "imull %3 \n\t"
|
||||
++ "shrdl %4, %%edx, %%eax \n\t"
|
||||
++ :"=a"(rt), "=d"(dummy)
|
||||
++ :"a"(a), "rm"(b), "c"((uint8_t)shift)
|
||||
++ );
|
||||
+ return rt;
|
||||
+ }
|
||||
+
|
||||
+@@ -113,19 +121,31 @@ __asm__ volatile(\
|
||||
+ // avoid +32 for shift optimization (gcc should do that ...)
|
||||
+ #define NEG_SSR32 NEG_SSR32
|
||||
+ static inline int32_t NEG_SSR32( int32_t a, int8_t s){
|
||||
++ if (__builtin_constant_p(s))
|
||||
+ __asm__ ("sarl %1, %0\n\t"
|
||||
+ : "+r" (a)
|
||||
+- : "ic" ((uint8_t)(-s))
|
||||
++ : "i" (-s & 0x1F)
|
||||
+ );
|
||||
++ else
|
||||
++ __asm__ ("sarl %1, %0\n\t"
|
||||
++ : "+r" (a)
|
||||
++ : "c" ((uint8_t)(-s))
|
||||
++ );
|
||||
+ return a;
|
||||
+ }
|
||||
+
|
||||
+ #define NEG_USR32 NEG_USR32
|
||||
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
|
||||
++ if (__builtin_constant_p(s))
|
||||
+ __asm__ ("shrl %1, %0\n\t"
|
||||
+ : "+r" (a)
|
||||
+- : "ic" ((uint8_t)(-s))
|
||||
++ : "i" (-s & 0x1F)
|
||||
+ );
|
||||
++ else
|
||||
++ __asm__ ("shrl %1, %0\n\t"
|
||||
++ : "+r" (a)
|
||||
++ : "c" ((uint8_t)(-s))
|
||||
++ );
|
||||
+ return a;
|
||||
+ }
|
||||
+
|
||||
+--
|
||||
+2.30.2
|
||||
--
|
||||
2.41.0
|
||||
@@ -5,9 +5,6 @@
|
||||
<email>media-video@gentoo.org</email>
|
||||
<name>Gentoo Video project</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="system-ffmpeg">Use the ffmpeg provided by the system.</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="github">mean00/avidemux2</remote-id>
|
||||
</upstream>
|
||||
|
||||
@@ -974,10 +974,6 @@ media-libs/libsdl2 custom-cflags
|
||||
# Broken for now (segmentation fault on play)
|
||||
gnustep-apps/cynthiune flac
|
||||
|
||||
# Tom Wijsman <TomWij@gentoo.org> (2013-03-10)
|
||||
# Experimental, masked until it compiles and works.
|
||||
media-libs/avidemux-core system-ffmpeg
|
||||
|
||||
# Jory A. Pratt <anarchy@gentoo.org> (2012-12-15)
|
||||
# PGO is known to be busted with most configurations
|
||||
www-client/firefox pgo
|
||||
|
||||
Reference in New Issue
Block a user