From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emcDW-0000a4-9X for guix-patches@gnu.org; Fri, 16 Feb 2018 04:22:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emcDS-0000Jd-HM for guix-patches@gnu.org; Fri, 16 Feb 2018 04:22:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:37728) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emcDS-0000JL-BH for guix-patches@gnu.org; Fri, 16 Feb 2018 04:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1emcDS-0005tD-4f for guix-patches@gnu.org; Fri, 16 Feb 2018 04:22:02 -0500 Subject: [bug#30380] gnu: Add dolphin-emu. References: In-Reply-To: Resent-Message-ID: Date: Fri, 16 Feb 2018 10:20:46 +0100 From: Rutger Helling Message-ID: <20180216102046.562bda38@mykolab.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/U8JpsiKaM+W+LjZAEoxe/70"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30380@debbugs.gnu.org, dthompson2@worcester.edu, manolis837@gmail.com, bjoern.hoefling@bjoernhoefling.de, ludo@gnu.org --Sig_/U8JpsiKaM+W+LjZAEoxe/70 Content-Type: multipart/mixed; boundary="MP_/DyzOp9H/T3ytt3e4xFve2Nd" --MP_/DyzOp9H/T3ytt3e4xFve2Nd Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hello everyone, As promised I've updated these patches. Just to reiterate, these are David's patches. I've only changed a few things. Here's the changes of the top of my head: * First patch is unchanged. * Renamed to dolphin-emu instead of dolphin-emulator since that seems like a more canonical name. * Incorporated Bj=C3=B6rn's suggestions. * Added a few more inputs to get rid of more externals. * Enabled Qt interface. --MP_/DyzOp9H/T3ytt3e4xFve2Nd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-Add-wxwidgets-gtk2-3.1.patch =46rom b09950c2847be7f17ea57906714f74a5ca2f671b Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 7 Feb 2018 06:28:46 -0500 Subject: [PATCH 1/2] gnu: Add wxwidgets-gtk2-3.1. * gnu/packages/wxwidgets.scm (wxwidgets-gtk2-3.1): New variable. --- gnu/packages/wxwidgets.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 84446d8ef..9f7a87ca4 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -126,6 +126,14 @@ and many other languages.") ((#:configure-flags flags) `(cons "--enable-mediactrl" ,flags)))))) =20 +(define-public wxwidgets-gtk2-3.1 + (package (inherit wxwidgets-3.1) + (inputs `(("gtk+" ,gtk+-2) + ,@(alist-delete + "gtk+" + (package-inputs wxwidgets-3.1)))) + (name "wxwidgets-gtk2"))) + (define-public python2-wxpython (package (name "python2-wxpython") --=20 2.16.1 --MP_/DyzOp9H/T3ytt3e4xFve2Nd Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-gnu-Add-dolphin-emu.patch =46rom 4d4b896d4e437ee81772939ef408943073504c51 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 16 Feb 2018 09:57:31 +0100 Subject: [PATCH 2/2] gnu: Add dolphin-emu. * gnu/packages/games.scm (dolphin-emu): New variable. --- gnu/packages/games.scm | 114 +++++++++++++++++++++++++++++++++++++++++++++= +++- 1 file changed, 113 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 286d0feef..898047f5b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2013 John Darrington ;;; Copyright =C2=A9 2013 Nikita Karetnikov -;;; Copyright =C2=A9 2014, 2015, 2016 David Thompson +;;; Copyright =C2=A9 2014, 2015, 2016, 2018 David Thompson ;;; Copyright =C2=A9 2014, 2015, 2016, 2017 Eric Bavier ;;; Copyright =C2=A9 2014 Cyrill Schenkel ;;; Copyright =C2=A9 2014 Sylvain Beucler @@ -88,6 +88,7 @@ #:use-module (gnu packages libcanberra) #:use-module (gnu packages libedit) #:use-module (gnu packages libunwind) + #:use-module (gnu packages libusb) #:use-module (gnu packages haskell) #:use-module (gnu packages mp3) #:use-module (gnu packages music) @@ -112,6 +113,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages gstreamer) #:use-module (gnu packages bash) + #:use-module (gnu packages digest) #:use-module (gnu packages perl) #:use-module (gnu packages qt) #:use-module (gnu packages compression) @@ -5549,3 +5551,113 @@ hacking the gamification of contribution graphs on = platforms such as Github or Gitlab.") (home-page "https://github.com/umayr/badass") (license license:expat)))) + +;; Building from recent Git because the official 5.0 release no longer bui= lds. +(define-public dolphin-emu + (let ((commit "d04b179111f8d863f360839474cb82c766f762b8") + (revision "0")) + (package + (name "dolphin-emu") + (version (git-version "5.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dolphin-emu/dolphin.git") + (commit commit))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file-recursively + ;; Remove Windows binaries. + '("Installer/dxredist/" + + ; Remove external stuff we don't need. + "Externals/LZO" + "Externals/OpenAL" + "Externals/Qt" + "Externals/SFML" + "Externals/SOIL" + "Externals/curl" + "Externals/ffmpeg" + "Externals/gettext" + "Externals/hidapi" + "Externals/libpng" + "Externals/libusb" + "Externals/mbedtls" + "Externals/miniupnpc" + "Externals/wxWidgets3" + "Externals/zlib" + + ; TODO: See if we can build these files from + ; source, delete until then. + "Data/Sys/GC/dsp_coef.bin" + "Data/Sys/GC/dsp_rom.bin")) + #t)) + (sha256 + (base32 + "0g725wmhlim73zrhi47wmr1bmplpy4b7sbimd5pm8xpfhj5nm10l")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f + ;; The FindGTK2 cmake script only checks hardcoded directories for + ;; glib/gtk headers. + #:configure-flags + (list (string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR=3D" + (assoc-ref %build-inputs "gtk+") + "/lib/gtk-2.0/include") + (string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR=3D" + (assoc-ref %build-inputs "glib") + "/lib/glib-2.0/include") + (string-append "-DX11_INCLUDE_DIR=3D" + (assoc-ref %build-inputs "libx11") + "/include") + (string-append "-DX11_LIBRARIES=3D" + (assoc-ref %build-inputs "libx11") + "/lib/libX11.so") + "-DX11_FOUND=3D1"))) + ; TODO: Make Vulkan backend work. + (native-inputs + `(("pkg-config" ,pkg-config) + ("gettext" ,gnu-gettext))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("ao" ,ao) + ("bluez" ,bluez) + ("curl" ,curl) + ("eudev" ,eudev) + ("ffmpeg" ,ffmpeg) + ("glew" ,glew) + ("glib" ,glib) + ("glu" ,glu) + ("gtk+" ,gtk+-2) + ("hidapi" ,hidapi) + ("libevdev" ,libevdev) + ("libpng" ,libpng) + ("libusb" ,libusb) + ("libx11" ,libx11) + ("libxi" ,libxi) + ("libxrandr" ,libxrandr) + ("lzo" ,lzo) + ("mbedtls-apache" ,mbedtls-apache) + ("mesa" ,mesa) + ("miniupnpc" ,miniupnpc) + ("openal" ,openal) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("sdl2" ,sdl2) + ("sfml" ,sfml) + ("soil" ,soil) + ("soundtouch" ,soundtouch) + ("wxwidgets" ,wxwidgets-gtk2-3.1) + ("zlib" ,zlib))) + (home-page "https://dolphin-emu.org/") + (synopsis "Nintendo Wii and GameCube emulator") + (description + "Dolphin is an emulator for two Nintendo video game consoles: the +GameCube and the Wii. It provides compatibility with all PC controllers, +turbo speed, networked multiplayer, and graphical enhancements.") + (supported-systems '("x86_64-linux")) ; TODO: should also work on AR= M64. + ; dolphin/Data/Sys/GC/font_*.bin: Licensed under ASL2.0. + (license (list license:gpl2+ license:asl2.0))))) --=20 2.16.1 --MP_/DyzOp9H/T3ytt3e4xFve2Nd-- --Sig_/U8JpsiKaM+W+LjZAEoxe/70 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlqGom8ACgkQ86cn20T8 yjax9gf/chFfHvrR5tQZhIOqYUyLZ8N2XDg6QTI5L1gcPP5qX9nyhd4gjyVW0gHa EYHN/MukG4h9ustXC++aRFzCixYawJ1AIxHZnjrt+DUBcvcXoh+XQIXAHO4lI85M OhgrjhnC23msxA/PUP/NBeFYmGTYvyUhHgKTYpWWFK8BCJcjjsdWlwtx4p9S0nwC O+kr8w7tzzmuhETBz4bm+Gty3u7DK0FdbVyoNyDy76q0Xr2aZQ/seXIe4zUAN5uf 86oj6+NyrUTlAtpiIMu0RdrpWvLxnPde3kMr/qzdd8OrB3s8Z/rJj12Rtod6qBmz xtcoqWlftHH/BNEqdMiQCmHww0JYxw== =Ify1 -----END PGP SIGNATURE----- --Sig_/U8JpsiKaM+W+LjZAEoxe/70--