Date: Sat, 19 Oct 2013 16:43:33 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330909 - in head: audio/dvda-author audio/musicpd audio/musicpd/files audio/sox audio/sox/files multimedia/bino multimedia/bino/files multimedia/ffmpeg multimedia/ffmpeg/files multimed... Message-ID: <201310191643.r9JGhX35055674@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Sat Oct 19 16:43:32 2013 New Revision: 330909 URL: http://svnweb.freebsd.org/changeset/ports/330909 Log: multimedia/ffmpeg: update to 2.0.1 - Update main ffmpeg port to 2.0.1 - Bump and update dependent ports when necessary (API change) Approved by: portmgr (bapt) Added: head/audio/musicpd/files/patch-ffmpeg2 (contents, props changed) head/audio/sox/files/patch-avcodec54 (contents, props changed) head/audio/sox/files/patch-ffmpeg2 (contents, props changed) head/audio/sox/files/patch-libav9 (contents, props changed) head/multimedia/bino/files/ head/multimedia/bino/files/patch-src-media_object.cpp (contents, props changed) head/multimedia/ffmpeg/files/patch-Makefile (contents, props changed) head/multimedia/ffmpeg/files/patch-doc-Makefile (contents, props changed) head/multimedia/kino/files/patch-libav7 (contents, props changed) head/multimedia/kino/files/patch-libav8 (contents, props changed) head/multimedia/libquicktime/files/ head/multimedia/libquicktime/files/patch-ffmpeg2 (contents, props changed) head/multimedia/libxine/files/patch-src-combined-ffmpeg-Makefile.in.diff (contents, props changed) head/multimedia/transcode/files/patch-ffmpeg0-10 (contents, props changed) head/multimedia/transcode/files/patch-ffmpeg0-11 (contents, props changed) head/multimedia/transcode/files/patch-ffmpeg2 (contents, props changed) head/multimedia/transcode/files/patch-livav-9.patch (contents, props changed) head/multimedia/vdr-plugin-osdpip/files/patch-ffmpeg1 (contents, props changed) head/multimedia/vdr-plugin-osdpip/files/patch-libav9 (contents, props changed) head/net/mediatomb/files/patch-livav7 (contents, props changed) head/net/mediatomb/files/patch-livav9 (contents, props changed) head/net/opal/files/patch-ffmpeg (contents, props changed) Deleted: head/multimedia/ffmpeg/files/patch-doc-protocols.texi head/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c head/multimedia/ffmpeg/files/patch-libavfilter-Makefile head/multimedia/libxine/files/patch-b0df4b6003ad head/multimedia/libxine/files/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c head/multimedia/qmmp/files/ Modified: head/audio/dvda-author/Makefile head/audio/musicpd/Makefile head/audio/sox/Makefile head/audio/sox/distinfo head/audio/sox/files/patch-ffmpeg head/audio/sox/pkg-plist (contents, props changed) head/multimedia/bino/Makefile head/multimedia/bino/distinfo head/multimedia/ffmpeg/Makefile head/multimedia/ffmpeg/distinfo head/multimedia/ffmpeg/files/patch-configure head/multimedia/ffmpeg/files/patch-libavcodec-Makefile head/multimedia/ffmpeg/files/patch-libavdevice-bktr.c head/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c head/multimedia/ffmpeg/files/patch-libavutil-common.h head/multimedia/ffmpeg/pkg-descr head/multimedia/ffmpeg/pkg-plist head/multimedia/kino/Makefile head/multimedia/libquicktime/Makefile head/multimedia/libquicktime/pkg-plist head/multimedia/libxine/Makefile head/multimedia/libxine/distinfo head/multimedia/libxine/pkg-plist head/multimedia/mlt/Makefile head/multimedia/qmmp-plugin-pack/Makefile head/multimedia/qmmp-plugin-pack/distinfo head/multimedia/qmmp/Makefile head/multimedia/qmmp/distinfo head/multimedia/qmmp/pkg-descr head/multimedia/qmmp/pkg-plist head/multimedia/xbmc-addon-pvr/Makefile head/net/opal/Makefile head/x11/xpra/Makefile Modified: head/audio/dvda-author/Makefile ============================================================================== --- head/audio/dvda-author/Makefile Sat Oct 19 16:37:47 2013 (r330908) +++ head/audio/dvda-author/Makefile Sat Oct 19 16:43:32 2013 (r330909) @@ -3,7 +3,7 @@ PORTNAME= dvda-author PORTVERSION= 09.05 -PORTREVISION= 9 +PORTREVISION= 10 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= SF/dvd-audio/${PORTNAME}-core/${PORTNAME}-${PORTVERSION}-core @@ -13,10 +13,10 @@ MAINTAINER= martin.dieringer@gmx.de COMMENT= Author and playback unencrypted and uncompressed Audio-DVDs LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \ - ogg:${PORTSDIR}/audio/libogg \ - sox.1:${PORTSDIR}/audio/sox \ - samplerate.1:${PORTSDIR}/audio/libsamplerate \ - png15:${PORTSDIR}/graphics/png + libogg.so:${PORTSDIR}/audio/libogg \ + libsox.so:${PORTSDIR}/audio/sox \ + libsamplerate.so:${PORTSDIR}/audio/libsamplerate \ + libpng15.so:${PORTSDIR}/graphics/png MAN1= dvda-author.1 Modified: head/audio/musicpd/Makefile ============================================================================== --- head/audio/musicpd/Makefile Sat Oct 19 16:37:47 2013 (r330908) +++ head/audio/musicpd/Makefile Sat Oct 19 16:43:32 2013 (r330909) @@ -148,9 +148,9 @@ LIB_DEPENDS+= zzip.13:${PORTSDIR}/devel/ .endif .if ${PORT_OPTIONS:MFFMPEG} -LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ - avformat:${PORTSDIR}/multimedia/ffmpeg \ - avutil.1:${PORTSDIR}/multimedia/ffmpeg +LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ + libavformat.so:${PORTSDIR}/multimedia/ffmpeg \ + libavutil.so:${PORTSDIR}/multimedia/ffmpeg .else CONFIGURE_ARGS+=--disable-ffmpeg .endif Added: head/audio/musicpd/files/patch-ffmpeg2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/musicpd/files/patch-ffmpeg2 Sat Oct 19 16:43:32 2013 (r330909) @@ -0,0 +1,19 @@ +Fix build with FFmpeg 2.0. + +Upstream status: Better patch sent and merged upstream. + +Index: src/decoder/ffmpeg_decoder_plugin.c +=================================================================== +--- src/decoder/ffmpeg_decoder_plugin.c.orig ++++ src/decoder/ffmpeg_decoder_plugin.c +@@ -47,6 +47,10 @@ + #undef G_LOG_DOMAIN + #define G_LOG_DOMAIN "ffmpeg" + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio ++#endif ++ + static GLogLevelFlags + level_ffmpeg_to_glib(int level) + { Modified: head/audio/sox/Makefile ============================================================================== --- head/audio/sox/Makefile Sat Oct 19 16:37:47 2013 (r330908) +++ head/audio/sox/Makefile Sat Oct 19 16:43:32 2013 (r330909) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sox -PORTVERSION= 14.3.2 -PORTREVISION= 6 +PORTVERSION= 14.4.1 CATEGORIES= audio MASTER_SITES= SF @@ -15,15 +14,10 @@ LICENSE_COMB= dual CONFLICTS= play-[0-9]* -MAN1= sox.1 soxi.1 -MAN3= libsox.3 -MAN7= soxformat.7 -MLINKS= sox.1 play.1 sox.1 rec.1 sox.1 soxeffect.7 GNU_CONFIGURE= yes USES= pkgconfig -NO_STAGE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libltdl +USE_AUTOTOOLS= aclocal autoconf automake libltdl OPTIONS_DEFINE= ALSA AO AMRNB AMRWB FFMPEG FLAC GSM ID3TAG LADSPA LAME \ MAD PNG SNDFILE VORBIS WAVPACK @@ -76,7 +70,7 @@ CONFIGURE_ARGS+= --without-amrwb .if ${PORT_OPTIONS:MFFMPEG} CONFIGURE_ARGS+= --with-ffmpeg -LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg +LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg .else CONFIGURE_ARGS+= --without-ffmpeg .endif @@ -156,4 +150,9 @@ LIB_DEPENDS+= wavpack.2:${PORTSDIR}/aud CONFIGURE_ARGS+= --without-wavpack .endif +post-patch: + @${REINPLACE_CMD} -e 's/ CODEC_ID/ AV_CODEC_ID/g' \ + -e 's/ CodecID/ AVCodecID/g' \ + ${WRKSRC}/src/ffmpeg.c + .include <bsd.port.mk> Modified: head/audio/sox/distinfo ============================================================================== --- head/audio/sox/distinfo Sat Oct 19 16:37:47 2013 (r330908) +++ head/audio/sox/distinfo Sat Oct 19 16:43:32 2013 (r330909) @@ -1,2 +1,2 @@ -SHA256 (sox-14.3.2.tar.gz) = 0668cc087c346f7c4084ae294c676a11ddefb462974bc3f67be30d789c850e8f -SIZE (sox-14.3.2.tar.gz) = 1110175 +SHA256 (sox-14.4.1.tar.gz) = 9a8c2c6fe51e608da346a157e111508a957af9e3ecf3de26781d36e9a67fa89b +SIZE (sox-14.4.1.tar.gz) = 1111653 Added: head/audio/sox/files/patch-avcodec54 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/sox/files/patch-avcodec54 Sat Oct 19 16:43:32 2013 (r330909) @@ -0,0 +1,100 @@ +Index: m4/ffmpeg.m4 +=================================================================== +--- m4/ffmpeg.m4.orig ++++ m4/ffmpeg.m4 +@@ -49,7 +49,7 @@ then + LIBS="$LIBS $FFMPEG_LIBS" + have_ffmpeg="no" + AC_CHECK_HEADERS([libavformat/avformat.h ffmpeg/avformat.h], +- [AC_CHECK_LIB(avformat, av_open_input_file, ++ [AC_CHECK_LIB(avformat, avformat_open_input, + [AC_CHECK_HEADERS([libavcodec/avcodec.h ffmpeg/avcodec.h], + [AC_CHECK_LIB(avcodec, avcodec_decode_audio3, have_ffmpeg=yes)])]) + break]) +Index: src/ffmpeg.c +=================================================================== +--- src/ffmpeg.c.orig ++++ src/ffmpeg.c +@@ -92,8 +92,10 @@ static int stream_component_open(priv_t + enc->workaround_bugs = 1; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + enc->error_resilience = 1; +-#else ++#elif LIBAVCODEC_VERSION_INT < ((54<<16)+(0<<8)+0) + enc->error_recognition = 1; ++#else ++ ic->error_recognition = 1; + #endif + + if (!codec || avcodec_open(enc, codec) < 0) +@@ -157,7 +159,7 @@ static int audio_decode_frame(priv_t * f + static int startread(sox_format_t * ft) + { + priv_t * ffmpeg = (priv_t *)ft->priv; +- AVFormatParameters params; ++ AVDictionary *params; + int ret; + int i; + +@@ -172,7 +174,7 @@ static int startread(sox_format_t * ft) + + /* Open file and get format */ + memset(¶ms, 0, sizeof(params)); +- if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0, ¶ms)) < 0) { ++ if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL, ¶ms)) < 0) { + lsx_fail("ffmpeg cannot open file for reading: %s (code %d)", ft->filename, ret); + return SOX_EOF; + } +@@ -231,7 +233,7 @@ static size_t read_samples(sox_format_t + /* If input buffer empty, read more data */ + if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) { + if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 && +- (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb))) ++ (ret == AVERROR_EOF || ( ffmpeg->ctxt->pb && ffmpeg->ctxt->pb->error))) + break; + ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE); + ffmpeg->audio_buf_index = 0; +@@ -373,13 +375,6 @@ static int startwrite(sox_format_t * ft) + return SOX_EOF; + } + +- /* set the output parameters (must be done even if no +- parameters). */ +- if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) { +- lsx_fail("ffmpeg invalid output format parameters"); +- return SOX_EOF; +- } +- + /* Next line for debugging */ + /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */ + +@@ -391,14 +386,14 @@ static int startwrite(sox_format_t * ft) + + /* open the output file, if needed */ + if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) { +- if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) { ++ if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) { + lsx_fail("ffmpeg could not open `%s'", ft->filename); + return SOX_EOF; + } + } + + /* write the stream header, if any */ +- av_write_header(ffmpeg->ctxt); ++ avformat_write_header(ffmpeg->ctxt, NULL); + + return SOX_SUCCESS; + } +@@ -475,11 +470,7 @@ static int stopwrite(sox_format_t * ft) + + if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) { + /* close the output file */ +-#if (LIBAVFORMAT_VERSION_INT < 0x340000) +- url_fclose(&ffmpeg->ctxt->pb); +-#else +- url_fclose(ffmpeg->ctxt->pb); +-#endif ++ avio_close(ffmpeg->ctxt->pb); + } + + /* Free the output context */ Modified: head/audio/sox/files/patch-ffmpeg ============================================================================== --- head/audio/sox/files/patch-ffmpeg Sat Oct 19 16:37:47 2013 (r330908) +++ head/audio/sox/files/patch-ffmpeg Sat Oct 19 16:43:32 2013 (r330909) @@ -1,55 +1,11 @@ -*** diff - -Update to use the new ffmpeg library API, but still work with -the old one. - ---- src/ffmpeg.c 2011-06-07 00:29:34.000000000 -0500 -+++ src/ffmpeg.c 2011-06-07 00:34:12.830996927 -0500 -@@ -50,6 +50,11 @@ - #include <ctype.h> - #include "ffmpeg.h" - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 64, 0) -+#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO -+#define AV_PKT_FLAG_KEY PKT_FLAG_KEY -+#endif -+ - /* Private data for ffmpeg files */ - typedef struct { - int audio_index; -@@ -91,7 +96,7 @@ static int stream_component_open(priv_t - - if (!codec || avcodec_open(enc, codec) < 0) - return -1; -- if (enc->codec_type != CODEC_TYPE_AUDIO) { -+ if (enc->codec_type != AVMEDIA_TYPE_AUDIO) { - lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type); - return -1; - } -@@ -182,7 +187,7 @@ static int startread(sox_format_t * ft) - /* Find audio stream (FIXME: allow different stream to be selected) */ - for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) { - AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec; -- if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) { -+ if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) { - ffmpeg->audio_index = i; - break; - } -@@ -273,7 +278,7 @@ static AVStream *add_audio_stream(sox_fo - - c = st->codec; - c->codec_id = codec_id; -- c->codec_type = CODEC_TYPE_AUDIO; -+ c->codec_type = AVMEDIA_TYPE_AUDIO; - - /* put sample parameters */ - c->bit_rate = 256000; /* FIXME: allow specification */ -@@ -423,7 +428,7 @@ static size_t write_samples(sox_format_t - av_init_packet(&pkt); - pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples); - pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base); -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - pkt.stream_index = ffmpeg->audio_st->index; - pkt.data = ffmpeg->audio_buf_aligned; +--- src/ffmpeg.h.orig ++++ src/ffmpeg.h +@@ -27,6 +27,8 @@ + #include <ffmpeg/avformat.h> + #endif ++#include <libavutil/mathematics.h> ++ + #if defined __SUNPRO_C + #pragma enable_warn + #elif defined _MSC_VER Added: head/audio/sox/files/patch-ffmpeg2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/sox/files/patch-ffmpeg2 Sat Oct 19 16:43:32 2013 (r330909) @@ -0,0 +1,16 @@ +Index: src/ffmpeg.c +=================================================================== +--- src/ffmpeg.c.orig ++++ src/ffmpeg.c +@@ -57,6 +57,11 @@ + #define PKT_FLAG_KEY AV_PKT_FLAG_KEY + #endif + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE (192000 * 4) ++#endif ++ ++ + /* Private data for ffmpeg files */ + typedef struct { + int audio_index; Added: head/audio/sox/files/patch-libav9 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/sox/files/patch-libav9 Sat Oct 19 16:43:32 2013 (r330909) @@ -0,0 +1,39 @@ +diff -burN src/ffmpeg.c sox-14.4.0/src/ffmpeg.c +--- src/ffmpeg.c.orig 2012-11-25 21:59:45.990825656 +0100 ++++ src/ffmpeg.c 2012-11-25 22:07:06.436809624 +0100 +@@ -98,7 +98,7 @@ + ic->error_recognition = 1; + #endif + +- if (!codec || avcodec_open(enc, codec) < 0) ++ if (!codec || avcodec_open2(enc, codec, NULL) < 0) + return -1; + if (enc->codec_type != AVMEDIA_TYPE_AUDIO) { + lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type); +@@ -180,7 +180,7 @@ + } + + /* Get CODEC parameters */ +- if ((ret = av_find_stream_info(ffmpeg->ctxt)) < 0) { ++ if ((ret = avformat_find_stream_info(ffmpeg->ctxt, NULL)) < 0) { + lsx_fail("ffmpeg could not find CODEC parameters for %s", ft->filename); + return SOX_EOF; + } +@@ -274,7 +274,7 @@ + AVCodecContext *c; + AVStream *st; + +- st = av_new_stream(oc, 1); ++ st = avformat_new_stream(oc, NULL); + if (!st) { + lsx_fail("ffmpeg could not alloc stream"); + return NULL; +@@ -308,7 +308,7 @@ + } + + /* open it */ +- if (avcodec_open(c, codec) < 0) { ++ if (avcodec_open2(c, codec, NULL) < 0) { + lsx_fail("ffmpeg could not open CODEC"); + return SOX_EOF; + } Modified: head/audio/sox/pkg-plist ============================================================================== --- head/audio/sox/pkg-plist Sat Oct 19 16:37:47 2013 (r330908) +++ head/audio/sox/pkg-plist Sat Oct 19 16:43:32 2013 (r330909) @@ -1,14 +1,17 @@ -@comment $FreeBSD$ bin/play bin/rec bin/sox bin/soxi include/sox.h -include/soxstdint.h lib/libsox.a lib/libsox.la lib/libsox.so -lib/libsox.so.1 -@exec mkdir -p %D/lib/sox -@dirrm lib/sox +lib/libsox.so.2 +man/man1/play.1.gz +man/man1/rec.1.gz +man/man1/sox.1.gz +man/man1/soxi.1.gz +man/man3/libsox.3.gz +man/man7/soxeffect.7.gz +man/man7/soxformat.7.gz libdata/pkgconfig/sox.pc Modified: head/multimedia/bino/Makefile ============================================================================== --- head/multimedia/bino/Makefile Sat Oct 19 16:37:47 2013 (r330908) +++ head/multimedia/bino/Makefile Sat Oct 19 16:43:32 2013 (r330909) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= bino -PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTVERSION= 1.4.2 CATEGORIES= multimedia MASTER_SITES= http://download.savannah.nongnu.org/releases/bino/ http://levsha.me/ports/distfiles/ @@ -13,20 +12,19 @@ COMMENT= 3D video player with multi-disp LICENSE= GPLv3 FETCH_ARGS= -Fpr -USES= pkgconfig +USES= gmake pkgconfig USE_XZ= yes GNU_CONFIGURE= yes -USE_GMAKE= yes INSTALLS_ICONS= yes USE_QT4= moc_build opengl rcc_build # no port fow equalizer now, lirc detecting not working CONFIGURE_ARGS+= --without-equalizer --without-liblircclient --docdir=${DOCSDIR} -LIB_DEPENDS+= ass.5:${PORTSDIR}/multimedia/libass \ - avformat.1:${PORTSDIR}/multimedia/ffmpeg \ - GLEW.1:${PORTSDIR}/graphics/glew \ - openal.1:${PORTSDIR}/audio/openal-soft +LIB_DEPENDS+= libass.so:${PORTSDIR}/multimedia/libass \ + libavformat.so:${PORTSDIR}/multimedia/ffmpeg \ + libGLEW.so:${PORTSDIR}/graphics/glew \ + libopenal.so:${PORTSDIR}/audio/openal-soft MAN1= bino.1 INFO= bino Modified: head/multimedia/bino/distinfo ============================================================================== --- head/multimedia/bino/distinfo Sat Oct 19 16:37:47 2013 (r330908) +++ head/multimedia/bino/distinfo Sat Oct 19 16:43:32 2013 (r330909) @@ -1,2 +1,2 @@ -SHA256 (bino-1.2.1.tar.xz) = 2573ba0c0f8ae1f2cb8f7ecb5ac311146ac2759b52087bf6c8580942054458d0 -SIZE (bino-1.2.1.tar.xz) = 714608 +SHA256 (bino-1.4.2.tar.xz) = 6cd88eb16ffee30a3cbb9b5d313feb61b91068387ae846ff96d9e99dcb5c88b6 +SIZE (bino-1.4.2.tar.xz) = 794272 Added: head/multimedia/bino/files/patch-src-media_object.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/bino/files/patch-src-media_object.cpp Sat Oct 19 16:43:32 2013 (r330909) @@ -0,0 +1,13 @@ +--- src/media_object.cpp.orig 2013-10-07 13:20:40.603922682 -0300 ++++ src/media_object.cpp 2013-10-07 13:21:13.558920266 -0300 +@@ -56,6 +56,10 @@ + + #include "media_object.h" + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++#endif ++ + + // The read thread. + // This thread reads packets from the AVFormatContext and stores them in the Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Sat Oct 19 16:37:47 2013 (r330908) +++ head/multimedia/ffmpeg/Makefile Sat Oct 19 16:43:32 2013 (r330909) @@ -1,11 +1,8 @@ -# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> +# Created by: Martin Matuska <mm@FreeBSD.org> # $FreeBSD$ PORTNAME= ffmpeg -PORTVERSION= 0.7.15 -PORTREVISION= 2 -PORTEPOCH= 1 -PORTREVISION= 2 +PORTVERSION= 2.0.1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -14,66 +11,207 @@ COMMENT= Realtime audio/video encoder/co LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 -LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1 BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \ - ${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html - -CONFLICTS= libav-[0-9]* -PORTSCOUT= limit:^0\..* + texi2html:${PORTSDIR}/textproc/texi2html HAS_CONFIGURE= yes CONFIGURE_LOG= config.err -USES= gmake perl5 pkgconfig +USES= gmake pkgconfig perl5 +USE_PERL5= build USE_BZIP2= yes WANT_SDL= yes -USE_PERL5= build - -OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \ - FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \ - OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \ - VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID - -OPTIONS_DEFAULT= FFSERVER FREETYPE FREI0R OPENCV SCHROEDINGER THEORA \ - VORBIS VPX X264 XVID +OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \ + FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM ICONV \ + LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG OPENSSL \ + OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \ + THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \ + X11GRAB X264 XVID + +OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \ + OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID + +ASS_DESC= Subtitles rendering via libass +CDIO_DESC= Audio CD grabbing with libcdio +FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK FFSERVER_DESC= Build and install ffserver +LIBV4L_DESC= Video for Linux support +OPUS_DESC= Opus decoding with libopus X11GRAB_DESC= Enable x11 grabbing -COMPAT_HEADERS=libavcodec/avcodec.h \ - libavcodec/opt.h \ - libavcodec/vdpau.h \ - libavcodec/xvmc.h \ - libavdevice/avdevice.h \ - libavfilter/avfilter.h \ - libavformat/avformat.h \ - libavformat/avio.h \ - libavutil/adler32.h \ - libavutil/avstring.h \ - libavutil/avutil.h \ - libavutil/base64.h \ - libavutil/common.h \ - libavutil/crc.h \ - libavutil/fifo.h \ - libavutil/intfloat_readwrite.h \ - libavutil/log.h \ - libavutil/lzo.h \ - libavutil/mathematics.h \ - libavutil/md5.h \ - libavutil/mem.h \ - libavutil/pixfmt.h \ - libavutil/rational.h \ - libavutil/sha1.h \ - libpostproc/postprocess.h \ - libswscale/swscale.h +# aacplus +AACPLUS_LIB_DEPENDS= libaacplus.so:${PORTSDIR}/audio/libaacplus +AACPLUS_CONFIGURE_ENABLE= libaacplus -.include <bsd.port.options.mk> +# alsa +ALSA_CONFIGURE_OFF= --disable-indev=alsa \ + --disable-outdev=alsa +ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib + +# Opencore AMR NB +AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr +AMR_NB_CONFIGURE_ENABLE= libopencore-amrnb + +# Opencore AMR WB +AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr +AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb + +# ass +ASS_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass +ASS_CONFIGURE_ENABLE= libass + +# cdio +CDIO_LIB_DEPENDS= libcdio.so:${PORTSDIR}/sysutils/libcdio +CDIO_CONFIGURE_ENABLE= libcdio + +# celt +CELT_LIB_DEPENDS= libcelt0.so:${PORTSDIR}/audio/celt +CELT_CONFIGURE_ENABLE= libcelt + +# faac +FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac +FAAC_CONFIGURE_ENABLE= libfaac + +# fdk_aac +FDK_AAC_LIB_DEPENDS= libfdk-aac.so:${PORTSDIR}/audio/fdk-aac +FDK_AAC_CONFIGURE_ENABLE= libfdk-aac + +# ffserver +FFSERVER_CONFIGURE_ENABLE= ffserver + +# fontconfig +FONTCONFIG_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig +FONTCONFIG_CONFIGURE_ENABLE= fontconfig + +# freetype +FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 +FREETYPE_CONFIGURE_ENABLE= libfreetype + +# frei0r +FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r +FREI0R_CONFIGURE_ENABLE= frei0r + +# gnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls +GNUTLS_CONFIGURE_ENABLE= gnutls + +# gsm +GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm +GSM_CONFIGURE_ENABLE= libgsm + +# iconv +ICONV_USES= iconv +ICONV_CONFIGURE_ENABLE= iconv + +# lame +LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame +LAME_CONFIGURE_ENABLE= libmp3lame + +# libbluray +LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray +LIBBLURAY_CONFIGURE_ENABLE= libbluray + +# libv4l +LIBV4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l +LIBV4L_CONFIGURE_ENABLE= libv4l2 + +# modplug +MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug +MODPLUG_CONFIGURE_ENABLE= libmodplug + +# OpenAL +OPENAL_LIB_DEPENDS= libopenal.so:${PORTSDIR}/audio/openal-soft +OPENAL_CONFIGURE_ENABLE= openal + +# opencv +OPENCV_LIB_DEPENDS= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core +OPENCV_CONFIGURE_ENABLE= libopencv + +# openjpeg +OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg +OPENJPEG_CONFIGURE_ENABLE= libopenjpeg + +# opus +OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus +OPUS_CONFIGURE_ENABLE= libopus + +# pulseaudio +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_CONFIGURE_ENABLE= libpulse # rtmp -.if ${PORT_OPTIONS:MRTMP} +RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/rtmpdump +RTMP_CONFIGURE_ENABLE= librtmp + +# schroedinger +SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger +SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger + +# speex +SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex +SPEEX_CONFIGURE_ENABLE= libspeex + +# theora +THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora +THEORA_CONFIGURE_ENABLE= libtheora + +# vaapi +VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva +VAAPI_CONFIGURE_ENABLE= vaapi + +# vdpau +VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau +VDPAU_CONFIGURE_ENABLE= vdpau + +# vo-aacenc +VO_AACENC_LIB_DEPENDS= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc +VO_AACENC_CONFIGURE_ENABLE= libvo-aacenc + +# vo-amrwbenc +VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc +VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc + +# vorbis +VORBIS_LIB_DEPENDS= libvorbisenc.so:${PORTSDIR}/audio/libvorbis +VORBIS_CONFIGURE_ENABLE= libvorbis + +# vp8 +VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx +VPX_CONFIGURE_ENABLE= libvpx + +# x264 +X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/x264 +X264_CONFIGURE_ENABLE= libx264 + +# xvid +XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid +XVID_CONFIGURE_ENABLE= libxvid + +FFPROGS= ffmpeg ffprobe +INSTALL_TARGET= install-progs install-data install-libs install-headers +#FFMPEG_SUFFIX= 2 +#PLIST_SUB+= SUFF="${FFMPEG_SUFFIX}" + +#USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX} +DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} + +.include <bsd.port.options.mk> + +# ssl +.if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS) USE_OPENSSL= yes +FFMPEG_NONFREE= yes +.endif + +.if ${PORT_OPTIONS:MAACPLUS} || ${PORT_OPTIONS:MFAAC} || ${PORT_OPTIONS:MFDK_AAC} +FFMPEG_NONFREE= yes +.endif + +.if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB} || \ +${PORT_OPTIONS:MVO_AACENC} || ${PORT_OPTIONS:MVO_AMRWBENC} +FFMPEG_LICENSE_GPL3= yes .endif # x11grab @@ -84,29 +222,32 @@ CONFIGURE_ARGS+= --enable-x11grab .include <bsd.port.pre.mk> +DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --mandir="${PREFIX}/man" \ + --datadir="${DATADIR}" \ --enable-shared \ --enable-gpl \ --enable-postproc \ --enable-avfilter \ + --enable-avresample \ --enable-pthreads \ --enable-memalign-hack \ - --enable-runtime-cpudetect \ + --disable-libstagefright-h264 \ + --disable-libutvideo \ + --disable-libsoxr \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \ --extra-libs="${PTHREAD_LIBS}" -SHLIB_VER= 1 -PLIST_SUB= SHLIB_VER=${SHLIB_VER} -USE_LDCONFIG= yes -DOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE +DOC_FILES= Changelog CREDITS INSTALL LICENSE MAINTAINERS README # under doc subdirectory -DOC_DOCFILES= APIchanges RELEASE_NOTES TODO *.txt *.html +DOC_DOCFILES= APIchanges RELEASE_NOTES *.txt *.html PORTDOCS= * .if ${PORT_OPTIONS:MDEBUG} @@ -134,7 +275,7 @@ _NO_BUILTIN_VECTOR= yes # builtin vector, requires mmx and sse .if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR) -CFLAGS+= -msse +FFMPEG_CFLAGS+= -msse .endif # optimizations @@ -142,232 +283,33 @@ CFLAGS+= -msse CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer .endif -#aacplus -.if ${PORT_OPTIONS:MAACPLUS} -FFMPEG_NONFREE= yes -LIB_DEPENDS+= aacplus.2:${PORTSDIR}/audio/libaacplus -CONFIGURE_ARGS+= --enable-libaacplus -.else -CONFIGURE_ARGS+= --disable-libaacplus -.endif - -#alsa -.if ${PORT_OPTIONS:MALSA} -LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib -.else -CONFIGURE_ARGS+= --disable-indev=alsa \ - --disable-outdev=alsa -.endif - -# Opencore AMR NB -.if ${PORT_OPTIONS:MAMR_NB} -FFMPEG_LICENSE_GPL3= yes -LIB_DEPENDS+= opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr -CONFIGURE_ARGS+= --enable-libopencore-amrnb -.else -CONFIGURE_ARGS+= --disable-libopencore-amrnb -.endif - -# Opencore AMR WB -.if ${PORT_OPTIONS:MAMR_WB} -FFMPEG_LICENSE_GPL3= yes -LIB_DEPENDS+= opencore-amrwb.0:${PORTSDIR}/audio/opencore-amr -CONFIGURE_ARGS+= --enable-libopencore-amrwb -.else -CONFIGURE_ARGS+= --disable-libopencore-amrwb -.endif - -# celt -.if ${PORT_OPTIONS:MCELT} -LIB_DEPENDS+= celt0.2:${PORTSDIR}/audio/celt -CONFIGURE_ARGS+= --enable-libcelt -.else -CONFIGURE_ARGS+= --disable-libcelt -.endif - -# dirac -.if ${PORT_OPTIONS:MDIRAC} -LIB_DEPENDS+= dirac_encoder.1:${PORTSDIR}/multimedia/dirac -CONFIGURE_ARGS+= --enable-libdirac -.else -CONFIGURE_ARGS+= --disable-libdirac -.endif - -# faac -.if ${PORT_OPTIONS:MFAAC} -FFMPEG_NONFREE= yes -LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac -CONFIGURE_ARGS+= --enable-libfaac -.else -CONFIGURE_ARGS+= --disable-libfaac -.endif - # ffserver .if ${PORT_OPTIONS:MFFSERVER} PLIST_SUB+= FFSERVER="" -.else -PLIST_SUB+= FFSERVER="@comment " -CONFIGURE_ARGS+= --disable-ffserver -.endif - -# freetype -.if ${PORT_OPTIONS:MFREETYPE} -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 -CONFIGURE_ARGS+= --enable-libfreetype -.else -CONFIGURE_ARGS+= --disable-libfreetype -.endif - -# frei0r -.if ${PORT_OPTIONS:MFREI0R} -BUILD_DEPENDS+= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r -CONFIGURE_ARGS+= --enable-frei0r -.else -CONFIGURE_ARGS+= --disable-frei0r -.endif - -# gsm -.if ${PORT_OPTIONS:MGSM} -LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm -CONFIGURE_ARGS+= --enable-libgsm -.else -CONFIGURE_ARGS+= --disable-libgsm -.endif - -# mp3 -.if ${PORT_OPTIONS:MLAME} -LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame -CONFIGURE_ARGS+= --enable-libmp3lame -.else -CONFIGURE_ARGS+= --disable-libmp3lame -.endif - -# opencv -.if ${PORT_OPTIONS:MOPENCV} -LIB_DEPENDS+= opencv_imgproc.2:${PORTSDIR}/graphics/opencv-core -CONFIGURE_ARGS+= --enable-libopencv -.else -CONFIGURE_ARGS+= --disable-libopencv -.endif - -# openjpeg -.if ${PORT_OPTIONS:MOPENJPEG} -LIB_DEPENDS+= openjpeg.2:${PORTSDIR}/graphics/openjpeg -CONFIGURE_ARGS+= --enable-libopenjpeg -.else -CONFIGURE_ARGS+= --disable-libopenjpeg -.endif - -# rtmp -.if ${PORT_OPTIONS:MRTMP} -LIB_DEPENDS+= rtmp.0:${PORTSDIR}/multimedia/rtmpdump -CONFIGURE_ARGS+= --enable-librtmp -. if ${OPENSSLBASE} != "/usr" -FFMPEG_CFLAGS+= -I${OPENSSLINC} -FFMPEG_LDFLAGS+= -L${OPENSSLLIB} +PLIST_FILES+= man/man1/ffserver.1.gz +FFPROGS+= ffserver +. if ${PORT_OPTIONS:MDOCS} +DOC_DOCFILES+= ffserver.html . endif .else -CONFIGURE_ARGS+= --disable-librtmp -.endif - -# schroedinger -.if ${PORT_OPTIONS:MSCHROEDINGER} -LIB_DEPENDS+= schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger -CONFIGURE_ARGS+= --enable-libschroedinger -.else -CONFIGURE_ARGS+= --disable-libschroedinger +PLIST_SUB+= FFSERVER="@comment " .endif # sdl .if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl PLIST_FILES+= bin/ffplay man/man1/ffplay.1.gz -.else -CONFIGURE_ARGS+= --disable-ffplay +FFPROGS+= ffplay +.if ${PORT_OPTIONS:MDOCS} +DOC_DOCFILES+= ffplay.html .endif - -# speex -.if ${PORT_OPTIONS:MSPEEX} -LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex -CONFIGURE_ARGS+= --enable-libspeex -.else -CONFIGURE_ARGS+= --disable-libspeex -.endif - -# theora -.if ${PORT_OPTIONS:MTHEORA} -LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora -CONFIGURE_ARGS+= --enable-libtheora -.else -CONFIGURE_ARGS+= --disable-libtheora -.endif - -# vaapi -.if ${PORT_OPTIONS:MVAAPI} -FFMPEG_LICENSE_GPL3= yes -LIB_DEPENDS+= va.1:${PORTSDIR}/multimedia/libva -CONFIGURE_ARGS+= --enable-vaapi -.else -CONFIGURE_ARGS+= --disable-vaapi -.endif - -# vdpau -.if ${PORT_OPTIONS:MVDPAU} -BUILD_DEPENDS+= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau -CONFIGURE_ARGS+= --enable-vdpau -.else -CONFIGURE_ARGS+= --disable-vdpau -.endif - -# vo-aacenc -.if ${PORT_OPTIONS:MVO_AACENC} -FFMPEG_LICENSE_GPL3= yes -LIB_DEPENDS+= vo-aacenc.0:${PORTSDIR}/audio/vo-aacenc -CONFIGURE_ARGS+= --enable-libvo-aacenc -.else -CONFIGURE_ARGS+= --disable-libvo-aacenc -.endif - -# vo-amrwbenc -.if ${PORT_OPTIONS:MVO_AMRWBENC} -FFMPEG_LICENSE_GPL3= yes -LIB_DEPENDS+= vo-amrwbenc.0:${PORTSDIR}/audio/vo-amrwbenc -CONFIGURE_ARGS+= --enable-libvo-amrwbenc .else -CONFIGURE_ARGS+= --disable-libvo-amrwbenc +CONFIGURE_ARGS+= --disable-ffplay .endif # vorbis .if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis -CONFIGURE_ARGS+= --enable-libvorbis FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis -.else -CONFIGURE_ARGS+= --disable-libvorbis -.endif - -# vp8 -.if ${PORT_OPTIONS:MVPX} -LIB_DEPENDS+= vpx.1:${PORTSDIR}/multimedia/libvpx -CONFIGURE_ARGS+= --enable-libvpx -.else -CONFIGURE_ARGS+= --disable-libvpx -.endif - -# x264 -.if ${PORT_OPTIONS:MX264} -LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264 -CONFIGURE_ARGS+= --enable-libx264 -.else -CONFIGURE_ARGS+= --disable-libx264 -.endif - -# xvid -.if ${PORT_OPTIONS:MXVID} -LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid -CONFIGURE_ARGS+= --enable-libxvid -.else -CONFIGURE_ARGS+= --disable-libxvid .endif # License knobs @@ -377,16 +319,16 @@ CONFIGURE_ARGS+= --enable-nonfree .endif .if defined(FFMPEG_LICENSE_GPL3) -LICENSE+= GPLv3 LGPL3 +CONFIGURE_ARGS+= --enable-version3 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310191643.r9JGhX35055674>