Commit f5abb96d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contrib: update to libmatroska 0.9.0

And remove patch applied upstream. Keep the same change as libebml for win32 buildsystem
parent b49b25bb
...@@ -1004,16 +1004,15 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2: ...@@ -1004,16 +1004,15 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
$(EXTRACT_BZ2) $(EXTRACT_BZ2)
patch -p0 < ./Patches/libmatroska-kaxblock.patch
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $@; patch -p0 < ../Patches/libmatroska-win32.patch) patch -p0 < Patches/libmatroska-win32.patch
endif endif
.matroska: libmatroska .ebml .matroska: libmatroska .ebml
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2)) (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
else else
(cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX)) (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
$(RANLIB) $(PREFIX)/lib/libmatroska.a $(RANLIB) $(PREFIX)/lib/libmatroska.a
endif endif
touch $@ touch $@
......
diff -ruN libmatroska-0.8.1/matroska/KaxBlock.h libmatroska/matroska/KaxBlock.h
--- libmatroska-0.8.1/matroska/KaxBlock.h 2007-01-14 18:20:35.000000000 +0100
+++ libmatroska/matroska/KaxBlock.h 2008-09-23 23:05:55.000000000 +0200
@@ -367,6 +367,7 @@
public:
KaxBlockVirtual() :ParentCluster(NULL) {Data = DataBlock; Size = countof(DataBlock);}
KaxBlockVirtual(const KaxBlockVirtual & ElementToClone);
+ ~KaxBlockVirtual() { if( Data == DataBlock ) SetBuffer( NULL, 0 ); };
static EbmlElement & Create() {return *(new KaxBlockVirtual);}
const EbmlCallbacks & Generic() const {return ClassInfos;}
static const EbmlCallbacks ClassInfos;
Index: make/linux/Makefile --- libmatroska/make/mingw32/Makefile 2010-04-11 18:40:15.000000000 +0200
=================================================================== +++ libmatroska.new/make/mingw32/Makefile 2010-05-29 14:38:19.000000000 +0200
--- make/linux/Makefile (revision 1206) @@ -67,7 +67,7 @@
+++ make/linux/Makefile (working copy) rm -f .depend
@@ -29,9 +29,9 @@
INSTALL_OPTS_LIB = -m 644
INSTALL_DIR_OPTS = -m 755
-ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw)) libmatroska.a: $(OBJ)
-$(error Please use the Makefile in ../mingw32) - $(AR) r $@ $(OBJ)
-endif + $(AR) rcvu $@ $(OBJ)
+#ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw)) $(RANLIB) $@
+#$(error Please use the Makefile in ../mingw32)
+#endif
CWD=$(shell pwd)
libmatroska.dll: $(OBJ)
...@@ -93,7 +93,7 @@ LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz ...@@ -93,7 +93,7 @@ LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
LIBEBML_VERSION=0.8.0 LIBEBML_VERSION=0.8.0
LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.bz2 LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.bz2
#LIBEBML_URL=$(CONTRIB_VIDEOLAN)/libebml-$(LIBEBML_VERSION).tar.bz2 #LIBEBML_URL=$(CONTRIB_VIDEOLAN)/libebml-$(LIBEBML_VERSION).tar.bz2
LIBMATROSKA_VERSION=0.8.1 LIBMATROSKA_VERSION=0.9.0
LIBMATROSKA_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 LIBMATROSKA_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
#IBMATROSKA_URL=$(CONTRIB_VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 #IBMATROSKA_URL=$(CONTRIB_VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
FFMPEG_VERSION=0.4.8 FFMPEG_VERSION=0.4.8
......
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