[arch-commits] Commit in yabause-qt/repos (4 files)

[Evangelos Foutras]

    Date: Saturday, April 25, 2020 @ 17:33:45
  Author: foutrelis
Revision: 621018

archrelease: copy trunk to community-staging-x86_64

Added:
  yabause-qt/repos/community-staging-x86_64/
  yabause-qt/repos/community-staging-x86_64/PKGBUILD
    (from rev 621017, yabause-qt/trunk/PKGBUILD)
  yabause-qt/repos/community-staging-x86_64/qt-5.11.patch
    (from rev 621017, yabause-qt/trunk/qt-5.11.patch)
  yabause-qt/repos/community-staging-x86_64/rwx.patch
    (from rev 621017, yabause-qt/trunk/rwx.patch)

---------------+
 PKGBUILD      |   56 ++++++++++++++++++++++++++++++++++++++++++++++++
 qt-5.11.patch |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 rwx.patch     |   20 +++++++++++++++++
 3 files changed, 141 insertions(+)

Copied: yabause-qt/repos/community-staging-x86_64/PKGBUILD (from rev 621017, yabause-qt/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-04-25 17:33:45 UTC (rev 621018)
@@ -0,0 +1,56 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Harley Laue <losinggeneration at gmail.com>
+# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux at free.fr>
+# Contributor: Anton Shestakov <engoredi at ya.ru>
+# Contributor: Tiago Camargo <tcamargo at gmail.com>
+# Contributor: robb_force <robb_force at holybuffalo.net>
+
+pkgname=yabause-qt
+pkgver=0.9.15
+pkgrel=3
+pkgdesc='A Sega Saturn emulator'
+arch=('x86_64')
+url="https://yabause.org/"
+license=('GPL')
+depends=('freeglut' 'glew' 'openal' 'qt5-base' 'qt5-multimedia' 'sdl2')
+makedepends=('cmake' 'glu' 'libxmu')
+conflicts=('yabause-gtk')
+source=("https://download.tuxfamily.org/yabause/releases/${pkgver}/yabause-${pkgver}.tar.gz"
+        'qt-5.11.patch'
+        'rwx.patch')
+sha256sums=('4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2'
+            '5c4f639478567d9a42963420bb6ab4086fd0514e8787c597c7b40804e1946ea6'
+            'd29997d3249683081a2687f31e777f917093101d56815d22103aaaf22ac786b1')
+
+prepare() {
+  cd yabause-${pkgver}
+
+  patch -Np2 -i ../qt-5.11.patch
+  patch -Np1 -i ../rwx.patch
+}
+
+build() {
+  cd yabause-${pkgver}
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  cmake .. \
+    -DCMAKE_BUILD_TYPE='Release' \
+    -DCMAKE_INSTALL_PREFIX='/usr' \
+    -DYAB_PORTS='qt' \
+    -DYAB_NETWORK='ON' \
+    -DYAB_OPTIMIZED_DMA='ON' \
+    -DSH2_DYNAREC=OFF    # https://github.com/Yabause/yabause/issues/270
+  make
+}
+
+package() {
+  cd yabause-${pkgver}/build
+
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:

Copied: yabause-qt/repos/community-staging-x86_64/qt-5.11.patch (from rev 621017, yabause-qt/trunk/qt-5.11.patch)
===================================================================
--- community-staging-x86_64/qt-5.11.patch	                        (rev 0)
+++ community-staging-x86_64/qt-5.11.patch	2020-04-25 17:33:45 UTC (rev 621018)
@@ -0,0 +1,65 @@
+From 06a816c032c6f7fd79ced6e594dd4b33571a0e73 Mon Sep 17 00:00:00 2001
+From: Guillaume Duhamel <guillaume.duhamel at gmail.com>
+Date: Fri, 6 Jul 2018 08:08:22 +0200
+Subject: [PATCH] Fix qt 5.11 (#422)
+
+Header fixes for Qt 5.11
+---
+ yabause/src/qt/ui/UICheatRaw.cpp | 2 --
+ yabause/src/qt/ui/UICheatRaw.h   | 2 +-
+ yabause/src/qt/ui/UICheats.cpp   | 2 ++
+ yabause/src/qt/ui/UIHexInput.h   | 2 ++
+ 4 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/yabause/src/qt/ui/UICheatRaw.cpp b/yabause/src/qt/ui/UICheatRaw.cpp
+index 4ad82d770..3f78486bf 100755
+--- a/yabause/src/qt/ui/UICheatRaw.cpp
++++ b/yabause/src/qt/ui/UICheatRaw.cpp
+@@ -20,8 +20,6 @@
+ #include "UIHexInput.h"
+ #include "../QtYabause.h"
+ 
+-#include <QButtonGroup>
+-
+ UICheatRaw::UICheatRaw( QWidget* p )
+ 	: QDialog( p )
+ {
+diff --git a/yabause/src/qt/ui/UICheatRaw.h b/yabause/src/qt/ui/UICheatRaw.h
+index d97b429da..20318c670 100755
+--- a/yabause/src/qt/ui/UICheatRaw.h
++++ b/yabause/src/qt/ui/UICheatRaw.h
+@@ -21,7 +21,7 @@
+ 
+ #include "ui_UICheatRaw.h"
+ 
+-class QButtonGroup;
++#include <QButtonGroup>
+ 
+ class UICheatRaw : public QDialog, public Ui::UICheatRaw
+ {
+diff --git a/yabause/src/qt/ui/UICheats.cpp b/yabause/src/qt/ui/UICheats.cpp
+index c60279723..44d341c34 100755
+--- a/yabause/src/qt/ui/UICheats.cpp
++++ b/yabause/src/qt/ui/UICheats.cpp
+@@ -21,6 +21,8 @@
+ #include "UICheatRaw.h"
+ #include "../CommonDialogs.h"
+ 
++#include <QButtonGroup>
++
+ UICheats::UICheats( QWidget* p )
+ 	: QDialog( p )
+ {
+diff --git a/yabause/src/qt/ui/UIHexInput.h b/yabause/src/qt/ui/UIHexInput.h
+index f333b0166..4bd8aed48 100644
+--- a/yabause/src/qt/ui/UIHexInput.h
++++ b/yabause/src/qt/ui/UIHexInput.h
+@@ -22,6 +22,8 @@
+ #include "ui_UIHexInput.h"
+ #include "../QtYabause.h"
+ 
++#include <QValidator>
++
+ class HexValidator : public QValidator
+ {
+    Q_OBJECT

Copied: yabause-qt/repos/community-staging-x86_64/rwx.patch (from rev 621017, yabause-qt/trunk/rwx.patch)
===================================================================
--- community-staging-x86_64/rwx.patch	                        (rev 0)
+++ community-staging-x86_64/rwx.patch	2020-04-25 17:33:45 UTC (rev 621018)
@@ -0,0 +1,20 @@
+--- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
++++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
+@@ -747,3 +747,7 @@ breakpoint:
+ 	ret
+ 	/* Set breakpoint here for debugging */
+ 	.size	breakpoint, .-breakpoint
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
++++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
+@@ -743,3 +743,7 @@ breakpoint:
+ 	ret
+ 	/* Set breakpoint here for debugging */
+ 	.size	breakpoint, .-breakpoint
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif