jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1408 from DDRBoxman/deps 

CI: Fix building libvpx dep on osx
master
Jim 2018-08-05 20:55:25 -07:00 committed by GitHub
parent 4dc57ef24f 5411d6666e
commit abbea9ef7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CI/util/build-package-deps-osx.sh
View File

@ -1,5 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e
# This script builds a tar file that contains a bunch of deps that OBS needs for # This script builds a tar file that contains a bunch of deps that OBS needs for
# advanced functionality on OSX. Currently this tar file is pulled down off of s3 # advanced functionality on OSX. Currently this tar file is pulled down off of s3
# and used in the CI build process on travis. # and used in the CI build process on travis.
@ -84,11 +86,12 @@ cd $WORK_DIR
# libvpx # libvpx
curl -L -O https://chromium.googlesource.com/webm/libvpx/+archive/v1.7.0.tar.gz curl -L -O https://chromium.googlesource.com/webm/libvpx/+archive/v1.7.0.tar.gz
tar -xf libvpx-1.7.0.tar.gz mkdir -p ./libvpx-v1.7.0
cd ./libvpx-1.7.0 tar -xf v1.7.0.tar.gz -C $PWD/libvpx-v1.7.0
mkdir build cd ./libvpx-v1.7.0
mkdir -p build
cd ./build cd ./build
../configure --disable-shared --libdir="/tmp/obsdeps/bin" ../configure --disable-shared --prefix="/tmp/obsdeps" --libdir="/tmp/obsdeps/lib"
make -j 12 make -j 12
make install make install
@ -135,7 +138,7 @@ unzip ./n4.0.2.zip
cd ./FFmpeg-n4.0.2 cd ./FFmpeg-n4.0.2
mkdir build mkdir build
cd ./build cd ./build
../configure --extra-ldflags="-mmacosx-version-min=10.11" --enable-shared --disable-static --shlibdir="/tmp/obsdeps/bin" --enable-gpl --disable-doc --enable-libx264 --enable-libopus --enable-libvorbis --enable-libvpx --disable-outdev=sdl ../configure --pkg-config-flags="--static" --extra-ldflags="-mmacosx-version-min=10.11" --enable-shared --disable-static --shlibdir="/tmp/obsdeps/bin" --enable-gpl --disable-doc --enable-libx264 --enable-libopus --enable-libvorbis --enable-libvpx --disable-outdev=sdl
make -j 12 make -j 12
find . -name \*.dylib -exec cp \{\} $DEPS_DEST/bin/ \; find . -name \*.dylib -exec cp \{\} $DEPS_DEST/bin/ \;
rsync -avh --include="*/" --include="*.h" --exclude="*" ../* $DEPS_DEST/include/ rsync -avh --include="*/" --include="*.h" --exclude="*" ../* $DEPS_DEST/include/