From patchwork Thu Mar 12 02:20:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christine Lemmer-Webber X-Patchwork-Id: 20642 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8B24E27BBEB; Thu, 12 Mar 2020 02:21:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3B18427BBE4 for ; Thu, 12 Mar 2020 02:21:12 +0000 (GMT) Received: from localhost ([::1]:60646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCDTD-0005yE-OY for patchwork@mira.cbaines.net; Wed, 11 Mar 2020 22:21:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40943) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCDT6-0005tO-Nd for guix-patches@gnu.org; Wed, 11 Mar 2020 22:21:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCDT4-0006qR-Go for guix-patches@gnu.org; Wed, 11 Mar 2020 22:21:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49787) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jCDT4-0006qJ-Bk for guix-patches@gnu.org; Wed, 11 Mar 2020 22:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jCDT4-0005H9-7e for guix-patches@gnu.org; Wed, 11 Mar 2020 22:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40033] Vice emulator, now with patch References: <87ftees4d6.fsf@dustycloud.org> In-Reply-To: <87ftees4d6.fsf@dustycloud.org> Resent-From: Christopher Lemmer Webber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Mar 2020 02:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40033 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40033@debbugs.gnu.org Received: via spool by 40033-submit@debbugs.gnu.org id=B40033.158397961020184 (code B ref 40033); Thu, 12 Mar 2020 02:21:02 +0000 Received: (at 40033) by debbugs.gnu.org; 12 Mar 2020 02:20:10 +0000 Received: from localhost ([127.0.0.1]:55760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCDSD-0005FS-D7 for submit@debbugs.gnu.org; Wed, 11 Mar 2020 22:20:09 -0400 Received: from dustycloud.org ([50.116.34.160]:51628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCDSB-0005FF-6p for 40033@debbugs.gnu.org; Wed, 11 Mar 2020 22:20:07 -0400 Received: from twig (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id B6E8426618 for <40033@debbugs.gnu.org>; Wed, 11 Mar 2020 22:20:06 -0400 (EDT) User-agent: mu4e 1.2.0; emacs 26.3 From: Christopher Lemmer Webber Date: Wed, 11 Mar 2020 22:20:06 -0400 Message-ID: <87eetys4a1.fsf@dustycloud.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Oops, patch below: From 3377e3b59203502c065d7c86cbb5e0f5e246862f Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Wed, 11 Mar 2020 22:04:53 -0400 Subject: [PATCH] gnu: Add vice. * gnu/packages/emulators.scm (vice): New variable. --- gnu/packages/emulators.scm | 58 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7e4c98fbc7..40f81d1cc7 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 David Wilson ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Christopher Lemmer Webber ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,12 +42,14 @@ #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages backup) #:use-module (gnu packages cdrom) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages elf) + #:use-module (gnu packages flex) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) @@ -1628,3 +1631,58 @@ derived from Gens. Project goals include clean source code, combined features from various forks of Gens, and improved platform portability.") (supported-systems '("i686-linux" "x86_64-linux")) (license license:gpl2+))) + +(define-public vice + (package + (name "vice") + (version "3.4") + (source (origin + (method url-fetch) + (uri (string-append "https://sourceforge.net/projects" + "/vice-emu/files/releases/vice-" + version ".tar.gz/download")) + (sha256 + (base32 + "1svsw3z18nsj3vmpxdp456y79xsj9f1k405r07zd336kccf0rl2b")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-sh + (lambda _ + (substitute* (find-files "." "configure") + (("-/bin/sh") (string-append "-" (which "sh"))) + (("= /bin/sh") (string-append "= " (which "sh")))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; The 'configure' script is a wrapper for Waf and + ;; doesn't recognize things like '--enable-fast-install'. + (invoke "./configure" + (string-append "--prefix=" out)))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("bison" ,bison) + ("texinfo" ,texinfo))) + (inputs + `(("flex" ,flex) + ("xa" ,xa) + ("sdl2" ,sdl2) + ("libpng" ,libpng) + ("libjpeg" ,libjpeg-turbo) + ("ffmpeg" ,ffmpeg) + ("giflib" ,giflib) + ("zlib" ,zlib) + ("alsa-lib" ,alsa-lib) + ("pulseaudio" ,pulseaudio) + ("portaudio" ,portaudio) + ("mesa" ,mesa) + ("glu" ,glu))) + (home-page "http://vice-emu.sourceforge.net/") + (synopsis "Versatile Commodore emulator") + (description + "VICE emulates the C64, the C64DTV, the C128, the VIC20, practically +all PET models, the PLUS4 and the CBM-II (aka C610/C510). An extra +emulator is provided for C64 expanded with the CMD SuperCPU.") + (license license:gpl2+))) -- 2.25.1