Skip to content

Commit 03cd31d

Browse files
committed
Contribs: update libmatroska to 1.4.2
Move to autotools
1 parent bb286ca commit 03cd31d

File tree

3 files changed

+4
-32
lines changed

3 files changed

+4
-32
lines changed

contrib/src/matroska/SHA512SUMS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
06db4906f497cca4adc09b8e8588edddc840cca1fbbf9890491cbfa55f9f238ad7d8b86de687293a5caa15dbc2ae64ac8fcb05da062940017f346be46e9ba8e3 libmatroska-1.4.1.tar.bz2
1+
37b7e35c4db0a5265682f69e2ded251168f64499ab86fa228d9a4dde8a85edab7b8b60c722563c1fed27317cd0e94ee86322c18446430aae7cafeda20a90e549 libmatroska-1.4.2.tar.bz2

contrib/src/matroska/matroska-pic.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.

contrib/src/matroska/rules.mak

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# matroska
22

3-
MATROSKA_VERSION := 1.4.1
3+
MATROSKA_VERSION := 1.4.2
44
MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.bz2
55
#MATROSKA_URL := $(CONTRIB_VIDEOLAN)/libmatroska-$(MATROSKA_VERSION).tar.bz2
66

@@ -14,15 +14,9 @@ $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2:
1414

1515
libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
1616
$(UNPACK)
17-
$(APPLY) $(SRC)/matroska/matroska-pic.patch
1817
$(MOVE)
1918

2019
.matroska: libmatroska
21-
ifdef HAVE_WIN32
22-
cd $< && $(MAKE) -C make/mingw32 prefix="$(PREFIX)" $(HOSTVARS) SHARED=no EBML_DLL=no libmatroska.a
23-
else
24-
cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) staticlib
25-
endif
26-
cd $< && $(MAKE) -C make/linux install_staticlib install_headers prefix="$(PREFIX)" $(HOSTVARS)
27-
$(RANLIB) "$(PREFIX)/lib/libmatroska.a"
20+
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
21+
cd $< && $(MAKE) install
2822
touch $@

0 commit comments

Comments
 (0)