dw/FFmpeg-Builds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/BtbN/FFmpeg-Builds

Browse source
This commit is contained in:
sudo-nautilus 2021-03-27 16:49:07 +05:30
commit 800cd3ec46
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts.d/25-openssl.sh
View file

@ -1,7 +1,10 @@
#!/bin/bash #!/bin/bash
OPENSSL_REPO="https://github.com/openssl/openssl.git" OPENSSL_REPO="https://github.com/openssl/openssl.git"
<<<<<<< HEAD
=======
>>>>>>> 8f268fa17dc92ff150c6a10e4c0e0512e050d5ca
OPENSSL_COMMIT="OpenSSL_1_1_1k" OPENSSL_COMMIT="OpenSSL_1_1_1k"
ffbuild_enabled() { ffbuild_enabled() {

3
scripts.d/50-gme.sh
View file

@ -13,8 +13,9 @@ ffbuild_dockerstage() {
} }
ffbuild_dockerbuild() { ffbuild_dockerbuild() {
git-mini-clone "$GME_REPO" "$GME_COMMIT" gme git clone "$GME_REPO" gme
cd gme cd gme
git checkout "$GME_COMMIT"
mkdir build && cd build mkdir build && cd build