New upstream version 22.0.3+dfsg1
This commit is contained in:
Sebastian Ramacher
parent
665f64a933
commit
cdc9a9fc87
334 changed files with 14525 additions and 2639 deletions
|
|
@ -14,11 +14,6 @@ export FILENAME=$FILE_DATE-$GIT_HASH-$TRAVIS_BRANCH-osx.pkg
|
|||
|
||||
cd ./build
|
||||
|
||||
# Move the CEF plugin out before running build_app so that it doesn't get packaged twice
|
||||
hr "Moving CEF out to preserve linking"
|
||||
mv ./rundir/RelWithDebInfo/obs-plugins/CEF.app ./
|
||||
mv ./rundir/RelWithDebInfo/obs-plugins/obs-browser.so ./
|
||||
|
||||
# Move obslua
|
||||
hr "Moving OBS LUA"
|
||||
mv ./rundir/RelWithDebInfo/data/obs-scripting/obslua.so ./rundir/RelWithDebInfo/bin/
|
||||
|
|
@ -35,12 +30,20 @@ if [ -n "${TRAVIS_TAG}" ]; then
|
|||
STABLE=true
|
||||
fi
|
||||
|
||||
sudo python ../CI/install/osx/build_app.py --public-key ../CI/install/osx/OBSPublicDSAKey.pem --sparkle-framework ../../sparkle/Sparkle.framework --base-url "https://obsproject.com/osx_update" --stable=$STABLE
|
||||
sudo python ../CI/install/osx/build_app.py --public-key ../CI/install/osx/OBSPublicDSAKey.pem --sparkle-framework ../../sparkle/Sparkle.framework --stable=$STABLE
|
||||
|
||||
# Move the CEF plugin back to where it belongs
|
||||
hr "Moving CEF back"
|
||||
mv ./CEF.app ./rundir/RelWithDebInfo/obs-plugins/
|
||||
mv ./obs-browser.so ./rundir/RelWithDebInfo/obs-plugins/
|
||||
# Copy Chromium embedded framework to app Frameworks directory
|
||||
hr "Copying Chromium Embedded Framework.framework"
|
||||
sudo mkdir -p OBS.app/Contents/Frameworks
|
||||
sudo cp -r ../../cef_binary_${CEF_BUILD_VERSION}_macosx64/Release/Chromium\ Embedded\ Framework.framework OBS.app/Contents/Frameworks/
|
||||
sudo install_name_tool -change \
|
||||
@rpath/Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
|
||||
../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
|
||||
OBS.app/Contents/Resources/obs-plugins/obs-browser.so
|
||||
sudo install_name_tool -change \
|
||||
@rpath/Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
|
||||
../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
|
||||
OBS.app/Contents/Resources/obs-plugins/obs-browser-page
|
||||
|
||||
# Package app
|
||||
hr "Generating .pkg"
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
# Make sure ccache is found
|
||||
export PATH=/usr/local/opt/ccache/libexec:$PATH
|
||||
|
||||
cd ./plugins/obs-browser
|
||||
git checkout origin/osx
|
||||
cd -
|
||||
git fetch --tags
|
||||
|
||||
mkdir build
|
||||
cd build
|
||||
cmake -DENABLE_SPARKLE_UPDATER=ON \
|
||||
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.10 \
|
||||
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 \
|
||||
-DQTDIR=/usr/local/Cellar/qt/5.10.1 \
|
||||
-DDepsPath=/tmp/obsdeps \
|
||||
-DVLCPath=$PWD/../../vlc-master \
|
||||
-DBUILD_BROWSER=ON \
|
||||
-DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 ..
|
||||
-DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 ..
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
hr() {
|
||||
echo "───────────────────────────────────────────────────"
|
||||
echo $1
|
||||
echo "───────────────────────────────────────────────────"
|
||||
}
|
||||
|
||||
# Exit if something fails
|
||||
set -e
|
||||
|
||||
|
|
@ -11,40 +17,46 @@ cd ../
|
|||
|
||||
# Install Packages app so we can build a package later
|
||||
# http://s.sudre.free.fr/Software/Packages/about.html
|
||||
wget --retry-connrefused --waitretry=1 https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg
|
||||
hr "Downloading Packages app"
|
||||
wget --quiet --retry-connrefused --waitretry=1 https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg
|
||||
sudo installer -pkg ./Packages.pkg -target /
|
||||
|
||||
brew update
|
||||
|
||||
#Base OBS Deps and ccache
|
||||
brew install qt5 jack speexdsp ccache swig
|
||||
brew install jack speexdsp ccache swig mbedtls
|
||||
brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/9a70413d137839de0054571e5f85fd07ee400955/Formula/qt.rb
|
||||
|
||||
export PATH=/usr/local/opt/ccache/libexec:$PATH
|
||||
ccache -s || echo "CCache is not available."
|
||||
|
||||
# Fetch and untar prebuilt OBS deps that are compatible with older versions of OSX
|
||||
wget --retry-connrefused --waitretry=1 https://s3-us-west-2.amazonaws.com/obs-nightly/osx-deps.tar.gz
|
||||
tar -xf ./osx-deps.tar.gz -C /tmp
|
||||
hr "Downloading OBS deps"
|
||||
wget --quiet --retry-connrefused --waitretry=1 https://obs-nightly.s3.amazonaws.com/osx-deps-2018-08-09.tar.gz
|
||||
tar -xf ./osx-deps-2018-08-09.tar.gz -C /tmp
|
||||
|
||||
# Fetch vlc codebase
|
||||
wget --retry-connrefused --waitretry=1 -O vlc-master.zip https://github.com/videolan/vlc/archive/master.zip
|
||||
hr "Downloading VLC repo"
|
||||
wget --quiet --retry-connrefused --waitretry=1 -O vlc-master.zip https://github.com/videolan/vlc/archive/master.zip
|
||||
unzip -q ./vlc-master.zip
|
||||
|
||||
# Get sparkle
|
||||
wget --retry-connrefused --waitretry=1 -O sparkle.tar.bz2 https://github.com/sparkle-project/Sparkle/releases/download/1.16.0/Sparkle-1.16.0.tar.bz2
|
||||
hr "Downloading Sparkle framework"
|
||||
wget --quiet --retry-connrefused --waitretry=1 -O sparkle.tar.bz2 https://github.com/sparkle-project/Sparkle/releases/download/1.20.0/Sparkle-1.20.0.tar.bz2
|
||||
mkdir ./sparkle
|
||||
tar -xf ./sparkle.tar.bz2 -C ./sparkle
|
||||
sudo cp -R ./sparkle/Sparkle.framework /Library/Frameworks/Sparkle.framework
|
||||
|
||||
# CEF Stuff
|
||||
wget --retry-connrefused --waitretry=1 https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
|
||||
hr "Downloading CEF"
|
||||
wget --quiet --retry-connrefused --waitretry=1 https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
|
||||
tar -xf ./cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
|
||||
cd ./cef_binary_${CEF_BUILD_VERSION}_macosx64
|
||||
# remove a broken test
|
||||
sed -i '.orig' '/add_subdirectory(tests\/ceftests)/d' ./CMakeLists.txt
|
||||
mkdir build
|
||||
cd ./build
|
||||
cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 ..
|
||||
cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 ..
|
||||
make -j4
|
||||
mkdir libcef_dll
|
||||
cd ../../
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@
|
|||
<key>GID</key>
|
||||
<integer>80</integer>
|
||||
<key>PATH</key>
|
||||
<string>../../../build/plugins/obs-browser/CEF.app</string>
|
||||
<string>../../../build/plugins/obs-browser/obs-browser-page</string>
|
||||
<key>PATH_TYPE</key>
|
||||
<integer>3</integer>
|
||||
<key>PERMISSIONS</key>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ parser.add_argument('-d', '--base-dir', dest='dir', default='rundir/RelWithDebIn
|
|||
parser.add_argument('-n', '--build-number', dest='build_number', default='0')
|
||||
parser.add_argument('-k', '--public-key', dest='public_key', default='OBSPublicDSAKey.pem')
|
||||
parser.add_argument('-f', '--sparkle-framework', dest='sparkle', default=None)
|
||||
parser.add_argument('-b', '--base-url', dest='base_url', default='https://builds.catchexception.org/obs-studio')
|
||||
parser.add_argument('-b', '--base-url', dest='base_url', default='https://obsproject.com/osx_update')
|
||||
parser.add_argument('-u', '--user', dest='user', default='jp9000')
|
||||
parser.add_argument('-c', '--channel', dest='channel', default='master')
|
||||
add_boolean_argument(parser, 'stable', default=False)
|
||||
|
|
@ -82,6 +82,16 @@ for i in candidate_paths:
|
|||
print("Checking " + i)
|
||||
for root, dirs, files in walk(build_path+"/"+i):
|
||||
for file_ in files:
|
||||
if ".ini" in file_:
|
||||
continue
|
||||
if ".png" in file_:
|
||||
continue
|
||||
if ".effect" in file_:
|
||||
continue
|
||||
if ".py" in file_:
|
||||
continue
|
||||
if ".json" in file_:
|
||||
continue
|
||||
path = root + "/" + file_
|
||||
try:
|
||||
out = check_output("{0}otool -L '{1}'".format(args.prefix, path), shell=True,
|
||||
|
|
|
|||
|
|
@ -1,5 +1 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# Fix permissions on CEF
|
||||
chmod 744 "/Library/Application Support/obs-studio/plugins/obs-browser/bin/CEF.app/Contents/Info.plist"
|
||||
chmod 744 "/Library/Application Support/obs-studio/plugins/obs-browser/bin/CEF.app/Contents/Frameworks/CEF Helper.app/Contents/Info.plist"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,13 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
|
||||
# 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
|
||||
# and used in the CI build process on travis.
|
||||
# Mostly this sets build flags to compile with older SDKS and make sure that
|
||||
# the libs are portable.
|
||||
|
||||
exists()
|
||||
{
|
||||
command -v "$1" >/dev/null 2>&1
|
||||
|
|
@ -35,15 +43,15 @@ mkdir $DEPS_DEST/include
|
|||
mkdir $DEPS_DEST/lib
|
||||
|
||||
# OSX COMPAT
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.9
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.11
|
||||
|
||||
# If you need an olders SDK and Xcode won't give it to you
|
||||
# https://github.com/phracker/MacOSX-SDKs
|
||||
|
||||
# libopus
|
||||
curl -L -O http://downloads.xiph.org/releases/opus/opus-1.1.3.tar.gz
|
||||
tar -xf opus-1.1.3.tar.gz
|
||||
cd ./opus-1.1.3
|
||||
curl -L -O https://ftp.osuosl.org/pub/xiph/releases/opus/opus-1.2.1.tar.gz
|
||||
tar -xf opus-1.2.1.tar.gz
|
||||
cd ./opus-1.2.1
|
||||
mkdir build
|
||||
cd ./build
|
||||
../configure --disable-shared --enable-static --prefix="/tmp/obsdeps"
|
||||
|
|
@ -53,9 +61,9 @@ make install
|
|||
cd $WORK_DIR
|
||||
|
||||
# libogg
|
||||
curl -L -O http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.gz
|
||||
tar -xf libogg-1.3.2.tar.gz
|
||||
cd ./libogg-1.3.2
|
||||
curl -L -O https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-1.3.3.tar.gz
|
||||
tar -xf libogg-1.3.3.tar.gz
|
||||
cd ./libogg-1.3.3
|
||||
mkdir build
|
||||
cd ./build
|
||||
../configure --disable-shared --enable-static --prefix="/tmp/obsdeps"
|
||||
|
|
@ -65,9 +73,9 @@ make install
|
|||
cd $WORK_DIR
|
||||
|
||||
# libvorbis
|
||||
curl -L -O http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.gz
|
||||
tar -xf libvorbis-1.3.5.tar.gz
|
||||
cd ./libvorbis-1.3.5
|
||||
curl -L -O https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.6.tar.gz
|
||||
tar -xf libvorbis-1.3.6.tar.gz
|
||||
cd ./libvorbis-1.3.6
|
||||
mkdir build
|
||||
cd ./build
|
||||
../configure --disable-shared --enable-static --prefix="/tmp/obsdeps"
|
||||
|
|
@ -77,12 +85,13 @@ make install
|
|||
cd $WORK_DIR
|
||||
|
||||
# libvpx
|
||||
curl -L -O http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.6.0.tar.bz2
|
||||
tar -xf libvpx-1.6.0.tar.bz2
|
||||
cd ./libvpx-1.6.0
|
||||
mkdir build
|
||||
curl -L -O https://chromium.googlesource.com/webm/libvpx/+archive/v1.7.0.tar.gz
|
||||
mkdir -p ./libvpx-v1.7.0
|
||||
tar -xf v1.7.0.tar.gz -C $PWD/libvpx-v1.7.0
|
||||
cd ./libvpx-v1.7.0
|
||||
mkdir -p build
|
||||
cd ./build
|
||||
../configure --disable-shared --libdir="/tmp/obsdeps/bin"
|
||||
../configure --disable-shared --prefix="/tmp/obsdeps" --libdir="/tmp/obsdeps/lib"
|
||||
make -j 12
|
||||
make install
|
||||
|
||||
|
|
@ -94,10 +103,10 @@ cd ./x264
|
|||
git checkout origin/stable
|
||||
mkdir build
|
||||
cd ./build
|
||||
../configure --extra-ldflags="-mmacosx-version-min=10.9" --enable-static --prefix="/tmp/obsdeps"
|
||||
../configure --extra-ldflags="-mmacosx-version-min=10.11" --enable-static --prefix="/tmp/obsdeps"
|
||||
make -j 12
|
||||
make install
|
||||
../configure --extra-ldflags="-mmacosx-version-min=10.9" --enable-shared --libdir="/tmp/obsdeps/bin" --prefix="/tmp/obsdeps"
|
||||
../configure --extra-ldflags="-mmacosx-version-min=10.11" --enable-shared --libdir="/tmp/obsdeps/bin" --prefix="/tmp/obsdeps"
|
||||
make -j 12
|
||||
ln -f -s libx264.*.dylib libx264.dylib
|
||||
find . -name \*.dylib -exec cp \{\} $DEPS_DEST/bin/ \;
|
||||
|
|
@ -107,9 +116,9 @@ rsync -avh --include="*/" --include="*.h" --exclude="*" ./* $DEPS_DEST/include/
|
|||
cd $WORK_DIR
|
||||
|
||||
# janson
|
||||
curl -L -O http://www.digip.org/jansson/releases/jansson-2.9.tar.gz
|
||||
tar -xf jansson-2.9.tar.gz
|
||||
cd jansson-2.9
|
||||
curl -L -O http://www.digip.org/jansson/releases/jansson-2.11.tar.gz
|
||||
tar -xf jansson-2.11.tar.gz
|
||||
cd jansson-2.11
|
||||
mkdir build
|
||||
cd ./build
|
||||
../configure --libdir="/tmp/obsdeps/bin" --enable-shared --disable-static
|
||||
|
|
@ -124,12 +133,12 @@ export LDFLAGS="-L/tmp/obsdeps/lib"
|
|||
export CFLAGS="-I/tmp/obsdeps/include"
|
||||
|
||||
# FFMPEG
|
||||
curl -L -O https://github.com/FFmpeg/FFmpeg/archive/n3.2.2.zip
|
||||
unzip ./n3.2.2.zip
|
||||
cd ./FFmpeg-n3.2.2
|
||||
curl -L -O https://github.com/FFmpeg/FFmpeg/archive/n4.0.2.zip
|
||||
unzip ./n4.0.2.zip
|
||||
cd ./FFmpeg-n4.0.2
|
||||
mkdir build
|
||||
cd ./build
|
||||
../configure --extra-ldflags="-mmacosx-version-min=10.9" --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
|
||||
find . -name \*.dylib -exec cp \{\} $DEPS_DEST/bin/ \;
|
||||
rsync -avh --include="*/" --include="*.h" --exclude="*" ../* $DEPS_DEST/include/
|
||||
|
|
@ -149,4 +158,4 @@ cd $WORK_DIR
|
|||
|
||||
tar -czf osx-deps.tar.gz obsdeps
|
||||
|
||||
cp ./osx-deps.tar.gz $CURDIR
|
||||
cp ./osx-deps.tar.gz $CURDIR
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue