Date: Tue, 17 Jul 2012 11:06:04 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r300999 - head/multimedia/ffmpeg-devel Message-ID: <201207171106.q6HB64sp046588@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Tue Jul 17 11:06:04 2012 New Revision: 300999 URL: http://svn.freebsd.org/changeset/ports/300999 Log: Update ffmpeg-devel to new options framework Modified: head/multimedia/ffmpeg-devel/Makefile Modified: head/multimedia/ffmpeg-devel/Makefile ============================================================================== --- head/multimedia/ffmpeg-devel/Makefile Tue Jul 17 10:49:02 2012 (r300998) +++ head/multimedia/ffmpeg-devel/Makefile Tue Jul 17 11:06:04 2012 (r300999) @@ -7,7 +7,7 @@ PORTNAME= ffmpeg DISTVERSION= 2012-04-25 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= mm/ffmpeg @@ -34,41 +34,21 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes WANT_SDL= yes -OPTIONS= AACPLUS "Enable aac via libaacplus" off \ - ALSA "Enable alsa input/output device" off \ - AMR_NB "AMR Narrow Band audio encoder (opencore)" off \ - AMR_WB "AMR Wide Band audio decoder (opencore)" off \ - ASS "Subtitles rendering via libass" off \ - CDIO "Audio CD grabbing with libcdio" off \ - CELT "Enable CELT/Opus decoding via libcelt" off \ - FAAC "FAAC mp4/aac audio encoder" off \ - FFSERVER "Build and install ffserver" on \ - FREETYPE "Text on top of video frames (freetype2)" on \ - FREI0R "Frei0r wrapper filter" on \ - GNUTLS "GnuTLS support (disables OpenSSL)" on \ - GSM "GSM audio codec" off \ - LAME "LAME MP3 encoder" off \ - MODPLUG "Mod support via libmodplug" off \ - OPENAL "OpenAL 1.1 capture support" off \ - OPENCV "OpenCV video filtering support" on \ - OPENJPEG "JPEG 2000 decoder" off \ - OPENSSL "OpenSSL support" off \ - OPTIMIZED_CFLAGS "Additional optimizations" off \ - PULSE "Pulseaudio input via libpulse" off \ - RTMP "RTMP[E] support via librtmp" off \ - SCHROEDINGER "Dirac codec via libschroedinger" on \ - SDL "SDL support (build ffplay)" off \ - SPEEX "Speex audio decoder" off \ - THEORA "Theora encoder (implies OGG)" on \ - VAAPI "GPU acceleration support (libva)" off \ - VDPAU "Nvidia vdpau support" off \ - VO_AACENC "AAC audio encoder (vo-aacenc)" on \ - VO_AMRWBENC "AMR Wide Band audio encoder (vo-amrwbenc)" off \ - VORBIS "Vorbis encoder via libvorbis (implies OGG)" on \ - VP8 "VP8 codec via libvpx" on \ - X11GRAB "Enable x11grabbing" off \ - X264 "H.264 encoder" on \ - XVID "Xvid encoder via xvidcore" on +OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \ + FFSERVER FREETYPE FREI0R GNUTLS GSM LAME MODPLUG OPENAL OPENCV \ + OPENJPEG OPENSSL OPTIMIZED_CFLAGS PULSEAUDIO RTMP SCHROEDINGER \ + SDL SPEEX THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \ + X11GRAB X264 XVID + +OPTIONS_DEFAULT= FFSERVER FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \ + THEORA VORBIS VPX X264 XVID + +ASS_DESC= Subtitles rendering via libass +CDIO_DESC= Audio CD grabbing with libcdio +FFSERVER_DESC= Build and install ffserver +MODPLUG_DESC= Mod support via libmodplug +OPENAL_DESC= OpenAL 1.1 capture support +X11GRAB_DESC= Enable x11 grabbing COMPAT_HEADERS=libavcodec/avcodec.h \ libavcodec/vdpau.h \ @@ -97,12 +77,12 @@ COMPAT_HEADERS=libavcodec/avcodec.h \ .include <bsd.port.options.mk> -.if defined(WITH_OPENSSL) && !defined(WITH_GNUTLS) +.if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS) USE_OPENSSL= yes FFMPEG_NONFREE= yes .endif -.if defined(WITH_X11GRAB) +.if ${PORT_OPTIONS:MX11GRAB} USE_XORG= x11 xext xfixes CONFIGURE_ARGS+= --enable-x11grab .endif @@ -133,19 +113,19 @@ DOC_FILES= Changelog CREDITS INSTALL LIC DOC_DOCFILES= APIchanges RELEASE_NOTES *.txt *.html PORTDOCS= * -.if !defined(WITH_DEBUG) -CONFIGURE_ARGS+= --disable-debug -.else +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --disable-stripping +.else +CONFIGURE_ARGS+= --disable-debug .endif -.if !defined(WITHOUT_FFSERVER) +.if ${PORT_OPTIONS:MFFSERVER} USE_RC_SUBR= ffserver .endif # sse hardware vector support .if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64") -WITH_BUILTIN_VECTOR= yes +_BUILTIN_VECTOR= yes .else CONFIGURE_ARGS+= --disable-sse .endif @@ -153,27 +133,27 @@ CONFIGURE_ARGS+= --disable-sse # mmx support .if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == "" CONFIGURE_ARGS+= --disable-mmx -WITHOUT_BUILTIN_VECTOR= yes +_NO_BUILTIN_VECTOR= yes .endif # builtin vector, requires mmx and sse -.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR) +.if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR) FFMPEG_CFLAGS+= -msse .endif # PORTDOCS -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html MAN1+= ffmpeg.1 ffprobe.1 .endif # optimizations -.if defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer .endif #aacplus -.if defined(WITH_AACPLUS) +.if ${PORT_OPTIONS:MAACPLUS} FFMPEG_NONFREE= yes LIB_DEPENDS+= aacplus.2:${PORTSDIR}/audio/libaacplus CONFIGURE_ARGS+= --enable-libaacplus @@ -182,7 +162,7 @@ CONFIGURE_ARGS+= --disable-libaacplus .endif #alsa -.if defined(WITH_ALSA) +.if ${PORT_OPTIONS:MALSA} LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib .else CONFIGURE_ARGS+= --disable-indev=alsa \ @@ -190,7 +170,7 @@ CONFIGURE_ARGS+= --disable-indev=alsa \ .endif # Opencore AMR NB -.if defined(WITH_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 @@ -199,7 +179,7 @@ CONFIGURE_ARGS+= --disable-libopencore-a .endif # Opencore AMR WB -.if defined(WITH_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 @@ -208,7 +188,7 @@ CONFIGURE_ARGS+= --disable-libopencore-a .endif # ass -.if defined(WITH_ASS) +.if ${PORT_OPTIONS:MASS} LIB_DEPENDS+= ass.5:${PORTSDIR}/multimedia/libass CONFIGURE_ARGS+= --enable-libass .else @@ -216,7 +196,7 @@ CONFIGURE_ARGS+= --disable-libass .endif # cdio -.if defined(WITH_CDIO) +.if ${PORT_OPTIONS:MCDIO} LIB_DEPENDS+= cdio.13:${PORTSDIR}/sysutils/libcdio CONFIGURE_ARGS+= --enable-libcdio .else @@ -224,7 +204,7 @@ CONFIGURE_ARGS+= --disable-libcdio .endif # celt -.if defined(WITH_CELT) +.if ${PORT_OPTIONS:MCELT} LIB_DEPENDS+= celt0.2:${PORTSDIR}/audio/celt CONFIGURE_ARGS+= --enable-libcelt .else @@ -232,7 +212,7 @@ CONFIGURE_ARGS+= --disable-libcelt .endif # faac -.if defined(WITH_FAAC) +.if ${PORT_OPTIONS:MFAAC} FFMPEG_NONFREE= yes LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac CONFIGURE_ARGS+= --enable-libfaac @@ -241,9 +221,9 @@ CONFIGURE_ARGS+= --disable-libfaac .endif # ffserver -.if !defined(WITHOUT_FFSERVER) +.if ${PORT_OPTIONS:MFFSERVER} PLIST_SUB+= FFSERVER="" -. if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} MAN1+= ffserver.1 DOC_DOCFILES+= ffserver.html . endif @@ -253,7 +233,7 @@ CONFIGURE_ARGS+= --disable-ffserver .endif # freetype -.if !defined(WITHOUT_FREETYPE) +.if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 CONFIGURE_ARGS+= --enable-libfreetype .else @@ -261,7 +241,7 @@ CONFIGURE_ARGS+= --disable-libfreetype .endif # frei0r -.if !defined(WITHOUT_FREI0R) +.if ${PORT_OPTIONS:MFREI0R} BUILD_DEPENDS+= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r CONFIGURE_ARGS+= --enable-frei0r .else @@ -269,7 +249,7 @@ CONFIGURE_ARGS+= --disable-frei0r .endif # GnuTLS -.if !defined(WITHOUT_GNUTLS) +.if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+= --enable-gnutls .else @@ -277,7 +257,7 @@ CONFIGURE_ARGS+= --disable-gnutls .endif # gsm -.if defined(WITH_GSM) +.if ${PORT_OPTIONS:MGSM} LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm CONFIGURE_ARGS+= --enable-libgsm .else @@ -285,7 +265,7 @@ CONFIGURE_ARGS+= --disable-libgsm .endif # mp3 -.if defined(WITH_LAME) +.if ${PORT_OPTIONS:MLAME} LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame CONFIGURE_ARGS+= --enable-libmp3lame .else @@ -293,7 +273,7 @@ CONFIGURE_ARGS+= --disable-libmp3lame .endif # modplug -.if defined(WITH_MODPLUG) +.if ${PORT_OPTIONS:MMODPLUG} LIB_DEPENDS+= modplug.1:${PORTSDIR}/audio/libmodplug CONFIGURE_ARGS+= --enable-libmodplug .else @@ -301,7 +281,7 @@ CONFIGURE_ARGS+= --disable-libmodplug .endif # OpenAL -.if defined(WITH_OPENAL) +.if ${PORT_OPTIONS:MOPENAL} LIB_DEPENDS+= openal.1:${PORTSDIR}/audio/openal-soft CONFIGURE_ARGS+= --enable-openal .else @@ -309,7 +289,7 @@ CONFIGURE_ARGS+= --disable-openal .endif # opencv -.if !defined(WITHOUT_OPENCV) +.if ${PORT_OPTIONS:MOPENCV} LIB_DEPENDS+= opencv_imgproc.2:${PORTSDIR}/graphics/opencv CONFIGURE_ARGS+= --enable-libopencv .else @@ -317,7 +297,7 @@ CONFIGURE_ARGS+= --disable-libopencv .endif # openjpeg -.if defined(WITH_OPENJPEG) +.if ${PORT_OPTIONS:MOPENJPEG} LIB_DEPENDS+= openjpeg.2:${PORTSDIR}/graphics/openjpeg CONFIGURE_ARGS+= --enable-libopenjpeg .else @@ -325,7 +305,7 @@ CONFIGURE_ARGS+= --disable-libopenjpeg .endif # PulseAudio -.if defined(WITH_PULSE) +.if ${PORT_OPTIONS:MPULSEAUDIO} LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio CONFIGURE_ARGS+= --enable-libpulse .else @@ -333,7 +313,7 @@ CONFIGURE_ARGS+= --disable-libpulse .endif # rtmp -.if defined(WITH_RTMP) +.if ${PORT_OPTIONS:MRTMP} LIB_DEPENDS+= rtmp.0:${PORTSDIR}/multimedia/rtmpdump CONFIGURE_ARGS+= --enable-librtmp .else @@ -341,7 +321,7 @@ CONFIGURE_ARGS+= --disable-librtmp .endif # schroedinger -.if !defined(WITHOUT_SCHROEDINGER) +.if ${PORT_OPTIONS:MSCHROEDINGER} LIB_DEPENDS+= schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger CONFIGURE_ARGS+= --enable-libschroedinger .else @@ -349,10 +329,10 @@ CONFIGURE_ARGS+= --disable-libschroeding .endif # sdl -.if defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl PLIST_FILES+= bin/ffplay -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} MAN1+= ffplay.1 DOC_DOCFILES+= ffplay.html .endif @@ -361,7 +341,7 @@ CONFIGURE_ARGS+= --disable-ffplay .endif # speex -.if defined(WITH_SPEEX) +.if ${PORT_OPTIONS:MSPEEX} LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex CONFIGURE_ARGS+= --enable-libspeex .else @@ -369,7 +349,7 @@ CONFIGURE_ARGS+= --disable-libspeex .endif # theora -.if !defined(WITHOUT_THEORA) +.if ${PORT_OPTIONS:MTHEORA} LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora CONFIGURE_ARGS+= --enable-libtheora .else @@ -377,7 +357,7 @@ CONFIGURE_ARGS+= --disable-libtheora .endif # vaapi -.if !defined(WITHOUT_VAAPI) +.if ${PORT_OPTIONS:MVAAPI} LIB_DEPENDS+= va.1:${PORTSDIR}/multimedia/libva CONFIGURE_ARGS+= --enable-vaapi .else @@ -385,7 +365,7 @@ CONFIGURE_ARGS+= --disable-vaapi .endif # vdpau -.if !defined(WITHOUT_VDPAU) +.if ${PORT_OPTIONS:MVDPAU} BUILD_DEPENDS+= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau CONFIGURE_ARGS+= --enable-vdpau .else @@ -393,7 +373,7 @@ CONFIGURE_ARGS+= --disable-vdpau .endif # vo-aacenc -.if defined(WITH_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 @@ -402,7 +382,7 @@ CONFIGURE_ARGS+= --disable-libvo-aacenc .endif # vo-amrwbenc -.if defined(WITH_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 @@ -411,7 +391,7 @@ CONFIGURE_ARGS+= --disable-libvo-amrwben .endif # vorbis -.if !defined(WITHOUT_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+= --enable-libvorbis FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis @@ -420,7 +400,7 @@ CONFIGURE_ARGS+= --disable-libvorbis .endif # vp8 -.if !defined(WITHOUT_VP8) +.if ${PORT_OPTIONS:MVPX} LIB_DEPENDS+= vpx.1:${PORTSDIR}/multimedia/libvpx CONFIGURE_ARGS+= --enable-libvpx .else @@ -428,7 +408,7 @@ CONFIGURE_ARGS+= --disable-libvpx .endif # x264 -.if !defined(WITHOUT_X264) +.if ${PORT_OPTIONS:MX264} LIB_DEPENDS+= x264.123:${PORTSDIR}/multimedia/x264 CONFIGURE_ARGS+= --enable-libx264 .else @@ -436,7 +416,7 @@ CONFIGURE_ARGS+= --disable-libx264 .endif # xvid -.if !defined(WITHOUT_XVID) +.if ${PORT_OPTIONS:MXVID} LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid CONFIGURE_ARGS+= --enable-libxvid .else @@ -464,11 +444,6 @@ LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.L . endif .endif -pre-configure: -.if defined(WITHOUT_OGG) && (!defined(WITHOUT_VORBIS) || !defined(WITHOUT_THEORA)) - @${ECHO_MSG} WITH_VORBIS or WITH_THEORA defined, libogg will be built -.endif - post-patch: # {C,LD}FLAGS safeness @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ @@ -484,7 +459,7 @@ post-patch: @${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \ -e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -.if defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDL} @${REINPLACE_CMD} -E \ -e 's|sdl-config|${SDL_CONFIG}|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @@ -494,20 +469,20 @@ post-patch: .endif post-configure: -.if defined(WITHOUT_THEORA) +.if empty(PORT_OPTIONS:MTHEORA) @${REINPLACE_CMD} -E \ -e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \ ${WRKSRC}/config.mak .endif post-install: -.if !defined(WITHOUT_FFSERVER) +.if ${PORT_OPTIONS:MFFSERVER} ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc/ffserver.conf-dist if [ ! -f ${PREFIX}/etc/ffserver.conf ]; then \ ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc; \ fi .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for FILE in ${DOC_FILES} ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207171106.q6HB64sp046588>