[arch-commits] Commit in higan/trunk (4 files)
Maxime Gauduin
alucryd at archlinux.org
Wed Dec 27 22:58:00 UTC 2017
Date: Wednesday, December 27, 2017 @ 22:57:58
Author: alucryd
Revision: 276270
upgpkg: higan 106-1
Added:
higan/trunk/higan-paths.patch
Modified:
higan/trunk/PKGBUILD
higan/trunk/higan-flags.patch
Deleted:
higan/trunk/higan.install
-------------------+
PKGBUILD | 21 ++++++++++------
higan-flags.patch | 67 ++++++++++++++++++++++++++++++----------------------
higan-paths.patch | 26 ++++++++++++++++++++
higan.install | 12 ---------
4 files changed, 79 insertions(+), 47 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-12-27 22:27:14 UTC (rev 276269)
+++ PKGBUILD 2017-12-27 22:57:58 UTC (rev 276270)
@@ -2,7 +2,7 @@
# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
pkgname=higan
-pkgver=104
+pkgver=106
pkgrel=1
pkgdesc='Nintendo multi-system emulator'
arch=('x86_64')
@@ -15,33 +15,40 @@
makedepends=('mesa')
conflicts=('higan-gtk' 'higan-qt')
replaces=('higan-gtk' 'higan-qt')
-install='higan.install'
source=("https://download.byuu.org/higan_v${pkgver}-source.7z"
- 'higan-flags.patch')
-sha256sums=('342400ba494b37a95210f11e6d941566e50a772095586406c14d75293f525544'
- '6ee3489a3cf3e8d09beaa5c1f809824593aa08b61dc9a8c9ddc12a09c89ae6cb')
+ 'higan-flags.patch'
+ 'higan-paths.patch')
+sha256sums=('6564f91f232040c46c052de763dc139e94005e0f2376959fdacbb6ccd3fd6d18'
+ '6cff6f9570de186bdfa4620d3a2b6e315118b6f6be45b35f3346995865f1718e'
+ '6d0bf69e00c9ea5c5155b52b5ee59c253f2bacbc64f044826f53d4d6ae175c68')
prepare() {
cd higan_v${pkgver}-source
patch -Np1 -i ../higan-flags.patch
+ patch -Np1 -i ../higan-paths.patch
}
build() {
cd higan_v${pkgver}-source
+ make -C higan
make -C icarus
- make -C higan
}
package() {
cd higan_v${pkgver}-source
- install -Dm 755 icarus/out/icarus -t "${pkgdir}"/usr/bin/
install -Dm 755 higan/out/higan -t "${pkgdir}"/usr/bin/
install -Dm 644 higan/data/higan.desktop -t "${pkgdir}"/usr/share/applications/
install -Dm 644 higan/data/higan.png -t "${pkgdir}"/usr/share/pixmaps/
cp -dr --no-preserve='ownership' higan/systems "${pkgdir}"/usr/share/higan
+
+ install -Dm 755 icarus/out/icarus -t "${pkgdir}"/usr/bin/
+ install -Dm 644 icarus/data/icarus.desktop -t "${pkgdir}"/usr/share/applications/
+ install -Dm 644 icarus/data/icarus.png -t "${pkgdir}"/usr/share/pixmaps/
+ install -dm 755 "${pkgdir}"/usr/share/icarus
+ cp -dr --no-preserve='ownership' icarus/Database "${pkgdir}"/usr/share/icarus/
}
# vim: ts=2 sw=2 et:
Modified: higan-flags.patch
===================================================================
--- higan-flags.patch 2017-12-27 22:27:14 UTC (rev 276269)
+++ higan-flags.patch 2017-12-27 22:57:58 UTC (rev 276270)
@@ -1,20 +1,34 @@
-diff -rupN higan_v097-source.orig/higan/GNUmakefile higan_v097-source/higan/GNUmakefile
---- higan_v097-source.orig/higan/GNUmakefile 2016-01-24 09:21:45.822940200 +0100
-+++ higan_v097-source/higan/GNUmakefile 2016-01-24 09:24:03.028722500 +0100
-@@ -36,7 +36,7 @@ ifeq ($(platform),windows)
- else ifeq ($(platform),macosx)
- flags += -march=native
- else ifneq ($(filter $(platform),linux bsd),)
-- flags += -march=native -fopenmp
-+ flags += -fopenmp
+diff -rupN higan_v106-source.orig/higan/GNUmakefile higan_v106-source/higan/GNUmakefile
+--- higan_v106-source.orig/higan/GNUmakefile 2017-12-27 23:12:21.263872763 +0100
++++ higan_v106-source/higan/GNUmakefile 2017-12-27 23:12:30.243627883 +0100
+@@ -1,4 +1,4 @@
+-build := optimize
++build := release
+ include ../nall/GNUmakefile
+
+ binary := application
+@@ -26,7 +26,6 @@ else ifneq ($(filter $(platform),linux b
+ flags += -fopenmp
link += -fopenmp
- link += -Wl,-export-dynamic
- link += -lX11 -lXext
-diff -rupN higan_v097-source.orig/nall/GNUmakefile higan_v097-source/nall/GNUmakefile
---- higan_v097-source.orig/nall/GNUmakefile 2016-01-24 09:21:46.021749600 +0100
-+++ higan_v097-source/nall/GNUmakefile 2016-01-24 09:25:06.347100800 +0100
-@@ -40,8 +40,8 @@ cflags := -x c -std=c99
- objcflags := -x objective-c -std=c99
+ ifeq ($(binary),application)
+- flags += -march=native
+ link += -Wl,-export-dynamic
+ link += -lX11 -lXext
+ else ifeq ($(binary),library)
+diff -rupN higan_v106-source.orig/icarus/GNUmakefile higan_v106-source/icarus/GNUmakefile
+--- higan_v106-source.orig/icarus/GNUmakefile 2017-12-27 23:12:21.280538976 +0100
++++ higan_v106-source/icarus/GNUmakefile 2017-12-27 23:12:30.243627883 +0100
+@@ -1,4 +1,4 @@
+-build := optimize
++build := release
+ include ../nall/GNUmakefile
+ include ../hiro/GNUmakefile
+
+diff -rupN higan_v106-source.orig/nall/GNUmakefile higan_v106-source/nall/GNUmakefile
+--- higan_v106-source.orig/nall/GNUmakefile 2017-12-27 23:12:21.283872217 +0100
++++ higan_v106-source/nall/GNUmakefile 2017-12-27 23:12:44.326577547 +0100
+@@ -40,8 +40,8 @@ cflags := -x c -std=c11
+ objcflags := -x objective-c -std=c11
cppflags := -x c++ -std=c++14
objcppflags := -x objective-c++ -std=c++14
-flags :=
@@ -24,15 +38,12 @@
# compiler detection
ifeq ($(compiler),)
-@@ -51,9 +51,9 @@ ifeq ($(compiler),)
- else ifeq ($(platform),macosx)
- compiler := clang++
- else ifeq ($(platform),linux)
-- compiler := g++-4.9
-+ compiler := g++
- else ifeq ($(platform),bsd)
-- compiler := g++49
-+ compiler := g++
- else
- compiler := g++
- endif
+@@ -120,7 +120,7 @@ ifeq ($(threaded),true)
+ endif
+
+ # paths
+-prefix := $(HOME)/.local
++prefix := /usr
+
+ # function rwildcard(directory, pattern)
+ rwildcard = \
Added: higan-paths.patch
===================================================================
--- higan-paths.patch (rev 0)
+++ higan-paths.patch 2017-12-27 22:57:58 UTC (rev 276270)
@@ -0,0 +1,26 @@
+diff -rupN higan_v106-source.orig/higan/target-tomoko/tomoko.cpp higan_v106-source/higan/target-tomoko/tomoko.cpp
+--- higan_v106-source.orig/higan/target-tomoko/tomoko.cpp 2017-12-27 23:48:31.103245742 +0100
++++ higan_v106-source/higan/target-tomoko/tomoko.cpp 2017-12-27 23:49:19.728586352 +0100
+@@ -11,6 +11,9 @@ auto locate(string name) -> string {
+ location = {Path::config(), "higan/", name};
+ if(inode::exists(location)) return location;
+
++ location = {Path::shared(), "higan/", name};
++ if(inode::exists(location)) return location;
++
+ directory::create({Path::local(), "higan/"});
+ return {Path::local(), "higan/", name};
+ }
+diff -rupN higan_v106-source.orig/icarus/icarus.cpp higan_v106-source/icarus/icarus.cpp
+--- higan_v106-source.orig/icarus/icarus.cpp 2017-12-27 23:48:31.109912227 +0100
++++ higan_v106-source/icarus/icarus.cpp 2017-12-27 23:49:02.672384569 +0100
+@@ -11,6 +11,9 @@ auto locate(string name) -> string {
+ location = {Path::config(), "icarus/", name};
+ if(inode::exists(location)) return location;
+
++ location = {Path::shared(), "icarus/", name};
++ if(inode::exists(location)) return location;
++
+ directory::create({Path::local(), "icarus/"});
+ return {Path::local(), "icarus/", name};
+ }
Deleted: higan.install
===================================================================
--- higan.install 2017-12-27 22:27:14 UTC (rev 276269)
+++ higan.install 2017-12-27 22:57:58 UTC (rev 276270)
@@ -1,12 +0,0 @@
-post_install() {
-cat << EOF
-higan needs the system files located in /usr/share/higan to be present inside
-your ~/Emulation directory, please copy them over before using the emulator.
-EOF
-}
-
-post_upgrade() {
- post_install
-}
-
-# vim: ts=2 sw=2 et:
More information about the arch-commits
mailing list