[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/, media-libs/libquicktime/files/
commit: 18fa34358d5e58bd9c6a59b66602bd4ee329a70f
Author: Pacho Ramos gentoo org>
AuthorDate: Sat May 18 10:26:05 2024 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat May 18 10:28:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18fa3435
media-libs/libquicktime: Apply fixes from Arch
Adds compatibility with newer ffmpeg versions, faad2 fixes and fix codecs
via patch instead of sedding.
Closes: https://bugs.gentoo.org/834384
Signed-off-by: Pacho Ramos gentoo.org>
.../files/libquicktime-1.2.4-faad2.patch | 86 +++
.../files/libquicktime-1.2.4-ffmpeg-codecs.patch | 651 +
.../files/libquicktime-1.2.4-ffmpeg5.patch | 342 +++
.../libquicktime/libquicktime-1.2.4-r5.ebuild | 124
4 files changed, 1203 insertions(+)
diff --git a/media-libs/libquicktime/files/libquicktime-1.2.4-faad2.patch
b/media-libs/libquicktime/files/libquicktime-1.2.4-faad2.patch
new file mode 100644
index ..563f46426f26
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.2.4-faad2.patch
@@ -0,0 +1,86 @@
+diff -ruN a/configure.ac b/configure.ac
+--- a/configure.ac 2012-03-29 21:44:28.0 +0200
b/configure.ac 2020-02-09 18:27:31.599127781 +0100
+@@ -728,82 +728,9 @@
+
+ if test "x$with_faad2" != "xno"; then
+
+-OLD_CFLAGS=$CFLAGS
+-OLD_LIBS=$LIBS
+-
+ CFLAGS="$CFLAGS"
+ LIBS="$LIBS -lfaad -lm"
+
+-AC_MSG_CHECKING(for neaacdec.h usability for faad2)
+-
+-
+-AC_TRY_RUN([
+-#include
+-#include
+-main()
+-{
+-int faad_major;
+-int faad_minor;
+-faacDecHandle dec;
+-
+-if(sscanf(FAAD2_VERSION, "%d.%d", _major, _minor) < 2)
+- return -1;
+-dec = faacDecOpen();
+-if(!dec)
+- return -1;
+-return 0;
+-}
+- ],
+- [
+-# program could be run
+-have_faad2="true"
+-AC_MSG_RESULT(yes)
+-FAAD2_CFLAGS=$CFLAGS
+-FAAD2_LIBS=$LIBS
+-AC_DEFINE(HAVE_NEAACDEC_H)
+- ],
+-# program could not be run
+-AC_MSG_RESULT(no)
+-)
+-
+-if test "x$have_faad2" != "xtrue"; then
+-
+-AC_MSG_CHECKING(for faad.h usability for faad2)
+-
+-AC_TRY_RUN([
+-#include
+-#include
+-main()
+-{
+-int faad_major;
+-int faad_minor;
+-faacDecHandle dec;
+-
+-if(sscanf(FAAD2_VERSION, "%d.%d", _major, _minor) < 2)
+- return -1;
+-dec = faacDecOpen();
+-if(!dec)
+- return -1;
+-return 0;
+-}
+- ],
+- [
+-# program could be run
+-have_faad2="true"
+-AC_MSG_RESULT(yes)
+-FAAD2_CFLAGS=$CFLAGS
+-FAAD2_LIBS=$LIBS
+-
+-
+- ],
+-# program could not be run
+-AC_MSG_RESULT(no)
+-)
+-
+-fi
+-
+-CFLAGS=$OLD_CFLAGS
+-LIBS=$OLD_LIBS
+
+ fi
+
diff --git
a/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg-codecs.patch
b/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg-codecs.patch
new file mode 100644
index ..8de9a288c176
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg-codecs.patch
@@ -0,0 +1,651 @@
+diff -ruN a/plugins/ffmpeg/audio.c b/plugins/ffmpeg/audio.c
+--- a/plugins/ffmpeg/audio.c 2012-03-29 21:44:28.0 +0200
b/plugins/ffmpeg/audio.c 2020-02-09 19:08:03.716063846 +0100
+@@ -626,7 +626,7 @@
+ {
+ /* If the codec is mp3, make sure to decode the very last frame */
+
+-if((codec->avctx->codec_id == CODEC_ID_MP3) &&
++if((codec->avctx->codec_id == AV_CODEC_ID_MP3) &&
+(codec->bytes_in_chunk_buffer >= 4))
+ {
+ if(!mpa_decode_header(, codec->chunk_buffer, (const mpa_header*)0))
+@@ -695,7 +695,7 @@
+
+ /* Some really broken mp3 files have the header bytes split across 2
chunks */
+
+-if(codec->avctx->codec_id == CODEC_ID_MP3)
++if(codec->avctx->codec_id == AV_CODEC_ID_MP3)
+ {
+ if(codec->bytes_in_chunk_buffer < 4)
+ {
+@@ -806,7 +806,7 @@
+
+ if(bytes_decoded < 0)
+ {
+- if(codec->avctx->codec_id == CODEC_ID_MP3)
++ if(codec->avctx->codec_id == AV_CODEC_ID_MP3)
+ {
+ /* For mp3, bytes_decoded < 0 means, that the frame should be muted */
+ memset(>sample_buffer[track_map->channels *
(codec->sample_buffer_end -
+@@ -866,8 +866,8 @@
+ quicktime_audio_map_t *track_map = >atracks[track];
+ quicktime_ffmpeg_audio_codec_t *codec = track_map->codec->priv;
+
+- if((codec->decoder->id == CODEC_ID_MP2) ||
+- (codec->decoder->id == CODEC_ID_MP3))
++ if((codec->decoder->id == AV_CODEC_ID_MP2) ||
++ (codec->decoder->id == AV_CODEC_ID_MP3))
+ {
+ mpa_header h;
+ uint32_t header;
+@@ -909,7 +909,7 @@
+ else
+ track_map->ci.bitrate = h.bitrate;
+ }
+- else if(codec->decoder->id == CODEC_ID_AC3)
++ else if(codec->decoder->id == AV_CODEC_ID_AC3)
+ {
+ a52_header h;
+ uint8_t * ptr;
+@@ -986,7 +986,7 @@
+ #endif
+ /* Some codecs need extra stuff */
+
+-if(codec->decoder->id == CODEC_ID_ALAC)
++if(codec->decoder->id ==
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: b7a2468b9b5dd390adca7c241ed4e85ec4c634e9
Author: Sam James gentoo org>
AuthorDate: Wed Feb 15 06:18:23 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 15 06:18:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a2468b
media-libs/libquicktime: depend on https://bugs.gentoo.org/834384
Signed-off-by: Sam James gentoo.org>
media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild
index 42a5ddc7da46..44db60e328ff 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,6 +14,8 @@ SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc
x86"
IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png
static-libs vorbis X x264"
+# =media-libs/alsa-lib-1.0.20 )
dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
- ffmpeg? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
+ ffmpeg? ( =media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/files/, media-libs/libquicktime/
commit: 298dd9d4630a90736e56d059481a99036b2ac1a2
Author: Sam James gentoo org>
AuthorDate: Tue Oct 25 12:14:07 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 25 12:15:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=298dd9d4
media-libs/libquicktime: fix build w/ Clang 16
Closes: https://bugs.gentoo.org/874447
Signed-off-by: Sam James gentoo.org>
.../files/libquicktime-1.2.4-implicit-func-decl.patch | 11 +++
...quicktime-1.2.4-r3.ebuild => libquicktime-1.2.4-r4.ebuild} | 5 +++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git
a/media-libs/libquicktime/files/libquicktime-1.2.4-implicit-func-decl.patch
b/media-libs/libquicktime/files/libquicktime-1.2.4-implicit-func-decl.patch
new file mode 100644
index ..c4fbb02d0754
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.2.4-implicit-func-decl.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/874447
+--- a/plugins/png/qtpng.c
b/plugins/png/qtpng.c
+@@ -26,6 +26,7 @@
+ #include
+ #include
+ #include
++#include
+ #include "qtpng.h"
+
+ typedef struct
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild
similarity index 96%
rename from media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
rename to media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild
index a56c905c7c94..d39c7d5b0dda 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,7 +25,7 @@ RDEPEND="
dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
ffmpeg? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
gtk? ( x11-libs/gtk+:2 )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+ jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
lame? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
opengl? ( virtual/opengl )
png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
@@ -58,6 +58,7 @@ PATCHES=(
"${FILESDIR}"/${P}-ffmpeg29.patch
"${FILESDIR}"/${P}-CVE-2016-2399.patch
"${FILESDIR}"/${P}-CVE-2017-9122_et_al.patch
+ "${FILESDIR}"/${P}-implicit-func-decl.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 414a69dcdf9f9df229e20bf980a6d14ad0cf34c2
Author: Marek Szuba gentoo org>
AuthorDate: Tue Aug 24 22:51:44 2021 +
Commit: Marek Szuba gentoo org>
CommitDate: Wed Aug 25 00:10:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=414a69dc
media-libs/libquicktime: keyword 1.2.4-r3 for ~riscv
Signed-off-by: Marek Szuba gentoo.org>
media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index cf8f4821192..a56c905c7c9 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png
static-libs vorbis X x264"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 345a43704bd07ca6c7c4a89b72841d2f0f140304
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Apr 26 09:13:08 2020 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Apr 26 09:13:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=345a4370
media-libs/libquicktime: migrate from libav
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada gentoo.org>
media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index ea62b7bbd77..1616c1db31f 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -12,7 +12,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"
-IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx
opengl png static-libs vorbis X x264"
+IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png
static-libs vorbis X x264"
RDEPEND="
sys-libs/zlib
@@ -23,10 +23,7 @@ RDEPEND="
)
alsa? ( >=media-libs/alsa-lib-1.0.20 )
dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
- ffmpeg? (
- libav? ( >=media-video/libav-12:0=[${MULTILIB_USEDEP}] )
- !libav? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
- )
+ ffmpeg? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
gtk? ( x11-libs/gtk+:2 )
jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
lame? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/, profiles/base/
commit: 96a2638125107fb67750258d5c72ace90e5b51c9
Author: Michał Górny gentoo org>
AuthorDate: Tue Dec 11 14:54:30 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Tue Dec 11 15:33:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a26381
media-libs/libquicktime: [QA] Punt removed schroedinger support
Signed-off-by: Michał Górny gentoo.org>
media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild | 5 ++---
media-libs/libquicktime/metadata.xml | 3 ---
profiles/base/package.use.mask | 1 -
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index 3271cf10dd3..eaddbd6d2a7 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -12,7 +12,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"
-IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx
opengl png schroedinger static-libs vorbis X x264"
+IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx
opengl png static-libs vorbis X x264"
RDEPEND="
sys-libs/zlib
@@ -32,7 +32,6 @@ RDEPEND="
lame? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
opengl? ( virtual/opengl )
png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
- schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]
)
vorbis? (
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
@@ -98,7 +97,7 @@ multilib_src_configure() {
$(use_with jpeg libjpeg) \
$(use_with ffmpeg) \
$(use_with png libpng) \
- $(use_with schroedinger) \
+ --without-schroedinger \
$(use_with aac faac) \
$(use encode || echo --without-faac) \
$(use_with aac faad2) \
diff --git a/media-libs/libquicktime/metadata.xml
b/media-libs/libquicktime/metadata.xml
index a9599b9652e..bdee16146c0 100644
--- a/media-libs/libquicktime/metadata.xml
+++ b/media-libs/libquicktime/metadata.xml
@@ -4,9 +4,6 @@
media-vi...@gentoo.org
-
- Enable Dirac video support (an
advanced royalty-free video compression format) via libschroedinger (high-speed
implementation in C of the Dirac codec)
-
libquicktime
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 3f2038676a8..7c2451a16a8 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -50,7 +50,6 @@ mate-extra/mate-power-manager pm-utils
# Pacho Ramos (04 Nov 2018)
# media-libs/schroedinger will be removed (#602938)
-media-libs/libquicktime schroedinger
media-video/ffmpeg schroedinger
media-video/libav schroedinger
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 0b9e63a9d14b162ee15c36f94a88453dd73ac2ba
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Nov 8 23:03:54 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Nov 8 23:03:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b9e63a9
media-libs/libquicktime: Security cleanup
Bug: https://bugs.gentoo.org/634806
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../libquicktime/libquicktime-1.2.4-r2.ebuild | 132 -
1 file changed, 132 deletions(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
deleted file mode 100644
index 32f2d0f169e..000
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="An enhanced version of the quicktime4linux library"
-HOMEPAGE="http://libquicktime.sourceforge.net/;
-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"
-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}]
- sys-libs/zlib:=
- aac? (
- >=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]
- encode? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
- )
- alsa? ( >=media-libs/alsa-lib-1.0.20 )
- dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
- ffmpeg? (
- libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
- )
- gtk? ( x11-libs/gtk+:2 )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- lame? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
- opengl? ( virtual/opengl )
- png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
- schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]
)
- vorbis? (
- >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
- >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
- )
- X? (
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXext
- x11-libs/libXt
- x11-libs/libXv
- )
- x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- sys-devel/gettext
- doc? ( app-doc/doxygen )
- X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="opengl? ( X )"
-
-DOCS=( ChangeLog README TODO )
-
-PATCHES=(
- "${FILESDIR}"/${P}+libav-9.patch
- "${FILESDIR}"/${P}-ffmpeg2.patch
- "${FILESDIR}"/${P}-CVE-2016-2399.patch
-)
-
-src_prepare() {
- default
- if has_version '>=media-video/ffmpeg-2.9' ||
- has_version '>=media-video/libav-12'; then
- eapply "${FILESDIR}"/${P}-ffmpeg29.patch
- fi
- if has_version '>media-video/ffmpeg-3.5' ; then
- eapply "${FILESDIR}/${P}-ffmpeg4.patch"
- fi
-
- 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
-}
-
-multilib_src_configure() {
- # utils use: alsa, opengl, gtk+, X
-
- ECONF_SOURCE=${S} \
- econf \
- --enable-gpl \
- $(use_enable static-libs static) \
- $(use_enable cpu_flags_x86_mmx asm) \
- $(multilib_native_use_with doc doxygen) \
- $(use vorbis || echo --without-vorbis) \
- $(use_with lame) \
- $(multilib_native_use_with X x) \
- $(multilib_native_use_with opengl) \
- $(multilib_native_use_with alsa) \
- $(multilib_native_use_with gtk) \
- $(use_with dv libdv) \
- $(use_with jpeg libjpeg) \
- $(use_with ffmpeg) \
- $(use_with png libpng) \
- $(use_with schroedinger) \
- $(use_with aac faac) \
- $(use encode || echo --without-faac) \
- $(use_with aac faad2) \
- $(use_with x264) \
- --without-cpuflags
-
- if ! multilib_is_native_abi; then
- # disable building utilities
- sed -i -e '/SUBDIRS =/s:utils::' Makefile || die
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-
- # Compatibility
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 41daf0ebdfaab9258b1c318d82625640e6119045
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Thu Nov 8 22:55:26 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Nov 8 22:59:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41daf0eb
media-libs/libquicktime: stable 1.2.4-r3 for sparc, bug #634806
Signed-off-by: Rolf Eike Beer sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich gentoo.org>
media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index 2940148b855..3271cf10dd3 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -11,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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 7cda7de7f7b660200ba93b9c0e79ceeea636464b
Author: Sergei Trofimovich gentoo org>
AuthorDate: Fri Oct 26 19:55:23 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Oct 26 20:19:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cda7de7
media-libs/libquicktime: stable 1.2.4-r3 for ia64, bug #634806
Signed-off-by: Sergei Trofimovich gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="ia64"
media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index 27006b45311..0c8dfc5c5db 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -11,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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: a6b098152125c084f4222c050471e788cbcc394f
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Oct 14 09:10:56 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Oct 14 09:14:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b09815
media-libs/libquicktime: stable 1.2.4-r3 for ppc64, bug #634806
Signed-off-by: Sergei Trofimovich gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc64"
media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index 93fd2e6a3bd..27006b45311 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 175eda53e481adcbf6fcbc437071d4f2cae60f1d
Author: Tobias Klausmann gentoo org>
AuthorDate: Tue Oct 2 10:58:11 2018 +
Commit: Tobias Klausmann gentoo org>
CommitDate: Tue Oct 2 10:58:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=175eda53
media-libs/libquicktime-1.2.4-r3: alpha stable
Gentoo-Bug: http://bugs.gentoo.org/634806
Signed-off-by: Tobias Klausmann gentoo.org>
media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index a7f558523e4..93fd2e6a3bd 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -11,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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 6f10a2334bca3700a8b48d49a4f3b4096b615459
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Sep 24 07:23:41 2018 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Sep 24 07:23:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f10a233
media-libs/libquicktime: amd64 stable wrt bug #634806
Package-Manager: Portage-2.3.49, Repoman-2.3.10
RepoMan-Options: --include-arches="amd64"
media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index 44c87db9ca8..a7f558523e4 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -11,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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 25a18101afe0cad67ff1159ab5d742289aef6a0c
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Sep 24 01:22:34 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Sep 24 01:22:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a18101
media-libs/libquicktime: x86 stable (bug #634806)
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index e4c2bea8920..44c87db9ca8 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -11,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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/files/, media-libs/libquicktime/
commit: c8d9d005d305c0d4a8232649e3ec93535c1bacca
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Sep 18 14:54:25 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Sep 18 15:07:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d9d005
media-libs/libquicktime: Fix CVE-2017-9122..9128
Bug: https://bugs.gentoo.org/634806
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../libquicktime-1.2.4-CVE-2017-9122_et_al.patch | 151 +
.../libquicktime/libquicktime-1.2.4-r3.ebuild | 1 +
2 files changed, 152 insertions(+)
diff --git
a/media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2017-9122_et_al.patch
b/media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2017-9122_et_al.patch
new file mode 100644
index 000..06fb7b33758
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2017-9122_et_al.patch
@@ -0,0 +1,151 @@
+From: Burkhard Plaum
+Origin:
https://sourceforge.net/p/libquicktime/mailman/libquicktime-devel/?viewmonth=201706
+
+Hi,
+
+I committed some (mostly trivial) updates to CVS. The following CVE's
+are fixed and/or no longer reproducible:
+
+CVE-2017-9122
+CVE-2017-9123
+CVE-2017-9124
+CVE-2017-9125
+CVE-2017-9126
+CVE-2017-9127
+CVE-2017-9128
+
+I was a bit surprised that one simple sanity check fixes a whole bunch of
files.
+
+So it could be, that the problems are still there, but better hidden since the
+critical code isn't executed anymore with the sample files I got.
+
+If someone encounters more crashes, feel free to report them.
+
+Burkhard
+
+--- a/include/lqt_funcprotos.h
b/include/lqt_funcprotos.h
+@@ -1345,9 +1345,9 @@ int quicktime_write_int32_le(quicktime_t
+ int quicktime_write_char32(quicktime_t *file, char *string);
+ float quicktime_read_fixed16(quicktime_t *file);
+ int quicktime_write_fixed16(quicktime_t *file, float number);
+-unsigned long quicktime_read_uint32(quicktime_t *file);
+-long quicktime_read_int32(quicktime_t *file);
+-long quicktime_read_int32_le(quicktime_t *file);
++uint32_t quicktime_read_uint32(quicktime_t *file);
++int32_t quicktime_read_int32(quicktime_t *file);
++int32_t quicktime_read_int32_le(quicktime_t *file);
+ int64_t quicktime_read_int64(quicktime_t *file);
+ int64_t quicktime_read_int64_le(quicktime_t *file);
+ long quicktime_read_int24(quicktime_t *file);
+--- a/src/atom.c
b/src/atom.c
+@@ -131,6 +131,9 @@ int quicktime_atom_read_header(quicktime
+ atom->size = read_size64(header);
+ atom->end = atom->start + atom->size;
+ }
++/* Avoid broken files */
++if(atom->end > file->total_length)
++ result = 1;
+ }
+
+
+--- a/src/lqt_quicktime.c
b/src/lqt_quicktime.c
+@@ -1788,8 +1788,8 @@ int quicktime_read_info(quicktime_t *fil
+ quicktime_set_position(file, start_position);
+ free(temp);
+
+-quicktime_read_moov(file, >moov, _atom);
+-got_header = 1;
++if(!quicktime_read_moov(file, >moov, _atom))
++ got_header = 1;
+ }
+ else
+ quicktime_atom_skip(file, _atom);
+--- a/src/moov.c
b/src/moov.c
+@@ -218,7 +218,8 @@ int quicktime_read_moov(quicktime_t *fil
+ if(quicktime_atom_is(_atom, "trak"))
+ {
+ quicktime_trak_t *trak = quicktime_add_trak(file);
+- quicktime_read_trak(file, trak, _atom);
++ if(quicktime_read_trak(file, trak, _atom))
++ return 1;
+ }
+ else
+ if(quicktime_atom_is(_atom, "udta"))
+--- a/src/trak.c
b/src/trak.c
+@@ -269,6 +269,14 @@ int quicktime_read_trak(quicktime_t *fil
+ else quicktime_atom_skip(file, _atom);
+ } while(quicktime_position(file) < trak_atom->end);
+
++ /* Do some sanity checks to prevent later crashes */
++ if(trak->mdia.minf.is_video || trak->mdia.minf.is_video)
++{
++if(!trak->mdia.minf.stbl.stsc.table ||
++ !trak->mdia.minf.stbl.stco.table)
++ return 1;
++}
++
+ #if 1
+ if(trak->mdia.minf.is_video &&
+ quicktime_match_32(trak->mdia.minf.stbl.stsd.table[0].format, "drac"))
+--- a/src/util.c
b/src/util.c
+@@ -647,10 +647,10 @@ int quicktime_write_fixed16(quicktime_t
+ return quicktime_write_data(file, data, 2);
+ }
+
+-unsigned long quicktime_read_uint32(quicktime_t *file)
++uint32_t quicktime_read_uint32(quicktime_t *file)
+ {
+- unsigned long result;
+- unsigned long a, b, c, d;
++ uint32_t result;
++ uint32_t a, b, c, d;
+ uint8_t data[4];
+
+ quicktime_read_data(file, data, 4);
+@@ -663,10 +663,10 @@ unsigned long quicktime_read_uint32(quic
+ return result;
+ }
+
+-long quicktime_read_int32(quicktime_t *file)
++int32_t quicktime_read_int32(quicktime_t *file)
+ {
+- unsigned long result;
+-
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/, media-libs/libquicktime/files/
commit: d8a4ee0263c4c38242fa751a779b8c5ec3bf3d5c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Sep 18 14:49:30 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Sep 18 15:07:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8a4ee02
media-libs/libquicktime: EAPI-7 bump
Package-Manager: Portage-2.3.49, Repoman-2.3.10
...atch => libquicktime-1.2.4-CVE-2016-2399.patch} | 0
.../libquicktime/libquicktime-1.2.4-r2.ebuild | 2 +-
2.4-r2.ebuild => libquicktime-1.2.4-r3.ebuild} | 30 +++---
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/media-libs/libquicktime/files/CVE-2016-2399.patch
b/media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2016-2399.patch
similarity index 100%
rename from media-libs/libquicktime/files/CVE-2016-2399.patch
rename to media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2016-2399.patch
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index 7153bd3006a..32f2d0f169e 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -57,7 +57,7 @@ DOCS=( ChangeLog README TODO )
PATCHES=(
"${FILESDIR}"/${P}+libav-9.patch
"${FILESDIR}"/${P}-ffmpeg2.patch
- "${FILESDIR}"/CVE-2016-2399.patch
+ "${FILESDIR}"/${P}-CVE-2016-2399.patch
)
src_prepare() {
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
similarity index 87%
copy from media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
copy to media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index 7153bd3006a..69f1b64818e 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit libtool multilib-minimal
@@ -11,20 +11,21 @@ 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}]
- sys-libs/zlib:=
+RDEPEND="
+ sys-libs/zlib
+ >=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
aac? (
>=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]
encode? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
- )
+ )
alsa? ( >=media-libs/alsa-lib-1.0.20 )
dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
ffmpeg? (
- libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+ libav? ( >=media-video/libav-12:0=[${MULTILIB_USEDEP}] )
+ !libav? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
)
gtk? ( x11-libs/gtk+:2 )
jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
@@ -35,16 +36,17 @@ RDEPEND=">=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
vorbis? (
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
- )
+ )
X? (
x11-libs/libX11
x11-libs/libXaw
x11-libs/libXext
x11-libs/libXt
x11-libs/libXv
- )
+ )
x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
sys-devel/gettext
doc? ( app-doc/doxygen )
@@ -57,15 +59,13 @@ DOCS=( ChangeLog README TODO )
PATCHES=(
"${FILESDIR}"/${P}+libav-9.patch
"${FILESDIR}"/${P}-ffmpeg2.patch
- "${FILESDIR}"/CVE-2016-2399.patch
+ "${FILESDIR}"/${P}-ffmpeg29.patch
+ "${FILESDIR}"/${P}-CVE-2016-2399.patch
)
src_prepare() {
default
- if has_version '>=media-video/ffmpeg-2.9' ||
- has_version '>=media-video/libav-12'; then
- eapply "${FILESDIR}"/${P}-ffmpeg29.patch
- fi
+
if has_version '>media-video/ffmpeg-3.5' ; then
eapply "${FILESDIR}/${P}-ffmpeg4.patch"
fi
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 48d450962dddf3fde6cc68126d4d8a696d154f38
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 20 16:16:28 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun May 20 19:09:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48d45096
media-libs/libquicktime: Drop eutils/implicit ltprune use
Package-Manager: Portage-2.3.38, Repoman-2.3.9
media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index 6dd960ea72e..5f97dcf7745 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit libtool eutils multilib-minimal
+inherit libtool multilib-minimal
DESCRIPTION="An enhanced version of the quicktime4linux library"
HOMEPAGE="http://libquicktime.sourceforge.net/;
@@ -108,7 +108,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
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 572b86f32497bfa057222183d26ff6502c9b8a27
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 20 16:14:36 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun May 20 19:09:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=572b86f3
media-libs/libquicktime: EAPI 6
Package-Manager: Portage-2.3.38, Repoman-2.3.9
media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index 94f86dea967..6dd960ea72e 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
+
inherit libtool eutils multilib-minimal
DESCRIPTION="An enhanced version of the quicktime4linux library"
@@ -54,15 +55,16 @@ REQUIRED_USE="opengl? ( X )"
DOCS="ChangeLog README TODO"
src_prepare() {
- epatch "${FILESDIR}"/${P}+libav-9.patch \
+ default
+ eapply "${FILESDIR}"/${P}+libav-9.patch \
"${FILESDIR}"/${P}-ffmpeg2.patch \
"${FILESDIR}/CVE-2016-2399.patch"
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
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: b23dc2120a3ef5c6a2d9a2fc20eef4289df26059
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 20 15:54:56 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun May 20 19:09:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b23dc212
media-libs/libquicktime: Drop to ~hppa
Package-Manager: Portage-2.3.38, Repoman-2.3.9
media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index ddb69d4245d..94f86dea967 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -10,7 +10,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}]
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: fe452768221269b09928ce9872f4b9a05e6e3c78
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 20 16:19:14 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun May 20 19:09:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe452768
media-libs/libquicktime: Use PATCHES
Package-Manager: Portage-2.3.38, Repoman-2.3.9
media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index 5f97dcf7745..7153bd3006a 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -52,13 +52,16 @@ 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() {
default
- eapply "${FILESDIR}"/${P}+libav-9.patch \
- "${FILESDIR}"/${P}-ffmpeg2.patch \
- "${FILESDIR}/CVE-2016-2399.patch"
if has_version '>=media-video/ffmpeg-2.9' ||
has_version '>=media-video/libav-12'; then
eapply "${FILESDIR}"/${P}-ffmpeg29.patch
@@ -67,8 +70,9 @@ src_prepare() {
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
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/, media-libs/libquicktime/files/
commit: 3060f60f2983c557129aaef8d877a890bfad3cf1
Author: Alexis Ballier gentoo org>
AuthorDate: Fri Apr 20 07:24:51 2018 +
Commit: Alexis Ballier gentoo org>
CommitDate: Fri Apr 20 07:47:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3060f60f
media-libs/libquicktime: fix build with ffmpeg4
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../files/libquicktime-1.2.4-ffmpeg4.patch | 342 +
.../libquicktime/libquicktime-1.2.4-r2.ebuild | 5 +-
2 files changed, 346 insertions(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg4.patch
b/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg4.patch
new file mode 100644
index 000..eb196ea16ae
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg4.patch
@@ -0,0 +1,342 @@
+Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c
+===
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c
libquicktime-1.2.4/plugins/ffmpeg/audio.c
+@@ -545,7 +545,7 @@ static int decode_chunk_vbr(quicktime_t
+
+ #if DECODE_AUDIO3 || DECODE_AUDIO4
+ codec->pkt.data = codec->chunk_buffer;
+-codec->pkt.size = packet_size + FF_INPUT_BUFFER_PADDING_SIZE;
++codec->pkt.size = packet_size + AV_INPUT_BUFFER_PADDING_SIZE;
+
+ #if DECODE_AUDIO4
+ frame_bytes = avcodec_decode_audio4(codec->avctx, ,
+@@ -583,7 +583,7 @@ static int decode_chunk_vbr(quicktime_t
+ (codec->sample_buffer_end -
codec->sample_buffer_start)],
+ _decoded,
+ codec->chunk_buffer,
+- packet_size + FF_INPUT_BUFFER_PADDING_SIZE);
++ packet_size + AV_INPUT_BUFFER_PADDING_SIZE);
+ if(frame_bytes < 0)
+ {
+ lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio2 error");
+@@ -645,13 +645,13 @@ static int decode_chunk(quicktime_t * fi
+ return 0;
+ }
+
+- if(codec->chunk_buffer_alloc < mph.frame_bytes +
FF_INPUT_BUFFER_PADDING_SIZE)
++ if(codec->chunk_buffer_alloc < mph.frame_bytes +
AV_INPUT_BUFFER_PADDING_SIZE)
+ {
+-codec->chunk_buffer_alloc = mph.frame_bytes +
FF_INPUT_BUFFER_PADDING_SIZE;
++codec->chunk_buffer_alloc = mph.frame_bytes +
AV_INPUT_BUFFER_PADDING_SIZE;
+ codec->chunk_buffer = realloc(codec->chunk_buffer,
codec->chunk_buffer_alloc);
+ }
+ memset(codec->chunk_buffer + codec->bytes_in_chunk_buffer, 0,
+- mph.frame_bytes - codec->bytes_in_chunk_buffer +
FF_INPUT_BUFFER_PADDING_SIZE);
++ mph.frame_bytes - codec->bytes_in_chunk_buffer +
AV_INPUT_BUFFER_PADDING_SIZE);
+ num_samples = mph.samples_per_frame;
+ codec->bytes_in_chunk_buffer = mph.frame_bytes;
+ }
+@@ -695,7 +695,7 @@ static int decode_chunk(quicktime_t * fi
+ {
+
+
+-/* BIG NOTE: We pass extra FF_INPUT_BUFFER_PADDING_SIZE for the buffer
size
++/* BIG NOTE: We pass extra AV_INPUT_BUFFER_PADDING_SIZE for the buffer
size
+because we know, that lqt_read_audio_chunk allocates 16 extra bytes
for us */
+
+ /* Some really broken mp3 files have the header bytes split across 2
chunks */
+@@ -761,7 +761,7 @@ static int decode_chunk(quicktime_t * fi
+
+ #if DECODE_AUDIO3 || DECODE_AUDIO4
+ codec->pkt.data = >chunk_buffer[bytes_used];
+-codec->pkt.size = codec->bytes_in_chunk_buffer +
FF_INPUT_BUFFER_PADDING_SIZE;
++codec->pkt.size = codec->bytes_in_chunk_buffer +
AV_INPUT_BUFFER_PADDING_SIZE;
+
+ #if DECODE_AUDIO4
+
+@@ -798,7 +798,7 @@ static int decode_chunk(quicktime_t * fi
+ (codec->sample_buffer_end -
codec->sample_buffer_start)],
+ _decoded,
+ >chunk_buffer[bytes_used],
+-codec->bytes_in_chunk_buffer +
FF_INPUT_BUFFER_PADDING_SIZE);
++codec->bytes_in_chunk_buffer +
AV_INPUT_BUFFER_PADDING_SIZE);
+ #endif
+ if(frame_bytes < 0)
+ {
+@@ -838,7 +838,7 @@ static int decode_chunk(quicktime_t * fi
+ }
+ }
+
+-/* This happens because ffmpeg adds FF_INPUT_BUFFER_PADDING_SIZE to the
bytes returned */
++/* This happens because ffmpeg adds AV_INPUT_BUFFER_PADDING_SIZE to the
bytes returned */
+
+ if(codec->bytes_in_chunk_buffer < 0)
+ codec->bytes_in_chunk_buffer = 0;
+Index: libquicktime-1.2.4/plugins/ffmpeg/params.c
+===
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c
libquicktime-1.2.4/plugins/ffmpeg/params.c
+@@ -124,16 +124,6 @@ typedef struct
+ }
+
+
+-enum_t me_method[] =
+- {
+-{ "Zero", ME_ZERO },
+-{ "Phods", ME_PHODS },
+-{ "Log", ME_LOG },
+-{ "X1",ME_X1 },
+-{ "Epzs", ME_EPZS },
+-{ "Full",
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 4340f54af6bd1aa282eeb5086391bfad8d1a07dd
Author: Alexis Ballier gentoo org>
AuthorDate: Sat Jul 8 09:16:27 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Sat Jul 8 09:18:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4340f54a
media-libs/libquicktime: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index f6d9c2953c5..baecbef1172 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm 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}]
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 85c7fca830d7c1e8e7bf1e2aba517470c3dc4e76
Author: Alexis Ballier gentoo org>
AuthorDate: Sun Jul 2 10:09:39 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Sun Jul 2 10:09:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85c7fca8
media-libs/libquicktime: add missing := dep on x264
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index ddb77bccb76..f6d9c2953c5 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -42,7 +42,7 @@ RDEPEND=">=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
x11-libs/libXt
x11-libs/libXv
)
- x264? ( >=media-libs/x264-0.0.20130506[${MULTILIB_USEDEP}] )"
+ x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
sys-devel/gettext
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: cc24830f73ed7655ad86be871c8dd41842f8b168
Author: Alexis Ballier gentoo org>
AuthorDate: Wed May 31 12:11:16 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed May 31 12:11:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc24830f
media-libs/libquicktime: remove old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../libquicktime/libquicktime-1.2.4-r1.ebuild | 122 -
1 file changed, 122 deletions(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
deleted file mode 100644
index b31abf34887..000
--- a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit libtool eutils multilib-minimal
-
-DESCRIPTION="An enhanced version of the quicktime4linux library"
-HOMEPAGE="http://libquicktime.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm 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}]
- sys-libs/zlib:=
- aac? (
- >=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]
- encode? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
- )
- alsa? ( >=media-libs/alsa-lib-1.0.20 )
- dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
- ffmpeg? (
- libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
- )
- gtk? ( x11-libs/gtk+:2 )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- lame? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
- opengl? ( virtual/opengl )
- png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
- schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]
)
- vorbis? (
- >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
- >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
- )
- X? (
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXext
- x11-libs/libXt
- x11-libs/libXv
- )
- x264? ( >=media-libs/x264-0.0.20130506[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- sys-devel/gettext
- doc? ( app-doc/doxygen )
- X? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] )"
-
-REQUIRED_USE="opengl? ( X )"
-
-DOCS="ChangeLog README TODO"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}+libav-9.patch \
- "${FILESDIR}"/${P}-ffmpeg2.patch
- if has_version '>=media-video/ffmpeg-2.9' ||
- has_version '>=media-video/libav-12'; then
- epatch "${FILESDIR}"/${P}-ffmpeg29.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
- done
-
- elibtoolize # Required for .so versioning on g/fbsd
-}
-
-multilib_src_configure() {
- # utils use: alsa, opengl, gtk+, X
-
- ECONF_SOURCE=${S} \
- econf \
- --enable-gpl \
- $(use_enable static-libs static) \
- $(use_enable cpu_flags_x86_mmx asm) \
- $(multilib_native_use_with doc doxygen) \
- $(use vorbis || echo --without-vorbis) \
- $(use_with lame) \
- $(multilib_native_use_with X x) \
- $(multilib_native_use_with opengl) \
- $(multilib_native_use_with alsa) \
- $(multilib_native_use_with gtk) \
- $(use_with dv libdv) \
- $(use_with jpeg libjpeg) \
- $(use_with ffmpeg) \
- $(use_with png libpng) \
- $(use_with schroedinger) \
- $(use_with aac faac) \
- $(use encode || echo --without-faac) \
- $(use_with aac faad2) \
- $(use_with x264) \
- --without-cpuflags
-
- if ! multilib_is_native_abi; then
- # disable building utilities
- sed -i -e '/SUBDIRS =/s:utils::' Makefile || die
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --all
-
- # Compatibility with software that uses quicktime prefix, but
- # don't do that when building for Darwin/MacOS
- [[ ${CHOST} != *-darwin* ]] && dosym /usr/include/lqt
/usr/include/quicktime
-}
-
-pkg_preinst() {
- if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then
-
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 24bc2b2715f9bda9af7e9507e05fc86bc6ebe91a
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Mar 17 10:40:46 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Mar 17 10:40:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24bc2b27
media-libs/libquicktime: sparc stable wrt bug #612290
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index be433b95f40..a93aef9ebf3 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm 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}]
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: fbf76fef722cd40f5cb44c35e37f369d95179d4e
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Mar 14 16:18:44 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Mar 14 16:18:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbf76fef
media-libs/libquicktime: Stable for HPPA (bug #612290).
Package-Manager: Portage-2.3.4, Repoman-2.3.2
RepoMan-Options: --ignore-arches
media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index 652d098af2c..be433b95f40 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm 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}]
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 7d9924802944ca272a4e1eece52758e1d67dcdd7
Author: Michael Weber gentoo org>
AuthorDate: Sat Mar 11 23:07:09 2017 +
Commit: Michael Weber gentoo org>
CommitDate: Sat Mar 11 23:07:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d992480
media-libs/libquicktime: ppc ppc64 stable (bug 612290).
Package-Manager: Portage-2.3.4, Repoman-2.3.2
media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index b5caedb826e..652d098af2c 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~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}]
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 3ac071e5f301497bfc0c690414bfdb99632d9304
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Mar 11 13:42:10 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Mar 11 13:42:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac071e5
media-libs/libquicktime: x86 stable wrt bug #612290
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index ee618152fdb..107e2b59915 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~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}]
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 346ff98b3f898cbc7b5cfeb9bed168781b2596cf
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Mar 11 13:30:34 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Mar 11 13:30:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=346ff98b
media-libs/libquicktime: amd64 stable wrt bug #612290
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index eb38c001faf..ee618152fdb 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~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}]
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/, media-libs/libquicktime/files/
commit: f4fb4a86e43e1182ff5fc0f422b31eb853860e13
Author: Alexis Ballier gentoo org>
AuthorDate: Sat Mar 11 09:47:47 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Sat Mar 11 09:48:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4fb4a86
media-libs/libquicktime: Add fix for CVE-2016-2399
Package-Manager: Portage-2.3.4, Repoman-2.3.2
media-libs/libquicktime/files/CVE-2016-2399.patch | 25 +
.../libquicktime/libquicktime-1.2.4-r2.ebuild | 123 +
2 files changed, 148 insertions(+)
diff --git a/media-libs/libquicktime/files/CVE-2016-2399.patch
b/media-libs/libquicktime/files/CVE-2016-2399.patch
new file mode 100644
index 000..a1737c0dc0a
--- /dev/null
+++ b/media-libs/libquicktime/files/CVE-2016-2399.patch
@@ -0,0 +1,25 @@
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855099
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2399
+
+diff --git a/src/util.c b/src/util.c
+index d8dc3c3..9422fc5 100644
+--- a/src/util.c
b/src/util.c
+@@ -340,9 +340,14 @@ int64_t quicktime_byte_position(quicktime_t *file)
+
+ void quicktime_read_pascal(quicktime_t *file, char *data)
+ {
+- char len = quicktime_read_char(file);
+- quicktime_read_data(file, (uint8_t*)data, len);
+- data[(int)len] = 0;
++ int len = quicktime_read_char(file);
++ if ((len > 0) && (len < 256)) {
++ /* data[] is expected to be 256 bytes long */
++ quicktime_read_data(file, (uint8_t*)data, len);
++ data[len] = 0;
++} else {
++ data[0] = 0;
++}
+ }
+
+ void quicktime_write_pascal(quicktime_t *file, char *data)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
new file mode 100644
index 000..eb38c001faf
--- /dev/null
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit libtool eutils multilib-minimal
+
+DESCRIPTION="An enhanced version of the quicktime4linux library"
+HOMEPAGE="http://libquicktime.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~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}]
+ sys-libs/zlib:=
+ aac? (
+ >=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]
+ encode? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+ )
+ alsa? ( >=media-libs/alsa-lib-1.0.20 )
+ dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
+ ffmpeg? (
+ libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
+ !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+ )
+ gtk? ( x11-libs/gtk+:2 )
+ jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+ lame? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+ opengl? ( virtual/opengl )
+ png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
+ schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]
)
+ vorbis? (
+ >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+ >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXext
+ x11-libs/libXt
+ x11-libs/libXv
+ )
+ x264? ( >=media-libs/x264-0.0.20130506[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ sys-devel/gettext
+ doc? ( app-doc/doxygen )
+ X? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] )"
+
+REQUIRED_USE="opengl? ( X )"
+
+DOCS="ChangeLog README TODO"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}+libav-9.patch \
+ "${FILESDIR}"/${P}-ffmpeg2.patch \
+ "${FILESDIR}/CVE-2016-2399.patch"
+ if has_version '>=media-video/ffmpeg-2.9' ||
+ has_version '>=media-video/libav-12'; then
+ epatch "${FILESDIR}"/${P}-ffmpeg29.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
+ done
+
+ elibtoolize # Required for .so versioning on g/fbsd
+}
+
+multilib_src_configure() {
+ # utils use: alsa, opengl, gtk+, X
+
+ ECONF_SOURCE=${S} \
+ econf \
+ --enable-gpl \
+ $(use_enable static-libs static) \
+ $(use_enable cpu_flags_x86_mmx asm) \
+ $(multilib_native_use_with doc doxygen) \
+ $(use vorbis ||
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 895493c43a95c0993e32116bd3773718dcbb8bde
Author: Alexis Ballier gentoo org>
AuthorDate: Sat Mar 11 09:26:10 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Sat Mar 11 09:48:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=895493c4
media-libs/libquicktime: remove old
Package-Manager: Portage-2.3.4, Repoman-2.3.2
media-libs/libquicktime/libquicktime-1.2.4.ebuild | 101 --
1 file changed, 101 deletions(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4.ebuild
deleted file mode 100644
index 86d7a1ebbed..000
--- a/media-libs/libquicktime/libquicktime-1.2.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit libtool eutils
-
-DESCRIPTION="An enchanced version of the quicktime4linux library"
-HOMEPAGE="http://libquicktime.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png
schroedinger static-libs vorbis X x264"
-
-RDEPEND="virtual/libintl
- aac? (
- media-libs/faad2
- encode? ( media-libs/faac )
- )
- alsa? ( >=media-libs/alsa-lib-1.0.20 )
- dv? ( media-libs/libdv )
- ffmpeg? ( virtual/ffmpeg )
- gtk? ( x11-libs/gtk+:2 )
- jpeg? ( virtual/jpeg )
- lame? ( media-sound/lame )
- opengl? ( virtual/opengl )
- png? ( media-libs/libpng:0 )
- schroedinger? ( >=media-libs/schroedinger-1.0.10 )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- X? (
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXext
- x11-libs/libXt
- x11-libs/libXv
- )
- x264? ( media-libs/x264 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/gettext
- doc? ( app-doc/doxygen )
- X? ( x11-proto/videoproto )"
-
-REQUIRED_USE="opengl? ( X )"
-
-DOCS="ChangeLog README TODO"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}+libav-9.patch \
- "${FILESDIR}"/${P}-ffmpeg2.patch
- elibtoolize # Required for .so versioning on g/fbsd
-}
-
-src_configure() {
- econf \
- --enable-gpl \
- $(use_enable static-libs static) \
- $(use_enable cpu_flags_x86_mmx asm) \
- $(use_with doc doxygen) \
- $(use vorbis || echo --without-vorbis) \
- $(use_with lame) \
- $(use_with X x) \
- $(use_with opengl) \
- $(use_with alsa) \
- $(use_with gtk) \
- $(use_with dv libdv) \
- $(use_with jpeg libjpeg) \
- $(use_with ffmpeg) \
- $(use_with png libpng) \
- $(use_with schroedinger) \
- $(use_with aac faac) \
- $(use encode || echo --without-faac) \
- $(use_with aac faad2) \
- $(use_with x264) \
- --without-cpuflags
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -exec rm -f {} +
-
- # Compatibility with software that uses quicktime prefix, but
- # don't do that when building for Darwin/MacOS
- [[ ${CHOST} != *-darwin* ]] && dosym /usr/include/lqt
/usr/include/quicktime
-}
-
-pkg_preinst() {
- if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then
- elog "For compatibility with other quicktime libraries, ${PN}
was"
- elog "going to create a /usr/include/quicktime symlink, but for
some"
- elog "reason that is a directory on your system."
-
- elog "Please check that is empty, and remove it, or submit a
bug"
- elog "telling us which package owns the directory."
- die "/usr/include/quicktime is a directory."
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 6551f51d42c0d551786819ba79a49eb382d769d0
Author: Alexis Ballier gentoo org>
AuthorDate: Sat Mar 11 09:41:50 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Sat Mar 11 09:48:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6551f51d
media-libs/libquicktime: Convert to libav useflag and add missing zlib dep, bug
#543438
Package-Manager: Portage-2.3.4, Repoman-2.3.2
media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
index 9c182daf58e..b31abf34887 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,16 +11,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png
schroedinger static-libs vorbis X x264"
+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}]
+ sys-libs/zlib:=
aac? (
>=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]
encode? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
)
alsa? ( >=media-libs/alsa-lib-1.0.20 )
dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
- ffmpeg? ( >=virtual/ffmpeg-9-r1[${MULTILIB_USEDEP}] )
+ ffmpeg? (
+ libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
+ !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+ )
gtk? ( x11-libs/gtk+:2 )
jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
lame? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 3ab0a11d7aaff28d4acbd7af4a72d8c25a27b166
Author: Peter-Levine gmail com>
AuthorDate: Tue Feb 14 21:21:53 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Feb 15 12:49:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab0a11d
media-libs/libquicktime: Apply libquicktime-1.2.4-ffmpeg29.patch when building
libquicktime-1.2.4 against >=media-video/libav-12
media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
index 8e2a7f3867..749049e928 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
@@ -53,7 +53,10 @@ DOCS="ChangeLog README TODO"
src_prepare() {
epatch "${FILESDIR}"/${P}+libav-9.patch \
"${FILESDIR}"/${P}-ffmpeg2.patch
- has_version '>=media-video/ffmpeg-2.9' && epatch
"${FILESDIR}"/${P}-ffmpeg29.patch
+ if has_version '>=media-video/ffmpeg-2.9' ||
+ has_version '>=media-video/libav-12'; then
+ epatch "${FILESDIR}"/${P}-ffmpeg29.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
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/files/, media-libs/libquicktime/
commit: fc758ce2a30914bd74410abeec0a48c4bd7bd840
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Sep 16 09:33:40 2015 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Sep 16 09:33:40 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc758ce2
media-libs/libquicktime: fix build with ffmpeg git master.
Package-Manager: portage-2.2.20.1
.../files/libquicktime-1.2.4-ffmpeg29.patch| 287 +
.../libquicktime/libquicktime-1.2.4-r1.ebuild | 1 +
2 files changed, 288 insertions(+)
diff --git a/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg29.patch
b/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg29.patch
new file mode 100644
index 000..96a323a
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.2.4-ffmpeg29.patch
@@ -0,0 +1,287 @@
+Index: libquicktime-1.2.4/plugins/ffmpeg/video.c
+===
+--- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c
libquicktime-1.2.4/plugins/ffmpeg/video.c
+@@ -37,10 +37,10 @@
+ #endif
+
+
+-#ifdef PIX_FMT_YUV422P10
+-#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10
++#ifdef AV_PIX_FMT_YUV422P10
++#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10
+ #else
+-#define PIX_FMT_YUV422P10_OR_DUMMY -1234
++#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234
+ #endif
+
+ #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0)
+@@ -90,9 +90,9 @@ typedef struct
+ int imx_bitrate;
+ int imx_strip_vbi;
+
+- /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while
+- we would like to treat it as PIX_FMT_YUVJ422P. It's only used for
decoding */
+- enum PixelFormat reinterpret_pix_fmt;
++ /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P,
while
++ we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for
decoding */
++ enum AVPixelFormat reinterpret_pix_fmt;
+
+ int is_imx;
+ int y_offset;
+@@ -137,42 +137,42 @@ typedef struct
+
+ static const struct
+ {
+- enum PixelFormat ffmpeg_id;
++ enum AVPixelFormat ffmpeg_id;
+ int lqt_id;
+ int exact;
+ }
+ colormodels[] =
+ {
+-{ PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb
sample per 2x2 Y samples)
++{ AV_PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr &
Cb sample per 2x2 Y samples)
+ #if LIBAVUTIL_VERSION_INT < (50<<16)
+-{ PIX_FMT_YUV422,BC_YUV422,1 },
++{ AV_PIX_FMT_YUV422,BC_YUV422,1 },
+ #else
+-{ PIX_FMT_YUYV422, BC_YUV422,1 },
++{ AV_PIX_FMT_YUYV422, BC_YUV422,1 },
+ #endif
+-{ PIX_FMT_RGB24, BC_RGB888,1 }, ///< Packed pixel, 3 bytes per
pixel, RGBRGB...
+-{ PIX_FMT_BGR24, BC_BGR888,1 }, ///< Packed pixel, 3 bytes per
pixel, BGRBGR...
+-{ PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb
sample per 2x1 Y samples)
+-{ PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb
sample per 1x1 Y samples)
+-{ PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb
sample per 4x1 Y samples)
+-{ PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1
Cr & Cb sample per 2x1 Y samples)
+-#ifdef PIX_FMT_YUV422P10
+-{ PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t
containers, planar 4:2:2
+-#endif
+-{ PIX_FMT_RGB565,BC_RGB565,1 }, ///< always stored in cpu
endianness
+-{ PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale
(jpeg)
+-{ PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale
(jpeg)
+-{ PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale
(jpeg)
++{ AV_PIX_FMT_RGB24, BC_RGB888,1 }, ///< Packed pixel, 3 bytes per
pixel, RGBRGB...
++{ AV_PIX_FMT_BGR24, BC_BGR888,1 }, ///< Packed pixel, 3 bytes per
pixel, BGRBGR...
++{ AV_PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr &
Cb sample per 2x1 Y samples)
++{ AV_PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr &
Cb sample per 1x1 Y samples)
++{ AV_PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr &
Cb sample per 4x1 Y samples)
++{ AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2
(1 Cr & Cb sample per 2x1 Y samples)
++#ifdef AV_PIX_FMT_YUV422P10
++{ AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in
uint16_t containers, planar 4:2:2
++#endif
++{ AV_PIX_FMT_RGB565,BC_RGB565,1 }, ///< always stored in cpu
endianness
++{ AV_PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full
scale (jpeg)
++{ AV_PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full
scale (jpeg)
++{ AV_PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full
scale (jpeg)
+ #if LIBAVUTIL_VERSION_INT < (50<<16)
+-{ PIX_FMT_RGBA32,
[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/
commit: 03d11a2d40e53e978343d9bd26700a9c1b1d3e62
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Sep 16 09:34:52 2015 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Sep 16 09:34:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03d11a2d
media-libs/libquicktime: fix slot on virtual/jpeg.
Package-Manager: portage-2.2.20.1
media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
index 67ab74c..8e2a7f3 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
ffmpeg? ( >=virtual/ffmpeg-9-r1[${MULTILIB_USEDEP}] )
gtk? ( x11-libs/gtk+:2 )
- jpeg? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
+ jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
lame? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
opengl? ( virtual/opengl )
png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
