diff options
| author | Yuichiro NAITO <[email protected]> | 2018-07-02 22:57:41 +0900 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-07-02 15:04:06 -0400 |
| commit | f12ebd45ef608ccc75b8e4382e58aafe414831d8 (patch) | |
| tree | f3c59d8aea6616b1ae597c2d5ef4e900e862b0e7 | |
| parent | 34fbe885ba5417214a01a641b628a4cdf6dbecbd (diff) | |
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.
| -rw-r--r-- | contrib/ffmpeg/P00-freebsd-configure.patch | 11 | ||||
| -rw-r--r-- | make/configure.py | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/contrib/ffmpeg/P00-freebsd-configure.patch b/contrib/ffmpeg/P00-freebsd-configure.patch deleted file mode 100644 index 0f6e08610..000000000 --- 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 4ec254fa6..c3eeee34d 100644 --- 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 ) |