2.3.3-8

- Fix missing includes
- Use more upstreamed patches
- Dynamically link against system boost

3 files changed, 62 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f81cc1758a17..80b1e19e642d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = casparcg-server
 	pkgdesc = Software used to play out professional graphics, audio and video to multiple outputs
 	pkgver = 2.3.3
-	pkgrel = 7
+	pkgrel = 8
 	url = https://github.com/CasparCG/server
 	arch = x86_64
 	license = GPL3
@@ -10,6 +10,7 @@ pkgbase = casparcg-server
 	makedepends = boost
 	makedepends = dos2unix
 	depends = ffmpeg
+	depends = boost-libs
 	depends = libgl
 	depends = freeimage
 	depends = glew
@@ -30,9 +31,16 @@ pkgbase = casparcg-server
 	source = https://github.com/CasparCG/server/commit/8fce42fabb67b469fe2b6fc0b22af69773b21779.patch
 	source = https://github.com/CasparCG/server/commit/a1933f38a7b14fa27d8a4a496ffe84782a840830.patch
 	source = https://github.com/CasparCG/server/commit/09c655313cac5951db23a90f8d8ea54c044def8e.patch
+	source = https://github.com/CasparCG/server/commit/638d0def6b2bc946db34e3b74d5e4b24f70cd65d.patch
+	source = https://github.com/CasparCG/server/commit/5b3a79735781b4ed6c3dd9154ab309fd5a5208a1.patch
+	source = https://github.com/CasparCG/server/commit/cfb93aad41a2d78e52c7c6e0b4eb8520741a9c6e.patch
+	source = https://github.com/CasparCG/server/commit/2f026f2cf149bed4f7c1ea29aa6ae1fa90bc3963.patch
+	source = https://github.com/CasparCG/server/commit/f8e48f5190aabd54b94b5fa0415df33a9cb71441.patch
 	source = https://patch-diff.githubusercontent.com/raw/CasparCG/server/pull/1308.patch
-	source = https://patch-diff.githubusercontent.com/raw/CasparCG/server/pull/1438.patch
+	source = https://patch-diff.githubusercontent.com/raw/CasparCG/server/pull/1465.patch
+	source = https://patch-diff.githubusercontent.com/raw/CasparCG/server/pull/1466.patch
 	source = ffmpeg-5.0.patch
+	source = missing-includes.patch
 	source = ffmpeg-cmake.patch
 	source = https://cef-builds.spotifycdn.com/cef_binary_3.3578.1870.gc974488_linux64_minimal.tar.bz2
 	source = casparcg
@@ -44,9 +52,16 @@ pkgbase = casparcg-server
 	sha256sums = d5bee5099e44de2ba0a86a6d099794a8e4be1811439c0ad0b0fb06700be47f7b
 	sha256sums = 30484f8a455ca5e55d758820499b9f8e275762c8004762dfd9d502a662d2e701
 	sha256sums = 0a811ad09fe9c7591a8cf3a158d9f10d2a951bd2fcba98cb3b87a6bacf8dfe48
+	sha256sums = 125635642bee7b50c7d91e33ba1d3c94d9c40e6f2c79f97eb46bc604fa187a26
+	sha256sums = 34c979e7a3e2309c60b13c9e8634ad2fdbef58b6c477990e4bcf713b7b26e5d5
+	sha256sums = feb45001941b029b339c896d9cc708461fe9e2650b746c14e592382373d2ca7b
+	sha256sums = 156a477bb655b4b60402f2a99c7a893e603141175480d0149933befe55a240d0
+	sha256sums = dc64e29a37b8db871cc74d9cac4e6a65a2d3ed12f51feeccef529758ebe5e23b
 	sha256sums = 5c6f2a3007e3a8739bc1f3eaec3c694af9836aed1943217843a92acff80950c1
-	sha256sums = 170cf317a92e4b94233f65ba5cbf984b94d648080a517852353579e5801482cc
+	sha256sums = fb6f4412629b4d1a149b7913c152857489394118a61b5925d4cc0dbf2c9c63d7
+	sha256sums = ab1091e19cd1d3948be3ca80f5a8f2718b60ead3e63ad35dcff9246f95160791
 	sha256sums = 74258b79273b852209f03c826cd64879514929cd222fa03c924b71444c9110a1
+	sha256sums = 62f98bbf454b04d99df0b385a81dc902c3b8faf2c245ebded69e8597da793717
 	sha256sums = e7f0e0dd123b1cccac21611f4e32ba7d27ce24a9a0587ef6f2180fb3c63894c0
 	sha256sums = b7c5401f342917ece7be583566bfc48b5cc1a8ff9f6470d396130b4aca7dfb22
 	sha256sums = ce9dd83ae2ef9289e551f0a3ecbe246537195049c15f69bbfdc6c3ddd23291c2
diff --git a/PKGBUILD b/PKGBUILD
index e670738eeb69..1ed5b111c656 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@ pkgname=casparcg-server
 pkgver=2.3.3
 _pkgver=$pkgver-lts-stable
 _cef_version=3.3578.1870.gc974488
-pkgrel=7
+pkgrel=8
 pkgdesc="Software used to play out professional graphics, audio and video to multiple outputs"
 arch=('x86_64')
 url="https://github.com/CasparCG/server"
 license=('GPL3')
-depends=(ffmpeg libgl freeimage glew tbb openal sfml libxcomposite libxss pango nss at-spi2-atk ttf-liberation)
+depends=(ffmpeg boost-libs libgl freeimage glew tbb openal sfml libxcomposite libxss pango nss at-spi2-atk ttf-liberation)
 makedepends=(cmake ninja boost dos2unix)
 source=("https://github.com/CasparCG/server/archive/refs/tags/v$_pkgver.tar.gz"
         "https://github.com/CasparCG/server/commit/f0e678e7cabc69d573d59f24f9fd3ceca322ab85.patch"
@@ -18,9 +18,18 @@ source=("https://github.com/CasparCG/server/archive/refs/tags/v$_pkgver.tar.gz"
         "https://github.com/CasparCG/server/commit/8fce42fabb67b469fe2b6fc0b22af69773b21779.patch"
         "https://github.com/CasparCG/server/commit/a1933f38a7b14fa27d8a4a496ffe84782a840830.patch"
         "https://github.com/CasparCG/server/commit/09c655313cac5951db23a90f8d8ea54c044def8e.patch"
+        "https://github.com/CasparCG/server/commit/638d0def6b2bc946db34e3b74d5e4b24f70cd65d.patch"
+        "https://github.com/CasparCG/server/commit/5b3a79735781b4ed6c3dd9154ab309fd5a5208a1.patch"
+        "https://github.com/CasparCG/server/commit/cfb93aad41a2d78e52c7c6e0b4eb8520741a9c6e.patch"
+        "https://github.com/CasparCG/server/commit/2f026f2cf149bed4f7c1ea29aa6ae1fa90bc3963.patch"
+        "https://github.com/CasparCG/server/commit/f8e48f5190aabd54b94b5fa0415df33a9cb71441.patch"
         "https://patch-diff.githubusercontent.com/raw/CasparCG/server/pull/1308.patch"
-        "https://patch-diff.githubusercontent.com/raw/CasparCG/server/pull/1438.patch"
+        "https://patch-diff.githubusercontent.com/raw/CasparCG/server/pull/1465.patch"
+        "https://patch-diff.githubusercontent.com/raw/CasparCG/server/pull/1466.patch"
+        # included upstream, but doesn't apply cleaning to 2.3.3
         "ffmpeg-5.0.patch"
+        # included upstream, but in larger commits that we don't want to backport
+        "missing-includes.patch"
         "ffmpeg-cmake.patch"
         "https://cef-builds.spotifycdn.com/cef_binary_${_cef_version}_linux64_minimal.tar.bz2"
         casparcg)
@@ -32,9 +41,16 @@ sha256sums=('6d8e973949009e95bb5a6496e26cbe680efd77666936e131df0da569f8f7c7e1'
             'd5bee5099e44de2ba0a86a6d099794a8e4be1811439c0ad0b0fb06700be47f7b'
             '30484f8a455ca5e55d758820499b9f8e275762c8004762dfd9d502a662d2e701'
             '0a811ad09fe9c7591a8cf3a158d9f10d2a951bd2fcba98cb3b87a6bacf8dfe48'
+            '125635642bee7b50c7d91e33ba1d3c94d9c40e6f2c79f97eb46bc604fa187a26'
+            '34c979e7a3e2309c60b13c9e8634ad2fdbef58b6c477990e4bcf713b7b26e5d5'
+            'feb45001941b029b339c896d9cc708461fe9e2650b746c14e592382373d2ca7b'
+            '156a477bb655b4b60402f2a99c7a893e603141175480d0149933befe55a240d0'
+            'dc64e29a37b8db871cc74d9cac4e6a65a2d3ed12f51feeccef529758ebe5e23b'
             '5c6f2a3007e3a8739bc1f3eaec3c694af9836aed1943217843a92acff80950c1'
-            '170cf317a92e4b94233f65ba5cbf984b94d648080a517852353579e5801482cc'
+            'fb6f4412629b4d1a149b7913c152857489394118a61b5925d4cc0dbf2c9c63d7'
+            'ab1091e19cd1d3948be3ca80f5a8f2718b60ead3e63ad35dcff9246f95160791'
             '74258b79273b852209f03c826cd64879514929cd222fa03c924b71444c9110a1'
+            '62f98bbf454b04d99df0b385a81dc902c3b8faf2c245ebded69e8597da793717'
             'e7f0e0dd123b1cccac21611f4e32ba7d27ce24a9a0587ef6f2180fb3c63894c0'
             'b7c5401f342917ece7be583566bfc48b5cc1a8ff9f6470d396130b4aca7dfb22'
             'ce9dd83ae2ef9289e551f0a3ecbe246537195049c15f69bbfdc6c3ddd23291c2')
@@ -47,12 +63,6 @@ prepare() {
         patch --forward --strip=1 --input "$f"
     done
 
-    # TODO don't statically link boost
-    sed -i '/Boost_USE_RELEASE/d;/Boost_USE_DEBUG/d' src/CMakeModules/Bootstrap_Linux.cmake
-
-    # pch files don't seem to work with FORTIFY_SOURCE, ignore warnings
-    sed -i /-Winvalid-pch/d src/CMakeModules/PrecompiledHeader.cmake
-
     dos2unix src/shell/casparcg.config
 }
 
@@ -72,6 +82,7 @@ build() {
         -DCMAKE_BUILD_TYPE=None \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCEF_ROOT_DIR="$srcdir/cef_binary_${_cef_version}_linux64_minimal" \
+        -DUSE_SYSTEM_BOOST=ON \
         -G Ninja
 
     ninja -C build
diff --git a/missing-includes.patch b/missing-includes.patch
new file mode 100644
index 000000000000..1ac9f2508ade
--- /dev/null
+++ b/missing-includes.patch
@@ -0,0 +1,23 @@
+diff --git a/src/common/os/linux/thread.cpp b/src/common/os/linux/thread.cpp
+index 26a47bb29..a5ec14207 100644
+--- a/src/common/os/linux/thread.cpp
++++ b/src/common/os/linux/thread.cpp
+@@ -1,5 +1,6 @@
+ #include "../thread.h"
+ #include "../../utf.h"
++#include <pthread.h>
+ 
+ namespace caspar {
+ 
+diff --git a/src/modules/ffmpeg/util/av_util.h b/src/modules/ffmpeg/util/av_util.h
+index 5809abb84..2fa703d20 100644
+--- a/src/modules/ffmpeg/util/av_util.h
++++ b/src/modules/ffmpeg/util/av_util.h
+@@ -3,6 +3,7 @@
+ #include <core/frame/frame.h>
+ #include <core/frame/frame_factory.h>
+ #include <core/frame/pixel_format.h>
++#include <core/video_format.h>
+ 
+ #include <memory>
+ #include <vector>