New upstream version 24.0.1+dfsg1
This commit is contained in:
Sebastian Ramacher
parent
b14f9eae6d
commit
5a730d6ec3
842 changed files with 42245 additions and 33385 deletions
|
|
@ -40,10 +40,18 @@ 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 \
|
||||
@executable_path/../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
|
||||
sudo install_name_tool -change \
|
||||
@executable_path/../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,6 +1,11 @@
|
|||
#!/bin/sh
|
||||
set -ex
|
||||
#!/bin/bash
|
||||
|
||||
./formatcode.sh
|
||||
if ! ./CI/check-format.sh; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
set -ex
|
||||
ccache -s || echo "CCache is not available."
|
||||
mkdir build && cd build
|
||||
cmake ..
|
||||
|
|
|
|||
|
|
@ -3,6 +3,11 @@ export PATH=/usr/local/opt/ccache/libexec:$PATH
|
|||
|
||||
git fetch --tags
|
||||
|
||||
./formatcode.sh
|
||||
if ! ./CI/check-format.sh; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir build
|
||||
cd build
|
||||
cmake -DENABLE_SPARKLE_UPDATER=ON \
|
||||
|
|
|
|||
11
CI/check-format.sh
Executable file
11
CI/check-format.sh
Executable file
|
|
@ -0,0 +1,11 @@
|
|||
#!/bin/bash
|
||||
dirty=$(git ls-files --modified)
|
||||
|
||||
set +x
|
||||
if [[ $dirty ]]; then
|
||||
echo "================================="
|
||||
echo "Files were not formatted properly"
|
||||
echo "$dirty"
|
||||
echo "================================="
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -3,6 +3,16 @@ set -ex
|
|||
|
||||
sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y
|
||||
curl -L https://packagecloud.io/github/git-lfs/gpgkey | sudo apt-key add -
|
||||
|
||||
# gets us newer clang
|
||||
sudo bash -c "cat >> /etc/apt/sources.list" << LLVMAPT
|
||||
# 3.8
|
||||
deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main
|
||||
deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main
|
||||
LLVMAPT
|
||||
|
||||
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
|
||||
|
||||
sudo apt-get -qq update
|
||||
sudo apt-get install -y \
|
||||
build-essential \
|
||||
|
|
@ -42,4 +52,5 @@ sudo apt-get install -y \
|
|||
python3-dev \
|
||||
qtbase5-dev \
|
||||
libqt5svg5-dev \
|
||||
swig
|
||||
swig \
|
||||
clang-format-8
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ set -v
|
|||
|
||||
if [[ $TRAVIS ]]; then
|
||||
git fetch --unshallow
|
||||
else
|
||||
/bin/bash -c "sudo xcode-select -s /Applications/Xcode_9.4.1.app/Contents/Developer"
|
||||
fi
|
||||
|
||||
# Leave obs-studio folder
|
||||
|
|
@ -26,7 +28,7 @@ sudo installer -pkg ./Packages.pkg -target /
|
|||
brew update
|
||||
|
||||
#Base OBS Deps and ccache
|
||||
brew install jack speexdsp ccache mbedtls
|
||||
brew install jack speexdsp ccache mbedtls clang-format
|
||||
brew install https://gist.githubusercontent.com/DDRBoxman/b3956fab6073335a4bf151db0dcbd4ad/raw/ed1342a8a86793ea8c10d8b4d712a654da121ace/qt.rb
|
||||
brew install https://gist.githubusercontent.com/DDRBoxman/4cada55c51803a2f963fa40ce55c9d3e/raw/572c67e908bfbc1bcb8c476ea77ea3935133f5b5/swig.rb
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
curl -kLO https://cdn-fastly.obsproject.com/downloads/Qt_5.10.1.7z -f --retry 5 -C -
|
||||
if exist Qt_5.10.1.7z (curl -kLO https://cdn-fastly.obsproject.com/downloads/Qt_5.10.1.7z -f --retry 5 -z Qt_5.10.1.7z) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/Qt_5.10.1.7z -f --retry 5 -C -)
|
||||
7z x Qt_5.10.1.7z -oQt
|
||||
mv Qt C:\QtDep
|
||||
dir C:\QtDep
|
||||
|
|
@ -1,18 +1,18 @@
|
|||
if exist dependencies2017.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/dependencies2017.zip -f --retry 5 -z dependencies2017.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/dependencies2017.zip -f --retry 5 -C -)
|
||||
if exist vlc.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/vlc.zip -f --retry 5 -z vlc.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/vlc.zip -f --retry 5 -C -)
|
||||
if exist cef_binary_%CEF_VERSION%_windows32.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows32.zip -f --retry 5 -z cef_binary_%CEF_VERSION%_windows32.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows32.zip -f --retry 5 -C -)
|
||||
if exist cef_binary_%CEF_VERSION%_windows64.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows64.zip -f --retry 5 -z cef_binary_%CEF_VERSION%_windows64.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows64.zip -f --retry 5 -C -)
|
||||
if exist cef_binary_%CEF_VERSION%_windows32_minimal.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows32_minimal.zip -f --retry 5 -z cef_binary_%CEF_VERSION%_windows32_minimal.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows32_minimal.zip -f --retry 5 -C -)
|
||||
if exist cef_binary_%CEF_VERSION%_windows64_minimal.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows64_minimal.zip -f --retry 5 -z cef_binary_%CEF_VERSION%_windows64_minimal.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows64_minimal.zip -f --retry 5 -C -)
|
||||
7z x dependencies2017.zip -odependencies2017
|
||||
7z x vlc.zip -ovlc
|
||||
7z x cef_binary_%CEF_VERSION%_windows32.zip -oCEF_32
|
||||
7z x cef_binary_%CEF_VERSION%_windows64.zip -oCEF_64
|
||||
7z x cef_binary_%CEF_VERSION%_windows32_minimal.zip -oCEF_32
|
||||
7z x cef_binary_%CEF_VERSION%_windows64_minimal.zip -oCEF_64
|
||||
set DepsPath32=%CD%\dependencies2017\win32
|
||||
set DepsPath64=%CD%\dependencies2017\win64
|
||||
set VLCPath=%CD%\vlc
|
||||
set QTDIR32=C:\QtDep\5.10.1\msvc2017
|
||||
set QTDIR64=C:\QtDep\5.10.1\msvc2017_64
|
||||
set CEF_32=%CD%\CEF_32\cef_binary_%CEF_VERSION%_windows32
|
||||
set CEF_64=%CD%\CEF_64\cef_binary_%CEF_VERSION%_windows64
|
||||
set CEF_32=%CD%\CEF_32\cef_binary_%CEF_VERSION%_windows32_minimal
|
||||
set CEF_64=%CD%\CEF_64\cef_binary_%CEF_VERSION%_windows64_minimal
|
||||
set build_config=RelWithDebInfo
|
||||
mkdir build build32 build64
|
||||
if "%TWITCH-CLIENTID%"=="$(twitch_clientid)" (
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue