multilib fixes in existing versions. Revbump to build shared library.

7 files changed, 173 insertions, 17 deletions

diff --git a/media-libs/libmatroska/ChangeLog b/media-libs/libmatroska/ChangeLog
index 6b8818b19765..d696658a8d4d 100644
--- a/media-libs/libmatroska/ChangeLog
+++ b/media-libs/libmatroska/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmatroska
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/ChangeLog,v 1.32 2004/09/25 19:27:14 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/ChangeLog,v 1.33 2004/10/08 10:29:50 eradicator Exp $
+
+  08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/libmatroska-0.7.3-shared.patch:
+  multilib fixes in existing versions.  Revbump to build shared library.
 
   25 Sep 2004; Jason Wever <weeve@gentoo.org> libmatroska-0.6.3.ebuild:
   Stable on sparc.
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index f2a5408edbd7..8b9c1d22d409 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,12 +1,13 @@
-MD5 db0dd7ce4fea60c618fa795f5fda8d6a ChangeLog 4019
 MD5 dd67452cc7502dee0a6f742598518b89 libmatroska-0.5.2.ebuild 798
 MD5 6f7373b6e5601004c3705913ba64c22b libmatroska-0.6.2.ebuild 843
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 5470f49d19c22dbc469431c1bf17ca3a libmatroska-0.6.3.ebuild 1048
 MD5 ab5b69aad34ad0903ff233638e9c0485 libmatroska-0.7.0.ebuild 1266
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 db0dd7ce4fea60c618fa795f5fda8d6a ChangeLog 4019
 MD5 1be73c5b1a49e1afa1a1a05f2d33b981 libmatroska-0.7.1.ebuild 1272
 MD5 53ca9a7acdd8e2c10b020f81eba5b0c4 libmatroska-0.7.2.ebuild 1272
-MD5 4218db6fb72d62286bdd9f0760f47fff libmatroska-0.7.3.ebuild 1269
+MD5 cc919d38b0b06a0d4242563299342192 libmatroska-0.7.3.ebuild 1415
+MD5 cc919d38b0b06a0d4242563299342192 libmatroska-0.7.3-r1.ebuild 1415
 MD5 a517d15638be5ee91357b70059040e06 files/digest-libmatroska-0.5.2 68
 MD5 a37de967f24a547a9f51018af01ccd30 files/digest-libmatroska-0.6.2 68
 MD5 5e4b1f66449918a4ae7b7a77a47dcde6 files/digest-libmatroska-0.6.3 68
@@ -14,3 +15,5 @@ MD5 4529e58fa584a5c14c77777cb6b57671 files/digest-libmatroska-0.7.0 69
 MD5 053bc87332097c45be3866399a4ef3da files/digest-libmatroska-0.7.1 69
 MD5 2cbdb96adeda267055be4eea02b96327 files/digest-libmatroska-0.7.2 69
 MD5 fd84899f8aaf8c41f8bc2fd83b744cdc files/digest-libmatroska-0.7.3 69
+MD5 04a23339f4c28a9ec286155a84482aee files/libmatroska-0.7.3-shared-multilib.patch 2482
+MD5 fd84899f8aaf8c41f8bc2fd83b744cdc files/digest-libmatroska-0.7.3-r1 69
diff --git a/media-libs/libmatroska/files/digest-libmatroska-0.7.3-r1 b/media-libs/libmatroska/files/digest-libmatroska-0.7.3-r1
new file mode 100644
index 000000000000..e2eea9f6b47e
--- /dev/null
+++ b/media-libs/libmatroska/files/digest-libmatroska-0.7.3-r1
@@ -0,0 +1 @@
+MD5 d3248068de3f34739de8ff81a6651162 libmatroska-0.7.3.tar.bz2 81678
diff --git a/media-libs/libmatroska/files/libmatroska-0.7.3-shared.patch b/media-libs/libmatroska/files/libmatroska-0.7.3-shared.patch
new file mode 100644
index 000000000000..0ce1a7fa5f15
--- /dev/null
+++ b/media-libs/libmatroska/files/libmatroska-0.7.3-shared.patch
@@ -0,0 +1,88 @@
+diff -Naur libmatroska-0.7.3.orig/make/linux/Makefile libmatroska-0.7.3/make/linux/Makefile
+--- libmatroska-0.7.3.orig/make/linux/Makefile	2004-07-19 09:43:44.000000000 -0700
++++ libmatroska-0.7.3/make/linux/Makefile	2004-10-08 03:10:14.377999956 -0700
+@@ -54,6 +54,8 @@
+ 
+ # Names
+ LIBRARY=libmatroska.a
++LIBRARY_SO=libmatroska.so
++LIBRARY_SO_VER=libmatroska.so.0
+ 
+ # source-files
+ sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
+@@ -67,28 +69,39 @@
+ # object files; replace .cxx extension with .o
+ objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
+ 
++objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
++
+ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
+ 		-Wshadow
+ COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)
+ LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
+ DEPENDFLAGS  = ${CXXFLAGS} ${INCLUDE}
+ 
+-all: $(LIBRARY)
++all: $(LIBRARY) $(LIBRARY_SO)
+ 
+-lib library: $(LIBRARY)
++lib library: $(LIBRARY) $(LIBRARY_SO)
+ 
+ # Build rules
+ %.o: %$(EXTENSION)
+ 	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
++%.lo: %$(EXTENSION)
++	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
++
+ $(LIBRARY): $(objects)
+ 	$(AR) $@ $(objects)
+ 	$(RANLIB) $@
+ 
++$(LIBRARY_SO): $(objects_so)
++	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
++	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
++
+ clean:	cleantest
+ 	rm -f $(objects)
+ 	rm -f $(dependencies)
+ 	rm -f $(LIBRARY)
++	rm -f $(LIBRARY_SO)
++	rm -f $(LIBRARY_SO_VER)
+ 	rm -f CORE
+ 
+ cleantest:
+@@ -100,27 +113,29 @@
+ 
+ test: test6 test8 test9
+ 
+-test6:	test6.o $(LIBRARY)
++test6:	test6.o $(LIBRARY) $(LIBRARY_SO)
+ 	$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
+ 
+ test6.o: $(MUX_SRC_DIR)test6.cpp
+ 	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
+-test8:	test8.o $(LIBRARY)
++test8:	test8.o $(LIBRARY) $(LIBRARY_SO)
+ 	$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
+ 
+ test8.o: $(MUX_SRC_DIR)test8.cpp
+ 	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
+-test9:	test9.o $(LIBRARY)
++test9:	test9.o $(LIBRARY) $(LIBRARY_SO)
+ 	$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
+ 
+ test9.o: $(TAG_SRC_DIR)test9.cpp
+ 	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
+-install: $(LIBRARY)
++install: $(LIBRARY) $(LIBRARY_SO)
+ 	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
+ 	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
++	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
++	ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+ 	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
+ 	for i in $(INCLUDE_DIR)/*.h; do \
+ 		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
diff --git a/media-libs/libmatroska/libmatroska-0.7.0.ebuild b/media-libs/libmatroska/libmatroska-0.7.0.ebuild
index 93a1bd525e49..9586b93bf0bc 100644
--- a/media-libs/libmatroska/libmatroska-0.7.0.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.0.ebuild,v 1.9 2004/07/16 23:05:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.0.ebuild,v 1.10 2004/10/08 10:29:50 eradicator Exp $
 
-inherit flag-o-matic gcc
+inherit flag-o-matic gcc eutils
 
 DESCRIPTION="Extensible multimedia container format based on EBML"
 HOMEPAGE="http://www.matroska.org/"
@@ -40,6 +40,6 @@ src_compile() {
 
 src_install() {
 	cd ${S}/make/linux
-	einstall || die "make install failed"
+	einstall libdir="${D}/usr/$(get_libdir)" || die "make install failed"
 	dodoc ${S}/LICENSE.*
 }
diff --git a/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild b/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..501b97685944
--- /dev/null
+++ b/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild,v 1.1 2004/10/08 10:29:50 eradicator Exp $
+
+IUSE=""
+
+inherit flag-o-matic gcc eutils
+
+DESCRIPTION="Extensible multimedia container format based on EBML"
+HOMEPAGE="http://www.matroska.org/"
+SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64"
+
+DEPEND=">=dev-libs/libebml-0.7.1-r1"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-shared.patch
+
+	cd ${S}/make/linux
+	sed -i -e 's/CXXFLAGS=/CXXFLAGS+=/g' Makefile
+}
+
+src_compile() {
+	cd ${S}/make/linux
+
+	# This is needed on amd64 to create shared libraries that make
+	# use of matroska, like libvlcplugin from vlc.
+	# Travis Tilley <lv@gentoo.org> 09 Apr 2004
+	use amd64 && append-flags -fPIC
+	use ppc && append-flags -fPIC
+
+	#fixes locale for gcc3.4.0 to close bug 52385
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+	then
+		append-flags -finput-charset=ISO8859-15
+	fi
+
+	make PREFIX=/usr \
+		LIBEBML_INCLUDE_DIR=/usr/include/ebml \
+		LIBEBML_LIB_DIR=/usr/$(get_libdir) || die "make failed"
+}
+
+src_install() {
+	cd ${S}/make/linux
+
+	einstall libdir="${D}/usr/$(get_libdir)" || die "make install failed"
+	dodoc ../../ChangeLog
+}
diff --git a/media-libs/libmatroska/libmatroska-0.7.3.ebuild b/media-libs/libmatroska/libmatroska-0.7.3.ebuild
index c04fdde13d0d..e48a0d6e6681 100644
--- a/media-libs/libmatroska/libmatroska-0.7.3.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.3.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.3.ebuild,v 1.1 2004/08/25 19:32:26 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.3.ebuild,v 1.2 2004/10/08 10:29:50 eradicator Exp $
 
-inherit flag-o-matic gcc
+IUSE=""
+
+inherit flag-o-matic gcc eutils
 
 DESCRIPTION="Extensible multimedia container format based on EBML"
 HOMEPAGE="http://www.matroska.org/"
@@ -11,10 +13,15 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64"
-IUSE=""
 
-DEPEND="virtual/libc
-	>=dev-libs/libebml-0.7.1"
+DEPEND=">=dev-libs/libebml-0.7.1"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}/make/linux
+	sed -i -e 's/CXXFLAGS=/CXXFLAGS+=/g' Makefile
+}
 
 src_compile() {
 	cd ${S}/make/linux
@@ -25,8 +32,6 @@ src_compile() {
 	use amd64 && append-flags -fPIC
 	use ppc && append-flags -fPIC
 
-	sed -i -e 's/CXXFLAGS=/CXXFLAGS+=/g' Makefile
-
 	#fixes locale for gcc3.4.0 to close bug 52385
 	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
 	then
@@ -35,11 +40,12 @@ src_compile() {
 
 	make PREFIX=/usr \
 		LIBEBML_INCLUDE_DIR=/usr/include/ebml \
-		LIBEBML_LIB_DIR=/usr/lib || die "make failed"
+		LIBEBML_LIB_DIR=/usr/$(get_libdir) || die "make failed"
 }
 
 src_install() {
 	cd ${S}/make/linux
-	einstall || die "make install failed"
-	dodoc ${S}/LICENSE.*
+
+	einstall libdir="${D}/usr/$(get_libdir)" || die "make install failed"
+	dodoc ../../ChangeLog
 }