Contribs: Vorbis bump version to 1.2.0. Security fixes and various fixes.
authorJean-Baptiste Kempf <jb@videolan.org>
Tue, 31 Jul 2007 07:07:11 +0000 (07:07 +0000)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 31 Jul 2007 07:07:11 +0000 (07:07 +0000)
extras/contrib/src/Makefile
extras/contrib/src/Patches/libvorbis-1.1.patch [deleted file]
extras/contrib/src/Patches/libvorbis.patch [new file with mode: 0644]
extras/contrib/src/packages.mak

index e1a2762..9549162 100644 (file)
@@ -654,7 +654,7 @@ libvorbis-$(VORBIS_VERSION).tar.gz:
 
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/libvorbis-1.1.patch
+       patch -p0 < Patches/libvorbis.patch
        (cd $@; autoconf)
 
 .vorbis: libvorbis .ogg
diff --git a/extras/contrib/src/Patches/libvorbis-1.1.patch b/extras/contrib/src/Patches/libvorbis-1.1.patch
deleted file mode 100644 (file)
index 2bc8d6a..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -ruN libvorbis-1.1.1/configure.in libvorbis/configure.in
---- libvorbis-1.1.1/configure.in       2005-06-21 15:47:45.000000000 +0200
-+++ libvorbis/configure.in     2005-11-14 22:40:18.000000000 +0100
-@@ -86,15 +86,15 @@
-                       CC=cc
-               fi
-               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
- else
-@@ -102,7 +102,7 @@
-       case $host in 
-       *86-*-linux*)
-               DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
--              CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
-+              EXTRA_CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
- #                     PROFILE="-Wall -W -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
-               PROFILE="-Wall -W -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
-@@ -142,33 +142,33 @@
-  AC_MSG_WARN([********************************************************])
-  AC_MSG_WARN([                                                        ])
--              CFLAGS=${OPT}" -D__NO_MATH_INLINES"
-+              EXTRA_CFLAGS=${OPT}" -D__NO_MATH_INLINES"
-               PROFILE=${PROFILE}" -D__NO_MATH_INLINES"
-               fi;;
-       powerpc-*-linux*)
-               DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES"
--              CFLAGS="-O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
-+              EXTRA_CFLAGS="-O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
-               PROFILE="-pg -g -O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT";;
-       *-*-linux*)
-               DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
--              CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
-+              EXTRA_CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
-               PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
-       sparc-sun-*)
-               DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char -mv8"
--              CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
-+              EXTRA_CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
-               PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
-       *-*-darwin*)
-               DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
--              CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
-+              EXTRA_CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
-               PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
-       *)
-               DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char"
--              CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
-+              EXTRA_CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
-               PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
-         esac
- fi
--CFLAGS="$CFLAGS $cflags_save"
-+CFLAGS="$EXTRA_CFLAGS $cflags_save"
- dnl --------------------------------------------------
- dnl Check for headers
diff --git a/extras/contrib/src/Patches/libvorbis.patch b/extras/contrib/src/Patches/libvorbis.patch
new file mode 100644 (file)
index 0000000..2bc8d6a
--- /dev/null
@@ -0,0 +1,71 @@
+diff -ruN libvorbis-1.1.1/configure.in libvorbis/configure.in
+--- libvorbis-1.1.1/configure.in       2005-06-21 15:47:45.000000000 +0200
++++ libvorbis/configure.in     2005-11-14 22:40:18.000000000 +0100
+@@ -86,15 +86,15 @@
+                       CC=cc
+               fi
+               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
+ else
+@@ -102,7 +102,7 @@
+       case $host in 
+       *86-*-linux*)
+               DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+-              CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
++              EXTRA_CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
+ #                     PROFILE="-Wall -W -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
+               PROFILE="-Wall -W -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
+@@ -142,33 +142,33 @@
+  AC_MSG_WARN([********************************************************])
+  AC_MSG_WARN([                                                        ])
+-              CFLAGS=${OPT}" -D__NO_MATH_INLINES"
++              EXTRA_CFLAGS=${OPT}" -D__NO_MATH_INLINES"
+               PROFILE=${PROFILE}" -D__NO_MATH_INLINES"
+               fi;;
+       powerpc-*-linux*)
+               DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES"
+-              CFLAGS="-O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
++              EXTRA_CFLAGS="-O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
+               PROFILE="-pg -g -O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT";;
+       *-*-linux*)
+               DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+-              CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
++              EXTRA_CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
+               PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
+       sparc-sun-*)
+               DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char -mv8"
+-              CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
++              EXTRA_CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
+               PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
+       *-*-darwin*)
+               DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
+-              CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
++              EXTRA_CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
+               PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
+       *)
+               DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char"
+-              CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
++              EXTRA_CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
+               PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+         esac
+ fi
+-CFLAGS="$CFLAGS $cflags_save"
++CFLAGS="$EXTRA_CFLAGS $cflags_save"
+ dnl --------------------------------------------------
+ dnl Check for headers
index b4a0215..dcc647b 100644 (file)
@@ -62,9 +62,9 @@ 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_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
-VORBIS_VERSION=1.1.2
-#VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz
-VORBIS_URL=$(VIDEOLAN)/testing/contrib/libvorbis-$(VORBIS_VERSION).tar.gz
+VORBIS_VERSION=1.2.0
+VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz
+#VORBIS_URL=$(VIDEOLAN)/testing/contrib/libvorbis-$(VORBIS_VERSION).tar.gz
 THEORA_VERSION=1.0alpha7
 #THEORA_URL=http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSION).tar.bz2
 THEORA_URL=$(VIDEOLAN)/testing/contrib/libtheora-$(THEORA_VERSION).tar.bz2