Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
linphone-cmake-builder
Commits
cf84de7f
Commit
cf84de7f
authored
May 25, 2015
by
Ghislain MARY
Browse files
Disable iconv when building FFmpeg + prevent useless patch on platforms other than Linux.
parent
135daa1a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
builders/ffmpeg.cmake
builders/ffmpeg.cmake
+2
-1
No files found.
builders/ffmpeg.cmake
View file @
cf84de7f
...
...
@@ -55,6 +55,7 @@ else()
"--disable-everything"
"--enable-decoder=mjpeg"
"--enable-encoder=mjpeg"
"--disable-iconv"
# Disable video acceleration support for compatibility with older Mac OS X versions (vda, vaapi, vdpau).
"--disable-vda"
"--disable-vaapi"
...
...
@@ -76,7 +77,6 @@ else()
)
endif
()
set
(
EP_ffmpeg_LINKING_TYPE
"--disable-static"
"--enable-shared"
)
set
(
EP_ffmpeg_PATCH_COMMAND
"
${
PATCH_PROGRAM
}
"
"-p1"
"-i"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/builders/ffmpeg/no-sdl.patch"
${
EP_ffmpeg_PATCH_OPTIONS
}
)
set
(
EP_ffmpeg_ARCH
"i386"
)
if
(
WIN32
)
...
...
@@ -110,6 +110,7 @@ else()
endif
()
else
()
set
(
EP_ffmpeg_TARGET_OS
"linux"
)
set
(
EP_ffmpeg_PATCH_COMMAND
"
${
PATCH_PROGRAM
}
"
"-p1"
"-i"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/builders/ffmpeg/no-sdl.patch"
${
EP_ffmpeg_PATCH_OPTIONS
}
)
endif
()
endif
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment