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
c692d4a8
Commit
c692d4a8
authored
Oct 28, 2014
by
Ghislain MARY
Browse files
Apply ffmpeg patches with "--binary" option on Windows.
parent
b9ebf4c3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
builders/ffmpeg.cmake
builders/ffmpeg.cmake
+7
-3
No files found.
builders/ffmpeg.cmake
View file @
c692d4a8
...
...
@@ -20,6 +20,10 @@
#
############################################################################
if
(
WIN32
)
set
(
EP_ffmpeg_PATCH_OPTIONS
"--binary"
)
endif
()
set
(
EP_ffmpeg_URL
"http://ffmpeg.org/releases/ffmpeg-0.10.2.tar.gz"
)
set
(
EP_ffmpeg_URL_HASH
"MD5=f449c9fb925e80c457e82187e6c20910"
)
set
(
EP_ffmpeg_BUILD_METHOD
"autotools"
)
...
...
@@ -58,17 +62,17 @@ if(ENABLE_MPEG4)
)
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"
)
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
)
set
(
EP_ffmpeg_TARGET_OS
"mingw32"
)
set
(
EP_ffmpeg_EXTRA_LDFLAGS
"-static-libgcc"
)
set
(
EP_ffmpeg_PATCH_COMMAND
${
EP_ffmpeg_PATCH_COMMAND
}
"COMMAND"
"
${
PATCH_PROGRAM
}
"
"-p1"
"-i"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/builders/ffmpeg/mingw-no-lib.patch"
)
set
(
EP_ffmpeg_PATCH_COMMAND
${
EP_ffmpeg_PATCH_COMMAND
}
"COMMAND"
"
${
PATCH_PROGRAM
}
"
"-p1"
"-i"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/builders/ffmpeg/mingw-no-lib.patch"
${
EP_ffmpeg_PATCH_OPTIONS
}
)
else
()
if
(
APPLE
)
set
(
EP_ffmpeg_TARGET_OS
"darwin"
)
set
(
EP_ffmpeg_PATCH_COMMAND
${
EP_ffmpeg_PATCH_COMMAND
}
"COMMAND"
"
${
PATCH_PROGRAM
}
"
"-p1"
"-i"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/builders/ffmpeg/configure-osx.patch"
)
set
(
EP_ffmpeg_PATCH_COMMAND
${
EP_ffmpeg_PATCH_COMMAND
}
"COMMAND"
"
${
PATCH_PROGRAM
}
"
"-p1"
"-i"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/builders/ffmpeg/configure-osx.patch"
${
EP_ffmpeg_PATCH_OPTIONS
}
)
else
()
set
(
EP_ffmpeg_TARGET_OS
"linux"
)
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