new upstream version. fixes #63216.

(Portage version: 2.0.51-r14)

5 files changed, 149 insertions, 1 deletions

diff --git a/media-libs/quicktime4linux/ChangeLog b/media-libs/quicktime4linux/ChangeLog
index 93ed04a45ea9..7dce8bf63518 100644
--- a/media-libs/quicktime4linux/ChangeLog
+++ b/media-libs/quicktime4linux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/quicktime4linux
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/ChangeLog,v 1.23 2005/01/16 16:57:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/ChangeLog,v 1.24 2005/01/23 03:15:07 luckyduck Exp $
+
+*quicktime4linux-2.0.4 (23 Jan 2005)
+
+  23 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/2.0.4-external-libs.patch, +quicktime4linux-2.0.4.ebuild:
+  new upstream version. fixes #63216.
 
   16 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
   quicktime4linux-2.0.0-r1.ebuild:
diff --git a/media-libs/quicktime4linux/Manifest b/media-libs/quicktime4linux/Manifest
index a7933a98645b..1788f982bf08 100644
--- a/media-libs/quicktime4linux/Manifest
+++ b/media-libs/quicktime4linux/Manifest
@@ -1,3 +1,4 @@
+MD5 d6c1621d3b970bb6fe635e4f13756096 quicktime4linux-2.0.4.ebuild 1362
 MD5 d0a078ec81a4dfdd16c70ca4d79fa6cc quicktime4linux-1.6.2.ebuild 1131
 MD5 7084829ee30b301dbc23eeaceb8bf70a quicktime4linux-1.5.5-r1.ebuild 938
 MD5 6921ff694f11249f469162fc85df1f9d quicktime4linux-2.0.0.ebuild 1133
@@ -7,6 +8,7 @@ MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 108d3e9d9e220d8415e069fb6232eeea files/quicktime_makefile.patch 420
 MD5 be32d825584a5b034b9976aa75a2b23b files/digest-quicktime4linux-1.6.2 79
 MD5 05a81d2da899448b5ec3b5bbf23b6f2d files/digest-quicktime4linux-2.0.0 79
+MD5 9b609bee6de30124e7d091979bc123c6 files/digest-quicktime4linux-2.0.4 79
 MD5 e55c3522c5ee09ecdc22287cb4d80539 files/2.0.0-external-libs.patch 1644
 MD5 c46fd893f3945688c806226477501585 files/digest-quicktime4linux-1.5.5-r1 74
 MD5 ae2802be07e21795df874c1d65cbe021 files/2.0.0-gcc2.patch 1007
diff --git a/media-libs/quicktime4linux/files/2.0.4-external-libs.patch b/media-libs/quicktime4linux/files/2.0.4-external-libs.patch
new file mode 100644
index 000000000000..af86af8657a3
--- /dev/null
+++ b/media-libs/quicktime4linux/files/2.0.4-external-libs.patch
@@ -0,0 +1,86 @@
+diff -uprN quicktime4linux-2.0.4.orig/Makefile quicktime4linux-2.0.4/Makefile
+--- quicktime4linux-2.0.4.orig/Makefile	2005-01-23 00:52:58.000000000 +0100
++++ quicktime4linux-2.0.4/Makefile	2005-01-23 04:05:38.568348256 +0100
+@@ -5,11 +5,7 @@ CC = gcc
+ 
+ 
+ 
+-ifeq ($(origin CFLAGS), environment)
+ HAVE_CFLAGS := y
+-else
+-HAVE_CFLAGS := n
+-endif
+ 
+ #ENCORE_DIR := encore2/src
+ #DECORE_DIR := decore2/src
+@@ -17,9 +13,10 @@ ENCORE_DIR := encore50
+ #DECORE_DIR := decore50
+ ENCORE_INCLUDE := $(ENCORE_DIR)/encore.h
+ #DECORE_INCLUDE := $(DECORE_DIR)/decore.h
+-MPEG3_DIR := $(shell expr ../libmpeg3* )
+-FAAD_DIR := faad2
+-FAAC_DIR := faac
++MPEG3_DIR := /usr/include/libmpeg3
++LAME_DIR := /usr/include/lame
++FAAD_DIR := /usr/include
++FAAC_DIR := /usr/include
+ OBJS := 
+ 
+ 
+@@ -52,26 +49,28 @@ DIRS = $(OBJDIR)
+ 
+ 
+ 
+-include Makefile.jpeg
+-include Makefile.vorbis
+-include Makefile.ffmpeg
+-include Makefile.lame
+-include Makefile.dv
++#include Makefile.jpeg
++#include Makefile.vorbis
++#include Makefile.ffmpeg
++#include Makefile.lame
++#include Makefile.dv
+ include Makefile.encore50
+-include Makefile.faad
+-include Makefile.faac
++#include Makefile.faad
++#include Makefile.faac
+ 
+ 
+ 
+ 
+ 
+ #CFLAGS += -g
++CFLAGS += $(MYCFLAGS)
+ CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ CFLAGS += -DHAVE_FIREWIRE
+ CFLAGS += -I. \
+-	-I$(JPEG_DIR) \
++	-I/usr/include/ffmpeg \
+ 	-I$(MPEG3_DIR) \
+-	-I$(LAME_DIR)/include
++	-I$(LAME_DIR) \
++	-I$(FAAD_DIR)
+ 
+ 
+ #	$(OBJDIR)/div3.o \
+@@ -230,7 +229,9 @@ DIRS += \
+ 	$(OBJDIR)/$(ENCORE_DIR)/mbtransquant/intel_mmx
+ 
+ 
+-LIBS := $(OUTPUT) $(MPEG3_DIR)/$(OBJDIR)/libmpeg3.a -lpng -lz -lpthread -ldl -lm
++LIBS := $(OUTPUT) \
++	-logg -lmpeg3 -lmp3lame -ldv -ljpeg -lvorbis -lvorbisenc -lavcodec \
++	-lpng -lz -lpthread -lglib -ldl -lm -lfaad -lfaac
+ 
+ 
+ $(shell if ! test -d $(OBJDIR) \; then mkdir -p $(DIRS) \; fi )
+@@ -248,7 +249,6 @@ all: $(OBJDIR) $(OUTPUT)
+ $(OUTPUT): $(DV_OBJS) $(DVMMXOBJ) $(OBJS) $(DVMMXOBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(FFMPEG_OBJS) $(FFMPEGIA32_OBJS) $(LAME_OBJS) $(FAAD_OBJS) $(FAAC_OBJS) $(JPEG_FAIL) 
+ 	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
+ 
+-
+ $(OBJDIR)/qtdump: $(OBJDIR)/dump.o $(OUTPUT)
+ 	$(CC) -o $(OBJDIR)/qtdump $(OBJDIR)/dump.o $(LIBS)
+ 
diff --git a/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.4 b/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.4
new file mode 100644
index 000000000000..201cb4fb0c11
--- /dev/null
+++ b/media-libs/quicktime4linux/files/digest-quicktime4linux-2.0.4
@@ -0,0 +1 @@
+MD5 c3b89779dd7082b3852db935fc18d91d quicktime4linux-2.0.4-src.tar.bz2 5241607
diff --git a/media-libs/quicktime4linux/quicktime4linux-2.0.4.ebuild b/media-libs/quicktime4linux/quicktime4linux-2.0.4.ebuild
new file mode 100644
index 000000000000..74d8a3b6f475
--- /dev/null
+++ b/media-libs/quicktime4linux/quicktime4linux-2.0.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-2.0.4.ebuild,v 1.1 2005/01/23 03:15:07 luckyduck Exp $
+
+inherit flag-o-matic gcc eutils
+
+DESCRIPTION="quicktime library for linux"
+HOMEPAGE="http://heroinewarrior.com/quicktime.php3"
+SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 -ppc ~amd64"
+IUSE=""
+
+DEPEND="media-libs/jpeg
+	media-libs/libpng
+	>=media-libs/libmpeg3-1.5.1
+	>=media-libs/libdv-0.99
+	>=media-video/ffmpeg-0.4.6
+	>=media-sound/lame-3.93.1
+	>=media-libs/libogg-1.0
+	>=media-libs/libvorbis-1.0
+	x86? ( media-libs/divx4linux )
+	media-libs/a52dec
+	media-libs/faac
+	media-libs/faad2
+	!virtual/quicktime
+	dev-lang/nasm"
+PROVIDE="virtual/quicktime"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	rm -rf decore2 encore2 ffmpeg-0.4.6 jpeg jpeg-mmx-0.1.4 \
+		lame-3.93.1 libdv-0.99 libogg-1.0 libvorbis-1.0
+	ln -s /usr/include jpeg
+	epatch ${FILESDIR}/${PV}-external-libs.patch
+}
+
+src_compile() {
+	make MYCFLAGS="${CFLAGS}" || die
+	make util MYCFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	dolib.so `uname -m`/libquicktime.so
+	dolib.a  `uname -m`/libquicktime.a
+	insinto /usr/include/quicktime
+	doins *.h
+	dodoc README
+	dohtml -r docs
+}