Commit 81c0161a authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: update libmatroska to 1.4.2

Move to autotools

(cherry picked from commit 03cd31d2b1a30ca58c809c824e9254c120d62fcd)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 9470b868
06db4906f497cca4adc09b8e8588edddc840cca1fbbf9890491cbfa55f9f238ad7d8b86de687293a5caa15dbc2ae64ac8fcb05da062940017f346be46e9ba8e3 libmatroska-1.4.1.tar.bz2 37b7e35c4db0a5265682f69e2ded251168f64499ab86fa228d9a4dde8a85edab7b8b60c722563c1fed27317cd0e94ee86322c18446430aae7cafeda20a90e549 libmatroska-1.4.2.tar.bz2
diff -ru libmatroska.orig/make/linux/Makefile libmatroska/make/linux/Makefile
--- 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
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 @@
# Build rules
%.o: %$(EXTENSION)
- $(CXX) -c $(COMPILEFLAGS) -o $@ $<
-
-%.lo: %$(EXTENSION)
$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
$(LIBRARY): $(objects)
# matroska # matroska
MATROSKA_VERSION := 1.4.1 MATROSKA_VERSION := 1.4.2
MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.bz2 MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.bz2
#MATROSKA_URL := $(CONTRIB_VIDEOLAN)/libmatroska-$(MATROSKA_VERSION).tar.bz2 #MATROSKA_URL := $(CONTRIB_VIDEOLAN)/libmatroska-$(MATROSKA_VERSION).tar.bz2
...@@ -14,15 +14,9 @@ $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2: ...@@ -14,15 +14,9 @@ $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2:
libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/matroska/matroska-pic.patch
$(MOVE) $(MOVE)
.matroska: libmatroska .matroska: libmatroska
ifdef HAVE_WIN32 cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) -C make/mingw32 prefix="$(PREFIX)" $(HOSTVARS) SHARED=no EBML_DLL=no libmatroska.a cd $< && $(MAKE) install
else
cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) staticlib
endif
cd $< && $(MAKE) -C make/linux install_staticlib install_headers prefix="$(PREFIX)" $(HOSTVARS)
$(RANLIB) "$(PREFIX)/lib/libmatroska.a"
touch $@ touch $@
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment