Refresh patches.
Tobias Hansen
6 years ago
| 0 | 0 |
higan (104-1) UNRELEASED; urgency=medium
|
| 1 | 1 |
|
| 2 | 2 |
* New upstream release.
|
|
3 |
* Remove sjlj-ftbfs.patch (applied upstream).
|
| 3 | 4 |
|
| 4 | 5 |
-- Tobias Hansen <thansen@debian.org> Sat, 02 Sep 2017 18:46:23 +0100
|
| 5 | 6 |
|
| 5 | 5 |
|
| 6 | 6 |
--- a/higan/target-tomoko/configuration/configuration.cpp
|
| 7 | 7 |
+++ b/higan/target-tomoko/configuration/configuration.cpp
|
| 8 | |
@@ -49,5 +49,6 @@
|
|
8 |
@@ -60,5 +60,6 @@
|
| 9 | 9 |
}
|
| 10 | 10 |
|
| 11 | |
auto Settings::quit() -> void {
|
|
11 |
auto Settings::save() -> void {
|
| 12 | 12 |
- file::write(locate("settings.bml"), BML::serialize(*this));
|
| 13 | 13 |
+ directory::create({Path::config(), "higan/"});
|
| 14 | 14 |
+ file::write({Path::config(), "higan/", "settings.bml"}, BML::serialize(*this));
|
| 5 | 5 |
@@ -27,8 +27,14 @@
|
| 6 | 6 |
ruby += input.quartz input.carbon
|
| 7 | 7 |
else ifeq ($(platform),linux)
|
| 8 | |
ruby += video.glx video.xv video.xshm video.sdl
|
| 9 | |
- ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao
|
| 10 | |
- ruby += input.udev input.sdl input.xlib
|
|
8 |
ruby += video.glx video.xvideo video.xshm video.sdl
|
|
9 |
- ruby += audio.oss audio.alsa audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao
|
|
10 |
- ruby += input.sdl input.xlib input.udev
|
| 11 | 11 |
+ ifneq ($(findstring Linux,$(uname)),)
|
| 12 | 12 |
+ ruby += audio.alsa
|
| 13 | 13 |
+ endif
|
| 14 | |
+ ruby += audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao
|
|
14 |
+ ruby += audio.oss audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao
|
| 15 | 15 |
+ ifneq ($(findstring Linux,$(uname)),)
|
| 16 | 16 |
+ ruby += input.udev
|
| 17 | 17 |
+ endif
|
| 18 | 18 |
+ ruby += input.sdl input.xlib
|
| 19 | 19 |
else ifeq ($(platform),bsd)
|
| 20 | |
ruby += video.glx video.xv video.xshm video.sdl
|
| 21 | |
ruby += audio.openal audio.oss
|
|
20 |
ruby += video.glx video.xvideo video.xshm video.sdl
|
|
21 |
ruby += audio.oss audio.openal
|
| 12 | 12 |
- set("Library/IgnoreManifests", false);
|
| 13 | 13 |
+ set("Library/IgnoreManifests", true);
|
| 14 | 14 |
|
| 15 | |
set("Video/Driver", ruby::Video::optimalDriver());
|
|
15 |
set("Video/Driver", ruby::Video::safestDriver());
|
| 16 | 16 |
set("Video/Synchronize", false);
|
| 10 | 10 |
include_cmath.patch
|
| 11 | 11 |
disable-alsa-and-udev-on-non-linux.patch
|
| 12 | 12 |
tomoko-makefile-fixes.patch
|
| 13 | |
sjlj-ftbfs.patch
|
| 4 | 4 |
|
| 5 | 5 |
--- a/libco/sjlj.c
|
| 6 | 6 |
+++ b/libco/sjlj.c
|
| 7 | |
@@ -10,6 +10,7 @@
|
|
7 |
@@ -4,6 +4,7 @@
|
| 8 | 8 |
*/
|
| 9 | 9 |
|
| 10 | 10 |
#define LIBCO_C
|
| 11 | 11 |
+#define _XOPEN_SOURCE 700
|
| 12 | 12 |
#include "libco.h"
|
|
13 |
#include "settings.h"
|
| 13 | 14 |
|
| 14 | |
#include <stdlib.h>
|
debian/patches/sjlj-ftbfs.patch
less
more
| 0 | |
Description: sjlj.c needs settings.h for thread_local
|
| 1 | |
Author: Adrian Bunk <bunk@debian.org>
|
| 2 | |
Bug-Debian: https://bugs.debian.org/869385
|
| 3 | |
|
| 4 | |
--- a/libco/sjlj.c
|
| 5 | |
+++ b/libco/sjlj.c
|
| 6 | |
@@ -12,6 +12,7 @@
|
| 7 | |
#define LIBCO_C
|
| 8 | |
#define _XOPEN_SOURCE 700
|
| 9 | |
#include "libco.h"
|
| 10 | |
+#include "settings.h"
|
| 11 | |
|
| 12 | |
#include <stdlib.h>
|
| 13 | |
#include <signal.h>
|
| 4 | 4 |
|
| 5 | 5 |
--- a/higan/target-tomoko/GNUmakefile
|
| 6 | 6 |
+++ b/higan/target-tomoko/GNUmakefile
|
| 7 | |
@@ -84,9 +84,7 @@
|
|
7 |
@@ -85,9 +85,7 @@
|
| 8 | 8 |
endif
|
| 9 | 9 |
|
| 10 | 10 |
install:
|