diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-22 14:00:47 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-22 14:00:47 +0100 |
| commit | 91c0ec2d7067f6ab1ef578bd9967b32ca07eb502 (patch) | |
| tree | f4c7f54d0aeb344c21de9b9d1a3f1e9826d7a64c /media-libs/libquicktime | |
| parent | 2bacbb3374587799c77a999f56352233a353b19e (diff) | |
gentoo resync : 22.05.2018
Diffstat (limited to 'media-libs/libquicktime')
| -rw-r--r-- | media-libs/libquicktime/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild | 30 |
2 files changed, 19 insertions, 13 deletions
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest index 55710047d9b1..416ce7efdd95 100644 --- a/media-libs/libquicktime/Manifest +++ b/media-libs/libquicktime/Manifest @@ -4,5 +4,5 @@ AUX libquicktime-1.2.4-ffmpeg2.patch 4046 BLAKE2B 1db6a761fa94a32741a05919d12d02 AUX libquicktime-1.2.4-ffmpeg29.patch 13436 BLAKE2B 8a1e7b5df65f5297f59aa17c4a52706413c1ffd88d8645de7359ec26f7059101ab81ac135cf7ef707a8acbeb709e1a6dae03d6a7e7f70c7e88185ebb271acbe4 SHA512 2a7e06c03b0f64f02b923c1a0e7121f4e1ea735f19a6df8ce8daf18177ead132d1ae921c64f3770042db3bbf29f15a7fcceece835d475e052c4c3bb7139c9e2e AUX libquicktime-1.2.4-ffmpeg4.patch 14723 BLAKE2B bd1299c24b738b3752e4d8d50ed1b2fa2f208c83e577876118d115fca22293e102614ae0cdc168060115f7145d951d290bccf21154fda4aabf55329d310b6aca SHA512 1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd -EBUILD libquicktime-1.2.4-r2.ebuild 3855 BLAKE2B a14612cc6aac547c5c645cee85bc5f8757123245b6c054e0c30d6eee5e87818c8a08b3010fccb3c1bbe91c88b049fff23c871f16c532239548540b85f17bd147 SHA512 289b95ef005c3a9895e2975abf084e74422f959b2b6816fa3e1815ce9fd249eefd8d3ec953677780fa78ca331afd2ce2ca736a8ce0dd5ad7a3f8847e01604dc8 +EBUILD libquicktime-1.2.4-r2.ebuild 3874 BLAKE2B a7f0b14e55deabcafe1ac0baa3648b6152b6f87e41adce1668f5170db9acee8507a91c53533304618f0bcf6abdd77d7eac7f487497fddbebcfbf6ce0ba983865 SHA512 a84ad63d5ccda95bb00833fbbbaff818693bd13c9a6036960f76ca4f4850737625a611d6c716bd649ec14c9e86a1dfa73553449a0b071b8cf0da8c9a33ea7ff5 MISC metadata.xml 506 BLAKE2B 2b6f16d304beace7cb71ac32cc734ec4bf0e28c2b155068f9c5f83fc9a5a8731056ec1b3743da9f2b6add73f4b82d4fb797dad913451ea255ab5752557f7b2eb SHA512 80ee7f91a4fafe6a9f9380bab5236633672484dea9389ab5b391319fbcbe010607903b21c12c37211575f4e55251f1718c2000225226fd0a63183ac903817ce1 diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild index ddb69d4245d5..7153bd3006a9 100644 --- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild +++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit libtool eutils multilib-minimal +EAPI=6 + +inherit libtool multilib-minimal DESCRIPTION="An enhanced version of the quicktime4linux library" HOMEPAGE="http://libquicktime.sourceforge.net/" @@ -10,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx opengl png schroedinger static-libs vorbis X x264" RDEPEND=">=virtual/libintl-0-r1[${MULTILIB_USEDEP}] @@ -51,22 +52,27 @@ DEPEND="${RDEPEND} REQUIRED_USE="opengl? ( X )" -DOCS="ChangeLog README TODO" +DOCS=( ChangeLog README TODO ) + +PATCHES=( + "${FILESDIR}"/${P}+libav-9.patch + "${FILESDIR}"/${P}-ffmpeg2.patch + "${FILESDIR}"/CVE-2016-2399.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}+libav-9.patch \ - "${FILESDIR}"/${P}-ffmpeg2.patch \ - "${FILESDIR}/CVE-2016-2399.patch" + default if has_version '>=media-video/ffmpeg-2.9' || has_version '>=media-video/libav-12'; then - epatch "${FILESDIR}"/${P}-ffmpeg29.patch + eapply "${FILESDIR}"/${P}-ffmpeg29.patch fi if has_version '>media-video/ffmpeg-3.5' ; then - epatch "${FILESDIR}/${P}-ffmpeg4.patch" + eapply "${FILESDIR}/${P}-ffmpeg4.patch" fi - for FILE in lqt_ffmpeg.c video.c audio.c ; do - sed -i -e "s:CODEC_ID_:AV_&:g" "${S}/plugins/ffmpeg/${FILE}" || die + local x + for x in lqt_ffmpeg.c video.c audio.c ; do + sed -i -e "s:CODEC_ID_:AV_&:g" "plugins/ffmpeg/${x}" || die done elibtoolize # Required for .so versioning on g/fbsd @@ -106,7 +112,7 @@ multilib_src_configure() { multilib_src_install_all() { einstalldocs - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die # Compatibility with software that uses quicktime prefix, but # don't do that when building for Darwin/MacOS |