From e982ad37f763880d5dbf8e86cdb662a1128f6194 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Tue, 9 Jan 2024 19:38:45 +0300 Subject: 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 --- ...ranscode-1.1.7-avoid-filtering-pkg-config.patch | 19 +++ media-video/transcode/transcode-1.1.7-r6.ebuild | 149 -------------------- media-video/transcode/transcode-1.1.7-r7.ebuild | 150 +++++++++++++++++++++ 3 files changed, 169 insertions(+), 149 deletions(-) create mode 100644 media-video/transcode/files/transcode-1.1.7-avoid-filtering-pkg-config.patch delete mode 100644 media-video/transcode/transcode-1.1.7-r6.ebuild create mode 100644 media-video/transcode/transcode-1.1.7-r7.ebuild 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-r6.ebuild deleted file mode 100644 index e3b0d10c..00000000 --- a/media-video/transcode/transcode-1.1.7-r6.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 2002-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Utilities for transcoding video and audio codecs in different containers" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2 - https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2 - https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-1.1.7-ffmpeg4.patch.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 ~riscv sparc x86" -IUSE="cpu_flags_ppc_altivec cpu_flags_x86_3dnow a52 aac alsa dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid" - -REQUIRED_USE=" - cpu_flags_x86_sse? ( cpu_flags_x86_mmx ) - cpu_flags_x86_sse2? ( cpu_flags_x86_mmx cpu_flags_x86_sse ) - cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) - nuv? ( lzo ) -" - -# =media-video/ffmpeg-2.8'; then - PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-ffmpeg29.patch ) - fi - - if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then - PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-imagemagick7.patch ) - fi - - if has_version '>=media-video/ffmpeg-4' ; then - PATCHES+=( "${WORKDIR}"/${P}-ffmpeg4.patch ) - fi - - default - - eautoreconf -} - -src_configure() { - local myconf - use x86 && myconf="$(use_enable !pic x86-textrels)" # bug 271476 - - local myeconfargs=( - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_3dnow 3dnow) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable v4l libv4l2) - $(use_enable v4l libv4lconvert) - $(use_enable mpeg libmpeg2) - $(use_enable mpeg libmpeg2convert) - --enable-experimental - --enable-deprecated - $(use_enable v4l) - $(use_enable oss) - $(use_enable alsa) - $(use_enable postproc libpostproc) - $(use_enable truetype freetype2) - $(use_enable mp3 lame) - $(use_enable xvid) - $(use_enable x264) - $(use_enable ogg) - $(use_enable vorbis) - $(use_enable theora) - $(use_enable dvd libdvdread) - $(use_enable dv libdv) - $(use_enable quicktime libquicktime) - $(use_enable lzo) - $(use_enable a52) - $(use_enable aac faac) - $(use_enable xml libxml2) - $(use_enable mjpeg mjpegtools) - $(use_enable sdl) - $(use_enable imagemagick) - $(use_enable jpeg libjpeg) - $(use_enable iconv) - $(use_enable nuv) - $(use_with X x) - --with-mod-path=/usr/$(get_libdir)/transcode - ${myconf} - ) - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" docsdir=/usr/share/doc/${PF} install - dodoc AUTHORS ChangeLog README STYLE TODO - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die -} diff --git a/media-video/transcode/transcode-1.1.7-r7.ebuild b/media-video/transcode/transcode-1.1.7-r7.ebuild new file mode 100644 index 00000000..b0e75201 --- /dev/null +++ b/media-video/transcode/transcode-1.1.7-r7.ebuild @@ -0,0 +1,150 @@ +# Copyright 2002-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Utilities for transcoding video and audio codecs in different containers" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2 + https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2 + https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-1.1.7-ffmpeg4.patch.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 ~riscv sparc x86" +IUSE="cpu_flags_ppc_altivec cpu_flags_x86_3dnow a52 aac alsa dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid" + +REQUIRED_USE=" + cpu_flags_x86_sse? ( cpu_flags_x86_mmx ) + cpu_flags_x86_sse2? ( cpu_flags_x86_mmx cpu_flags_x86_sse ) + cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) + nuv? ( lzo ) +" + +# =media-video/ffmpeg-2.8'; then + PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-ffmpeg29.patch ) + fi + + if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then + PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-imagemagick7.patch ) + fi + + if has_version '>=media-video/ffmpeg-4' ; then + PATCHES+=( "${WORKDIR}"/${P}-ffmpeg4.patch ) + fi + + default + + eautoreconf +} + +src_configure() { + local myconf + use x86 && myconf="$(use_enable !pic x86-textrels)" # bug 271476 + + local myeconfargs=( + $(use_enable cpu_flags_ppc_altivec altivec) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_enable cpu_flags_x86_3dnow 3dnow) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable cpu_flags_x86_sse2 sse2) + $(use_enable v4l libv4l2) + $(use_enable v4l libv4lconvert) + $(use_enable mpeg libmpeg2) + $(use_enable mpeg libmpeg2convert) + --enable-experimental + --enable-deprecated + $(use_enable v4l) + $(use_enable oss) + $(use_enable alsa) + $(use_enable postproc libpostproc) + $(use_enable truetype freetype2) + $(use_enable mp3 lame) + $(use_enable xvid) + $(use_enable x264) + $(use_enable ogg) + $(use_enable vorbis) + $(use_enable theora) + $(use_enable dvd libdvdread) + $(use_enable dv libdv) + $(use_enable quicktime libquicktime) + $(use_enable lzo) + $(use_enable a52) + $(use_enable aac faac) + $(use_enable xml libxml2) + $(use_enable mjpeg mjpegtools) + $(use_enable sdl) + $(use_enable imagemagick) + $(use_enable jpeg libjpeg) + $(use_enable iconv) + $(use_enable nuv) + $(use_with X x) + --with-mod-path=/usr/$(get_libdir)/transcode + ${myconf} + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" docsdir=/usr/share/doc/${PF} install + dodoc AUTHORS ChangeLog README STYLE TODO + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die +} -- cgit v1.2.1