forked from intel/cartwheel-ffmpeg
-
Notifications
You must be signed in to change notification settings - Fork 0
/
README.cartwheel
60 lines (46 loc) · 1.95 KB
/
README.cartwheel
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
# cartwheel : ffmpeg
Intel developer staging area for upstream patch contributions to [FFmpeg](https://github.com/ffmpeg/ffmpeg).
The upstream project is tracked as a submodule in this repo.
## upstream process
To improve upstream patch quality and reduce patchset rebase efforts, we use the following process
1. Send PR1 to https://github.com/intel-media-ci/ffmpeg, add module maintainers to Reviewers
1. Got approval from one maintainer
1. Wait for 1 more workday to see any objections. If it's an urgent issue, please ask another reviewer + 1 for you.
1. Close PR1, and send it to the community, ping the community with some frequency if it's no response.
1. If the community has no response in 4 weeks or it’s an urgent issue, send PR2 to https://github.com/intel/cartwheel-ffmpeg
1. Provide upstream patch link, ping maintainers for merging
1. Ping community until the patch merged in upstream
## maintainers
* @xhaihao @feiwan1 @xuguangxin for Linux and OneVPL
* @galinart for Windows
* @guoyejun @Semmer2 for DNN
* @uartie @FocusLuo @Bin-CI for CI system
## clone
```shell
$ git clone https://github.com/intel/cartwheel-ffmpeg --recursive
```
## apply patches
```shell
# at top-level directory
$ git submodule update --init --recursive
# at submodule directory
$ cd ffmpeg
# It is recommended to create a branch before applying the patches
$ git checkout -b <my new branch>
$ git am ../patches/*.patch
```
## rebase
```shell
# at top-level directory
$ git pull --rebase --recurse-submodule
```
## administrators
To update the submodule reference commit id to the latest upstream:
```shell
# at top-level directory
$ git submodule update --remote --recursive
$ git commit -sam "$(git diff --submodule | head -1 | sed 's/:$//')"
```
...verify the patches still apply successfully. If they don't apply, fix them and include in new commit(s).
## additional information
For more information and examples about Git Submodules, see https://git-scm.com/book/en/v2/Git-Tools-Submodules