Commit 4b6e13d3 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: libogg and libvorbis upgrade

parent d75c4e63
--- libogg/configure.in 2009-07-08 18:56:26.000000000 +0200 --- libogg/configure.in 2010-11-01 21:13:42.000000000 +0100
+++ libogg.new/configure.in 2009-07-08 18:55:50.000000000 +0200 +++ libogg.new/configure.in 2010-11-03 23:59:54.267733114 +0100
@@ -28,17 +28,17 @@ @@ -28,17 +28,17 @@
case $host in case $host in
*-*-irix*) *-*-irix*)
...@@ -21,31 +21,19 @@ ...@@ -21,31 +21,19 @@
PROFILE="-g -p" PROFILE="-g -p"
;; ;;
esac esac
@@ -46,36 +46,36 @@ @@ -46,27 +46,27 @@
case $host in case $host in
*-*-linux*) *-*-linux*)
DEBUG="-g -Wall -fsigned-char" DEBUG="-g -Wall -fsigned-char"
- CFLAGS="-O20 -ffast-math -fsigned-char" - CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
+ EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char" + EXTRA_CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char" PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char"
;; ;;
sparc-sun-*) sparc-sun-*)
sparc_cpu="" DEBUG="-g -Wall -fsigned-char"
AC_MSG_CHECKING([if gcc supports -mv8]) - CFLAGS="-O20 -ffast-math -fsigned-char"
- old_cflags="$CFLAGS" + EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char"
- CFLAGS="$CFLAGS -mv8" PROFILE="-pg -g -O20 -fsigned-char"
+ 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"
......
...@@ -653,7 +653,6 @@ libogg-$(OGG_VERSION).tar.gz: ...@@ -653,7 +653,6 @@ libogg-$(OGG_VERSION).tar.gz:
libogg: libogg-$(OGG_VERSION).tar.gz libogg: libogg-$(OGG_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
patch -p0 < Patches/libogg-inttypes.patch
patch -p0 < Patches/libogg-1.1.patch patch -p0 < Patches/libogg-1.1.patch
ifdef HAVE_WINCE ifdef HAVE_WINCE
patch -p0 < Patches/libogg-wince.patch patch -p0 < Patches/libogg-wince.patch
......
...@@ -64,11 +64,11 @@ LIBMPEG2_VERSION=0.5.1 ...@@ -64,11 +64,11 @@ LIBMPEG2_VERSION=0.5.1
LIBMPEG2_URL=http://libmpeg2.sourceforge.net/files/libmpeg2-$(LIBMPEG2_VERSION).tar.gz LIBMPEG2_URL=http://libmpeg2.sourceforge.net/files/libmpeg2-$(LIBMPEG2_VERSION).tar.gz
LIBMAD_VERSION=0.15.1b LIBMAD_VERSION=0.15.1b
LIBMAD_URL=$(CONTRIB_VIDEOLAN)/libmad-$(LIBMAD_VERSION).tar.gz LIBMAD_URL=$(CONTRIB_VIDEOLAN)/libmad-$(LIBMAD_VERSION).tar.gz
OGG_VERSION=1.2.0 OGG_VERSION=1.2.1
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
#GG_URL=$(CONTRIB_VIDEOLAN)/libogg-$(OGG_VERSION).tar.gz #GG_URL=$(CONTRIB_VIDEOLAN)/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.3.1 VORBIS_VERSION=1.3.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
#VORBIS_URL=$(CONTRIB_VIDEOLAN)/libvorbis-$(VORBIS_VERSION).tar.gz #VORBIS_URL=$(CONTRIB_VIDEOLAN)/libvorbis-$(VORBIS_VERSION).tar.gz
THEORA_VERSION=1.1.1 THEORA_VERSION=1.1.1
......
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