From f2d97d577d1dd527bbc707d857ccd0de81714420 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 4 Apr 2020 15:48:44 +0200 Subject: gnu: Replace uses of 'gettext' with 'gettext-minimal'. * gnu/packages/cdrom.scm (dvdstyler)[native-inputs]: Change from GNU-GETTEXT to GETTEXT-MINIMAL. * gnu/packages/emulators.scm (dolphin-emu)[native-inputs]: Likewise. * gnu/packages/engineering.scm (lepton-eda, kicad, kicad-i18l)[native-inputs]: Likewise. * gnu/packages/games.scm (quadrapassel, edgar)[native-inputs]: Likewise. * gnu/packages/gnome.scm (eog-plugins, workrave, geary)[native-inputs]: Likewise. * gnu/packages/guile-xyz.scm (guile-gi, emacsy)[native-inputs]: Likewise. * gnu/packages/image.scm (gpick)[native-inputs]: Likewise. * gnu/packages/messaging.scm (telegram-purple)[native-inputs]: Likewise. * gnu/packages/music.scm (fmit)[native-inputs]: Likewise. * gnu/packages/package-management.scm (flatpak)[native-inputs]: Likewise. * gnu/packages/patchutils.scm (quilt)[native-inputs]: Likewise. * gnu/packages/photo.scm (hugin)[native-inputs]: Likewise. * gnu/packages/security-token.scm (eid-mw)[native-inputs]: Likewise. * gnu/packages/telephony.scm (jami)[native-inputs]: Likewise. * gnu/packages/texinfo.scm (pinfo)[native-inputs]: Likewise. * gnu/packages/vulkan.scm (vkd3d)[native-inputs]: Likewise. * gnu/packages/web.scm (cadaver)[native-inputs]: Likewise. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 2fcb176ae4..505e4024aa 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -197,7 +197,7 @@ "-DX11_FOUND=1"))) (native-inputs `(("pkg-config" ,pkg-config) - ("gettext" ,gnu-gettext))) + ("gettext" ,gettext-minimal))) (inputs `(("alsa-lib" ,alsa-lib) ("ao" ,ao) -- cgit v1.2.3 From 58ee99fcb2d31a3eeee402fc013f9d97783bcad3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 7 Apr 2020 13:47:39 +0200 Subject: gnu: mame: Update to 0.220. * gnu/packages/emulators.scm (mame): Update to 0.220. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 505e4024aa..48ab4b2ce4 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1281,7 +1281,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.219") + (version "0.220") (source (origin (method git-fetch) @@ -1290,7 +1290,7 @@ play them on systems for which they were never designed!") (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "0s3nhkfa5c17ar1lzgvm20ndqain9llgqkab0ji5ycv2c85f06fl")) + (base32 "0x3yr195zi7xjr21p1c2l8c0vhg0a0af0mpz4i1w7q7r9krvcvz4")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3 From 76cc11a0edc81bd620d64b3cffe3125b6795f057 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Apr 2020 09:54:40 +0200 Subject: gnu: higan: Update to 110. * gnu/packages/emulators.scm (higan): Update to 110. [source]: Switch to new repository. [inputs]: Add libxrandr, replace sdl with sdl2. [home-page]: Use new URL. [license]: Switch license. * gnu/packages/patches/higan-remove-march-native-flag.patch: Delete file. * gnu/local.mk: Reflect patch removal. --- gnu/local.mk | 1 - gnu/packages/emulators.scm | 27 +++++++--------------- .../patches/higan-remove-march-native-flag.patch | 12 ---------- 3 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 gnu/packages/patches/higan-remove-march-native-flag.patch (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/local.mk b/gnu/local.mk index d305a5eab9..d177faf106 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1031,7 +1031,6 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ - %D%/packages/patches/higan-remove-march-native-flag.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ %D%/packages/patches/hplip-remove-imageprocessor.patch \ diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 48ab4b2ce4..7050eee211 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -311,28 +311,19 @@ and a game metadata scraper.") (home-page "https://emulationstation.org") (license license:expat)))) -;; Note: higan v107 has been released, but as explained by the dialog that -;; appears after starting the new version, it's an experimental release. The -;; author recommends v106 for general use. -;; -;; When updating to v107 (or probably beyond), sdl will have to be replaced -;; with sdl2, and libxrandr will need to be added to inputs. The patch -;; `higan-remove-march-native-flag.patch' will not be necessary, since the flag -;; is now being added only for `platform=local', which is not the default. (define-public higan (package (name "higan") - (version "106") + (version "110") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/byuu/higan/") - (commit (string-append "v" version)))) + (url "https://github.com/higan-emu/higan.git") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mxivf8124vz4hl0b0xa1yqv0z9m3i12v9psmbpqkprrbq0wbgn1")) - (patches (search-patches "higan-remove-march-native-flag.patch")))) + (base32 "11rvm53c3p2f6zk8xbyv2j51xp8zmqnch7zravhj3fk590qrjrr2")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -342,11 +333,12 @@ and a game metadata scraper.") ("eudev" ,eudev) ("gtk+" ,gtk+-2) ("gtksourceview-2" ,gtksourceview-2) + ("libxrandr" ,libxrandr) ("libxv" ,libxv) ("mesa" ,mesa) ("openal" ,openal) ("pulseaudio" ,pulseaudio) - ("sdl" ,sdl))) + ("sdl2" ,sdl2))) (arguments '(#:phases (let ((build-phase (assoc-ref %standard-phases 'build)) @@ -405,7 +397,7 @@ and a game metadata scraper.") (string-append "prefix=" (assoc-ref %outputs "out"))) ;; There is no test suite. #:tests? #f)) - (home-page "https://byuu.org/higan") + (home-page "https://github.com/higan-emu/higan/") (synopsis "Nintendo multi-system emulator") (description "higan (formerly bsnes) is an emulator for multiple Nintendo video game @@ -413,10 +405,7 @@ consoles, including the Nintendo Entertainment System (NES/Famicom), Super Nintendo Entertainment System (SNES/Super Famicom), Game Boy, Game Boy Color (GBC), and Game Boy Advance (GBA). It also supports the subsystems Super Game Boy, BS-X Satellaview, and Sufami Turbo.") - ;; As noted in these files among more: - ;; - icarus/icarus.cpp - ;; - higan/emulator/emulator.hpp - (license license:gpl3))) + (license license:gpl3+))) (define-public mgba (package diff --git a/gnu/packages/patches/higan-remove-march-native-flag.patch b/gnu/packages/patches/higan-remove-march-native-flag.patch deleted file mode 100644 index 30d4cdd061..0000000000 --- a/gnu/packages/patches/higan-remove-march-native-flag.patch +++ /dev/null @@ -1,12 +0,0 @@ -Remove -march=native from build flags. - ---- a/higan/GNUmakefile -+++ b/higan/GNUmakefile -@@ -26,7 +26,6 @@ - flags += -fopenmp - link += -fopenmp - ifeq ($(binary),application) -- flags += -march=native - link += -Wl,-export-dynamic - link += -lX11 -lXext - else ifeq ($(binary),library) -- cgit v1.2.3 From 6e2f7dc5e23f07855da808cf2e4f825680b23d50 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 8 Apr 2020 10:03:25 +0200 Subject: gnu: higan: Update description. * gnu/packages/emulators.scm (higan)[synopsis, description]: Update description. --- gnu/packages/emulators.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7050eee211..58d6c73ee2 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -398,13 +398,17 @@ and a game metadata scraper.") ;; There is no test suite. #:tests? #f)) (home-page "https://github.com/higan-emu/higan/") - (synopsis "Nintendo multi-system emulator") + (synopsis "Multi-system emulator") (description - "higan (formerly bsnes) is an emulator for multiple Nintendo video game -consoles, including the Nintendo Entertainment System (NES/Famicom), Super -Nintendo Entertainment System (SNES/Super Famicom), Game Boy, Game Boy -Color (GBC), and Game Boy Advance (GBA). It also supports the subsystems -Super Game Boy, BS-X Satellaview, and Sufami Turbo.") + "higan is a multi-system emulator with an uncompromising focus on +accuracy and code readability. + +It currently emulates the following systems: Famicom, Famicom Disk System, +Super Famicom, Super Game Boy, Game Boy, Game Boy Color, Game Boy Advance, +Game Boy Player, SG-1000, SC-3000, Master System, Game Gear, Mega Drive, Mega +CD, PC Engine, SuperGrafx, MSX, MSX2, ColecoVision, Neo Geo Pocket, Neo Geo +Pocket Color, WonderSwan, WonderSwan Color, SwanCrystal, Pocket Challenge +V2.") (license license:gpl3+))) (define-public mgba -- cgit v1.2.3