build: Fix to not pass --enable-nvenc to FFmpeg configure on FreeBSD.

Nvenc is not currently supported by Nvidia on FreeBSD. If it becomes supported on FreeBSD, please check nvidia-driver and FFmpeg.

diff --git a/contrib/ffmpeg/P00-freebsd-configure.patch b/contrib/ffmpeg/P00-freebsd-configure.patch
deleted file mode 100644 (file)
index 0f6e086..0000000
--- a/contrib/ffmpeg/P00-freebsd-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.bak    2018-06-16 10:12:16.000000000 +0900
-+++ b/configure        2018-06-30 17:38:01.378774000 +0900
-@@ -6325,7 +6325,7 @@
- 
- if enabled x86; then
-     case $target_os in
--        mingw32*|mingw64*|win32|win64|linux|cygwin*)
-+        mingw32*|mingw64*|win32|win64|linux|freebsd|cygwin*)
-             ;;
-         *)
-             disable ffnvcodec cuvid nvdec nvenc

diff --git a/make/configure.py b/make/configure.py
index 4ec254fa66d9cfc4afcc762726ccef83f602928a..c3eeee34dfb9f832998d85f04ab1afccd80f9c01 100644 (file)
--- a/make/configure.py
+++ b/make/configure.py
@@ -1320,7 +1320,7 @@ def createCLI():
     grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false' )
 
     h = IfHost( 'enable Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
-    grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not host.match( '*-*-darwin*' ), action='store_true', help=h )
+    grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=h )
 
 
     cli.add_option_group( grp )