[arch-commits] Commit in higan/repos (14 files)
Maxime Gauduin
alucryd at archlinux.org
Sat Dec 26 17:50:45 UTC 2015
Date: Saturday, December 26, 2015 @ 18:50:45
Author: alucryd
Revision: 154567
archrelease: copy trunk to community-i686, community-x86_64
Added:
higan/repos/community-i686/PKGBUILD
(from rev 154566, higan/trunk/PKGBUILD)
higan/repos/community-i686/higan
(from rev 154566, higan/trunk/higan)
higan/repos/community-i686/higan-makefile.patch
(from rev 154566, higan/trunk/higan-makefile.patch)
higan/repos/community-i686/higan.install
(from rev 154566, higan/trunk/higan.install)
higan/repos/community-x86_64/PKGBUILD
(from rev 154566, higan/trunk/PKGBUILD)
higan/repos/community-x86_64/higan
(from rev 154566, higan/trunk/higan)
higan/repos/community-x86_64/higan-makefile.patch
(from rev 154566, higan/trunk/higan-makefile.patch)
higan/repos/community-x86_64/higan.install
(from rev 154566, higan/trunk/higan.install)
Deleted:
higan/repos/community-i686/PKGBUILD
higan/repos/community-i686/higan
higan/repos/community-i686/higan-makefile.patch
higan/repos/community-x86_64/PKGBUILD
higan/repos/community-x86_64/higan
higan/repos/community-x86_64/higan-makefile.patch
---------------------------------------+
/PKGBUILD | 120 ++++++++++++++++++++++++++++++++
/higan | 50 +++++++++++++
/higan-makefile.patch | 96 +++++++++++++++++++++++++
community-i686/PKGBUILD | 59 ---------------
community-i686/higan | 22 -----
community-i686/higan-makefile.patch | 48 ------------
community-i686/higan.install | 10 ++
community-x86_64/PKGBUILD | 59 ---------------
community-x86_64/higan | 22 -----
community-x86_64/higan-makefile.patch | 48 ------------
community-x86_64/higan.install | 10 ++
11 files changed, 286 insertions(+), 258 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-12-26 17:50:26 UTC (rev 154566)
+++ community-i686/PKGBUILD 2015-12-26 17:50:45 UTC (rev 154567)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-
-pkgname=higan
-pkgver=095
-pkgrel=2
-pkgdesc='Nintendo multi-system emulator'
-arch=('i686' 'x86_64')
-url='http://byuu.org/'
-license=('GPL3')
-depends=('alsa-lib' 'cairo' 'gcc-libs' 'gdk-pixbuf2' 'glib2' 'glibc' 'gtk2'
- 'gtksourceview2' 'libao' 'libgl' 'libpulse' 'libx11' 'libxext' 'libxv'
- 'openal' 'pango' 'sdl' 'zenity'
- 'libudev.so')
-makedepends=('mesa')
-conflicts=('higan-gtk' 'higan-qt')
-replaces=('higan-gtk' 'higan-qt')
-source=("http://download.byuu.org/higan_v${pkgver}-source.7z"
- 'higan-makefile.patch'
- 'higan')
-sha256sums=('443a11ef64b817861e9cb7b818fc9283afb50f8e254345eb88fa12c764f44f77'
- 'cbdb3524bc5f0380df4d96312a15bc0bf641a7a82723bfb30998efeb977d4b7f'
- '4a9f59253caa51fa8313db421bf7ce431722c601594b2bdb0fa0459652284168')
-
-prepare() {
- cd higan_v${pkgver}-source
-
- patch -Np1 -i ../higan-makefile.patch
-}
-
-build() {
- cd higan_v${pkgver}-source
-
- make -C icarus
-
- for p in {accuracy,balanced,performance}; do
- make profile=$p
- mv out/tomoko tomoko-$p
- make clean
- done
-}
-
-package() {
- cd higan_v${pkgver}-source
-
- 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 755 icarus/icarus "${pkgdir}"/usr/bin/
-
- for p in {accuracy,balanced,performance}; do
- install -m 755 tomoko-$p "${pkgdir}"/usr/bin/
- done
-}
-
-# vim: ts=2 sw=2 et:
Copied: higan/repos/community-i686/PKGBUILD (from rev 154566, higan/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-12-26 17:50:45 UTC (rev 154567)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+
+pkgname=higan
+pkgver=096
+pkgrel=1
+pkgdesc='Nintendo multi-system emulator'
+arch=('i686' 'x86_64')
+url='http://byuu.org/'
+license=('GPL3')
+depends=('alsa-lib' 'cairo' 'gcc-libs' 'gdk-pixbuf2' 'glib2' 'glibc' 'gtk2'
+ 'gtksourceview2' 'libao' 'libgl' 'libpulse' 'libx11' 'libxext' 'libxv'
+ 'openal' 'pango' 'sdl' 'zenity'
+ 'libudev.so')
+makedepends=('mesa')
+conflicts=('higan-gtk' 'higan-qt')
+replaces=('higan-gtk' 'higan-qt')
+install='higan.install'
+source=("http://download.byuu.org/higan_v${pkgver}-source.7z"
+ 'higan-makefile.patch'
+ 'higan')
+sha256sums=('10ef9bd93708ea56bf0c6180d5a02d850a892c37e68d8945e431e1661e7f8579'
+ 'cbdb3524bc5f0380df4d96312a15bc0bf641a7a82723bfb30998efeb977d4b7f'
+ '801ddccd26d4e21c7d5ddde01be936da155a020cd755f02ac89f354108592de2')
+
+prepare() {
+ cd higan_v${pkgver}-source
+
+ patch -Np1 -i ../higan-makefile.patch
+}
+
+build() {
+ cd higan_v${pkgver}-source
+
+ make -C icarus
+
+ for p in {accuracy,balanced,performance}; do
+ make profile=$p
+ mv out/tomoko tomoko-$p
+ make clean
+ done
+}
+
+package() {
+ cd higan_v${pkgver}-source
+
+ 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 755 icarus/icarus "${pkgdir}"/usr/bin/
+
+ for p in {accuracy,balanced,performance}; do
+ install -m 755 tomoko-$p "${pkgdir}"/usr/bin/
+ done
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-i686/higan
===================================================================
--- community-i686/higan 2015-12-26 17:50:26 UTC (rev 154566)
+++ community-i686/higan 2015-12-26 17:50:45 UTC (rev 154567)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-cp -ru /usr/share/higan ~/.config/
-
-prompt="$(zenity --list --radiolist --title 'Please select a profile' --column '' --column '' FALSE 'Icarus' FALSE 'Tomoko (accuracy)' TRUE 'Tomoko (balanced)' FALSE 'Tomoko (performance)')"
-
-case $prompt in
- 'Icarus')
- exec icarus
- ;;
- 'Tomoko (accuracy)')
- exec tomoko-accuracy
- ;;
- 'Tomoko (balanced)')
- exec tomoko-balanced
- ;;
- 'Tomoko (performance)')
- exec tomoko-performance
- ;;
-esac
-
-# vim: ts=2 sw=2 et:
Copied: higan/repos/community-i686/higan (from rev 154566, higan/trunk/higan)
===================================================================
--- community-i686/higan (rev 0)
+++ community-i686/higan 2015-12-26 17:50:45 UTC (rev 154567)
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+cp -u /usr/share/higan/cheats.bml ~/.config/
+if [[ -d ~/Emulation ]]; then
+ 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)')"
+
+case $prompt in
+ 'Icarus')
+ exec icarus
+ ;;
+ 'Tomoko (accuracy)')
+ exec tomoko-accuracy
+ ;;
+ 'Tomoko (balanced)')
+ exec tomoko-balanced
+ ;;
+ 'Tomoko (performance)')
+ exec tomoko-performance
+ ;;
+esac
+
+# vim: ts=2 sw=2 et:
Deleted: community-i686/higan-makefile.patch
===================================================================
--- community-i686/higan-makefile.patch 2015-12-26 17:50:26 UTC (rev 154566)
+++ community-i686/higan-makefile.patch 2015-12-26 17:50:45 UTC (rev 154567)
@@ -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
Copied: higan/repos/community-i686/higan-makefile.patch (from rev 154566, higan/trunk/higan-makefile.patch)
===================================================================
--- community-i686/higan-makefile.patch (rev 0)
+++ community-i686/higan-makefile.patch 2015-12-26 17:50:45 UTC (rev 154567)
@@ -0,0 +1,48 @@
+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
Copied: higan/repos/community-i686/higan.install (from rev 154566, higan/trunk/higan.install)
===================================================================
--- community-i686/higan.install (rev 0)
+++ community-i686/higan.install 2015-12-26 17:50:45 UTC (rev 154567)
@@ -0,0 +1,10 @@
+post_install() {
+ echo << EOF
+higan needs the system files located in /usr/share/higan to be copied inside
+your ~/Emulation directory. This is done automatically by the launcher script
+if you're using the default directory, otherwise make sure you copy them
+manually.
+EOF
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-12-26 17:50:26 UTC (rev 154566)
+++ community-x86_64/PKGBUILD 2015-12-26 17:50:45 UTC (rev 154567)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-
-pkgname=higan
-pkgver=095
-pkgrel=2
-pkgdesc='Nintendo multi-system emulator'
-arch=('i686' 'x86_64')
-url='http://byuu.org/'
-license=('GPL3')
-depends=('alsa-lib' 'cairo' 'gcc-libs' 'gdk-pixbuf2' 'glib2' 'glibc' 'gtk2'
- 'gtksourceview2' 'libao' 'libgl' 'libpulse' 'libx11' 'libxext' 'libxv'
- 'openal' 'pango' 'sdl' 'zenity'
- 'libudev.so')
-makedepends=('mesa')
-conflicts=('higan-gtk' 'higan-qt')
-replaces=('higan-gtk' 'higan-qt')
-source=("http://download.byuu.org/higan_v${pkgver}-source.7z"
- 'higan-makefile.patch'
- 'higan')
-sha256sums=('443a11ef64b817861e9cb7b818fc9283afb50f8e254345eb88fa12c764f44f77'
- 'cbdb3524bc5f0380df4d96312a15bc0bf641a7a82723bfb30998efeb977d4b7f'
- '4a9f59253caa51fa8313db421bf7ce431722c601594b2bdb0fa0459652284168')
-
-prepare() {
- cd higan_v${pkgver}-source
-
- patch -Np1 -i ../higan-makefile.patch
-}
-
-build() {
- cd higan_v${pkgver}-source
-
- make -C icarus
-
- for p in {accuracy,balanced,performance}; do
- make profile=$p
- mv out/tomoko tomoko-$p
- make clean
- done
-}
-
-package() {
- cd higan_v${pkgver}-source
-
- 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 755 icarus/icarus "${pkgdir}"/usr/bin/
-
- for p in {accuracy,balanced,performance}; do
- install -m 755 tomoko-$p "${pkgdir}"/usr/bin/
- done
-}
-
-# vim: ts=2 sw=2 et:
Copied: higan/repos/community-x86_64/PKGBUILD (from rev 154566, higan/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-12-26 17:50:45 UTC (rev 154567)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+
+pkgname=higan
+pkgver=096
+pkgrel=1
+pkgdesc='Nintendo multi-system emulator'
+arch=('i686' 'x86_64')
+url='http://byuu.org/'
+license=('GPL3')
+depends=('alsa-lib' 'cairo' 'gcc-libs' 'gdk-pixbuf2' 'glib2' 'glibc' 'gtk2'
+ 'gtksourceview2' 'libao' 'libgl' 'libpulse' 'libx11' 'libxext' 'libxv'
+ 'openal' 'pango' 'sdl' 'zenity'
+ 'libudev.so')
+makedepends=('mesa')
+conflicts=('higan-gtk' 'higan-qt')
+replaces=('higan-gtk' 'higan-qt')
+install='higan.install'
+source=("http://download.byuu.org/higan_v${pkgver}-source.7z"
+ 'higan-makefile.patch'
+ 'higan')
+sha256sums=('10ef9bd93708ea56bf0c6180d5a02d850a892c37e68d8945e431e1661e7f8579'
+ 'cbdb3524bc5f0380df4d96312a15bc0bf641a7a82723bfb30998efeb977d4b7f'
+ '801ddccd26d4e21c7d5ddde01be936da155a020cd755f02ac89f354108592de2')
+
+prepare() {
+ cd higan_v${pkgver}-source
+
+ patch -Np1 -i ../higan-makefile.patch
+}
+
+build() {
+ cd higan_v${pkgver}-source
+
+ make -C icarus
+
+ for p in {accuracy,balanced,performance}; do
+ make profile=$p
+ mv out/tomoko tomoko-$p
+ make clean
+ done
+}
+
+package() {
+ cd higan_v${pkgver}-source
+
+ 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 755 icarus/icarus "${pkgdir}"/usr/bin/
+
+ for p in {accuracy,balanced,performance}; do
+ install -m 755 tomoko-$p "${pkgdir}"/usr/bin/
+ done
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-x86_64/higan
===================================================================
--- community-x86_64/higan 2015-12-26 17:50:26 UTC (rev 154566)
+++ community-x86_64/higan 2015-12-26 17:50:45 UTC (rev 154567)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-cp -ru /usr/share/higan ~/.config/
-
-prompt="$(zenity --list --radiolist --title 'Please select a profile' --column '' --column '' FALSE 'Icarus' FALSE 'Tomoko (accuracy)' TRUE 'Tomoko (balanced)' FALSE 'Tomoko (performance)')"
-
-case $prompt in
- 'Icarus')
- exec icarus
- ;;
- 'Tomoko (accuracy)')
- exec tomoko-accuracy
- ;;
- 'Tomoko (balanced)')
- exec tomoko-balanced
- ;;
- 'Tomoko (performance)')
- exec tomoko-performance
- ;;
-esac
-
-# vim: ts=2 sw=2 et:
Copied: higan/repos/community-x86_64/higan (from rev 154566, higan/trunk/higan)
===================================================================
--- community-x86_64/higan (rev 0)
+++ community-x86_64/higan 2015-12-26 17:50:45 UTC (rev 154567)
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+cp -u /usr/share/higan/cheats.bml ~/.config/
+if [[ -d ~/Emulation ]]; then
+ 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)')"
+
+case $prompt in
+ 'Icarus')
+ exec icarus
+ ;;
+ 'Tomoko (accuracy)')
+ exec tomoko-accuracy
+ ;;
+ 'Tomoko (balanced)')
+ exec tomoko-balanced
+ ;;
+ 'Tomoko (performance)')
+ exec tomoko-performance
+ ;;
+esac
+
+# vim: ts=2 sw=2 et:
Deleted: community-x86_64/higan-makefile.patch
===================================================================
--- community-x86_64/higan-makefile.patch 2015-12-26 17:50:26 UTC (rev 154566)
+++ community-x86_64/higan-makefile.patch 2015-12-26 17:50:45 UTC (rev 154567)
@@ -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
Copied: higan/repos/community-x86_64/higan-makefile.patch (from rev 154566, higan/trunk/higan-makefile.patch)
===================================================================
--- community-x86_64/higan-makefile.patch (rev 0)
+++ community-x86_64/higan-makefile.patch 2015-12-26 17:50:45 UTC (rev 154567)
@@ -0,0 +1,48 @@
+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
Copied: higan/repos/community-x86_64/higan.install (from rev 154566, higan/trunk/higan.install)
===================================================================
--- community-x86_64/higan.install (rev 0)
+++ community-x86_64/higan.install 2015-12-26 17:50:45 UTC (rev 154567)
@@ -0,0 +1,10 @@
+post_install() {
+ echo << EOF
+higan needs the system files located in /usr/share/higan to be copied inside
+your ~/Emulation directory. This is done automatically by the launcher script
+if you're using the default directory, otherwise make sure you copy them
+manually.
+EOF
+}
+
+# vim: ts=2 sw=2 et:
More information about the arch-commits
mailing list