Skip to content

Commit c72568f

Browse files
srubinsrubin
authored
Merge pull request #2 from descriptinc/sr/shared-macos-10.11
Shared libraries (targeting macOS 10.11)
2 parents 7fe79d0 + cd2df57 commit c72568f

File tree

6 files changed

+456
-194
lines changed

6 files changed

+456
-194
lines changed

‎.github/workflows/build.yml‎

Lines changed: 142 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -4,147 +4,149 @@ on:
44
push:
55
paths-ignore:
66
- '*.md'
7-
pull_request:
8-
branches: [ master ]
97

108
jobs:
11-
build-linux:
12-
name: build in native linux
13-
runs-on: ubuntu-20.04
14-
steps:
15-
- name: Checkout code
16-
uses: actions/checkout@v2
9+
# build-linux:
10+
# name: build in native linux
11+
# runs-on: ubuntu-20.04
12+
# steps:
13+
# - name: Checkout code
14+
# uses: actions/checkout@v2
15+
#
16+
# - name: install libva-dev
17+
# run: |
18+
# sudo apt-get update
19+
# sudo apt-get install -y libva-dev
20+
#
21+
# - name: build ffmpeg
22+
# run: |
23+
# while sleep 300; do echo "=====[ $SECONDS seconds still running ]====="; done &
24+
# SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build
25+
# kill %1
26+
# - name: check shared library
27+
# run: |
28+
# ldd ./workspace/bin/ffmpeg
29+
# - name: test run ffmepg
30+
# run: |
31+
# ./workspace/bin/ffmpeg -buildconf
32+
# - name: clean up
33+
# run: |
34+
# ./build-ffmpeg --cleanup
1735

18-
- name: install libva-dev
19-
run: |
20-
sudo apt-get update
21-
sudo apt-get install -y libva-dev
36+
# build-macos:
37+
# name: build in native macOS
38+
# runs-on: macos-10.15
39+
# steps:
40+
# - name: Checkout code
41+
# uses: actions/checkout@v2
42+
#
43+
# - name: Use nodejs
44+
# uses: actions/setup-node@v1
45+
#
46+
# - name: build ffmpeg
47+
# run: |
48+
# while sleep 300; do echo "=====[ $SECONDS seconds still running ]====="; done &
49+
# SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build
50+
# kill %1
51+
# - name: check shared library
52+
# run: |
53+
# otool -L ./workspace/bin/ffmpeg
54+
# - name: test run ffmepg
55+
# run: |
56+
# ./workspace/bin/ffmpeg -buildconf
57+
# - name: clean up
58+
# run: |
59+
# ./build-ffmpeg --cleanup
2260

23-
- name: build ffmpeg
24-
run: |
25-
while sleep 300; do echo "=====[ $SECONDS seconds still running ]====="; done &
26-
SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build
27-
kill %1
28-
- name: check shared library
29-
run: |
30-
ldd ./workspace/bin/ffmpeg
31-
- name: test run ffmepg
32-
run: |
33-
./workspace/bin/ffmpeg -buildconf
34-
- name: clean up
35-
run: |
36-
./build-ffmpeg --cleanup
37-
38-
build-macos:
39-
name: build in native macOS
40-
runs-on: macos-10.15
41-
steps:
42-
- name: Checkout code
43-
uses: actions/checkout@v2
44-
45-
- name: build ffmpeg
46-
run: |
47-
while sleep 300; do echo "=====[ $SECONDS seconds still running ]====="; done &
48-
SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build
49-
kill %1
50-
- name: check shared library
51-
run: |
52-
otool -L ./workspace/bin/ffmpeg
53-
- name: test run ffmepg
54-
run: |
55-
./workspace/bin/ffmpeg -buildconf
56-
- name: clean up
57-
run: |
58-
./build-ffmpeg --cleanup
59-
60-
build-docker:
61-
name: build in docker
62-
runs-on: ubuntu-20.04
63-
steps:
64-
- name: Checkout code
65-
uses: actions/checkout@v2
66-
67-
- name: pull base image
68-
id: ubuntu_pull
69-
run: |
70-
docker pull ubuntu:20.04
71-
- name: run if ubuntu_pull failed
72-
if: failure() && steps.ubuntu_pull.outcome == 'failure'
73-
run: |
74-
docker pull ubuntu:20.04
75-
- name: build ffmpeg
76-
run: |
77-
docker build -t ffmpeg:ubuntu -f Dockerfile .
78-
- name: test run ffmepg
79-
run: |
80-
docker run --rm ffmpeg:ubuntu -buildconf
81-
82-
build-cuda-ubuntu-docker:
83-
name: build in ubuntu docker with cuda
84-
runs-on: ubuntu-20.04
85-
steps:
86-
- name: Checkout code
87-
uses: actions/checkout@v2
88-
89-
- name: pull base image
90-
id: cuda_ubuntu_pull
91-
run: |
92-
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
93-
docker pull ubuntu:20.04
94-
- name: run if cuda_ubuntu_pull failed
95-
if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
96-
run: |
97-
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
98-
docker pull ubuntu:20.04
99-
- name: build ffmpeg
100-
run: |
101-
docker build -t ffmpeg:cuda-ubuntu -f cuda-ubuntu.dockerfile .
102-
- name: test run ffmepg
103-
run: |
104-
docker run --rm ffmpeg:cuda-ubuntu -buildconf
105-
106-
build-cuda-centos-docker:
107-
name: build in centos docker with cuda
108-
runs-on: ubuntu-20.04
109-
steps:
110-
- name: Checkout code
111-
uses: actions/checkout@v2
112-
113-
- name: pull base image
114-
id: cuda_centos_pull
115-
run: |
116-
docker pull nvidia/cuda:11.1-devel-centos8
117-
docker pull centos:8
118-
- name: run if cuda_centos_pull failed
119-
if: failure() && steps.cuda_centos_pull.outcome == 'failure'
120-
run: |
121-
docker pull nvidia/cuda:11.1-devel-centos8
122-
docker pull centos:8
123-
- name: build ffmpeg
124-
run: |
125-
docker build -t ffmpeg:cuda-centos -f cuda-centos.dockerfile .
126-
- name: test run ffmepg
127-
run: |
128-
docker run --rm ffmpeg:cuda-centos -buildconf
129-
130-
build-full-static:
131-
name: full static build in docker
132-
runs-on: ubuntu-20.04
133-
steps:
134-
- name: Checkout code
135-
uses: actions/checkout@v2
136-
137-
- name: pull base image
138-
id: cuda_ubuntu_pull
139-
run: |
140-
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
141-
- name: run if cuda_ubuntu_pull failed
142-
if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
143-
run: |
144-
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
145-
- name: build ffmpeg
146-
run: |
147-
docker build -t ffmpeg:cuda-static -f full-static.dockerfile .
148-
- name: test run ffmepg
149-
run: |
150-
docker run --rm ffmpeg:cuda-static -buildconf
61+
#
62+
# build-docker:
63+
# name: build in docker
64+
# runs-on: ubuntu-20.04
65+
# steps:
66+
# - name: Checkout code
67+
# uses: actions/checkout@v2
68+
#
69+
# - name: pull base image
70+
# id: ubuntu_pull
71+
# run: |
72+
# docker pull ubuntu:20.04
73+
# - name: run if ubuntu_pull failed
74+
# if: failure() && steps.ubuntu_pull.outcome == 'failure'
75+
# run: |
76+
# docker pull ubuntu:20.04
77+
# - name: build ffmpeg
78+
# run: |
79+
# docker build -t ffmpeg:ubuntu -f Dockerfile .
80+
# - name: test run ffmepg
81+
# run: |
82+
# docker run --rm ffmpeg:ubuntu -buildconf
83+
#
84+
# build-cuda-ubuntu-docker:
85+
# name: build in ubuntu docker with cuda
86+
# runs-on: ubuntu-20.04
87+
# steps:
88+
# - name: Checkout code
89+
# uses: actions/checkout@v2
90+
#
91+
# - name: pull base image
92+
# id: cuda_ubuntu_pull
93+
# run: |
94+
# docker pull nvidia/cuda:11.1-devel-ubuntu20.04
95+
# docker pull ubuntu:20.04
96+
# - name: run if cuda_ubuntu_pull failed
97+
# if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
98+
# run: |
99+
# docker pull nvidia/cuda:11.1-devel-ubuntu20.04
100+
# docker pull ubuntu:20.04
101+
# - name: build ffmpeg
102+
# run: |
103+
# docker build -t ffmpeg:cuda-ubuntu -f cuda-ubuntu.dockerfile .
104+
# - name: test run ffmepg
105+
# run: |
106+
# docker run --rm ffmpeg:cuda-ubuntu -buildconf
107+
#
108+
# build-cuda-centos-docker:
109+
# name: build in centos docker with cuda
110+
# runs-on: ubuntu-20.04
111+
# steps:
112+
# - name: Checkout code
113+
# uses: actions/checkout@v2
114+
#
115+
# - name: pull base image
116+
# id: cuda_centos_pull
117+
# run: |
118+
# docker pull nvidia/cuda:11.1-devel-centos8
119+
# docker pull centos:8
120+
# - name: run if cuda_centos_pull failed
121+
# if: failure() && steps.cuda_centos_pull.outcome == 'failure'
122+
# run: |
123+
# docker pull nvidia/cuda:11.1-devel-centos8
124+
# docker pull centos:8
125+
# - name: build ffmpeg
126+
# run: |
127+
# docker build -t ffmpeg:cuda-centos -f cuda-centos.dockerfile .
128+
# - name: test run ffmepg
129+
# run: |
130+
# docker run --rm ffmpeg:cuda-centos -buildconf
131+
#
132+
# build-full-static:
133+
# name: full static build in docker
134+
# runs-on: ubuntu-20.04
135+
# steps:
136+
# - name: Checkout code
137+
# uses: actions/checkout@v2
138+
#
139+
# - name: pull base image
140+
# id: cuda_ubuntu_pull
141+
# run: |
142+
# docker pull nvidia/cuda:11.1-devel-ubuntu20.04
143+
# - name: run if cuda_ubuntu_pull failed
144+
# if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
145+
# run: |
146+
# docker pull nvidia/cuda:11.1-devel-ubuntu20.04
147+
# - name: build ffmpeg
148+
# run: |
149+
# docker build -t ffmpeg:cuda-static -f full-static.dockerfile .
150+
# - name: test run ffmepg
151+
# run: |
152+
# docker run --rm ffmpeg:cuda-static -buildconf

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ workspace
33
.idea
44
linux
55
.artifacts
6+
.DS_Store

‎.node-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
12.18.3

0 commit comments

Comments
 (0)