summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authordanitool2016-07-18 13:52:24 +0200
committerdanitool2016-07-18 13:52:24 +0200
commit540b6cc8338a31067dcb2dc22f3608305ee5cdec (patch)
tree0dbdb9941e3d829530e81cbdf6d742accca86df4
parent4021b2e7a11210d6a23c7837bac79069f790f0d6 (diff)
downloadaur-540b6cc8338a31067dcb2dc22f3608305ee5cdec.tar.gz
fix dvbdevice.cpp file
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD9
-rw-r--r--kaffeine-1.2.2-dvbdevice.patch39
3 files changed, 50 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2dfeff97a9c..cd2e231884a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Jul 18 11:50:38 UTC 2016
pkgbase = kaffeine-legacy
pkgdesc = KDE media player. Old 1.2.2 version using Xine frontend
pkgver = 1.2.2
- pkgrel = 5
+ pkgrel = 6
url = http://kaffeine.kde.org
install = kaffeine.install
arch = i686
@@ -15,8 +17,10 @@ pkgbase = kaffeine-legacy
conflicts = kaffeine-git
source = http://downloads.sourceforge.net/kaffeine/kaffeine-1.2.2.tar.gz
source = kaffeine-1.2.2-gcc4.7.patch
+ source = kaffeine-1.2.2-dvbdevice.patch
md5sums = 690e48d2e5fe123887109aa9b1bc1c31
md5sums = 48afe5ec99b38fe02782db57a847033f
+ md5sums = fa923a1c4adb5f14a5e22bf2c4f1f85e
pkgname = kaffeine-legacy
diff --git a/PKGBUILD b/PKGBUILD
index 757e1cc1e86..10d2e0f4c7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=kaffeine-legacy
pkgver=1.2.2
-pkgrel=5
+pkgrel=6
pkgdesc='KDE media player. Old 1.2.2 version using Xine frontend'
license=('GPL')
arch=('i686' 'x86_64')
@@ -14,13 +14,16 @@ makedepends=('cmake' 'automoc4')
conflicts=('kaffeine' 'kaffeine-git')
install=kaffeine.install
source=(http://downloads.sourceforge.net/kaffeine/kaffeine-${pkgver}.tar.gz
- kaffeine-1.2.2-gcc4.7.patch)
+ kaffeine-1.2.2-gcc4.7.patch
+ kaffeine-1.2.2-dvbdevice.patch)
md5sums=('690e48d2e5fe123887109aa9b1bc1c31'
- '48afe5ec99b38fe02782db57a847033f')
+ '48afe5ec99b38fe02782db57a847033f'
+ 'fa923a1c4adb5f14a5e22bf2c4f1f85e')
prepare() {
cd kaffeine-${pkgver}
patch -p1 -i "${srcdir}/kaffeine-1.2.2-gcc4.7.patch"
+ patch -p1 -i "${srcdir}/kaffeine-1.2.2-dvbdevice.patch"
sed -i -e '2aINCLUDE(CheckIncludeFiles)' CMakeLists.txt
}
diff --git a/kaffeine-1.2.2-dvbdevice.patch b/kaffeine-1.2.2-dvbdevice.patch
new file mode 100644
index 00000000000..b588cda3115
--- /dev/null
+++ b/kaffeine-1.2.2-dvbdevice.patch
@@ -0,0 +1,39 @@
+--- a/src/dvb/dvbdevice.cpp 2011-04-17 21:17:19.000000000 +0200
++++ b/src/dvb/dvbdevice.cpp 2016-07-17 16:43:02.485477721 +0200
+@@ -353,7 +353,7 @@
+
+ switch (config->configuration) {
+ case DvbConfigBase::DiseqcSwitch: {
+- char cmd[] = { 0xe0, 0x10, 0x38, 0x00 };
++ char cmd[] = { char(0xe0), 0x10, 0x38, 0x00 };
+ cmd[3] = 0xf0 | (config->lnbNumber << 2) | (horPolar ? 2 : 0) | (highBand ? 1 : 0);
+ backend->sendMessage(cmd, sizeof(cmd));
+ usleep(15000);
+@@ -391,15 +391,15 @@
+
+ if (angle >= 0) {
+ // east
+- value = ((16 * angle * 180 / M_PI) + 0.5);
++ value = int ((16 * angle * 180 / M_PI) + 0.5);
+ value |= 0xe000;
+ } else {
+ // west
+- value = ((16 * (-angle) * 180 / M_PI) + 0.5);
++ value = int ((16 * (-angle) * 180 / M_PI) + 0.5);
+ value |= 0xd000;
+ }
+
+- char cmd[] = { 0xe0, 0x31, 0x6e, (value / 256), (value % 256) };
++ char cmd[] = { char(0xe0), 0x31, 0x6e, char(value / 256), char(value % 256) };
+ backend->sendMessage(cmd, sizeof(cmd));
+ usleep(15000);
+ moveRotor = true;
+@@ -407,7 +407,7 @@
+ }
+
+ case DvbConfigBase::PositionsRotor: {
+- char cmd[] = { 0xe0, 0x31, 0x6b, config->lnbNumber };
++ char cmd[] = { char(0xe0), 0x31, 0x6b, char(config->lnbNumber) };
+ backend->sendMessage(cmd, sizeof(cmd));
+ usleep(15000);
+ moveRotor = true;