Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

encodersgpl flavor #23

Merged
merged 14 commits into from
Sep 24, 2023
Merged

encodersgpl flavor #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2e6c6be
encodersgpl flavor
moffatman Sep 15, 2023
9f6e99c
Install nasm in CI
moffatman Sep 16, 2023
0906626
feat: remove `update-downloads-lock`
birros Sep 16, 2023
2dee776
feat(tool-versions): add nasm and python3
birros Sep 16, 2023
eb1eec0
docs: improve dependencies graph
birros Sep 16, 2023
965054d
refactor(make): change dependencies order
birros Sep 16, 2023
ce8eaf6
ci: add encodersgpl flavor builds
birros Sep 16, 2023
f5efd08
refactor: rename encodersgpl flavor to encoders
birros Sep 16, 2023
190cb01
refactor(mbedtls): use meson.build
birros Sep 16, 2023
c88cfcb
docs(uchardet): add todo about double build
birros Sep 16, 2023
8831261
fix(cmake): add sys_root property
birros Sep 16, 2023
0995f3c
fix(cmake): fix sys_root arch
birros Sep 16, 2023
0b780c5
fix(cmake): fix sysroot collision
birros Sep 16, 2023
5896a83
Revert "refactor: rename encodersgpl flavor to encoders"
birros Sep 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v3

- name: Install requirements
run: brew install go meson ninja
run: brew install go meson ninja nasm

- name: Print tool versions
run: make tool-versions
Expand Down Expand Up @@ -41,40 +41,58 @@ jobs:
VERSION=${{ steps.version.outputs.version }}
make build/output/libmpv-libs_${VERSION}_ios-arm64-audio-default.tar.gz
make build/output/libmpv-libs_${VERSION}_ios-arm64-audio-full.tar.gz
make build/output/libmpv-libs_${VERSION}_ios-arm64-audio-encodersgpl.tar.gz
make build/output/libmpv-libs_${VERSION}_ios-arm64-video-default.tar.gz
make build/output/libmpv-libs_${VERSION}_ios-arm64-video-full.tar.gz
make build/output/libmpv-libs_${VERSION}_ios-arm64-video-encodersgpl.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-amd64-audio-default.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-amd64-audio-full.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-amd64-audio-encodersgpl.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-amd64-video-default.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-amd64-video-full.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-amd64-video-encodersgpl.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-arm64-audio-default.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-arm64-audio-full.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-arm64-audio-encodersgpl.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-arm64-video-default.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-arm64-video-full.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-arm64-video-encodersgpl.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-universal-audio-default.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-universal-audio-full.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-universal-audio-encodersgpl.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-universal-video-default.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-universal-video-full.tar.gz
make build/output/libmpv-libs_${VERSION}_iossimulator-universal-video-encodersgpl.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-amd64-audio-default.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-amd64-audio-full.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-amd64-audio-encodersgpl.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-amd64-video-default.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-amd64-video-full.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-amd64-video-encodersgpl.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-arm64-audio-default.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-arm64-audio-full.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-arm64-audio-encodersgpl.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-arm64-video-default.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-arm64-video-full.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-arm64-video-encodersgpl.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-universal-audio-default.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-universal-audio-full.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-universal-audio-encodersgpl.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-universal-video-default.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-universal-video-full.tar.gz
make build/output/libmpv-libs_${VERSION}_macos-universal-video-encodersgpl.tar.gz
make build/output/libmpv-xcframeworks_${VERSION}_ios-universal-audio-default.tar.gz
make build/output/libmpv-xcframeworks_${VERSION}_ios-universal-audio-full.tar.gz
make build/output/libmpv-xcframeworks_${VERSION}_ios-universal-audio-encodersgpl.tar.gz
make build/output/libmpv-xcframeworks_${VERSION}_ios-universal-video-default.tar.gz
make build/output/libmpv-xcframeworks_${VERSION}_ios-universal-video-full.tar.gz
make build/output/libmpv-xcframeworks_${VERSION}_ios-universal-video-encodersgpl.tar.gz
make build/output/libmpv-xcframeworks_${VERSION}_macos-universal-audio-default.tar.gz
make build/output/libmpv-xcframeworks_${VERSION}_macos-universal-audio-full.tar.gz
make build/output/libmpv-xcframeworks_${VERSION}_macos-universal-audio-encodersgpl.tar.gz
make build/output/libmpv-xcframeworks_${VERSION}_macos-universal-video-default.tar.gz
make build/output/libmpv-xcframeworks_${VERSION}_macos-universal-video-full.tar.gz
make build/output/libmpv-xcframeworks_${VERSION}_macos-universal-video-encodersgpl.tar.gz
make build/output/debug.zip

- name: Upload artifacts
Expand Down
6 changes: 4 additions & 2 deletions .tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
clang 14.0.3
cmake 3.27.4
cmake 3.27.5
golang 1.21.0
macos 13.5.1
macos 13.5.2
make 3.81
meson 1.2.1
nasm 2.16.01
ninja 1.11.1
python3 3.11.5
xcode 14.3.1
19 changes: 19 additions & 0 deletions LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
For the "default" and "full" flavors, the following license applies:

MIT License

Copyright (c) 2023 birros
Expand All @@ -19,3 +21,20 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

For the "encodersgpl" flavor, the following license applies:

Copyright (C) 2023 moffatman

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Loading