[vlc-commits] commit: Contrib: update vorbis and ogg with 1.3.1 (1.2.3) and 1.2.0 (1.1.4) (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Mar 29 21:41:19 2010 +0200| [7ef74456c5ee63f1f96c7043ce845eb6b2ce81d6] | committer: Jean-Baptiste Kempf 

Contrib: update vorbis and ogg with 1.3.1 (1.2.3) and 1.2.0 (1.1.4)

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

 extras/contrib/src/Patches/vorbis-noapps.patch |   23 +++++++++++------------
 extras/contrib/src/packages.mak                |    4 ++--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/extras/contrib/src/Patches/vorbis-noapps.patch b/extras/contrib/src/Patches/vorbis-noapps.patch
index 447a93b..d7d04c0 100644
--- a/extras/contrib/src/Patches/vorbis-noapps.patch
+++ b/extras/contrib/src/Patches/vorbis-noapps.patch
@@ -1,12 +1,11 @@
-diff -urNp libvorbis.orig/Makefile.in libvorbis/Makefile.in
---- libvorbis.orig/Makefile.in	2009-07-10 04:19:15.000000000 +0200
-+++ libvorbis/Makefile.in	2009-11-13 22:23:38.000000000 +0100
-@@ -227,7 +227,7 @@ target_vendor = @target_vendor@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
--SUBDIRS = m4 include vq lib examples test doc
-+SUBDIRS = m4 include vq lib doc
- m4datadir = $(datadir)/aclocal
- m4data_DATA = vorbis.m4
- pkgconfigdir = $(libdir)/pkgconfig
+--- libvorbis/Makefile.in	2010-03-26 08:00:09.000000000 +0100
++++ libvorbis.new/Makefile.in	2010-03-29 21:39:50.000000000 +0200
+@@ -80,7 +80,7 @@
+   distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = m4 include vq lib test doc examples
++DIST_SUBDIRS = m4 include vq lib 
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 862553f..cccf826 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -68,11 +68,11 @@ LIBID3TAG_VERSION=0.15.1b
 LIBID3TAG_URL=$(CONTRIB_VIDEOLAN)/libid3tag-$(LIBID3TAG_VERSION).tar.gz
 LIBMAD_VERSION=0.15.1b
 LIBMAD_URL=$(CONTRIB_VIDEOLAN)/libmad-$(LIBMAD_VERSION).tar.gz
-OGG_VERSION=1.1.4
+OGG_VERSION=1.2.0
 OGG_URL=http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.gz
 #GG_URL=$(CONTRIB_VIDEOLAN)/libogg-$(OGG_VERSION).tar.gz
 OGG_CVSROOT=:pserver:anoncvs at xiph.org:/usr/local/cvsroot
-VORBIS_VERSION=1.2.3
+VORBIS_VERSION=1.3.1
 VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz
 #VORBIS_URL=$(CONTRIB_VIDEOLAN)/libvorbis-$(VORBIS_VERSION).tar.gz
 THEORA_VERSION=1.1.1