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

2 files changed, 89 insertions, 0 deletions

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) ; \