summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Siegert2019-04-09 11:22:53 +0200
committerbartus2020-10-11 14:48:22 +0200
commit007f53bf6aee7d2c3a2e7ff218dc7c7b6b33a1e2 (patch)
treea55d8b2431ed323acce6ae9c137686c5d69ea3b6
parent9d90f47fc285739521a241872b63d618d8fbdd51 (diff)
downloadaur-007f53bf6aee7d2c3a2e7ff218dc7c7b6b33a1e2.tar.gz
Update to 1.5.2-2
-rw-r--r--.SRCINFO6
-rw-r--r--218.diff15
-rw-r--r--PKGBUILD5
3 files changed, 22 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0e705170f73e..9eaff30ee323 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Thu Jan 24 17:29:53 UTC 2019
pkgbase = openboard-develop
pkgdesc = Interactive whiteboard software for schools and universities
pkgver = 1.5.2
- pkgrel = 1
+ pkgrel = 2
url = http://openboard.ch/index.en.html
arch = x86_64
arch = i686
@@ -25,12 +23,14 @@ pkgbase = openboard-develop
source = ssl10.patch
source = qchar.patch
source = qwebkit.patch
+ source = 218.diff
source = openboard.desktop
md5sums = 12942db4dd84699921a460dccb45d00b
md5sums = fa1ff089f0bcc15d2a510bb90cdd3002
md5sums = 9dbccb56e4079b75c606dc40c3e77f00
md5sums = bf2c524f3897cfcfb4315bcd92d4206e
md5sums = 60f64db6bf627015f4747879c4b30fd3
+ md5sums = f484614cc48181287607afb5a45ef644
md5sums = 21d1749400802f8fc0669feaf77de683
pkgname = openboard-develop
diff --git a/218.diff b/218.diff
new file mode 100644
index 000000000000..6e5c1b60c05e
--- /dev/null
+++ b/218.diff
@@ -0,0 +1,15 @@
+diff --git a/src/podcast/podcast.pri b/src/podcast/podcast.pri
+index 7e6ea9ee..e96263fa 100644
+--- a/src/podcast/podcast.pri
++++ b/src/podcast/podcast.pri
+@@ -69,8 +69,8 @@ linux-g++* {
+ -lxcb-xfixes \
+ -lxcb-render -lxcb-shape -lxcb -lX11 -lasound -lSDL -lx264 -lpthread -lvpx -lvorbisenc -lvorbis -ltheoraenc -ltheoradec -logg -lopus -lmp3lame -lfreetype -lfdk-aac -lass -llzma -lbz2 -lz -ldl -lswresample -lswscale -lavutil -lm
+
+- UBUNTU_VERSION = $$system(lsb_release -irs)
+- equals(UBUNTU_VERSION, Ubuntu 14.04) {
++ FFMPEG_VERSION = $$system(ffmpeg --version|& grep -oP "version.*?\K[0-9]\.[0-9]")
++ equals(FFMPEG_VERSION, 2.8) {
+ LIBS -= -lswresample
+ LIBS += -lavresample
+ }
diff --git a/PKGBUILD b/PKGBUILD
index f5f4618b75e3..fa1688e487b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Frank Siegert <frank.siegert@googlemail.com>
pkgname=openboard-develop
pkgver=1.5.2
-pkgrel=1
+pkgrel=2
pkgdesc="Interactive whiteboard software for schools and universities"
arch=('x86_64' 'i686')
url="http://openboard.ch/index.en.html"
@@ -12,12 +12,14 @@ source=("https://github.com/OpenBoard-org/OpenBoard/archive/v$pkgver.tar.gz"
ssl10.patch
qchar.patch
qwebkit.patch
+ 218.diff
openboard.desktop)
md5sums=('12942db4dd84699921a460dccb45d00b'
'fa1ff089f0bcc15d2a510bb90cdd3002'
'9dbccb56e4079b75c606dc40c3e77f00'
'bf2c524f3897cfcfb4315bcd92d4206e'
'60f64db6bf627015f4747879c4b30fd3'
+ 'f484614cc48181287607afb5a45ef644'
'21d1749400802f8fc0669feaf77de683')
prepare() {
@@ -28,6 +30,7 @@ prepare() {
patch -p1 < $srcdir/ssl10.patch
patch -p1 < $srcdir/qchar.patch
patch -p1 < $srcdir/qwebkit.patch
+ patch -p1 < $srcdir/218.diff
}
build() {