Merge pull request #11340 from AndersonTorres/yabause

Yabause: init at 0.9.14
This commit is contained in:
Arseniy Seroka 2015-11-30 22:55:22 +03:00
commit 56dc9789aa
3 changed files with 59 additions and 0 deletions

View File

@ -0,0 +1,35 @@
{ stdenv, fetchurl, config
, cmake, pkgconfig
, doxygen
, qt
, libXmu, mesa, openal, SDL2, freeglut
}:
stdenv.mkDerivation rec {
name = "yabause-${meta.version}";
src = fetchurl {
url = "http://download.tuxfamily.org/yabause/releases/${meta.version}/${name}.tar.gz";
sha256 = "0nkpvnr599g0i2mf19sjvw5m0rrvixdgz2snav4qwvzgfc435rkm";
};
patches = [ ./linkage-rwx-linux-elf.diff ];
buildInputs =
[ cmake pkgconfig doxygen qt libXmu mesa openal SDL2 freeglut ];
cmakeConfigureFlags = [
"-DYAB_PORTS='qt'"
"-DYAB_OPTIMIZED_DMA='ON'"
"-DYAB_NETWORK='ON'" ] ;
meta = with stdenv.lib; {
version = "0.9.14";
description = "An open-source Sega Saturn emulator";
homepage = http://yabause.org/;
license = licenses.gpl2Plus;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
};
}
# TODO: Qt5

View File

@ -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

View File

@ -15532,6 +15532,10 @@ let
};
};
yabause = callPackage ../misc/emulators/yabause {
qt = qt4;
};
yafc = callPackage ../applications/networking/yafc { };
yandex-disk = callPackage ../tools/filesystems/yandex-disk { };