[vlc-commits] commit: Contribs: update to libogg 1.2.2 (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Dec 28 17:16:59 2010 +0100| [80bf9fe9a00447930f0cc49231b3b763a56e324d] | committer: Jean-Baptiste Kempf 

Contribs: update to libogg 1.2.2

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

 extras/contrib/src/contrib-src.mak |    1 -
 extras/contrib/src/packages.mak    |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index af06c3a..bcb011d 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -602,7 +602,6 @@ libogg-$(OGG_VERSION).tar.gz:
 libogg: libogg-$(OGG_VERSION).tar.gz
 	$(EXTRACT_GZ)
 	patch -p0 < Patches/libogg-1.1.patch
-	(cd $@; patch -p2 < ../Patches/libogg-r17608.diff)
 ifdef HAVE_WINCE
 	patch -p0 < Patches/libogg-wince.patch
 endif
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 101fb27..7ea8f1d 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -64,7 +64,7 @@ LIBMPEG2_VERSION=0.5.1
 LIBMPEG2_URL=http://libmpeg2.sourceforge.net/files/libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 LIBMAD_VERSION=0.15.1b
 LIBMAD_URL=$(CONTRIB_VIDEOLAN)/libmad-$(LIBMAD_VERSION).tar.gz
-OGG_VERSION=1.2.1
+OGG_VERSION=1.2.2
 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