* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/, media-libs/avidemux-core/files/
@ 2020-08-11 23:10 Thomas Deutschmann
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2020-08-11 23:10 UTC (permalink / raw
To: gentoo-commits
commit: 8e0f752f7311788876c687958328c72ecccaff64
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 22:19:57 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 23:10:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0f752f
media-libs/avidemux-core: bump to v2.7.6
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/avidemux-core/Manifest | 1 +
.../avidemux-core/avidemux-core-2.7.6.ebuild | 100 +++++++++++++++++++++
.../files/avidemux-core-2.7.6-ffmpeg-flags.patch | 8 ++
3 files changed, 109 insertions(+)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 81a3ad8e8a8..20c2b9ff2f2 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1 +1,2 @@
DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
+DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
new file mode 100644
index 00000000000..ac6eace06eb
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake 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.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+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
+ nvenc? ( media-video/nvidia_video_sdk )
+ sdl? ( media-libs/libsdl:0 )
+ system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
+ vaapi? ( x11-libs/libva:0= )
+ vdpau? ( x11-libs/libvdpau:0 )
+ xv? ( x11-libs/libXv:0 )
+"
+RDEPEND="${DEPEND}
+ !<media-libs/avidemux-core-${PV}
+ !<media-video/avidemux-${PV}
+ nls? ( virtual/libintl:0 )
+"
+BDEPEND="virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ !system-ffmpeg? ( dev-lang/yasm[nls=] )
+"
+
+PATCHES=( "${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.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
+
+ local mycmakeargs=(
+ -DAVIDEMUX_SOURCE_DIR='${S}'
+ -DGETTEXT="$(usex nls)"
+ -DNVENC="$(usex nvenc)"
+ -DSDL="$(usex sdl)"
+ -DLIBVA="$(usex vaapi)"
+ -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
+}
diff --git a/media-libs/avidemux-core/files/avidemux-core-2.7.6-ffmpeg-flags.patch b/media-libs/avidemux-core/files/avidemux-core-2.7.6-ffmpeg-flags.patch
new file mode 100644
index 00000000000..48e58be6d28
--- /dev/null
+++ b/media-libs/avidemux-core/files/avidemux-core-2.7.6-ffmpeg-flags.patch
@@ -0,0 +1,8 @@
+--- 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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/, media-libs/avidemux-core/files/
@ 2023-08-10 4:08 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-08-10 4:08 UTC (permalink / raw
To: gentoo-commits
commit: fa73e5fd23da1151eadc3e12abe14afbad98152d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 04:06:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 10 04:06:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa73e5fd
media-libs/avidemux-core: fix build w/ binutils-2.41
Closes: https://bugs.gentoo.org/911986
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../avidemux-core/avidemux-core-2.8.1-r1.ebuild | 5 +-
.../files/avidemux-core-2.8.1-ffmpeg-2.41.patch | 84 ++++++++++++++++++++++
2 files changed, 88 insertions(+), 1 deletion(-)
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
index bc742a9bb980..617721f52e31 100644
--- a/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild
@@ -40,7 +40,10 @@ BDEPEND="
!system-ffmpeg? ( dev-lang/yasm[nls=] )
"
-PATCHES=( "${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.patch )
+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/-/_}"
diff --git a/media-libs/avidemux-core/files/avidemux-core-2.8.1-ffmpeg-2.41.patch b/media-libs/avidemux-core/files/avidemux-core-2.8.1-ffmpeg-2.41.patch
new file mode 100644
index 000000000000..da444e9e1c81
--- /dev/null
+++ b/media-libs/avidemux-core/files/avidemux-core-2.8.1-ffmpeg-2.41.patch
@@ -0,0 +1,84 @@
+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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/, media-libs/avidemux-core/files/
@ 2020-08-07 23:24 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-08-07 23:24 UTC (permalink / raw
To: gentoo-commits
commit: 1a0d283aac7962bf749e58c577c05f09c6fe95bf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 7 20:24:32 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 7 23:23:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0d283a
media-libs/avidemux-core: Drop 2.7.3-r1
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/avidemux-core/Manifest | 1 -
.../avidemux-core/avidemux-core-2.7.3-r1.ebuild | 88 ----------------------
.../files/avidemux-core-2.7.3-permissions.patch | 28 -------
3 files changed, 117 deletions(-)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 7d6012ce4fc..81a3ad8e8a8 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,2 +1 @@
-DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild
deleted file mode 100644
index 1b987f4d1e1..00000000000
--- a/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake
-
-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.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-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
- nvenc? ( media-video/nvidia_video_sdk )
- sdl? ( media-libs/libsdl:0 )
- system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
- vaapi? ( x11-libs/libva:0= )
- vdpau? ( x11-libs/libvdpau:0 )
- xv? ( x11-libs/libXv:0 )
-"
-RDEPEND="${DEPEND}
- !<media-libs/avidemux-core-${PV}
- !<media-video/avidemux-${PV}
- nls? ( virtual/libintl:0 )
-"
-BDEPEND="virtual/pkgconfig
- nls? ( sys-devel/gettext )
- !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/avidemux2-${PV}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-PATCHES=( "${FILESDIR}"/${P}-permissions.patch )
-
-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}"
- fi
-}
-
-src_configure() {
- # See bug 432322.
- use x86 && replace-flags -O0 -O1
-
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -DGETTEXT="$(usex nls)"
- -DNVENC="$(usex nvenc)"
- -DSDL="$(usex sdl)"
- -DLIBVA="$(usex vaapi)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- )
-
- if use debug ; then
- mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
- fi
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-}
-
-src_install() {
- cmake_src_install
-}
diff --git a/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch b/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch
deleted file mode 100644
index 0f8ee21632e..00000000000
--- a/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7c5c267987b90cf0b61ca98e9f8b6db2c0cdb84f Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 14 Aug 2019 03:35:01 +0300
-Subject: [PATCH] [cmake] Fix library permissions
-
-Upstream-Status: Submitted
-[https://github.com/mean00/avidemux2/pull/179]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- cmake/admInstallDir.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/admInstallDir.cmake b/cmake/admInstallDir.cmake
-index ab16f283d..5af762626 100644
---- a/cmake/admInstallDir.cmake
-+++ b/cmake/admInstallDir.cmake
-@@ -55,7 +55,7 @@ ENDMACRO(ADM_INSTALL_LIB )
- MACRO (ADM_INSTALL_LIB_FILES files)
- INSTALL(FILES ${files}
- DESTINATION ${AVIDEMUX_LIB_DIR}
-- PERMISSIONS WORLD_READ WORLD_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE
-+ PERMISSIONS WORLD_READ WORLD_EXECUTE GROUP_READ GROUP_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE
- COMPONENT runtime
- )
- ENDMACRO (ADM_INSTALL_LIB_FILES)
---
-2.22.0
-
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/, media-libs/avidemux-core/files/
@ 2017-10-04 8:02 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-10-04 8:02 UTC (permalink / raw
To: gentoo-commits
commit: fff114915bdd5c1de5c27bc0e07e9790c53f3285
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Oct 1 06:10:33 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 08:01:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fff11491
media-libs/avidemux-core: Fix building avidemux-plugins with >=cmake-3.9.0
Bug: https://bugs.gentoo.org/625930
Package-Manager: Portage-2.3.10, Repoman-2.3.3
.../avidemux-core/avidemux-core-2.6.20-r1.ebuild | 2 ++
.../files/avidemux-core-2.6.20-fix-cmake.patch | 18 ++++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild
index 16e22ff152f..64d78546cff 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild
@@ -54,6 +54,8 @@ DEPEND="
S="${WORKDIR}/${MY_P}"
CMAKE_USE_DIR="${S}/${PN/-/_}"
+PATCHES=("${FILESDIR}"/${P}-fix-cmake.patch )
+
src_prepare() {
cmake-utils_src_prepare
diff --git a/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch b/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch
new file mode 100644
index 00000000000..d7df42d31b5
--- /dev/null
+++ b/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch
@@ -0,0 +1,18 @@
+Bug: https://bugs.gentoo.org/625930
+Backported from https://github.com/mean00/avidemux2/commit/c5edc6cf7b3768ac1409c6cef69ab5980a86596a
+
+diff -Naur a/cmake/admCheckX264.cmake b/cmake/admCheckX264.cmake
+--- a/cmake/admCheckX264.cmake 2017-04-28 05:22:27.000000000 -0400
++++ b/cmake/admCheckX264.cmake 2017-10-01 01:38:33.249996381 -0400
+@@ -20,9 +20,9 @@
+ ELSE (x264_version LESS 67)
+ IF (x264_version GREATER 73)
+ FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version})
++ ELSE (x264_version GREATER 73)
++ FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open)
+ ENDIF (x264_version GREATER 73)
+- ELSE (x264_version LESS 67)
+- FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open)
+ ENDIF (x264_version LESS 67)
+ IF(X264_FOUND)
+ SET(USE_X264 True CACHE BOOL "")
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-10 4:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-11 23:10 [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/, media-libs/avidemux-core/files/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2023-08-10 4:08 Sam James
2020-08-07 23:24 Andreas Sturmlechner
2017-10-04 8:02 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox