[arch-commits] Commit in higan-gtk/trunk (PKGBUILD higan-makefile.patch)

[Maxime Gauduin]

    Date: Tuesday, January 20, 2015 @ 15:16:46
  Author: alucryd
Revision: 126304

upgpkg: higan-gtk 094-2

Added:
  higan-gtk/trunk/higan-makefile.patch
Modified:
  higan-gtk/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   30 ++++++++++++-------------
 higan-makefile.patch |   58 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-20 14:06:52 UTC (rev 126303)
+++ PKGBUILD	2015-01-20 14:16:46 UTC (rev 126304)
@@ -1,9 +1,9 @@
 # $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 
 pkgname=higan-gtk
 pkgver=094
-pkgrel=1
+pkgrel=2
 pkgdesc='Nintendo multi-system emulator'
 arch=('i686' 'x86_64')
 url='http://byuu.org/'
@@ -12,27 +12,27 @@
 makedepends=('mesa')
 optdepends=('beat: Delta patcher')
 conflicts=('higan-qt')
-source=("http://byuu.org/files/${pkgname%-*}_v${pkgver}-source.tar.xz"
+source=("http://files.byuu.org/download/higan_v${pkgver}-source.tar.xz"
+        'higan-makefile.patch'
         'higan')
 sha256sums=('5e149df9d50c1066eb97c0d66665428d75304da782bba5a87078b87fc311151b'
+            '77f2412c47e9855a30c1ea10c49e58c5bceb8c28de29777dd9293553b2a6ab3d'
             'c799232a0f67c4b7f40fc6ad05325a6c04e86d78e40f361d02f168a16d11d048')
 
-_profiles='accuracy balanced performance'
-
 prepare() {
   cd higan_v${pkgver}-source
 
-  sed "s/-march=native/-march=${CARCH/_/-} -mtune=generic/g" -i Makefile
+  patch -Np1 -i ../higan-makefile.patch
 }
 
 build() {
   cd higan_v${pkgver}-source
 
-  make phoenix=gtk -C ananke
+  make phoenix='gtk' -C ananke
 
-  for _profile in ${_profiles}; do
-    make phoenix=gtk profile=${_profile}
-    mv out/higan{,-${_profile}}
+  for p in {accuracy,balanced,performance}; do
+    make phoenix='gtk' profile="$p"
+    mv out/higan{,-$p}
     make clean
   done
 }
@@ -41,17 +41,17 @@
   cd higan_v${pkgver}-source
 
   install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{applications,pixmaps,higan/Video\ Shaders}}
-  install -m 755 {..,"${pkgdir}"/usr/bin}/higan
+  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/
-  cp -dr --no-preserve=ownership shaders/*.shader "${pkgdir}"/usr/share/higan/Video\ Shaders/
+  cp -dr --no-preserve='ownership' profile/* data/cheats.bml "${pkgdir}"/usr/share/higan/
+  cp -dr --no-preserve='ownership' shaders/*.shader "${pkgdir}"/usr/share/higan/Video\ Shaders/
 
   install -m 644 ananke/libananke.so "${pkgdir}"/usr/lib/libananke.so.1
   ln -s libananke.so.1 "${pkgdir}"/usr/lib/libananke.so
 
-  for _profile in ${_profiles}; do
-    install -m 755 {out,"${pkgdir}"/usr/bin}/higan-${_profile}
+  for p in {accuracy,balanced,performance}; do
+    install -m 755 out/higan-$p "${pkgdir}"/usr/bin/
   done
 }
 

Added: higan-makefile.patch
===================================================================
--- higan-makefile.patch	                        (rev 0)
+++ higan-makefile.patch	2015-01-20 14:16:46 UTC (rev 126304)
@@ -0,0 +1,58 @@
+diff -rupN higan_v094-source.orig/ananke/Makefile higan_v094-source/ananke/Makefile
+--- higan_v094-source.orig/ananke/Makefile	2015-01-20 14:56:18.634660183 +0100
++++ higan_v094-source/ananke/Makefile	2015-01-20 15:00:39.164662554 +0100
+@@ -2,7 +2,8 @@ include ../nall/Makefile
+ include ../phoenix/Makefile
+ 
+ path := /usr/local/lib
+-flags := $(flags) -O3 -fomit-frame-pointer -I..
++flags := $(flags) $(CXXFLAGS) -I..
++link := $(link) $(LDFLAGS)
+ 
+ all:
+ 	$(compiler) $(cppflags) $(flags) -fPIC -o obj/ananke.o -c ananke.cpp
+diff -rupN higan_v094-source.orig/Makefile higan_v094-source/Makefile
+--- higan_v094-source.orig/Makefile	2015-01-20 14:56:18.634660183 +0100
++++ higan_v094-source/Makefile	2015-01-20 15:06:30.531332416 +0100
+@@ -13,8 +13,8 @@ target  := ethos
+ # console := true
+ 
+ # compiler
+-flags   += -I. -O3 -fomit-frame-pointer
+-link    +=
++flags   += $(CXXFLAGS) -I.
++link    += $(LDFLAGS)
+ objects := libco
+ 
+ # profile-guided optimization mode
+@@ -45,7 +45,7 @@ else ifeq ($(platform),macosx)
+   flags += -march=native
+ else ifeq ($(platform),linux)
+   flags += -march=native
+-  link += -s -Wl,-export-dynamic -lX11 -lXext -ldl
++  link += -Wl,-export-dynamic -lX11 -lXext -ldl
+ else ifeq ($(platform),bsd)
+   flags += -march=native
+   link += -s -Wl,-export-dynamic -lX11 -lXext
+diff -rupN higan_v094-source.orig/nall/Makefile higan_v094-source/nall/Makefile
+--- higan_v094-source.orig/nall/Makefile	2015-01-20 14:56:18.641326850 +0100
++++ higan_v094-source/nall/Makefile	2015-01-20 15:04:30.104664654 +0100
+@@ -52,13 +52,13 @@ ifeq ($(compiler),)
+     flags :=
+     link :=
+   endif
+-
+-  cflags := -x c -std=c99
+-  objcflags := -x objective-c -std=c99
+-  cppflags := -x c++ -std=c++11
+-  objcppflags := -x objective-c++ -std=c++11
+ endif
+ 
++cflags := -x c -std=c99
++objcflags := -x objective-c -std=c99
++cppflags := -x c++ -std=c++11
++objcppflags := -x objective-c++ -std=c++11
++
+ # cross-compilation support
+ ifeq ($(arch),x86)
+   flags := -m32 $(flags)