- updated to 1.3.0 (note: new soname)

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

diff --git a/libmatroska-makefile.patch b/libmatroska-makefile.patch
index e881fa17661a7458cf8be7f711a742a9546224a0..f521a7b77506aceaa4d53fc520412870f279a446 100644 (file)
--- a/libmatroska-makefile.patch
+++ b/libmatroska-makefile.patch
@@ -1,14 +1,11 @@
---- libmatroska-0.7.6/make/linux/Makefile.orig 2005-04-16 13:29:02.000000000 +0200
-+++ libmatroska-0.7.6/make/linux/Makefile      2005-04-24 01:13:24.741389560 +0200
-@@ -28,6 +28,7 @@
+--- libmatroska-1.3.0/make/linux/Makefile.orig 2011-09-26 17:14:10.104527029 +0200
++++ libmatroska-1.3.0/make/linux/Makefile      2011-09-26 17:15:20.211196043 +0200
+@@ -29,12 +29,13 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
  INSTALL_DIR_OPTS = -m 755
 +LIBTOOL = libtool
  
- ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw))
- $(error Please use the Makefile in ../mingw32)
-@@ -36,8 +37,8 @@
  CWD=$(shell pwd)
  
  # Options
@@ -19,7 +16,7 @@
  EXTENSION=.cpp
  
  ifeq (yes,$(DEBUG))
-@@ -52,12 +53,10 @@
+@@ -49,12 +50,10 @@
  # Librarires
  INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
  LIBS=
@@ -29,12 +26,12 @@
  # Names
 -LIBRARY=libmatroska.a
 -LIBRARY_SO=libmatroska.so
--LIBRARY_SO_VER=libmatroska.so.0
+-LIBRARY_SO_VER=libmatroska.so.5
 +LIBRARY=libmatroska.la
  
  # source-files
  sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -65,10 +64,8 @@
+@@ -62,10 +61,8 @@
  # header files; replace .cxx extension with .h
  headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
  
@@ -47,17 +44,18 @@
  
  WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
                -Wshadow
-@@ -76,30 +73,18 @@
- LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
- DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
- 
+@@ -76,32 +73,19 @@
+ ifeq (Darwin,$(shell uname -s))
+ all: staticlib
+ else
 -all: staticlib sharedlib
--
++all: $(LIBRARY)
+ endif
+ 
 -staticlib: $(LIBRARY)
 -
 -sharedlib: $(LIBRARY_SO)
-+all: $(LIBRARY)
- 
+-
  lib:
        @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
        @false
@@ -68,45 +66,50 @@
 -
  %.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 5:0:0 -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
  
  clean:        cleantest
        rm -f $(objects) $(objects_so)
-@@ -127,43 +112,38 @@
+@@ -129,19 +113,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 $@ $<
- 
+@@ -149,27 +133,22 @@
+ ifeq (Darwin,$(shell uname -s))
+ install: install_staticlib install_headers
+ else
 -install: install_staticlib install_sharedlib install_headers
 +install: install_lib install_headers
+ endif
  
  install_headers:
 -      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
@@ -129,7 +132,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)