summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrimi2016-11-05 20:16:43 +0100
committergrimi2016-11-05 20:16:43 +0100
commit31343409ebb16269bd013fe07af21628834a99a3 (patch)
treea2b6ae7f428fbda28e99c82b4ce5207b780c6dce
parent29d43b3ea5e3f2cf31526828a2c073082622564e (diff)
downloadaur-31343409ebb16269bd013fe07af21628834a99a3.tar.gz
Fix: patch for SDL2 2.0.5 (SDL_PeepEvents problem).
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD14
-rw-r--r--sdl_check_ev.patch40
3 files changed, 55 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ee27a00364cc..0f007ea49aa8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = antimicro
pkgdesc = Graphical program used to map keyboard keys and mouse controls to gamepad buttons
pkgver = 2.22
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/AntiMicro/antimicro
arch = i686
arch = x86_64
@@ -17,7 +17,9 @@ pkgbase = antimicro
depends = shared-mime-info
depends = desktop-file-utils
source = antimicro-2.22.tar.gz::https://github.com/AntiMicro/antimicro/archive/2.22.tar.gz
- md5sums = 165a0dbe5931783f0d2c035a87b8e6a1
+ source = sdl_check_ev.patch
+ sha1sums = b30cd898218d3325ff7f18fd2efee2a88a79a5ea
+ sha1sums = 068047dad992f99e70aedceb0a4587ac6735412d
pkgname = antimicro
diff --git a/PKGBUILD b/PKGBUILD
index 95f2d67c2137..1f006e66c587 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,23 @@
pkgname=antimicro
pkgver=2.22
-pkgrel=1
+pkgrel=2
pkgdesc="Graphical program used to map keyboard keys and mouse controls to gamepad buttons"
arch=('i686' 'x86_64')
url="https://github.com/AntiMicro/antimicro"
license=('GPL3')
depends=('libxkbcommon-x11' 'libxtst' 'qt5-base' 'sdl2' 'shared-mime-info' 'desktop-file-utils')
makedepends=('cmake' 'gettext' 'itstool' 'qt5-tools')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/AntiMicro/${pkgname}/archive/${pkgver}.tar.gz")
-md5sums=('165a0dbe5931783f0d2c035a87b8e6a1')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/AntiMicro/${pkgname}/archive/${pkgver}.tar.gz" "sdl_check_ev.patch")
+sha1sums=('b30cd898218d3325ff7f18fd2efee2a88a79a5ea'
+ '068047dad992f99e70aedceb0a4587ac6735412d')
+
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../sdl_check_ev.patch
+}
+
build() {
cd ${pkgname}-${pkgver}
diff --git a/sdl_check_ev.patch b/sdl_check_ev.patch
new file mode 100644
index 000000000000..d3223c43153f
--- /dev/null
+++ b/sdl_check_ev.patch
@@ -0,0 +1,40 @@
+diff --git a/src/sdleventreader.cpp b/src/sdleventreader.cpp
+index 6729155..e8e60ae 100644
+--- a/src/sdleventreader.cpp
++++ b/src/sdleventreader.cpp
+@@ -205,7 +205,17 @@ int SDLEventReader::CheckForEvents()
+ exit = true;
+ break;
+ }
+- case 1:
++ case 0:
++ {
++ if (!pollRateTimer.isActive())
++ {
++ pollRateTimer.start();
++ }
++ //exit = true;
++ //SDL_Delay(10);
++ break;
++ }
++ default:
+ {
+ /*Logger::LogInfo(
+ QString("Gamepad Poll %1").arg(
+@@ -217,16 +227,6 @@ int SDLEventReader::CheckForEvents()
+ exit = true;
+ break;
+ }
+- case 0:
+- {
+- if (!pollRateTimer.isActive())
+- {
+- pollRateTimer.start();
+- }
+- //exit = true;
+- //SDL_Delay(10);
+- break;
+- }
+ }
+
+ return result;