[arch-commits] Commit in higan/repos/community-x86_64 (6 files)
Maxime Gauduin
alucryd at archlinux.org
Wed Mar 18 19:54:47 UTC 2020
Date: Wednesday, March 18, 2020 @ 19:54:46
Author: alucryd
Revision: 600669
archrelease: copy trunk to community-x86_64
Added:
higan/repos/community-x86_64/PKGBUILD
(from rev 600668, higan/trunk/PKGBUILD)
higan/repos/community-x86_64/higan-flags.patch
(from rev 600668, higan/trunk/higan-flags.patch)
higan/repos/community-x86_64/higan-paths.patch
(from rev 600668, higan/trunk/higan-paths.patch)
Deleted:
higan/repos/community-x86_64/PKGBUILD
higan/repos/community-x86_64/higan-flags.patch
higan/repos/community-x86_64/higan-paths.patch
-------------------+
PKGBUILD | 148 ++++++++++++++++++++++++++--------------------------
higan-flags.patch | 46 ++++++++--------
higan-paths.patch | 84 ++++++++++++++---------------
3 files changed, 139 insertions(+), 139 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-18 19:54:38 UTC (rev 600668)
+++ PKGBUILD 2020-03-18 19:54:46 UTC (rev 600669)
@@ -1,74 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-
-pkgname=higan
-pkgver=109
-pkgrel=1
-pkgdesc='Nintendo multi-system emulator'
-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
-
- 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
-
- make -C higan hiro=qt5
- make -C icarus hiro=qt5
-}
-
-package() {
- install -dm 755 "${pkgdir}"/usr/share/{higan,icarus}
-
- 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 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:
Copied: higan/repos/community-x86_64/PKGBUILD (from rev 600668, higan/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-18 19:54:46 UTC (rev 600669)
@@ -0,0 +1,74 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+
+pkgname=higan
+pkgver=109
+pkgrel=2
+pkgdesc='A multi-system emulator focused on accuracy, preservation, and configurability'
+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
+
+ 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
+
+ make -C higan hiro=qt5
+ make -C icarus hiro=qt5
+}
+
+package() {
+ install -dm 755 "${pkgdir}"/usr/share/{higan,icarus}
+
+ 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 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 19:54:38 UTC (rev 600668)
+++ higan-flags.patch 2020-03-18 19:54:46 UTC (rev 600669)
@@ -1,23 +0,0 @@
-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
Copied: higan/repos/community-x86_64/higan-flags.patch (from rev 600668, higan/trunk/higan-flags.patch)
===================================================================
--- higan-flags.patch (rev 0)
+++ higan-flags.patch 2020-03-18 19:54:46 UTC (rev 600669)
@@ -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 19:54:38 UTC (rev 600668)
+++ higan-paths.patch 2020-03-18 19:54:46 UTC (rev 600669)
@@ -1,42 +0,0 @@
-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& {
Copied: higan/repos/community-x86_64/higan-paths.patch (from rev 600668, higan/trunk/higan-paths.patch)
===================================================================
--- higan-paths.patch (rev 0)
+++ higan-paths.patch 2020-03-18 19:54:46 UTC (rev 600669)
@@ -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