[arch-commits] Commit in higan/trunk (4 files)
Maxime Gauduin
alucryd at archlinux.org
Sun Jan 24 09:02:37 UTC 2016
Date: Sunday, January 24, 2016 @ 10:02:36
Author: alucryd
Revision: 158722
upgpkg: higan 097-1
Added:
higan/trunk/higan-flags.patch
Modified:
higan/trunk/PKGBUILD
higan/trunk/higan
Deleted:
higan/trunk/higan-makefile.patch
----------------------+
PKGBUILD | 32 +++++++++++++++++---------------
higan | 14 +++++++-------
higan-flags.patch | 38 ++++++++++++++++++++++++++++++++++++++
higan-makefile.patch | 48 ------------------------------------------------
4 files changed, 62 insertions(+), 70 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-01-24 08:56:22 UTC (rev 158721)
+++ PKGBUILD 2016-01-24 09:02:36 UTC (rev 158722)
@@ -2,8 +2,8 @@
# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
pkgname=higan
-pkgver=096
-pkgrel=2
+pkgver=097
+pkgrel=1
pkgdesc='Nintendo multi-system emulator'
arch=('i686' 'x86_64')
url='http://byuu.org/'
@@ -17,26 +17,28 @@
replaces=('higan-gtk' 'higan-qt')
install='higan.install'
source=("http://download.byuu.org/higan_v${pkgver}-source.7z"
- 'higan-makefile.patch'
+ 'higan-flags.patch'
'higan')
-sha256sums=('10ef9bd93708ea56bf0c6180d5a02d850a892c37e68d8945e431e1661e7f8579'
- 'cbdb3524bc5f0380df4d96312a15bc0bf641a7a82723bfb30998efeb977d4b7f'
- '801ddccd26d4e21c7d5ddde01be936da155a020cd755f02ac89f354108592de2')
+sha256sums=('6dea7084f0b786e42d1911df05de2d7f7f18c58f426e3e61c3a122b17481e22b'
+ '6ee3489a3cf3e8d09beaa5c1f809824593aa08b61dc9a8c9ddc12a09c89ae6cb'
+ '1abd4fd30e48e48dddb3cdce95f62be0b1b28c66f85a3b6ce95d29d7bfc94659')
prepare() {
cd higan_v${pkgver}-source
- patch -Np1 -i ../higan-makefile.patch
+ patch -Np1 -i ../higan-flags.patch
}
build() {
- cd higan_v${pkgver}-source
+ cd higan_v${pkgver}-source/icarus
- make -C icarus
+ make
+ cd ../higan
+
for p in {accuracy,balanced,performance}; do
make profile=$p
- mv out/tomoko tomoko-$p
+ mv out/higan higan-$p
make clean
done
}
@@ -46,14 +48,14 @@
install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,higan,pixmaps}}
install -m 755 ../higan "${pkgdir}"/usr/bin/
- install -m 644 data/higan.desktop "${pkgdir}"/usr/share/applications/
- install -m 644 data/higan.png "${pkgdir}"/usr/share/pixmaps/
- cp -dr --no-preserve='ownership' profile/* data/cheats.bml "${pkgdir}"/usr/share/higan/
+ install -m 644 higan/data/higan.desktop "${pkgdir}"/usr/share/applications/
+ install -m 644 higan/data/higan.png "${pkgdir}"/usr/share/pixmaps/
+ cp -dr --no-preserve='ownership' higan/profile/* higan/data/cheats.bml "${pkgdir}"/usr/share/higan/
- install -m 755 icarus/icarus "${pkgdir}"/usr/bin/
+ install -m 755 icarus/out/icarus "${pkgdir}"/usr/bin/
for p in {accuracy,balanced,performance}; do
- install -m 755 tomoko-$p "${pkgdir}"/usr/bin/
+ install -m 755 higan/higan-$p "${pkgdir}"/usr/bin/
done
}
Modified: higan
===================================================================
--- higan 2016-01-24 08:56:22 UTC (rev 158721)
+++ higan 2016-01-24 09:02:36 UTC (rev 158722)
@@ -5,20 +5,20 @@
cp -ru /usr/share/higan/*.sys ~/Emulation/
fi
-prompt="$(zenity --list --radiolist --title 'Please select a profile' --column '' --column '' FALSE 'Icarus' FALSE 'Tomoko (accuracy)' TRUE 'Tomoko (balanced)' FALSE 'Tomoko (performance)')"
+prompt="$(zenity --list --radiolist --title 'Please select a profile' --column '' --column '' FALSE 'icarus' FALSE 'higan (accuracy)' TRUE 'higan (balanced)' FALSE 'higan (performance)')"
case $prompt in
'Icarus')
exec icarus
;;
- 'Tomoko (accuracy)')
- exec tomoko-accuracy
+ 'higan (accuracy)')
+ exec higan-accuracy
;;
- 'Tomoko (balanced)')
- exec tomoko-balanced
+ 'higan (balanced)')
+ exec higan-balanced
;;
- 'Tomoko (performance)')
- exec tomoko-performance
+ 'higan (performance)')
+ exec higan-performance
;;
esac
Added: higan-flags.patch
===================================================================
--- higan-flags.patch (rev 0)
+++ higan-flags.patch 2016-01-24 09:02:36 UTC (rev 158722)
@@ -0,0 +1,38 @@
+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
+ 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
+ cppflags := -x c++ -std=c++14
+ objcppflags := -x objective-c++ -std=c++14
+-flags :=
+-link :=
++flags := $(CXXFLAGS)
++link := $(LDFLAGS)
+
+ # 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
Property changes on: higan/trunk/higan-flags.patch
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Deleted: higan-makefile.patch
===================================================================
--- higan-makefile.patch 2016-01-24 08:56:22 UTC (rev 158721)
+++ higan-makefile.patch 2016-01-24 09:02:36 UTC (rev 158722)
@@ -1,48 +0,0 @@
-diff -rupN higan_v095-source.orig/GNUmakefile higan_v095-source/GNUmakefile
---- higan_v095-source.orig/GNUmakefile 2015-11-04 10:28:26.173428178 +0100
-+++ higan_v095-source/GNUmakefile 2015-11-04 10:28:31.752231593 +0100
-@@ -12,7 +12,8 @@ target := tomoko
- # console := true
-
- # compiler
--flags += -I. -O3
-+flags += -I. $(CXXFLAGS)
-+link += $(LDFLAGS)
- objects := libco
-
- # profile-guided optimization mode
-@@ -43,7 +44,7 @@ ifeq ($(platform),windows)
- else ifeq ($(platform),macosx)
- flags += -march=native
- else ifeq ($(platform),linux)
-- flags += -march=native -fopenmp
-+ flags += -fopenmp
- link += -fopenmp
- link += -Wl,-export-dynamic
- link += -lX11 -lXext -ldl
-diff -rupN higan_v095-source.orig/icarus/GNUmakefile higan_v095-source/icarus/GNUmakefile
---- higan_v095-source.orig/icarus/GNUmakefile 2015-11-04 10:28:26.186486119 +0100
-+++ higan_v095-source/icarus/GNUmakefile 2015-11-04 10:28:48.755059317 +0100
-@@ -1,8 +1,8 @@
- include ../nall/GNUmakefile
- include ../hiro/GNUmakefile
-
--flags += -I.. -O3
--link +=
-+flags += -I.. $(CXXFLAGS)
-+link += $(LDFLAGS)
- objects := obj/hiro.o obj/icarus.o
- objects += $(if $(call streq,$(platform),windows),obj/resource.o)
-
-diff -rupN higan_v095-source.orig/nall/GNUmakefile higan_v095-source/nall/GNUmakefile
---- higan_v095-source.orig/nall/GNUmakefile 2015-11-04 10:28:26.189750604 +0100
-+++ higan_v095-source/nall/GNUmakefile 2015-11-04 10:28:31.752231593 +0100
-@@ -51,7 +51,7 @@ 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
- else
More information about the arch-commits
mailing list