From owner-svn-ports-head@FreeBSD.ORG Thu Oct 31 19:38:32 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 789F327A; Thu, 31 Oct 2013 19:38:32 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4C9732BF5; Thu, 31 Oct 2013 19:38:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9VJcW9e028626; Thu, 31 Oct 2013 19:38:32 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9VJcWJF028625; Thu, 31 Oct 2013 19:38:32 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310311938.r9VJcWJF028625@svn.freebsd.org> From: William Grzybowski Date: Thu, 31 Oct 2013 19:38:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332279 - head/multimedia/ffmpeg X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Oct 2013 19:38:32 -0000 Author: wg Date: Thu Oct 31 19:38:31 2013 New Revision: 332279 URL: http://svnweb.freebsd.org/changeset/ports/332279 Log: multimedia/ffmpeg: do not link to libs not selected - ffmpeg build would link to libs like jack and SDL if they are not listed in --disable-{in,out}dev - Add JACK option PR: ports/182167 Modified: head/multimedia/ffmpeg/Makefile Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Thu Oct 31 19:34:14 2013 (r332278) +++ head/multimedia/ffmpeg/Makefile Thu Oct 31 19:38:31 2013 (r332279) @@ -26,7 +26,7 @@ WANT_SDL= yes 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 \ + JACK 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 @@ -106,6 +106,9 @@ GSM_CONFIGURE_ENABLE= libgsm ICONV_USES= iconv ICONV_CONFIGURE_ENABLE= iconv +JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audi/jack +JACK_CONFIGURE_OFF= --disable-indev=jack + # lame LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame LAME_CONFIGURE_ENABLE= libmp3lame @@ -117,6 +120,8 @@ LIBBLURAY_CONFIGURE_ENABLE= libbluray # libv4l LIBV4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l LIBV4L_CONFIGURE_ENABLE= libv4l2 +LIBV4L_CONFIGURE_OFF= --disable-indev=v4l2 \ + --disable-outdev=v4l2 # modplug MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug @@ -125,6 +130,7 @@ MODPLUG_CONFIGURE_ENABLE= libmodplug # OpenAL OPENAL_LIB_DEPENDS= libopenal.so:${PORTSDIR}/audio/openal-soft OPENAL_CONFIGURE_ENABLE= openal +OPENAL_CONFIGURE_OFF= --disable-indev=openal # opencv OPENCV_LIB_DEPENDS= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core @@ -141,6 +147,8 @@ OPUS_CONFIGURE_ENABLE= libopus # pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= libpulse +PULSEAUDIO_CONFIGURE_OFF= --disable-indev=pulse \ + --disable-outdev=pulse # rtmp RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp @@ -305,7 +313,7 @@ FFPROGS+= ffplay DOC_DOCFILES+= ffplay.html .endif .else -CONFIGURE_ARGS+= --disable-ffplay +CONFIGURE_ARGS+= --disable-ffplay --disable-outdev=sdl .endif # vorbis