summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-12-29 22:22:06 +0000
committerMike Frysinger <vapier@gentoo.org>2008-12-29 22:22:06 +0000
commit50f2af6b804396ab2c7bc83dbb8e7d0f420bacbb (patch)
treefaf15b5b588ec3813b946bbf8938eded82e529be /media-libs/libquicktime
parentFilter stack-protector for <gcc-4 on amd64. (diff)
downloadgentoo-2-50f2af6b804396ab2c7bc83dbb8e7d0f420bacbb.tar.gz
gentoo-2-50f2af6b804396ab2c7bc83dbb8e7d0f420bacbb.tar.bz2
gentoo-2-50f2af6b804396ab2c7bc83dbb8e7d0f420bacbb.zip
Fix random crash on 64bit systems due to implicit string func decls.
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)
Diffstat (limited to 'media-libs/libquicktime')
-rw-r--r--media-libs/libquicktime/ChangeLog8
-rw-r--r--media-libs/libquicktime/files/libquicktime-1.1.1-headers.patch12
-rw-r--r--media-libs/libquicktime/libquicktime-1.1.1.ebuild6
3 files changed, 22 insertions, 4 deletions
diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index a64456ca993e..7af69031159f 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libquicktime
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.128 2008/12/20 08:42:07 ssuominen Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.129 2008/12/29 22:22:06 vapier Exp $
+
+ 29 Dec 2008; Mike Frysinger <vapier@gentoo.org>
+ +files/libquicktime-1.1.1-headers.patch, libquicktime-1.1.1.ebuild:
+ Fix random crash on 64bit systems due to implicit string func decls.
20 Dec 2008; <ssuominen@gentoo.org> libquicktime-1.0.3.ebuild,
libquicktime-1.1.0.ebuild, libquicktime-1.1.1.ebuild:
diff --git a/media-libs/libquicktime/files/libquicktime-1.1.1-headers.patch b/media-libs/libquicktime/files/libquicktime-1.1.1-headers.patch
new file mode 100644
index 000000000000..6e61de0b322f
--- /dev/null
+++ b/media-libs/libquicktime/files/libquicktime-1.1.1-headers.patch
@@ -0,0 +1,12 @@
+implicit string prototypes break 64bit systems
+
+--- src/timecode.c
++++ src/timecode.c
+@@ -23,6 +23,7 @@
+ *******************************************************************************/
+
+ #include <stdlib.h>
++#include <string.h>
+
+ #include "lqt_private.h"
+
diff --git a/media-libs/libquicktime/libquicktime-1.1.1.ebuild b/media-libs/libquicktime/libquicktime-1.1.1.ebuild
index 7e6ea47c1e04..023eb01d26a2 100644
--- a/media-libs/libquicktime/libquicktime-1.1.1.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.1.1.ebuild,v 1.2 2008/12/20 08:42:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.1.1.ebuild,v 1.3 2008/12/29 22:22:06 vapier Exp $
inherit libtool eutils
@@ -11,7 +11,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
IUSE="mmx X opengl dv gtk alsa aac encode png jpeg vorbis lame x264 ffmpeg doc"
RDEPEND="dv? ( media-libs/libdv )
@@ -50,9 +49,12 @@ src_unpack() {
unpack ${A}
cd "${S}"
+ epatch "${FILESDIR}"/${P}-headers.patch
+
# Needed for sane .so versionning on g/fbsd
elibtoolize
}
+
src_compile() {
local MY_OPTS=""
if use !encode || use !aac; then