Commit 8d756c52 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf Committed by Rémi Denis-Courmont

Libogg update to 1.1.4

(cherry picked from commit e2989313)
Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 1539ab65
--- /libogg-1.1.3/configure.in 2005-11-28 05:26:07.000000000 +0100 --- libogg/configure.in 2009-07-08 18:56:26.000000000 +0200
+++ libogg/configure.in 2006-07-11 19:52:15.000000000 +0200 +++ libogg.new/configure.in 2009-07-08 18:55:50.000000000 +0200
@@ -45,27 +45,27 @@ @@ -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 case $host in
*-*-linux*) *-*-linux*)
DEBUG="-g -Wall -fsigned-char" DEBUG="-g -Wall -fsigned-char"
...@@ -9,10 +30,22 @@ ...@@ -9,10 +30,22 @@
PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char" PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char"
;; ;;
sparc-sun-*) sparc-sun-*)
DEBUG="-g -Wall -fsigned-char -mv8" sparc_cpu=""
- CFLAGS="-O20 -ffast-math -fsigned-char -mv8" AC_MSG_CHECKING([if gcc supports -mv8])
+ EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char -mv8" - old_cflags="$CFLAGS"
PROFILE="-pg -g -O20 -fsigned-char -mv8" - 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*) *-*-darwin*)
DEBUG="-fno-common -g -Wall -fsigned-char" DEBUG="-fno-common -g -Wall -fsigned-char"
......
...@@ -66,9 +66,9 @@ LIBID3TAG_VERSION=0.15.1b ...@@ -66,9 +66,9 @@ LIBID3TAG_VERSION=0.15.1b
LIBID3TAG_URL=$(VIDEOLAN)/testing/contrib/libid3tag-$(LIBID3TAG_VERSION).tar.gz LIBID3TAG_URL=$(VIDEOLAN)/testing/contrib/libid3tag-$(LIBID3TAG_VERSION).tar.gz
LIBMAD_VERSION=0.15.1b LIBMAD_VERSION=0.15.1b
LIBMAD_URL=$(VIDEOLAN)/testing/contrib/libmad-$(LIBMAD_VERSION).tar.gz LIBMAD_URL=$(VIDEOLAN)/testing/contrib/libmad-$(LIBMAD_VERSION).tar.gz
OGG_VERSION=1.1.3 OGG_VERSION=1.1.4
#OGG_URL=http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.gz OGG_URL=http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.gz
OGG_URL=$(VIDEOLAN)/testing/contrib/libogg-$(OGG_VERSION).tar.gz #GG_URL=$(VIDEOLAN)/testing/contrib/libogg-$(OGG_VERSION).tar.gz
OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
VORBIS_VERSION=1.2.2 VORBIS_VERSION=1.2.2
VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment