diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2006-05-11 12:12:23 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2006-05-11 12:12:23 +0000 |
| commit | b05523340ef4fdaa677f77e5ff6a0ce1f96ecea4 (patch) | |
| tree | 98339226ddf66f545417f48be059edda8f3814c8 /multimedia | |
| parent | - Update to 2.14.4 (diff) | |
- Fix build on 4.x
PR: 97131
Submitted by: Sven Berkvens-Matthijsse
Notes
Notes:
svn path=/head/; revision=162076
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/x264-devel/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/x264-devel/files/patch-encoder_ratecontrol.c | 13 | ||||
| -rw-r--r-- | multimedia/x264/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/x264/files/patch-encoder_ratecontrol.c | 13 |
4 files changed, 30 insertions, 0 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index 8eb875e54389..e510563b6d62 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -51,6 +51,8 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm MAKE_ENV+= ARCH_X86_64="1" .endif +MAKE_ARGS+= ARCH=${ARCH} + .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif diff --git a/multimedia/x264-devel/files/patch-encoder_ratecontrol.c b/multimedia/x264-devel/files/patch-encoder_ratecontrol.c new file mode 100644 index 000000000000..7e10b7b28297 --- /dev/null +++ b/multimedia/x264-devel/files/patch-encoder_ratecontrol.c @@ -0,0 +1,13 @@ +--- encoder/ratecontrol.c.orig Thu May 11 13:35:36 2006 ++++ encoder/ratecontrol.c Thu May 11 13:36:57 2006 +@@ -38,6 +38,9 @@ + #if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD) + #define exp2f(x) powf( 2, (x) ) + #endif ++#if defined(__FreeBSD__) && (__FreeBSD__ < 5) ++#define isfinite(val) (!isnan((val)) && !isinf((val))) ++#endif + #if defined(SYS_MACOSX) + #define exp2f(x) (float)pow( 2, (x) ) + #define sqrtf sqrt + diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index 8eb875e54389..e510563b6d62 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -51,6 +51,8 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm MAKE_ENV+= ARCH_X86_64="1" .endif +MAKE_ARGS+= ARCH=${ARCH} + .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif diff --git a/multimedia/x264/files/patch-encoder_ratecontrol.c b/multimedia/x264/files/patch-encoder_ratecontrol.c new file mode 100644 index 000000000000..7e10b7b28297 --- /dev/null +++ b/multimedia/x264/files/patch-encoder_ratecontrol.c @@ -0,0 +1,13 @@ +--- encoder/ratecontrol.c.orig Thu May 11 13:35:36 2006 ++++ encoder/ratecontrol.c Thu May 11 13:36:57 2006 +@@ -38,6 +38,9 @@ + #if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD) + #define exp2f(x) powf( 2, (x) ) + #endif ++#if defined(__FreeBSD__) && (__FreeBSD__ < 5) ++#define isfinite(val) (!isnan((val)) && !isinf((val))) ++#endif + #if defined(SYS_MACOSX) + #define exp2f(x) (float)pow( 2, (x) ) + #define sqrtf sqrt + |