Date: Sun, 21 Oct 2018 10:35:36 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r482659 - in branches/2018Q4/multimedia/ffmpeg: . files Message-ID: <201810211035.w9LAZakt044167@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Oct 21 10:35:35 2018 New Revision: 482659 URL: https://svnweb.freebsd.org/changeset/ports/482659 Log: MFH: r482658 multimedia/ffmpeg: unbreak ALSA=off after r468844 https://ffmpeg.org/pipermail/ffmpeg-devel/2018-September/234516.html PR: 232498 Approved by: ports-secteam blanket Modified: branches/2018Q4/multimedia/ffmpeg/Makefile branches/2018Q4/multimedia/ffmpeg/files/patch-configure Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/multimedia/ffmpeg/Makefile ============================================================================== --- branches/2018Q4/multimedia/ffmpeg/Makefile Sun Oct 21 10:33:37 2018 (r482658) +++ branches/2018Q4/multimedia/ffmpeg/Makefile Sun Oct 21 10:35:35 2018 (r482659) @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 4.0.2 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= https://ffmpeg.org/releases/ Modified: branches/2018Q4/multimedia/ffmpeg/files/patch-configure ============================================================================== --- branches/2018Q4/multimedia/ffmpeg/files/patch-configure Sun Oct 21 10:33:37 2018 (r482658) +++ branches/2018Q4/multimedia/ffmpeg/files/patch-configure Sun Oct 21 10:35:35 2018 (r482659) @@ -14,3 +14,15 @@ cpu="generic" intrinsics="none" +@@ -6234,8 +6229,10 @@ else + EOF + fi + +-enabled alsa && check_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp || ++if enabled alsa; then ++ check_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp || + check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound ++fi + + enabled libjack && + require_pkg_config libjack jack jack/jack.h jack_port_get_latency_range
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810211035.w9LAZakt044167>