diff options
| author | lioux <lioux@FreeBSD.org> | 2006-09-25 08:47:40 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2006-09-25 08:47:40 +0800 |
| commit | ddfe3a4e261b8df4bb8e30b240eca919fd324d8e (patch) | |
| tree | f9892d11fb9fc85e7f8a60daee4ed441d9009d02 /multimedia | |
| parent | 0eb2c3b93812c2a0e15ea48c81f76eeae296b41b (diff) | |
| download | freebsd-ports-gnome-ddfe3a4e261b8df4bb8e30b240eca919fd324d8e.tar.gz freebsd-ports-gnome-ddfe3a4e261b8df4bb8e30b240eca919fd324d8e.tar.zst freebsd-ports-gnome-ddfe3a4e261b8df4bb8e30b240eca919fd324d8e.zip | |
Fix build on 4.x: fix devel/sdl header include
PR: 102431
Submitted by: Shaun Amott <shaun@FreeBSD.org>
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg-devel/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c | 11 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/patch-libavformat_movenc.c | 13 |
3 files changed, 17 insertions, 12 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index 809e9e93b980..00dc31fabf18 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -54,7 +54,7 @@ FFMPEG_LDFLAGS= \ -fPIE PLIST_SUB= SHLIB_VERSION=${SHLIB_VERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NO_LATEST_LINK= yes CONFLICTS= ffmpeg-[0-9]*-* @@ -545,6 +545,9 @@ post-patch: @${REINPLACE_CMD} -E \ -e 's|sdl-config|${SDL_CONFIG}|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + @${FIND} ${WRKSRC} -type f | \ + ${XARGS} -n 10 ${REINPLACE_CMD} -E \ + -e 's|#include <SDL|#include <SDL11/SDL|' .endif .ifndef(WITHOUT_POSTPROCESS) @${LN} -sf libpostproc.so \ diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c b/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c index fed127c13b4e..e69de29bb2d1 100644 --- a/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c +++ b/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c @@ -1,11 +0,0 @@ ---- libavcodec/x264.c.orig Thu Aug 10 06:10:59 2006 -+++ libavcodec/x264.c Thu Aug 10 06:11:24 2006 -@@ -148,7 +148,7 @@ - - // if neither crf nor cqp modes are selected we have to enable the RC - // we do it this way because we cannot check if the bitrate has been set -- if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.b_cbr = 1; -+ if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.i_rc_method = 1; - - x4->params.i_bframe = avctx->max_b_frames; - x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; diff --git a/multimedia/ffmpeg-devel/files/patch-libavformat_movenc.c b/multimedia/ffmpeg-devel/files/patch-libavformat_movenc.c new file mode 100644 index 000000000000..c814b06d11f4 --- /dev/null +++ b/multimedia/ffmpeg-devel/files/patch-libavformat_movenc.c @@ -0,0 +1,13 @@ +--- libavformat/movenc.c.orig Wed Mar 22 16:49:05 2006 ++++ libavformat/movenc.c Wed Aug 23 12:37:33 2006 +@@ -22,6 +22,10 @@ + #include "avio.h" + #include "mov.h" + ++#ifndef UINT32_MAX ++#define UINT32_MAX 0xffffffffU ++#endif ++ + #undef NDEBUG + #include <assert.h> + |