Fix compilation with latest versions of poppler and ffmpeg

* Poppler >= 22.01 needed C++17
* Poppler >= 22.03 had an API change in PDFDoc constructor
* ffmpeg version 5 does not work with OpenBoard yet, link to ffmpeg4.4

4 files changed, 29 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 114f0e349998..a98c53408be9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openboard
 	pkgdesc = Interactive whiteboard software for schools and universities
 	pkgver = 1.6.1
-	pkgrel = 5
+	pkgrel = 6
 	url = http://openboard.ch/index.en.html
 	arch = x86_64
 	arch = i686
@@ -19,7 +19,7 @@ pkgbase = openboard
 	depends = openssl
 	depends = libfdk-aac
 	depends = sdl
-	depends = ffmpeg
+	depends = ffmpeg4.4
 	depends = quazip
 	depends = poppler
 	source = https://github.com/OpenBoard-org/OpenBoard/archive/v1.6.1.tar.gz
@@ -27,12 +27,14 @@ pkgbase = openboard
 	source = qchar.patch
 	source = quazip.patch
 	source = drop_ThirdParty_repo.patch
-	source = use-c-17-for-pdf-on-linux-builds.patch
+	source = https://github.com/letsfindaway/OpenBoard/commit/8a3835c9139c47709358a1ec8eef9b4f816182c8.patch
+	source = ffmpeg.patch
 	sha256sums = cf5bfb570b9ac4e61e1670c5a433f1dcaf0de1e8dbcbd544f058711690afba79
 	sha256sums = 64289f9d91cb25fa79fb988f19d43a542d67380fcf27668d0da1ee4ba1e705eb
 	sha256sums = b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549
 	sha256sums = 0a9d037336dab3dbd99652b71934a94cd1e9801650fe5e72f4dd1de1718dd4c1
 	sha256sums = a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14
-	sha256sums = 33a1e28293a8f2e97ba9ab9be1c77bfc04d473ce477b31322b20eececad9bc2f
+	sha256sums = 8e15b88ea217a068bdd5affdcaf350ffc5c22ea6614abbfe904533127d965941
+	sha256sums = b2c8d92275c976af195f1b8f8df0ae1a61781a1c20ccc10b41fdc81178427bd3
 
 pkgname = openboard
diff --git a/PKGBUILD b/PKGBUILD
index 0c7fd190fe4f..e621a1f405f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 pkgname=openboard
 pkgver=1.6.1
 _src_folder="OpenBoard-${pkgver}"
-pkgrel=5
+pkgrel=6
 pkgdesc="Interactive whiteboard software for schools and universities"
 arch=('x86_64' 'i686')
 url="http://openboard.ch/index.en.html"
 license=('GPL3')
-depends=('qt5-base' 'qt5-multimedia' 'qt5-svg' 'qt5-script' 'qt5-webkit' 'qt5-tools' 'qt5-xmlpatterns' 'libpaper' 'bzip2' 'openssl' 'libfdk-aac' 'sdl' 'ffmpeg')
+depends=('qt5-base' 'qt5-multimedia' 'qt5-svg' 'qt5-script' 'qt5-webkit' 'qt5-tools' 'qt5-xmlpatterns' 'libpaper' 'bzip2' 'openssl' 'libfdk-aac' 'sdl' 'ffmpeg4.4')
 depends+=(quazip)  #drop internal quazip and use system one.
 depends+=(poppler) #replace internal xpdf with poppler and drop freetype/xpdf from deps
 makedepends=('patch')
@@ -17,18 +17,20 @@ source=("https://github.com/OpenBoard-org/OpenBoard/archive/v${pkgver}.tar.gz"
 source+=(qchar.patch)
 source+=(quazip.patch)
 source+=(drop_ThirdParty_repo.patch)
-source+=(use-c-17-for-pdf-on-linux-builds.patch)
+source+=("https://github.com/letsfindaway/OpenBoard/commit/8a3835c9139c47709358a1ec8eef9b4f816182c8.patch")
+source+=(ffmpeg.patch)
 sha256sums=('cf5bfb570b9ac4e61e1670c5a433f1dcaf0de1e8dbcbd544f058711690afba79'
             '64289f9d91cb25fa79fb988f19d43a542d67380fcf27668d0da1ee4ba1e705eb'
             'b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549'
             '0a9d037336dab3dbd99652b71934a94cd1e9801650fe5e72f4dd1de1718dd4c1'
             'a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14'
-            '33a1e28293a8f2e97ba9ab9be1c77bfc04d473ce477b31322b20eececad9bc2f')
+            '8e15b88ea217a068bdd5affdcaf350ffc5c22ea6614abbfe904533127d965941'
+            'b2c8d92275c976af195f1b8f8df0ae1a61781a1c20ccc10b41fdc81178427bd3')
 
 prepare() {
   cd "$srcdir"/$_src_folder
-  msg2 "c17"
-  patch -f -p1 < "$srcdir"/use-c-17-for-pdf-on-linux-builds.patch
+  msg2 "poppler"
+  patch -f -p1 < "$srcdir"/8a3835c9139c47709358a1ec8eef9b4f816182c8.patch
   msg2 "drop_ThirdParty_repo"
   patch -f -p1 < "$srcdir"/drop_ThirdParty_repo.patch || true
   msg2 "qchar"
@@ -37,6 +39,8 @@ prepare() {
   patch -f -p1 < "$srcdir"/quazip.patch
   msg2 "gcc11"
   sed 's/_serialize/serialize/g' -i src/pdf-merger/Object.{h,cpp}
+  msg2 "ffpmeg"
+  patch -f -p1 < "$srcdir"/ffmpeg.patch
 }
 
 build() {
diff --git a/ffmpeg.patch b/ffmpeg.patch
new file mode 100644
index 000000000000..295cb59120cf
--- /dev/null
+++ b/ffmpeg.patch
@@ -0,0 +1,13 @@
+--- a/src/podcast/podcast.pri	2021-04-13 19:05:29.000000000 +0200
++++ b/src/podcast/podcast.pri	2022-03-22 08:34:21.095697431 +0100
+@@ -59,8 +59,9 @@
+ 
+ 
+     DEPENDPATH += /usr/lib/x86_64-linux-gnu
++    INCLUDEPATH += /usr/include/ffmpeg4.4
+ 
+-    LIBS += -lavformat -lavcodec -lswscale -lavutil \
++    LIBS += -L/usr/lib/ffmpeg4.4 -lavformat -lavcodec -lswscale -lavutil \
+             -lva-x11 \
+             -lva \
+             -lxcb-shm \
diff --git a/use-c-17-for-pdf-on-linux-builds.patch b/use-c-17-for-pdf-on-linux-builds.patch
deleted file mode 100644
index c765e22f8723..000000000000
--- a/use-c-17-for-pdf-on-linux-builds.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/pdf/pdf.pri	2021-04-13 19:05:29.000000000 +0200
-+++ b/src/pdf/pdf.pri	2022-02-27 19:43:33.932172711 +0100
-@@ -1,3 +1,6 @@
-+linux-g++* {

-+    CONFIG += c++17

-+}

- 

- HEADERS      += src/pdf/GraphicsPDFItem.h \

-                 src/pdf/PDFRenderer.h \