- updated to 1.1.0 (new soname)

[packages/libmatroska.git] / libmatroska-makefile.patch

diff --git a/libmatroska-makefile.patch b/libmatroska-makefile.patch
index e607b9dfaefd78364c83779e44e4037dffeef559..ad4f2e9822cadb295fe813dc0b4dc92f621e388e 100644 (file)
--- a/libmatroska-makefile.patch
+++ b/libmatroska-makefile.patch
@@ -1,5 +1,5 @@
---- libmatroska-0.7.7/make/linux/Makefile.orig 2005-04-19 09:00:00.000000000 +0200
-+++ libmatroska-0.7.7/make/linux/Makefile      2005-06-12 21:27:18.499321560 +0200
+--- libmatroska-1.0.0/make/linux/Makefile~     2010-08-05 23:37:39.000000000 +0300
++++ libmatroska-1.0.0/make/linux/Makefile      2010-08-05 23:38:53.361903703 +0300
 @@ -28,6 +28,7 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
@@ -19,7 +19,7 @@
  EXTENSION=.cpp
  
  ifeq (yes,$(DEBUG))
-@@ -52,12 +53,10 @@
+@@ -50,12 +50,10 @@
  # Librarires
  INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
  LIBS=
@@ -29,7 +29,7 @@
  # Names
 -LIBRARY=libmatroska.a
 -LIBRARY_SO=libmatroska.so
--LIBRARY_SO_VER=libmatroska.so.0
+-LIBRARY_SO_VER=libmatroska.so.3
 +LIBRARY=libmatroska.la
  
  # source-files
@@ -47,7 +47,7 @@
  
  WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
                -Wshadow
-@@ -79,31 +76,19 @@
+@@ -75,32 +73,19 @@
  ifeq (Darwin,$(shell uname -s))
  all: staticlib
  else
@@ -69,43 +69,44 @@
 -
  %.lo: %$(EXTENSION)
 -      $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
-+      $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
++      $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
  $(LIBRARY): $(objects)
--      $(AR) $@ $(objects)
+-      $(AR) rcvu $@ $(objects)
 -      $(RANLIB) $@
 -
 -$(LIBRARY_SO): $(objects_so)
 -      $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
+-      rm -f $(LIBRARY_SO)
 -      ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
-+      $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
++      $(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -version-info 3:0:0 -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
  
  clean:        cleantest
        rm -f $(objects) $(objects_so)
-@@ -131,19 +116,19 @@
+@@ -132,19 +116,19 @@
  test: test6 test9
  
  test6:        test6.o $(LIBRARY) $(LIBRARY_SO)
 -      $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+      $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
++      $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
  
  test6.o: $(MUX_SRC_DIR)test6.cpp
        $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
  test8:        test8.o $(LIBRARY) $(LIBRARY_SO)
 -      $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+      $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
++      $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
  
  test8.o: $(MUX_SRC_DIR)test8.cpp
        $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
  test9:        test9.o $(LIBRARY) $(LIBRARY_SO)
 -      $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+      $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
++      $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
  
  test9.o: $(TAG_SRC_DIR)test9.cpp
        $(CXX) -c $(COMPILEFLAGS) -o $@ $<
-@@ -151,27 +136,22 @@
+@@ -152,27 +136,22 @@
  ifeq (Darwin,$(shell uname -s))
  install: install_staticlib install_headers
  else
@@ -134,7 +135,7 @@
 -install_sharedlib: $(LIBRARY_SO)
 -      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
 -      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
--      ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+-      ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
 +install_lib: $(LIBRARY)
 +      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
 +      $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)