Commit 8cefd276 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: Theora moves from alpha7 to alpha8. New encoder, one patch has gone...

Contribs: Theora moves from alpha7 to alpha8. New encoder, one patch has gone upstream, and examples can be disabled. A lot of new features are available in the encoder. Postprocessing, anyone ?
Ref  #1303

parent 9c888eea
......@@ -755,14 +755,13 @@ libtheora-$(THEORA_VERSION).tar.bz2:
libtheora: libtheora-$(THEORA_VERSION).tar.bz2
$(EXTRACT_BZ2)
patch -p0 < Patches/theora.patch
patch -p0 < Patches/theora-1.0a7.patch
(cd $@; autoconf)
.theora: libtheora .ogg
ifdef HAVE_BEOS
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm && make && make install)
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install)
else
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest && make && make install)
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples && make && make install)
endif
$(INSTALL_NAME)
......
Index: libtheora/lib/dsp.h
===================================================================
--- libtheora/lib/dsp.h (revision 11456)
+++ libtheora/lib/dsp.h (revision 11701)
@@ -20,5 +20,4 @@
#include <theora/theora.h>
-typedef unsigned long int ogg_uint64_t;
typedef struct
Index: libtheora/lib/x86_64/dsp_mmx.c
===================================================================
--- libtheora/lib/x86_64/dsp_mmx.c (revision 11441)
+++ libtheora/lib/x86_64/dsp_mmx.c (revision 11701)
@@ -20,4 +20,6 @@
#include "codec_internal.h"
#include "dsp.h"
+
+typedef unsigned long long ogg_uint64_t;
static const __attribute__ ((aligned(8),used)) ogg_int64_t V128 = 0x0080008000800080LL;
Index: libtheora/lib/x86_64/dsp_mmxext.c
===================================================================
--- libtheora/lib/x86_64/dsp_mmxext.c (revision 11441)
+++ libtheora/lib/x86_64/dsp_mmxext.c (revision 11701)
@@ -21,4 +21,6 @@
#include "dsp.h"
+typedef unsigned long long ogg_uint64_t;
+
static ogg_uint32_t sad8x8__mmxext (unsigned char *ptr1, ogg_uint32_t stride1,
unsigned char *ptr2, ogg_uint32_t stride2)
Index: libtheora/lib/x86_64/recon_mmx.c
===================================================================
--- libtheora/lib/x86_64/recon_mmx.c (revision 11441)
+++ libtheora/lib/x86_64/recon_mmx.c (revision 11701)
@@ -17,4 +17,6 @@
#include "codec_internal.h"
+
+typedef unsigned long long ogg_uint64_t;
static const __attribute__ ((aligned(8),used)) ogg_int64_t V128 = 0x8080808080808080LL;
diff -ruN libtheora-1.0alpha7/configure.ac libtheora/configure.ac
--- libtheora-1.0alpha7/configure.ac 2006-06-20 22:04:50.000000000 +0200
+++ libtheora/configure.ac 2006-07-11 20:08:04.000000000 +0200
@@ -88,7 +88,7 @@
--- libtheora/configure.ac 2007-09-18 08:47:09.000000000 +0200
+++ libtheora.new/configure.ac 2007-09-23 14:44:48.000000000 +0200
@@ -93,7 +93,7 @@
case $host in
*)
DEBUG="-g -DDEBUG"
......@@ -10,41 +9,17 @@ diff -ruN libtheora-1.0alpha7/configure.ac libtheora/configure.ac
PROFILE="-g -p -DDEBUG" ;;
esac
else
@@ -96,11 +96,11 @@
@@ -101,11 +101,11 @@
case $host in
*)
DEBUG="-g -Wall -DDEBUG -D__NO_MATH_INLINES"
- CFLAGS="-Wall -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
+ EXTRA_CFLAGS="-Wall -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
PROFILE="-Wall -pg -g -O3 -fno-inline-functions -DDEBUG";;
DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
- CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
+ EXTRAS_CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
esac
fi
-CFLAGS="$CFLAGS $cflags_save"
+CFLAGS="$EXTRA_CFLAGS $cflags_save"
+CFLAGS="$EXTRAS_CFLAGS $cflags_save"
cpu_x86_64=no
cpu_x86_32=no
diff -ruN libtheora-1.0alpha7/Makefile.am libtheora/Makefile.am
--- libtheora-1.0alpha7/Makefile.am 2006-06-13 00:57:36.000000000 +0200
+++ libtheora/Makefile.am 2006-07-11 20:04:43.000000000 +0200
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
-SUBDIRS = lib include doc examples tests m4
+SUBDIRS = lib include doc tests m4
# we include the whole debian/ dir in EXTRA_DIST because there's a problem
# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
diff -ruN libtheora-1.0alpha7/Makefile.in libtheora/Makefile.in
--- libtheora-1.0alpha7/Makefile.in 2006-06-20 22:06:56.000000000 +0200
+++ libtheora/Makefile.in 2006-07-11 20:05:06.000000000 +0200
@@ -231,7 +231,7 @@
target_os = @target_os@
target_vendor = @target_vendor@
AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
-SUBDIRS = lib include doc examples tests m4
+SUBDIRS = lib include doc tests m4
# we include the whole debian/ dir in EXTRA_DIST because there's a problem
# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
......@@ -67,9 +67,9 @@ OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
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
THEORA_VERSION=1.0alpha8
THEORA_URL=http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSION).tar.bz2
#THEORA_URL=$(VIDEOLAN)/testing/contrib/libtheora-$(THEORA_VERSION).tar.bz2
FLAC_VERSION=1.2.0
FLAC_URL=$(SF)/flac/flac-$(FLAC_VERSION).tar.gz
SPEEX_VERSION=1.2beta2
......
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