[arch-commits] Commit in higan/trunk (5 files)
Maxime Gauduin
alucryd at archlinux.org
Wed Mar 18 16:46:45 UTC 2020
Date: Wednesday, March 18, 2020 @ 16:46:44
Author: alucryd
Revision: 600594
upgpkg: higan 109-1
Added:
higan/trunk/higan-flags.patch
higan/trunk/higan-paths.patch
Modified:
higan/trunk/PKGBUILD
Deleted:
higan/trunk/higan-flags.patch
higan/trunk/higan-paths.patch
-------------------+
PKGBUILD | 83 ++++++++++++++++++++++++++++++++--------------------
higan-flags.patch | 72 ++++++++++++++-------------------------------
higan-paths.patch | 68 ++++++++++++++++++++++++++----------------
3 files changed, 117 insertions(+), 106 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-18 16:20:56 UTC (rev 600593)
+++ PKGBUILD 2020-03-18 16:46:44 UTC (rev 600594)
@@ -1,53 +1,74 @@
# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
pkgname=higan
-pkgver=106
+pkgver=109
pkgrel=1
pkgdesc='Nintendo multi-system emulator'
-arch=('x86_64')
-url='https://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'
- 'libudev.so')
-makedepends=('mesa')
-conflicts=('higan-gtk' 'higan-qt')
-replaces=('higan-gtk' 'higan-qt')
-source=("https://download.byuu.org/higan_v${pkgver}-source.7z"
- 'higan-flags.patch'
- 'higan-paths.patch')
-sha256sums=('6564f91f232040c46c052de763dc139e94005e0f2376959fdacbb6ccd3fd6d18'
- '6cff6f9570de186bdfa4620d3a2b6e315118b6f6be45b35f3346995865f1718e'
- '6d0bf69e00c9ea5c5155b52b5ee59c253f2bacbc64f044826f53d4d6ae175c68')
+arch=(x86_64)
+url=https://byuu.org/
+license=(GPL3)
+depends=(
+ gcc-libs
+ glibc
+ libao
+ libasound.so
+ libgl
+ libpulse-simple.so
+ libpulse.so
+ libudev.so
+ libx11
+ libxext
+ libxrandr
+ libxv
+ openal
+ qt5-base
+ sdl2
+)
+makedepends=(
+ git
+)
+source=(
+ git+https://github.com/byuu/higan.git#tag=bda7f3b2f815e9491501dcda22478ae5a97f5cf5
+ higan-flags.patch
+ higan-paths.patch
+)
+sha256sums=('SKIP'
+ 'bf84cfa9f2499a187dca613272fadf267fd3e2c29b615af74b1e219bd8c3247c'
+ '9cc20274c420a05667f35bdc9db313f1a6ce47d964dbf0cef62d85c46a4170a4')
+pkgver() {
+ cd higan
+
+ git describe --tags | sed 's/^v//'
+}
+
prepare() {
- cd higan_v${pkgver}-source
+ cd higan
patch -Np1 -i ../higan-flags.patch
patch -Np1 -i ../higan-paths.patch
+ sed 's|/usr/local/lib/qt5/bin/moc|moc|' -i hiro/GNUmakefile
}
build() {
- cd higan_v${pkgver}-source
+ cd higan
- make -C higan
- make -C icarus
+ make -C higan hiro=qt5
+ make -C icarus hiro=qt5
}
package() {
- cd higan_v${pkgver}-source
+ install -dm 755 "${pkgdir}"/usr/share/{higan,icarus}
- 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 higan/higan/out/higan -t "${pkgdir}"/usr/bin/
+ install -Dm 644 higan/higan/target-higan/resource/higan.desktop -t "${pkgdir}"/usr/share/applications/
+ install -Dm 644 higan/higan/target-higan/resource/higan.svg -t "${pkgdir}"/usr/share/pixmaps/
+ cp -dr --no-preserve='ownership' higan/higan/System "${pkgdir}"/usr/share/higan/Templates
- 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/
+ install -Dm 755 higan/icarus/out/icarus -t "${pkgdir}"/usr/bin/
+ install -Dm 644 higan/icarus/data/icarus.desktop -t "${pkgdir}"/usr/share/applications/
+ install -Dm 644 higan/icarus/data/icarus.svg -t "${pkgdir}"/usr/share/pixmaps/
+ cp -dr --no-preserve='ownership' higan/icarus/Database higan/icarus/Firmware "${pkgdir}"/usr/share/icarus/
}
# vim: ts=2 sw=2 et:
Deleted: higan-flags.patch
===================================================================
--- higan-flags.patch 2020-03-18 16:20:56 UTC (rev 600593)
+++ higan-flags.patch 2020-03-18 16:46:44 UTC (rev 600594)
@@ -1,49 +0,0 @@
-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
- 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 :=
--link :=
-+flags := $(CXXFLAGS)
-+link := $(LDFLAGS)
-
- # compiler detection
- ifeq ($(compiler),)
-@@ -120,7 +120,7 @@ ifeq ($(threaded),true)
- endif
-
- # paths
--prefix := $(HOME)/.local
-+prefix := /usr
-
- # function rwildcard(directory, pattern)
- rwildcard = \
Added: higan-flags.patch
===================================================================
--- higan-flags.patch (rev 0)
+++ higan-flags.patch 2020-03-18 16:46:44 UTC (rev 600594)
@@ -0,0 +1,23 @@
+From 6d0f100d25fecae89a48c76f55371730a51c10fe Mon Sep 17 00:00:00 2001
+From: Maxime Gauduin <alucryd at archlinux.org>
+Date: Wed, 18 Mar 2020 17:08:25 +0100
+Subject: [PATCH] use system flags
+
+---
+ nall/GNUmakefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/nall/GNUmakefile b/nall/GNUmakefile
+index 67fb3a15..fddec93d 100755
+--- a/nall/GNUmakefile
++++ b/nall/GNUmakefile
+@@ -127,7 +127,8 @@ endif
+
+ # linux settings
+ ifeq ($(platform),linux)
+- options += -ldl
++ flags += ${CXXFLAGS}
++ options += ${LDFLAGS} -ldl
+ endif
+
+ # bsd settings
Deleted: higan-paths.patch
===================================================================
--- higan-paths.patch 2020-03-18 16:20:56 UTC (rev 600593)
+++ higan-paths.patch 2020-03-18 16:46:44 UTC (rev 600594)
@@ -1,26 +0,0 @@
-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};
- }
Added: higan-paths.patch
===================================================================
--- higan-paths.patch (rev 0)
+++ higan-paths.patch 2020-03-18 16:46:44 UTC (rev 600594)
@@ -0,0 +1,42 @@
+From c0495ce121ab0c3eeffdf08614e18bd4f0c455f2 Mon Sep 17 00:00:00 2001
+From: Maxime Gauduin <alucryd at archlinux.org>
+Date: Wed, 18 Mar 2020 12:19:31 +0100
+Subject: [PATCH] use more sensible paths
+
+---
+ higan/target-higan/higan.cpp | 5 ++---
+ icarus/icarus.cpp | 3 +--
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/higan/target-higan/higan.cpp b/higan/target-higan/higan.cpp
+index 1ce9b991..7d1ae122 100644
+--- a/higan/target-higan/higan.cpp
++++ b/higan/target-higan/higan.cpp
+@@ -43,11 +43,10 @@ auto nall::main(Arguments arguments) -> void {
+ Path::data = document["data"].text();
+ }
+ if(!directory::exists(Path::templates)) {
+- Path::templates = {Path::userData(), "higan/"};
+- directory::create(Path::templates);
++ Path::templates = {Path::sharedData(), "higan/Templates/"};
+ }
+ if(!directory::exists(Path::data)) {
+- Path::data = {Path::user(), "higan/"};
++ Path::data = {Path::userData(), "higan/Systems/"};
+ directory::create(Path::data);
+ }
+ file::write({Path::settings, "paths.bml"}, string{
+diff --git a/icarus/icarus.cpp b/icarus/icarus.cpp
+index 95435f38..a46744e5 100644
+--- a/icarus/icarus.cpp
++++ b/icarus/icarus.cpp
+@@ -8,8 +8,7 @@ auto locate(string name) -> string {
+ string location = {Path::program(), name};
+ if(inode::exists(location)) return location;
+
+- directory::create({Path::userData(), "icarus/"});
+- return {Path::userData(), "icarus/", name};
++ return {Path::sharedData(), "icarus/", name};
+ }
+
+ auto operator+=(string& lhs, const string& rhs) -> string& {
More information about the arch-commits
mailing list