[vlc-devel] commit: Libogg update to 1.1.4 (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jul  8 19:01:36 2009 +0200| [e29893130b5259d0fdc2c6458c356130e398709c] | committer: Jean-Baptiste Kempf 

Libogg update to 1.1.4

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

 extras/contrib/src/Patches/libogg-1.1.patch |   47 +++++++++++++++++++++++----
 extras/contrib/src/packages.mak             |    6 ++--
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/extras/contrib/src/Patches/libogg-1.1.patch b/extras/contrib/src/Patches/libogg-1.1.patch
index e23bb0e..6e4f4c9 100644
--- a/extras/contrib/src/Patches/libogg-1.1.patch
+++ b/extras/contrib/src/Patches/libogg-1.1.patch
@@ -1,6 +1,27 @@
---- /libogg-1.1.3/configure.in	2005-11-28 05:26:07.000000000 +0100
-+++ libogg/configure.in	2006-07-11 19:52:15.000000000 +0200
-@@ -45,27 +45,27 @@
+--- libogg/configure.in	2009-07-08 18:56:26.000000000 +0200
++++ libogg.new/configure.in	2009-07-08 18:55:50.000000000 +0200
+@@ -28,17 +28,17 @@
+         case $host in 
+         *-*-irix*)
+                 DEBUG="-g -signed" 
+-                CFLAGS="-O2 -w -signed"
++                EXTRA_CFLAGS="-O2 -w -signed"
+                 PROFILE="-p -g3 -O2 -signed"
+ 		;;
+         sparc-sun-solaris*)
+                 DEBUG="-v -g"
+-                CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
++                EXTRA_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+                 PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc"
+ 		;;
+         *)
+                 DEBUG="-g"
+-                CFLAGS="-O"
++                EXTRA_CFLAGS="-O"
+                 PROFILE="-g -p" 
+ 		;;
+         esac
+@@ -46,36 +46,36 @@
          case $host in 
          *-*-linux*)
                  DEBUG="-g -Wall -fsigned-char"
@@ -9,10 +30,22 @@
                  PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char"
  		;;
          sparc-sun-*)
-                 DEBUG="-g -Wall -fsigned-char -mv8"
--                CFLAGS="-O20 -ffast-math -fsigned-char -mv8"
-+                EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char -mv8"
-                 PROFILE="-pg -g -O20 -fsigned-char -mv8" 
+                 sparc_cpu=""
+                 AC_MSG_CHECKING([if gcc supports -mv8])
+-                old_cflags="$CFLAGS"
+-                CFLAGS="$CFLAGS -mv8"
++                old_EXTRA_CFLAGS="$CFLAGS"
++                EXTRA_CFLAGS="$CFLAGS -mv8"
+                 AC_TRY_COMPILE(, [return 0;], [
+                         AC_MSG_RESULT([yes])
+                         sparc_cpu="-mv8"
+                 ])
+-                CFLAGS="$old_cflags"
++                EXTRA_CFLAGS="$old_cflags"
+                 DEBUG="-g -Wall -fsigned-char $sparc_cpu"
+-                CFLAGS="-O20 -ffast-math -fsigned-char $sparc_cpu"
++                EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char $sparc_cpu"
+                 PROFILE="-pg -g -O20 -fsigned-char $sparc_cpu" 
  		;;
  	*-*-darwin*)
  		DEBUG="-fno-common -g -Wall -fsigned-char"
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index c464dc6..5d1fa1a 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -66,9 +66,9 @@ LIBID3TAG_VERSION=0.15.1b
 LIBID3TAG_URL=$(VIDEOLAN)/testing/contrib/libid3tag-$(LIBID3TAG_VERSION).tar.gz
 LIBMAD_VERSION=0.15.1b
 LIBMAD_URL=$(VIDEOLAN)/testing/contrib/libmad-$(LIBMAD_VERSION).tar.gz
-OGG_VERSION=1.1.3
-#OGG_URL=http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.gz
-OGG_URL=$(VIDEOLAN)/testing/contrib/libogg-$(OGG_VERSION).tar.gz
+OGG_VERSION=1.1.4
+OGG_URL=http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.gz
+#GG_URL=$(VIDEOLAN)/testing/contrib/libogg-$(OGG_VERSION).tar.gz
 OGG_CVSROOT=:pserver:anoncvs at xiph.org:/usr/local/cvsroot
 VORBIS_VERSION=1.2.2
 VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz