Skip to content

Commit bb286ca

Browse files
committed
Contribs: update libebml 1.3.1
Move to autoconf
1 parent c25d1ce commit bb286ca

File tree

4 files changed

+4
-44
lines changed

4 files changed

+4
-44
lines changed

contrib/src/ebml/SHA512SUMS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f5687af60e94f167cd341c24f038d57735d447b6279e96b916e3b0a98ca141f3c241ef4c46dd55ac87b0f6007eb14835e0f2a602f89610fcc0b4f93e8b9c87ab libebml-1.3.0.tar.bz2
1+
b42d198611e480a4938fe95b920f6ee6ca37453f9551990e4310ed82651f93284f1de1d871357b6280219634bbbf6a98d4ac988e25e7bd7b5bbf5c0ba5766334 libebml-1.3.1.tar.bz2

contrib/src/ebml/ebml-pic.patch

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

contrib/src/ebml/no-ansi.patch

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

contrib/src/ebml/rules.mak

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

3-
EBML_VERSION := 1.3.0
3+
EBML_VERSION := 1.3.1
44
EBML_URL := http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar.bz2
55
#EBML_URL := $(CONTRIB_VIDEOLAN)/libebml-$(EBML_VERSION).tar.bz2
66

@@ -11,20 +11,13 @@ $(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2:
1111

1212
libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
1313
$(UNPACK)
14-
$(APPLY) $(SRC)/ebml/ebml-pic.patch
15-
$(APPLY) $(SRC)/ebml/no-ansi.patch
1614
$(MOVE)
1715

1816
# libebml requires exceptions
1917
EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" \
2018
CPPFLAGS=""
2119

2220
.ebml: libebml
23-
ifdef HAVE_WIN32
24-
cd $< && $(MAKE) -C make/mingw32 prefix="$(PREFIX)" $(HOSTVARS) SHARED=no
25-
else
26-
cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) $(EBML_EXTRA_FLAGS) staticlib
27-
endif
28-
cd $< && $(MAKE) -C make/linux install_staticlib install_headers prefix="$(PREFIX)" $(HOSTVARS)
29-
$(RANLIB) "$(PREFIX)/lib/libebml.a"
21+
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
22+
cd $< && $(MAKE) install
3023
touch $@

0 commit comments

Comments
 (0)