-c6bcabfd69dcbf131d1412cbaed5d0eee8f26db702b0ac54b04ff9bdc3c162a6a16fc0e8f4445e88bd1b4536a9fec347b2993484fb3b300077b8e6cf0c9c8950 libmatroska-1.4.0.tar.bz2
+06db4906f497cca4adc09b8e8588edddc840cca1fbbf9890491cbfa55f9f238ad7d8b86de687293a5caa15dbc2ae64ac8fcb05da062940017f346be46e9ba8e3 libmatroska-1.4.1.tar.bz2
--- libmatroska.orig/make/linux/Makefile 2011-06-15 15:00:37.000000000 +0300
+++ libmatroska/make/linux/Makefile 2011-08-03 13:33:25.000000000 +0300
@@ -65,7 +65,7 @@
- # object files; replace .cxx extension with .o\r
- objects:=$(patsubst %$(EXTENSION),%.o,$(sources))\r
- \r
--objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))\r
-+objects_so:=$(objects)\r
- \r
- WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \\r
- -Wshadow\r
+ # object files; replace .cxx extension with .o
+ objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
+
+-objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
++objects_so:=$(objects)
+
+ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
+ -Wshadow
@@ -89,9 +89,6 @@
- \r
- # Build rules\r
- %.o: %$(EXTENSION)\r
-- $(CXX) -c $(COMPILEFLAGS) -o $@ $<\r
--\r
--%.lo: %$(EXTENSION)\r
- $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<\r
- \r
- $(LIBRARY): $(objects)\r
+
+ # Build rules
+ %.o: %$(EXTENSION)
+- $(CXX) -c $(COMPILEFLAGS) -o $@ $<
+-
+-%.lo: %$(EXTENSION)
+ $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
+
+ $(LIBRARY): $(objects)
+++ /dev/null
---- libmatroska-1.4.0/make/linux/Makefile.orig 2013-07-04 19:12:54.531784786 +0200
-+++ libmatroska-1.4.0/make/linux/Makefile 2013-07-04 19:13:25.958887357 +0200
-@@ -67,7 +67,7 @@
- \r
- objects_so:=$(objects)\r
- \r
--WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \\r
-+WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -fno-gnu-keywords -D_GNU_SOURCE \\r
- -Wshadow\r
- COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)\r
- LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)\r
# matroska
-MATROSKA_VERSION := 1.4.0
+MATROSKA_VERSION := 1.4.1
MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.bz2
#MATROSKA_URL := $(CONTRIB_VIDEOLAN)/libmatroska-$(MATROSKA_VERSION).tar.bz2
libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
$(UNPACK)
$(APPLY) $(SRC)/matroska/matroska-pic.patch
- $(APPLY) $(SRC)/matroska/no-ansi.patch
$(MOVE)
.matroska: libmatroska