diff options
| author | wg <wg@FreeBSD.org> | 2013-10-28 14:37:33 +0000 |
|---|---|---|
| committer | wg <wg@FreeBSD.org> | 2013-10-28 14:37:33 +0000 |
| commit | 1fb51df6b753a4c88415ffe29aaed2f0631b85ba (patch) | |
| tree | 3f27d55c0d0c2299d7cbe489da0d52c6e2b21fc8 | |
| parent | 30d36a898a5bf9a234ab47bfe68a0e0b197358ac (diff) | |
| download | FreeBSD-ports-1fb51df6b753a4c88415ffe29aaed2f0631b85ba.zip FreeBSD-ports-1fb51df6b753a4c88415ffe29aaed2f0631b85ba.tar.gz | |
multimedia/ffmpeg2theora: fix build with newer ffmpeg
- Add patch to build with ffmpeg 2.0
- Remove useless PTHREAD_CFLAGS from CFLAGS
- Take maintainership
Reported by: marino
| -rw-r--r-- | multimedia/ffmpeg2theora/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg2theora/files/patch-ffmpeg2 | 40 |
2 files changed, 42 insertions, 2 deletions
diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile index 80dc770..ccff915 100644 --- a/multimedia/ffmpeg2theora/Makefile +++ b/multimedia/ffmpeg2theora/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 0.29 CATEGORIES= multimedia MASTER_SITES= http://v2v.cc/~j/ffmpeg2theora/downloads/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= wg@FreeBSD.org COMMENT= Reencode many media file formats to Ogg Theora LICENSE= GPLv3 @@ -19,7 +19,7 @@ USE_BZIP2= yes USES= iconv pkgconfig scons MAKE_ENV= APPEND_CCFLAGS="${CPPFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} PLIST_FILES= bin/ffmpeg2theora man/man1/ffmpeg2theora.1.gz diff --git a/multimedia/ffmpeg2theora/files/patch-ffmpeg2 b/multimedia/ffmpeg2theora/files/patch-ffmpeg2 new file mode 100644 index 0000000..ee3e987 --- /dev/null +++ b/multimedia/ffmpeg2theora/files/patch-ffmpeg2 @@ -0,0 +1,40 @@ +commit d3435a6a83dc656379de9e6523ecf8d565da6ca6 +Author: Jan Gerber <j@xiph.org> +Date: Sun May 26 15:25:42 2013 +0200 + + don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE + +diff --git src/ffmpeg2theora.c.orig src/ffmpeg2theora.c +index cde63b9..8bebf28 100644 +--- src/ffmpeg2theora.c ++++ src/ffmpeg2theora.c +@@ -47,6 +47,9 @@ + #include "ffmpeg2theora.h" + #include "avinfo.h" + ++#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio ++ ++ + #define LENGTH(x) (sizeof(x) / sizeof(*x)) + + enum { +@@ -1069,8 +1072,8 @@ void ff2theora_output(ff2theora this) { + int first = 1; + int audio_eos = 0, video_eos = 0, audio_done = 0, video_done = 0; + int ret; +- int16_t *audio_buf=av_malloc(4*AVCODEC_MAX_AUDIO_FRAME_SIZE); +- int16_t *resampled=av_malloc(4*AVCODEC_MAX_AUDIO_FRAME_SIZE); ++ int16_t *audio_buf=av_malloc(4*MAX_AUDIO_FRAME_SIZE); ++ int16_t *resampled=av_malloc(4*MAX_AUDIO_FRAME_SIZE); + int16_t *audio_p=NULL; + int no_frames; + int no_samples; +@@ -1531,7 +1534,7 @@ void ff2theora_output(ff2theora this) { + while((audio_eos && !audio_done) || avpkt.size > 0 ) { + int samples=0; + int samples_out=0; +- int data_size = 4*AVCODEC_MAX_AUDIO_FRAME_SIZE; ++ int data_size = 4*MAX_AUDIO_FRAME_SIZE; + int bytes_per_sample = av_get_bytes_per_sample(aenc->sample_fmt); + + if (avpkt.size > 0) { |
