commit: c209050e3922bf0f52156a60b550424bef73ee3d Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue May 23 08:40:28 2017 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue May 23 08:40:28 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c209050e
media-video/transcode: Fixed compilation with imagemagick-7 (bug #581822) Package-Manager: Portage-2.3.6, Repoman-2.3.2 media-video/transcode/Manifest | 1 + media-video/transcode/transcode-1.1.7-r3.ebuild | 91 +++++++++++++------------ 2 files changed, 50 insertions(+), 42 deletions(-) diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest index e373218fea7..51ff3e47717 100644 --- a/media-video/transcode/Manifest +++ b/media-video/transcode/Manifest @@ -1 +1,2 @@ +DIST transcode-1.1.7-imagemagick7.patch 34353 SHA256 4ede15540ea6932954ac332c12dde130bf48e7e4773d1e04d3c3f23038c6ac51 SHA512 4eface4bbeb41bf6b44f4efa9bb6e77a0dbb6e22d881261a5884ab843c98ffaf1f40c180d819db6fd48ff81046032b90d11f771d98ba366d2ee4fab94bb99b18 WHIRLPOOL dbd356b24c62d071f989f42969bacbc851782c5125f30724f673b2e50c0be56a15a38d2c63032ee96f0f184b4affe62ef11323a9ddb6fca0955160dec7cb96ba DIST transcode-1.1.7.tar.bz2 2183627 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f WHIRLPOOL ccd085b3a2638de92c2d589ff93038fed3d1a760d3513fde2946a805f7efed87813850f5e9eee306ed8efd3608ad9492d16f4c41bd6278379995deb22f92354e diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r3.ebuild index 1e9246461bf..9dc8b90dca9 100644 --- a/media-video/transcode/transcode-1.1.7-r3.ebuild +++ b/media-video/transcode/transcode-1.1.7-r3.ebuild @@ -2,11 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils libtool multilib +inherit autotools libtool multilib DESCRIPTION="A suite of utilities for transcoding video and audio codecs in different containers" HOMEPAGE="http://www.transcoding.org/ https://bitbucket.org/france/transcode-tcforge"; -SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2"; +SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/${P}-imagemagick7.patch"; LICENSE="GPL-2" SLOT="0" @@ -73,58 +74,64 @@ src_prepare() { PATCHES+=( "${FILESDIR}"/${P}-ffmpeg29.patch ) fi + if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then + PATCHES+=( "${DISTDIR}"/${P}-imagemagick7.patch ) + fi + default - elibtoolize + eautoreconf } src_configure() { local myconf use x86 && myconf="$(use_enable !pic x86-textrels)" #271476 - econf \ - $(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 altivec) \ - $(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 \ + local myeconfargs=( + $(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 altivec) + $(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 - prune_libtool_files --all + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die }
