diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index 0f2afc1b081f8..5d3a6e32a52c3 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/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-core/avidemux-core-2.8.1-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild deleted file mode 100644 index 8fc974e1ba29d..0000000000000 --- a/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild +++ /dev/null @@ -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} - ! -+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 -+(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 diff --git a/media-libs/avidemux-core/metadata.xml b/media-libs/avidemux-core/metadata.xml index b1eda22c6936d..2cdabc4c2f5ef 100644 --- a/media-libs/avidemux-core/metadata.xml +++ b/media-libs/avidemux-core/metadata.xml @@ -5,9 +5,6 @@ media-video@gentoo.org Gentoo Video project - - Use the ffmpeg provided by the system. - mean00/avidemux2 diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 759e2bc08425f..7e3ecd79c7692 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -974,10 +974,6 @@ media-libs/libsdl2 custom-cflags # Broken for now (segmentation fault on play) gnustep-apps/cynthiune flac -# Tom Wijsman (2013-03-10) -# Experimental, masked until it compiles and works. -media-libs/avidemux-core system-ffmpeg - # Jory A. Pratt (2012-12-15) # PGO is known to be busted with most configurations www-client/firefox pgo