uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,67 @@
|
|||
From 3140afd6fb7dad7a25296526a71b005fb9eae048 Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
|
||||
Date: Sat, 8 Sep 2018 00:44:08 -0400
|
||||
Subject: [PATCH] Fixes for Qt 5.11 upgrade
|
||||
|
||||
---
|
||||
src/qt/ui/UICheatRaw.cpp | 2 --
|
||||
src/qt/ui/UICheatRaw.h | 2 +-
|
||||
src/qt/ui/UICheats.cpp | 2 ++
|
||||
src/qt/ui/UIHexInput.h | 2 ++
|
||||
4 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/qt/ui/UICheatRaw.cpp b/src/qt/ui/UICheatRaw.cpp
|
||||
index 4ad82d77..3f78486b 100755
|
||||
--- a/src/qt/ui/UICheatRaw.cpp
|
||||
+++ b/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/src/qt/ui/UICheatRaw.h b/src/qt/ui/UICheatRaw.h
|
||||
index d97b429d..20318c67 100755
|
||||
--- a/src/qt/ui/UICheatRaw.h
|
||||
+++ b/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/src/qt/ui/UICheats.cpp b/src/qt/ui/UICheats.cpp
|
||||
index c6027972..44d341c3 100755
|
||||
--- a/src/qt/ui/UICheats.cpp
|
||||
+++ b/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/src/qt/ui/UIHexInput.h b/src/qt/ui/UIHexInput.h
|
||||
index f333b016..4bd8aed4 100644
|
||||
--- a/src/qt/ui/UIHexInput.h
|
||||
+++ b/src/qt/ui/UIHexInput.h
|
||||
@@ -22,6 +22,8 @@
|
||||
#include "ui_UIHexInput.h"
|
||||
#include "../QtYabause.h"
|
||||
|
||||
+#include <QValidator>
|
||||
+
|
||||
class HexValidator : public QValidator
|
||||
{
|
||||
Q_OBJECT
|
||||
--
|
||||
2.16.4
|
||||
|
||||
36
pkgs/applications/emulators/yabause/default.nix
Normal file
36
pkgs/applications/emulators/yabause/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ mkDerivation, lib, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL
|
||||
, freeglut ? null, openal ? null, SDL2 ? null }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "yabause";
|
||||
version = "0.9.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/yabause/releases/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL freeglut openal SDL2 ];
|
||||
|
||||
patches = [
|
||||
./linkage-rwx-linux-elf.patch
|
||||
# Fixes derived from
|
||||
# https://github.com/Yabause/yabause/commit/06a816c032c6f7fd79ced6e594dd4b33571a0e73
|
||||
./0001-Fixes-for-Qt-5.11-upgrade.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DYAB_NETWORK=ON"
|
||||
"-DYAB_OPTIMIZED_DMA=ON"
|
||||
"-DYAB_PORTS=qt"
|
||||
] ;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open-source Sega Saturn emulator";
|
||||
homepage = "https://yabause.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -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
|
||||
Loading…
Add table
Add a link
Reference in a new issue