From 6f483f8deb3ba5335579872b8d8ac6b625aaf53a Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Fri, 10 Sep 2021 21:02:35 +0000 Subject: gnu: nestopia-ue: Update to 1.51.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emulators.scm (nestopia-ue): Update to 1.51.1. [source]: libretro is not included in nestopia-ue anymore. [build-system]: Change to gnu-build-system. [native-inputs]: Add autoconf, autoconf-archive and automake. [inputs]: Remove ao and gtk+, add fltk, fontconfig, libxft and libxrender. [arguments]: Remove 'wrap-program phase which was needed for the removed gtk+ dependency. Signed-off-by: 宋文武 --- gnu/packages/emulators.scm | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 28ecb0c563..3393506c0e 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -59,6 +59,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages digest) #:use-module (gnu packages elf) #:use-module (gnu packages flex) + #:use-module (gnu packages fltk) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) @@ -1369,7 +1370,7 @@ (define-public mupen64plus-ui-console (define-public nestopia-ue (package (name "nestopia-ue") - (version "1.48") + (version "1.51.1") (source (origin (method git-fetch) @@ -1378,36 +1379,24 @@ (define-public nestopia-ue (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "19c8vx5yxbysl0sszk5blfngwacshdgwbf44g1qaxvq8ywiyxmb4")) - (modules '((guix build utils))) - (snippet - '(begin - ;; We don't need libretro for the GNU/Linux build. - (delete-file-recursively "libretro") - #t)))) - (build-system cmake-build-system) + (base32 "1g19gz33jav00rwzkpcnynf5ps41vl64a9qx0xjd6lva4bgn8s57")))) + (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("autoconf" ,autoconf) + ("autoconf-archive" ,autoconf-archive) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) (inputs - `(("ao" ,ao) - ("gtk+" ,gtk+) + `(("fltk" ,fltk) + ("fontconfig", fontconfig) ("libarchive" ,libarchive) ("libepoxy" ,libepoxy) + ("libxft" ,libxft) + ("libxrender" ,libxrender) ("sdl2" ,sdl2) ("zlib" ,zlib))) (arguments - '(#:phases - (modify-phases %standard-phases - ;; This fixes the file chooser crash that happens with GTK 3. - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (nestopia (string-append out "/bin/nestopia")) - (gtk (assoc-ref inputs "gtk+")) - (gtk-share (string-append gtk "/share"))) - (wrap-program nestopia - `("XDG_DATA_DIRS" ":" prefix (,gtk-share))))))) - ;; There are no tests. + '(;; There are no tests. #:tests? #f)) (home-page "http://0ldsk00l.ca/nestopia/") (synopsis "Nintendo Entertainment System (NES/Famicom) emulator") -- cgit v1.2.3 From 79771bd2bbfff9ff17199d639d3aa24c283edc4e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 29 Sep 2021 15:58:56 +0200 Subject: gnu: mame: Update to 0.236. * gnu/packages/emulators.scm (mame): Update to 0.236. --- 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 3393506c0e..84fb848b4f 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1761,7 +1761,7 @@ (define-public libticalcs2 (define-public mame (package (name "mame") - (version "0.235") + (version "0.236") (source (origin (method git-fetch) @@ -1770,7 +1770,7 @@ (define-public mame (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "1iz5p51am7gh19i0zx96vfpfpza8xvrz9f2pd908jsc4xpr36agd")) + (base32 "0pxvvdirbwakl5cy7lp0zib6z176ckxx8c3mazsd7q1ddxxd3l8x")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3 From 365a9947386d9a18a4975c720c4cce2caa9f37de Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 4 Oct 2021 23:46:56 +0200 Subject: gnu: dosbox-staging: Update to 0.77.1. * gnu/packages/emulators.scm (dosbox-staging): Update to 0.77.1. [build-system]: Switch to Meson. [arguments]: Remove all old #:configure-flags. Disable unit_tests and mt32emu. [native-inputs]: Remove autoconf & automake. [inputs]: Add mesa. --- gnu/packages/emulators.scm | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 84fb848b4f..77a45afe0b 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -47,10 +47,11 @@ (define-module (gnu packages emulators) #:use-module (gnu packages audio) #:use-module (gnu packages autogen) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages boost) - #:use-module (gnu packages backup) + #:use-module (gnu packages build-tools) #:use-module (gnu packages cdrom) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -102,6 +103,7 @@ (define-module (gnu packages emulators) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system python)) (define-public vice @@ -398,7 +400,7 @@ (define-public dosbox-staging ;; This is not a patch staging area for DOSBox, but an unaffiliated fork. (package (name "dosbox-staging") - (version "0.76.0") + (version "0.77.1") (source (origin (method git-fetch) @@ -407,34 +409,20 @@ (define-public dosbox-staging (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "14zlkm9qmaq2x4zdiadczsxvdnrf35w13ccvkxzd8cwrzxv84fvd")))) - (build-system gnu-build-system) + (base32 "07jwmmm1bhfxavlhl854cj8l5iy5hqx5hpwkkjbcwqg7yh9jfs2x")))) + (build-system meson-build-system) (arguments - `(#:configure-flags - (let* ((flags (list "-O3" - ;; From scripts/automator/build/gcc-defaults. - "-fstrict-aliasing" - "-fno-signed-zeros" - "-fno-trapping-math" - "-fassociative-math" - "-frename-registers" - "-ffunction-sections" - "-fdata-sections")) - (CFLAGS (string-join flags " "))) - ;; Several files #include instead of , - ;; including configure.ac itself. - (list (string-append "CPPFLAGS=-I" (assoc-ref %build-inputs "sdl2") - "/include/SDL2") - (string-append "CFLAGS=" CFLAGS) - (string-append "CXXFLAGS=-DNDEBUG " CFLAGS))))) + `(#:meson ,meson-0.55 #:configure-flags + ;; These both try to git clone subprojects. + (list "-Dunit_tests=disabled" ; gtest + "-Duse_mt32emu=false"))) ; mt32emu (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) ("fluidsynth" ,fluidsynth) ("libpng" ,libpng) + ("mesa" ,mesa) ("opusfile" ,opusfile) ("sdl2" ,(sdl-union (list sdl2 sdl2-net))) ("zlib" ,zlib))) -- cgit v1.2.3 From da878d7380c144ed8183e9369b46bdcd11ecd683 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 4 Oct 2021 23:50:47 +0200 Subject: gnu: sameboy: Update to 0.14.5. * gnu/packages/emulators.scm (sameboy): Update to 0.14.5. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/emulators.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 77a45afe0b..b1ca968530 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -769,7 +769,7 @@ (define-public mgba (define-public sameboy (package (name "sameboy") - (version "0.14.4") + (version "0.14.5") (source (origin (method git-fetch) @@ -778,7 +778,7 @@ (define-public sameboy (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0zp11qm8b3cmx70pzczyh4vv4jyhlh4jnci8kn6b30c8lzl43g83")))) + (base32 "0qqribyksm51fhq923rdhrzb9c4yf16szymprbw8fsz0nzv8frm3")))) (build-system gnu-build-system) (native-inputs `(("rgbds" ,rgbds) @@ -803,8 +803,7 @@ (define-public sameboy (with-directory-excursion "build/bin/SDL" (install-file "sameboy" bin) (delete-file "sameboy") - (copy-recursively "." data)) - #t)))))) + (copy-recursively "." data)))))))) (home-page "https://sameboy.github.io/") (synopsis "Accurate Game Boy, Game Boy Color and Super Game Boy emulator") (description "SameBoy is a user friendly Game Boy, Game Boy Color -- cgit v1.2.3 From 23fe63e4b33eb338ca651ea31522dd0b20df99e7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 8 Oct 2021 12:26:33 +0200 Subject: gnu: scummvm: Update to 2.5.0. * gnu/packages/emulators.scm (scummvm): Update to 2.5.0. [inputs]: Add glew and giflib. --- gnu/packages/emulators.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emulators.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index b1ca968530..f09ac6b0a1 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1524,14 +1524,14 @@ (define-public retroarch (define-public scummvm (package (name "scummvm") - (version "2.2.0") + (version "2.5.0") (source (origin (method url-fetch) (uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version "/scummvm-" version ".tar.xz")) (sha256 - (base32 "11vknasm5dna2vqr6gk343qynh7nhsq3kf60zayarn1vb5z6as8l")))) + (base32 "08ynw1cmld41p4bwrw84gb1nv229va70i91qiqsjr3c2jnqy8zml")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;require "git" @@ -1558,6 +1558,8 @@ (define-public scummvm ("fluidsynth" ,fluidsynth) ("freetype" ,freetype) ("fribidi" ,fribidi) + ("glew" ,glew) + ("giflib" ,giflib) ("liba52" ,liba52) ("libflac" ,flac) ("libjpeg-turbo" ,libjpeg-turbo) -- cgit v1.2.3