[vlc-commits] commit: Contribs: update to libebml 0.8.0 (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat May 29 14:32:48 2010 +0200| [b49b25bb5b2c5b9c55471f3688db45473e26a282] | committer: Jean-Baptiste Kempf 

Contribs: update to libebml 0.8.0

Remove 2 patches applied upstream, add another one :)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b49b25bb5b2c5b9c55471f3688db45473e26a282
---

 extras/contrib/src/Makefile                        |    9 +---
 extras/contrib/src/Patches/libebml-svn-win32.patch |   41 --------------------
 extras/contrib/src/Patches/libebml-win32.patch     |   12 ++++++
 extras/contrib/src/Patches/libebml-win64.patch     |   12 ------
 extras/contrib/src/packages.mak                    |   10 ++--
 5 files changed, 19 insertions(+), 65 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6140c1d..2dd7bd5 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -980,16 +980,11 @@ libebml-$(LIBEBML_VERSION).tar.bz2:
 
 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-ifdef HAVE_WIN32
-	(cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch)
-endif
-ifdef HAVE_WIN64
-	patch -p0 < Patches/libebml-win64.patch
-endif
+	patch -p0 < Patches/libebml-win32.patch
 
 .ebml: libebml
 ifdef HAVE_WIN32
-	(cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) CFLAGS="$(CFLAGS) -DWIN32" SHARED=no && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2))
+	(cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) CFLAGS="$(CFLAGS) -DWIN32" SHARED=no && 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))
 	$(RANLIB) $(PREFIX)/lib/libebml.a
diff --git a/extras/contrib/src/Patches/libebml-svn-win32.patch b/extras/contrib/src/Patches/libebml-svn-win32.patch
deleted file mode 100644
index 3c2023b..0000000
--- a/extras/contrib/src/Patches/libebml-svn-win32.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: make/linux/Makefile
-===================================================================
---- make/linux/Makefile	(revision 1206)
-+++ make/linux/Makefile	(working copy)
-@@ -36,9 +36,9 @@
- DEBUGFLAGS=-g -DDEBUG
- endif
- 
--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)
- 
-Index: make/mingw32/Makefile
-===================================================================
---- make/mingw32/Makefile	(revision 1206)
-+++ make/mingw32/Makefile	(working copy)
-@@ -19,6 +19,8 @@
- CXX  = g++.exe
- CC   = gcc.exe
- WINDRES = windres.exe
-+AR = ar rcvu
-+RANLIB = ranlib
- RES  = 
- SRC  = $(wildcard ../../src/*.cpp)
- OBJ  = $(patsubst %.cpp,%.o,$(SRC))
-@@ -47,8 +49,8 @@
- 	rm -f .depend
- 
- libebml.a: $(OBJ)
--	ar r $@ $(OBJ)
--	ranlib $@
-+	$(AR) $@ $(OBJ)
-+	$(RANLIB) $@
- 
- libebml.dll: $(OBJ)
- 	$(CXX) -shared -Wl,--export-all -Wl,--out-implib=$@.a -o $@ $(OBJ)
diff --git a/extras/contrib/src/Patches/libebml-win32.patch b/extras/contrib/src/Patches/libebml-win32.patch
new file mode 100644
index 0000000..cea0086
--- /dev/null
+++ b/extras/contrib/src/Patches/libebml-win32.patch
@@ -0,0 +1,12 @@
+diff -ruN libebml/make/mingw32/Makefile libebml.new/make/mingw32/Makefile
+--- libebml/make/mingw32/Makefile	2010-04-11 18:36:50.000000000 +0200
++++ libebml.new/make/mingw32/Makefile	2010-05-29 14:26:07.000000000 +0200
+@@ -50,7 +50,7 @@
+ 	rm -f .depend
+ 
+ libebml.a: $(OBJ)
+-	$(AR) r $@ $(OBJ)
++	$(AR) rcvu $@ $(OBJ)
+ 	$(RANLIB) $@
+ 
+ libebml.dll: $(OBJ)
diff --git a/extras/contrib/src/Patches/libebml-win64.patch b/extras/contrib/src/Patches/libebml-win64.patch
deleted file mode 100644
index 5dc55e0..0000000
--- a/extras/contrib/src/Patches/libebml-win64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN libebml/ebml/EbmlCrc32.h libebml.new/ebml/EbmlCrc32.h
---- libebml/ebml/EbmlCrc32.h	2009-08-19 00:48:35.000000000 +0200
-+++ libebml.new/ebml/EbmlCrc32.h	2009-08-19 00:49:35.000000000 +0200
-@@ -143,7 +143,7 @@
- 
- inline bool IsAlignedOn(const void *p, unsigned int alignment)
- {
--	return IsPowerOf2(alignment) ? ModPowerOf2((unsigned long)p, alignment) == 0 : (unsigned long)p % alignment == 0;
-+	return IsPowerOf2(alignment) ? ModPowerOf2((uintptr_t)p, alignment) == 0 : (uintptr_t)p % alignment == 0;
- }
- 
- template <class T>
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 7c0789a..9757bca 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -90,12 +90,12 @@ FAAD2_URL=$(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz
 FAAD2_CVSROOT=:pserver:anonymous at cvs.audiocoding.com:/cvsroot/faac
 LAME_VERSION=3.98.4
 LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
-LIBEBML_VERSION=0.7.8
-#LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.bz2
-LIBEBML_URL=$(CONTRIB_VIDEOLAN)/libebml-$(LIBEBML_VERSION).tar.bz2
+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_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
-LIBMATROSKA_URL=$(CONTRIB_VIDEOLAN)/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
 FFMPEG_VERSION=0.4.8
 FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
 FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk