[vlc-commits] commit: Contrib: update to libmatroska 0.9.0 (Jean-Baptiste Kempf )
git at videolan.org
git at videolan.org
Sat May 29 14:42:03 CEST 2010
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat May 29 14:41:24 2010 +0200| [f5abb96d4aef877581f7afb92b7c9ccd7c5a0869] | committer: Jean-Baptiste Kempf
Contrib: update to libmatroska 0.9.0
And remove patch applied upstream. Keep the same change as libebml for win32 buildsystem
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f5abb96d4aef877581f7afb92b7c9ccd7c5a0869
---
extras/contrib/src/Makefile | 7 ++---
.../contrib/src/Patches/libmatroska-kaxblock.patch | 11 --------
extras/contrib/src/Patches/libmatroska-win32.patch | 28 ++++++++------------
extras/contrib/src/packages.mak | 2 +-
4 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 2dd7bd5..b270d1f 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1004,16 +1004,15 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
$(EXTRACT_BZ2)
- patch -p0 < ./Patches/libmatroska-kaxblock.patch
ifdef HAVE_WIN32
- (cd $@; patch -p0 < ../Patches/libmatroska-win32.patch)
+ patch -p0 < Patches/libmatroska-win32.patch
endif
.matroska: libmatroska .ebml
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
- (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
endif
touch $@
diff --git a/extras/contrib/src/Patches/libmatroska-kaxblock.patch b/extras/contrib/src/Patches/libmatroska-kaxblock.patch
deleted file mode 100644
index e6f0d58..0000000
--- a/extras/contrib/src/Patches/libmatroska-kaxblock.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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;
diff --git a/extras/contrib/src/Patches/libmatroska-win32.patch b/extras/contrib/src/Patches/libmatroska-win32.patch
index 91719cb..39a4160 100644
--- a/extras/contrib/src/Patches/libmatroska-win32.patch
+++ b/extras/contrib/src/Patches/libmatroska-win32.patch
@@ -1,17 +1,11 @@
-Index: make/linux/Makefile
-===================================================================
---- make/linux/Makefile (revision 1206)
-+++ make/linux/Makefile (working copy)
-@@ -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))
--$(error Please use the Makefile in ../mingw32)
--endif
-+#ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw))
-+#$(error Please use the Makefile in ../mingw32)
-+#endif
-
- CWD=$(shell pwd)
-
+--- 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
+@@ -67,7 +67,7 @@
+ rm -f .depend
+
+ libmatroska.a: $(OBJ)
+- $(AR) r $@ $(OBJ)
++ $(AR) rcvu $@ $(OBJ)
+ $(RANLIB) $@
+
+ libmatroska.dll: $(OBJ)
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 9757bca..a3b37a8 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -93,7 +93,7 @@ LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
LIBEBML_VERSION=0.8.0
LIBEBML_URL=http://dl.matroska.org/downloads/libebml/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
#IBMATROSKA_URL=$(CONTRIB_VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
FFMPEG_VERSION=0.4.8
More information about the vlc-commits
mailing list