Commit cfac4eb5 authored by Christophe Massiot's avatar Christophe Massiot

* extras/contrib: Fixed theora and x264-svn compilation.

parent 09ed6d81
......@@ -552,7 +552,7 @@ libshout-$(SHOUT_VERSION).tar.gz:
libshout: libshout-$(SHOUT_VERSION).tar.gz
$(EXTRACT_GZ)
.shout: libshout
.shout: libshout .theora .ogg
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
$(INSTALL_NAME)
touch $@
......@@ -951,7 +951,7 @@ DISTCLEAN_PKG += libdts-$(LIBDTS_VERSION).tar.gz
ifdef SVN
x264:
$(SVN) co svn://svn.videolan.org/x264/trunk/ x264
patch -p 0 < Patches/x264_svn.patch
cd x264 && patch -p 0 < ../Patches/x264_svn.patch
rm x264/x264.c
else
x264-$(X264_VERSION).tar.gz:
......
--- x264.orig/encoder/ratecontrol.c 2005-08-24 21:46:21.000000000 +0200
+++ x264/encoder/ratecontrol.c 2005-08-24 21:45:53.000000000 +0200
@@ -37,7 +37,7 @@
#include "common/macroblock.h"
#include "ratecontrol.h"
-#if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD)
+#if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_MACOSX)
Index: encoder/ratecontrol.c
===================================================================
--- encoder/ratecontrol.c (revision 291)
+++ encoder/ratecontrol.c (working copy)
@@ -40,7 +40,7 @@
#if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD)
#define exp2f(x) powf( 2, (x) )
#endif
#if defined(_MSC_VER) || defined(SYS_SunOS)
--- x264.orig/Makefile 2005-08-24 21:44:32.000000000 +0200
+++ x264/Makefile 2005-08-24 21:44:11.000000000 +0200
-#if defined(_MSC_VER) || defined(SYS_SunOS)
+#if defined(_MSC_VER) || defined(SYS_SunOS) || defined(SYS_MACOSX)
#define exp2f(x) pow( 2, (x) )
#define sqrtf sqrt
#endif
Index: Makefile
===================================================================
--- Makefile (revision 291)
+++ Makefile (working copy)
@@ -53,7 +53,7 @@
OBJS = $(SRCS:%.c=%.o)
DEP = depend
......
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