Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
74e8907e
Commit
74e8907e
authored
Sep 25, 2020
by
Jerome Wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Test ignore closure in Mac
parent
a28b9b9c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
main.yml
.github/workflows/main.yml
+0
-5
build-x264.sh
wasm/build-scripts/build-x264.sh
+9
-1
No files found.
.github/workflows/main.yml
View file @
74e8907e
...
...
@@ -29,10 +29,6 @@ jobs:
macos-build
:
runs-on
:
macos-latest
steps
:
-
uses
:
joschi/setup-jdk@v2
with
:
java-version
:
'
6'
# The OpenJDK version to make available on the path
architecture
:
'
x64'
# defaults to 'x64'
-
uses
:
actions/checkout@v2
with
:
submodules
:
recursive
...
...
@@ -49,7 +45,6 @@ jobs:
-
name
:
Build FFMpeg
shell
:
bash
run
:
|
java -version
export PATH=$PATH:$PWD/emsdk-cache/emsdk-master/upstream/bin
bash build.sh
-
uses
:
actions/upload-artifact@master
...
...
wasm/build-scripts/build-x264.sh
View file @
74e8907e
...
...
@@ -5,6 +5,14 @@ set -eo pipefail
ROOT
=
$1
BUILD_DIR
=
$2
OPT_FLAGS
=
"-O3 --closure 1"
if
[[
"
$OSTYPE
"
==
"darwin"
*
]]
;
then
# As closure compiler requires java 6 and
# I don't find a way to install it in github actions
OPT_FLAGS
=
"-O3"
fi
cd
$ROOT
ARGS
=(
--prefix
=
$BUILD_DIR
# install library in a build directory for FFmpeg to include
...
...
@@ -12,7 +20,7 @@ ARGS=(
--enable-static
# enable building static library
--disable-cli
# disable cli tools
--disable-asm
# disable asm optimization
--extra-cflags
=
"-s USE_PTHREADS=1
-O3 --closure 1
"
# flags to use pthread and code optimization
--extra-cflags
=
"-s USE_PTHREADS=1
$OPT_FLAGS
"
# flags to use pthread and code optimization
)
emconfigure ./configure
"
${
ARGS
[@]
}
"
emmake make install-lib-static
-j4
...
...
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