version bump

8 files changed, 79 insertions, 26 deletions

diff --git a/media-libs/quicktime4linux/ChangeLog b/media-libs/quicktime4linux/ChangeLog
index 14f19d6bff0f..a45c8c96e14c 100644
--- a/media-libs/quicktime4linux/ChangeLog
+++ b/media-libs/quicktime4linux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/quicktime4linux
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/ChangeLog,v 1.13 2003/07/12 18:06:06 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/ChangeLog,v 1.14 2003/07/26 22:30:18 vapier Exp $
+
+*quicktime4linux-1.6.2 (26 Jul 2003)
+
+  26 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + NPTL happy header patches.
 
 *quicktime4linux-1.5.5-r1 (13 Jun 2003)
  
diff --git a/media-libs/quicktime4linux/Manifest b/media-libs/quicktime4linux/Manifest
index b8a75d63a2eb..8bce93d07642 100644
--- a/media-libs/quicktime4linux/Manifest
+++ b/media-libs/quicktime4linux/Manifest
@@ -1,6 +1,8 @@
-MD5 b1d9ca4ecc32b34cf7fb723318e614be quicktime4linux-1.5.5-r1.ebuild 891
-MD5 723ee15bb63e0031a2ff232f30cf962e ChangeLog 2322
-MD5 dd34011997315d20d0d24bcef281cfa1 quicktime4linux-1.5.5.ebuild 710
-MD5 108d3e9d9e220d8415e069fb6232eeea files/quicktime_makefile.patch 420
-MD5 c46fd893f3945688c806226477501585 files/digest-quicktime4linux-1.5.5 74
+MD5 856fdf26d3cf2a72a72147c73f14a2c9 files/digest-quicktime4linux-1.6.2 150
 MD5 c46fd893f3945688c806226477501585 files/digest-quicktime4linux-1.5.5-r1 74
+MD5 108d3e9d9e220d8415e069fb6232eeea files/quicktime_makefile.patch 420
+MD5 18f6f22f1a711f5be21eed00582cf61e files/1.6.2-gentoo-libmpeg3.patch 647
+MD5 947ef42daabc28f6c58cbccd4f7bb911 files/1.6.2-gentoo-sharedlib.patch 1072
+MD5 8fc75a24a8ebe6217011390d7400429b quicktime4linux-1.5.5-r1.ebuild 885
+MD5 e509581355f2a85aa0b915533be4e934 quicktime4linux-1.6.2.ebuild 915
+MD5 dcc3d51f08d70d6c56e7c481aa9f2252 ChangeLog 2459
diff --git a/media-libs/quicktime4linux/files/1.6.2-gentoo-libmpeg3.patch b/media-libs/quicktime4linux/files/1.6.2-gentoo-libmpeg3.patch
new file mode 100644
index 000000000000..a4d21814ad63
--- /dev/null
+++ b/media-libs/quicktime4linux/files/1.6.2-gentoo-libmpeg3.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig	2003-07-26 17:58:29.000000000 -0400
++++ Makefile	2003-07-26 17:58:50.000000000 -0400
+@@ -8,7 +8,7 @@
+ DECORE_DIR := decore50
+ ENCORE_INCLUDE := $(ENCORE_DIR)/encore.h
+ DECORE_INCLUDE := $(DECORE_DIR)/decore.h
+-MPEG3_DIR := ../libmpeg3
++MPEG3_DIR := /usr/include/libmpeg3
+ OBJS := 
+ 
+ 
+@@ -207,7 +207,7 @@
+ 	$(OBJDIR)/$(ENCORE_DIR)/mbtransquant/intel_mmx
+ 
+ 
+-LIBS := $(OUTPUT) $(MPEG3_DIR)/$(OBJDIR)/libmpeg3.a -lpng -lz -lpthread -lglib -ldl -lm
++LIBS := $(OUTPUT) /usr/lib/libmpeg3.a -lpng -lz -lpthread -lglib -ldl -lm
+ 
+ $(shell echo  $(CFLAGS) > $(OBJDIR)/c_flags)
+ $(shell echo  $(LIBRAW_CFLAGS) > $(OBJDIR)/libraw_cflags)
diff --git a/media-libs/quicktime4linux/files/1.6.2-gentoo-sharedlib.patch b/media-libs/quicktime4linux/files/1.6.2-gentoo-sharedlib.patch
new file mode 100644
index 000000000000..0a6b4ec6fa3f
--- /dev/null
+++ b/media-libs/quicktime4linux/files/1.6.2-gentoo-sharedlib.patch
@@ -0,0 +1,21 @@
+--- Makefile.orig	2003-07-26 18:09:51.000000000 -0400
++++ Makefile	2003-07-26 18:21:16.000000000 -0400
+@@ -213,7 +213,7 @@
+ $(shell echo  $(LIBRAW_CFLAGS) > $(OBJDIR)/libraw_cflags)
+ $(shell echo  $(OBJS) $(LIBRAW_OBJS) $(DV_OBJS) $(DVMMXOBJS) $(DECOREMMX_OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(JPEG_FAIL) $(FFMPEG_OBJS) $(FFMPEGIA32_OBJS) $(LAME_OBJS) > $(OBJDIR)/objs)
+ 
+-all: $(DIRS) $(OUTPUT)
++all: $(DIRS) $(OUTPUT) $(SHAREDOUTPUT)
+ 
+ $(DIRS):
+ 	if ! test -d $@ ; then mkdir -p $@ ; fi
+@@ -221,6 +221,9 @@
+ $(OUTPUT): $(LIBRAW_OBJS) $(DV_OBJS) $(DVMMXOBJ) $(OBJS) $(DVMMXOBJS) $(DECOREMMX_OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(FFMPEG_OBJS) $(FFMPEGIA32_OBJS) $(LAME_OBJS) $(JPEG_FAIL) 
+ 	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
+ 
++$(SHAREDOUTPUT): $(DVMMXOBJ) $(OBJS) $(DVMMXOBJS) $(ENCOREMMX_OBJS)
++	gcc -shared -o $(SHAREDOUTPUT) $(LIBRAW_OBJS) $(DV_OBJS) $(DVMMXOBJS) $(DECOREMMX_OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(LAME_OBJS) $(JPEG_FAIL) $(FFMPEGIA32_OBJS)
++
+ $(OBJDIR)/qtdump: $(OBJDIR)/dump.o $(OUTPUT)
+ 	$(CC) -o $(OBJDIR)/qtdump $(OBJDIR)/dump.o $(LIBS)
+ 
diff --git a/media-libs/quicktime4linux/files/digest-quicktime4linux-1.5.5 b/media-libs/quicktime4linux/files/digest-quicktime4linux-1.5.5
deleted file mode 100644
index 7387d013c33d..000000000000
--- a/media-libs/quicktime4linux/files/digest-quicktime4linux-1.5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cbfed358123cfcd35b553df2b77b42f7 quicktime4linux-1.5.5.tar.gz 2109955
diff --git a/media-libs/quicktime4linux/files/digest-quicktime4linux-1.6.2 b/media-libs/quicktime4linux/files/digest-quicktime4linux-1.6.2
new file mode 100644
index 000000000000..67f9a428cbae
--- /dev/null
+++ b/media-libs/quicktime4linux/files/digest-quicktime4linux-1.6.2
@@ -0,0 +1,2 @@
+MD5 bcb007e083e6762d828cc20e1b8d42ef quicktime4linux-1.6.2-src.tar.bz2 5893469
+MD5 8aec1ab57e0cd7f968b9398e206cb4d4 libmpeg3-1.5.1-src.tar.bz2 626532
diff --git a/media-libs/quicktime4linux/quicktime4linux-1.5.5-r1.ebuild b/media-libs/quicktime4linux/quicktime4linux-1.5.5-r1.ebuild
index c7ae37361f15..3caa6b508bdf 100644
--- a/media-libs/quicktime4linux/quicktime4linux-1.5.5-r1.ebuild
+++ b/media-libs/quicktime4linux/quicktime4linux-1.5.5-r1.ebuild
@@ -1,37 +1,34 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-1.5.5-r1.ebuild,v 1.10 2003/07/22 18:07:42 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-1.5.5-r1.ebuild,v 1.11 2003/07/26 22:30:18 vapier Exp $
 
-S=${WORKDIR}/quicktime
 DESCRIPTION="quicktime library for linux"
-SRC_URI="http://heroinewarrior.com/${P}.tar.gz"
 HOMEPAGE="http://heroinewarrior.com/quicktime.php3"
+SRC_URI="http://heroinewarrior.com/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86 sparc  ppc amd64"
+SLOT="0"
+KEYWORDS="x86 sparc ppc amd64"
 
 DEPEND="media-libs/jpeg
 	media-libs/libpng
 	!media-libs/libquicktime"
-
 PROVIDE="virtual/quicktime"
 
+S=${WORKDIR}/quicktime
+
 src_unpack() {
 	unpack ${P}.tar.gz
-
 	cd ${S}
 	epatch ${FILESDIR}/quicktime_makefile.patch
 }
 
 src_compile() {
-	
 	emake || die
 	make util || die
 }
 
-src_install () {
-
+src_install() {
 	dolib.so `uname -m`/libquicktime.so
 	dolib.a  `uname -m`/libquicktime.a
 	insinto /usr/include/quicktime
diff --git a/media-libs/quicktime4linux/quicktime4linux-1.5.5.ebuild b/media-libs/quicktime4linux/quicktime4linux-1.6.2.ebuild
index 0eef6b0a4487..6fcddba670af 100644
--- a/media-libs/quicktime4linux/quicktime4linux-1.5.5.ebuild
+++ b/media-libs/quicktime4linux/quicktime4linux-1.6.2.ebuild
@@ -1,26 +1,33 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-1.5.5.ebuild,v 1.7 2003/02/13 12:54:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quicktime4linux/quicktime4linux-1.6.2.ebuild,v 1.1 2003/07/26 22:30:18 vapier Exp $
 
-S=${WORKDIR}/quicktime
 DESCRIPTION="quicktime library for linux"
-SRC_URI="http://heroinewarrior.com/${P}.tar.gz"
 HOMEPAGE="http://heroinewarrior.com/quicktime.php3"
+SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
 
-SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86 sparc "
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
-DEPEND="media-libs/jpeg"
+DEPEND="media-libs/jpeg
+	media-libs/libpng
+	!media-libs/libquicktime"
+PROVIDE="virtual/quicktime"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gentoo-libmpeg3.patch
+	epatch ${FILESDIR}/${PV}-gentoo-sharedlib.patch
+}
 
 src_compile() {
-	
 	emake || die
 	make util || die
 }
 
-src_install () {
-
+src_install() {
 	dolib.so `uname -m`/libquicktime.so
 	dolib.a  `uname -m`/libquicktime.a
 	insinto /usr/include/quicktime