From 01cdf4ede134e3fbefce0b3c80d2bf90a3ed86c3 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Tue, 9 Jan 2024 19:38:45 +0300 Subject: [PATCH] media-video/transcode: fix build against recent ImageMagick Closes: https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo/issues/347 Signed-off-by: Alexander Golubev (cherry picked from commit e982ad37f763880d5dbf8e86cdb662a1128f6194) --- ...ode-1.1.7-avoid-filtering-pkg-config.patch | 19 +++++++++++++++++++ ....7-r6.ebuild => transcode-1.1.7-r7.ebuild} | 1 + 2 files changed, 20 insertions(+) create mode 100644 media-video/transcode/files/transcode-1.1.7-avoid-filtering-pkg-config.patch rename media-video/transcode/{transcode-1.1.7-r6.ebuild => transcode-1.1.7-r7.ebuild} (98%) diff --git a/media-video/transcode/files/transcode-1.1.7-avoid-filtering-pkg-config.patch b/media-video/transcode/files/transcode-1.1.7-avoid-filtering-pkg-config.patch new file mode 100644 index 00000000..159ca01f --- /dev/null +++ b/media-video/transcode/files/transcode-1.1.7-avoid-filtering-pkg-config.patch @@ -0,0 +1,19 @@ +Trinity-Bug: https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo/issues/347 +Gentoo-Bug: https://bugs.gentoo.org/914628 +--- transcode-1.1.7/acinclude.m4.orig 2024-01-09 16:21:06.928183121 -0000 ++++ transcode-1.1.7/acinclude.m4 2024-01-09 16:21:18.600682772 -0000 +@@ -561,14 +561,6 @@ + fi + fi + fi +- ipaths="" ; xi="" +- for i in $$1_ii ; do +- case $i in +- -I*) ipaths="$ipaths $i" ;; +- *) xi="$xi $i" ;; +- esac +- done +- $1_ii="$ipaths" + $1_ii="`echo $$1_ii | sed -e 's/ */ /g'`" + $3_EXTRA_CFLAGS="$$3_EXTRA_CFLAGS $xi" + $3_EXTRA_CFLAGS="`echo $$3_EXTRA_CFLAGS | sed -e 's/ */ /g'`" diff --git a/media-video/transcode/transcode-1.1.7-r6.ebuild b/media-video/transcode/transcode-1.1.7-r7.ebuild similarity index 98% rename from media-video/transcode/transcode-1.1.7-r6.ebuild rename to media-video/transcode/transcode-1.1.7-r7.ebuild index e3b0d10c..b0e75201 100644 --- a/media-video/transcode/transcode-1.1.7-r6.ebuild +++ b/media-video/transcode/transcode-1.1.7-r7.ebuild @@ -75,6 +75,7 @@ PATCHES=( "${FILESDIR}"/${P}-swresample.patch # bug 722296 "${FILESDIR}"/${P}-gcc10-fno-common.patch "${FILESDIR}"/${P}-glibc-2.32.patch + "${FILESDIR}"/${P}-avoid-filtering-pkg-config.patch # gentoo-bug 914628 ) src_prepare() {