diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2005-05-12 01:53:28 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2005-05-12 01:53:28 +0000 |
| commit | 29de4a86b3e55c2196920eb221b70a908fb62526 (patch) | |
| tree | 89152a67233e093c4edc8b93158324631a2d5d7a /multimedia | |
| parent | - Make FPECTL support optional and turn it off by default because (diff) | |
- Use SCHAR_MAX [1]
- Only s/llrintf/rintf/ on 4.x and early 5.x
Requested by: gavl author [1]
Notes
Notes:
svn path=/head/; revision=135089
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gavl/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/gavl/files/gavl-c-_cmix_c.c-patch (renamed from multimedia/gavl/files/patch-gavl-c-_cmix_c.c) | 4 | ||||
| -rw-r--r-- | multimedia/gavl/files/gavl-mix.c-patch (renamed from multimedia/gavl/files/patch-gavl-mix.c) | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile index 66742c5a1d81..974dd51d7427 100644 --- a/multimedia/gavl/Makefile +++ b/multimedia/gavl/Makefile @@ -29,6 +29,11 @@ PORTDOCS= README .include <bsd.port.pre.mk> +.if ${OSVERSION} < 504000 +EXTRA_PATCHES= ${PATCHDIR}/gavl-mix.c-patch \ + ${PATCHDIR}/gavl-c-_cmix_c.c-patch +.endif + pre-everything:: .if !defined(WITH_OPTIMIZED_CFLAGS) @${ECHO_MSG} "===>" @@ -39,8 +44,10 @@ pre-everything:: post-patch: # No llrintf in freebsd (yet) +.if ${OSVERSION} < 504000 @${REINPLACE_CMD} -e 's|llrintf|rintf|g' \ ${WRKSRC}/gavl/c/*.* +.endif .if !defined(WITH_OPTIMIZED_CFLAGS) @${REINPLACE_CMD} -e \ 's|-fomit-frame-pointer -funroll-all-loops -falign-functions=2 -falign-loops=2 -falign-jumps=2||; \ diff --git a/multimedia/gavl/files/patch-gavl-c-_cmix_c.c b/multimedia/gavl/files/gavl-c-_cmix_c.c-patch index 6fc99d31a873..6350aca75be2 100644 --- a/multimedia/gavl/files/patch-gavl-c-_cmix_c.c +++ b/multimedia/gavl/files/gavl-c-_cmix_c.c-patch @@ -4,10 +4,10 @@ +#include <machine/limits.h> + +#ifndef INT8_MAX -+#define INT8_MAX INT_MAX ++#define INT8_MAX SCHAR_MAX +#endif +#ifndef INT8_MIN -+#define INT8_MIN INT_MIN ++#define INT8_MIN SCHAR_MIN +#endif +#ifndef INT16_MAX +#define INT16_MAX SHRT_MAX diff --git a/multimedia/gavl/files/patch-gavl-mix.c b/multimedia/gavl/files/gavl-mix.c-patch index b314a8b606ab..9f624f7698e4 100644 --- a/multimedia/gavl/files/patch-gavl-mix.c +++ b/multimedia/gavl/files/gavl-mix.c-patch @@ -7,7 +7,7 @@ +#include <machine/limits.h> + +#ifndef INT8_MAX -+#define INT8_MAX INT_MAX ++#define INT8_MAX SCHAR_MAX +#endif +#ifndef INT16_MAX +#define INT16_MAX SHRT_MAX |