From owner-svn-ports-all@freebsd.org Wed Dec 18 20:14:47 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E8B1D1E5B0B; Wed, 18 Dec 2019 20:14:47 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47dR7W5s0sz3DZQ; Wed, 18 Dec 2019 20:14:47 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C00AD374B; Wed, 18 Dec 2019 20:14:47 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBIKElqf051516; Wed, 18 Dec 2019 20:14:47 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBIKElSJ051515; Wed, 18 Dec 2019 20:14:47 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201912182014.xBIKElSJ051515@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 18 Dec 2019 20:14:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520395 - in head/multimedia: ffmpeg vlc X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/multimedia: ffmpeg vlc X-SVN-Commit-Revision: 520395 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Dec 2019 20:14:48 -0000 Author: jbeich Date: Wed Dec 18 20:14:47 2019 New Revision: 520395 URL: https://svnweb.freebsd.org/changeset/ports/520395 Log: multimedia/ffmpeg: simplify ARCH-specific options ONLY_FOR_ARCHS already blocks build if not supported. Modified: head/multimedia/ffmpeg/Makefile (contents, props changed) head/multimedia/vlc/Makefile (contents, props changed) Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Wed Dec 18 19:32:46 2019 (r520394) +++ head/multimedia/ffmpeg/Makefile Wed Dec 18 20:14:47 2019 (r520395) @@ -35,15 +35,16 @@ NOPRECIOUSMAKEVARS= yes # ARCH PORTSCOUT= limit:^4\. # Option CHROMAPRINT disabled, it cannot work and people are baffled. -OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ARIBB24 ASS BEIGNET BS2B CACA CDIO CELT CODEC2 \ - DAV1D DAVS2 DC1394 DEBUG DOCS DRM FDK_AAC FLITE FONTCONFIG \ - FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KLVANC KVAZAAR LADSPA \ - LAME LENSFUN LIBBLURAY LIBRSVG2 LIBXML2 LV2 MODPLUG MYSOFA OPENAL OPENCL OPENCV OPENGL \ - OPENH264 OPENJPEG OPENMPT OPTIMIZED_CFLAGS OPUS POCKETSPHINX PULSEAUDIO \ - RAV1E RUBBERBAND RTCPU SDL SMB SNAPPY SNDIO SOXR SPEEX SRT SSH TENSORFLOW \ - TESSERACT THEORA TWOLAME V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB VMAF VORBIS \ - VO_AMRWBENC VPX WAVPACK WEBP X264 X265 XAVS2 XCB XVID \ - XVIDEO ZIMG ZMQ ZVBI +OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ARIBB24 ASS BEIGNET BS2B CACA CDIO CELT \ + CODEC2 DAV1D DAVS2 DC1394 DEBUG DOCS DRM FDK_AAC FLITE \ + FONTCONFIG FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK \ + KLVANC KVAZAAR LADSPA LAME LENSFUN LIBBLURAY LIBRSVG2 LIBXML2 \ + LV2 MFX MODPLUG MYSOFA OPENAL OPENCL OPENCV OPENGL OPENH264 \ + OPENJPEG OPENMPT OPTIMIZED_CFLAGS OPUS POCKETSPHINX PULSEAUDIO \ + RAV1E RTCPU RUBBERBAND SDL SMB SNAPPY SNDIO SOXR SPEEX SRT SSH \ + SVTAV1 SVTHEVC SVTVP9 TENSORFLOW TESSERACT THEORA TWOLAME V4L \ + VAAPI VAPOURSYNTH VDPAU VIDSTAB VMAF VO_AMRWBENC VORBIS VPX \ + WAVPACK WEBP X264 X265 XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI OPTIONS_DEFAULT= AOM DAV1D FONTCONFIG FREETYPE FREI0R GMP GNUTLS ICONV \ OPENCV OPTIMIZED_CFLAGS OPUS RTCPU THEORA V4L VAAPI VDPAU \ @@ -85,9 +86,9 @@ OPTIONS_RADIO_SSL= GNUTLS MBEDTLS OPENSSL OPTIONS_GROUP= LICENSE OPTIONS_GROUP_LICENSE= GPL3 NONFREE -OPTIONS_DEFINE_amd64= BEIGNET MFX MMX SSE SVTAV1 SVTHEVC SVTVP9 +OPTIONS_DEFINE_amd64= MMX SSE OPTIONS_DEFINE_armv6= VFP NEON -OPTIONS_DEFINE_i386= BEIGNET MFX MMX SSE +OPTIONS_DEFINE_i386= MMX SSE OPTIONS_DEFAULT_amd64= MMX SSE OPTIONS_DEFAULT_i386= MMX SSE Modified: head/multimedia/vlc/Makefile ============================================================================== --- head/multimedia/vlc/Makefile Wed Dec 18 19:32:46 2019 (r520394) +++ head/multimedia/vlc/Makefile Wed Dec 18 20:14:47 2019 (r520395) @@ -63,13 +63,11 @@ CFLAGS_i386= -fomit-frame-pointer OPTIONS_DEFINE= A52 AALIB AOM ASS AVAHI CACA CHROMECAST DAV1D DBUS DCA DOCS DVDREAD \ DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GME GNUTLS \ GOOM HARFBUZZ JACK JPEG KATE LIBBLURAY LIBPLACEBO LIBRSVG2 LIBSSH2 LIRC \ - LIVEMEDIA LUA MAD MODPLUG MPEG2 MTP MUSEPACK \ + LIVEMEDIA LUA MAD MFX MODPLUG MPEG2 MTP MUSEPACK \ NCURSES NFS NLS NOTIFY OGG OGGSPOTS OPTIMIZED_CFLAGS OPUS PNG PULSEAUDIO \ QT5 REALRTSP RUNROOT SAMPLERATE SIDPLAY SCHROEDINGER \ SDL SHOUTCAST SKINS SMB SNDIO STREAM SPEEX TAGLIB THEORA \ TWOLAME UPNP V4L VAAPI VCD VDPAU VPX VORBIS WAYLAND X11 X264 X265 ZVBI -OPTIONS_DEFINE_amd64= MFX -OPTIONS_DEFINE_i386= MFX OPTIONS_DEFINE_powerpc= ALTIVEC OPTIONS_DEFINE_powerpc64= ALTIVEC OPTIONS_DEFAULT=A52 AVAHI DAV1D DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS JPEG \