From patchwork Fri Apr 30 00:22:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 28991 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 8700327BC7C; Fri, 30 Apr 2021 01:24:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,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 ESMTPS id CBFEE27BC7D for ; Fri, 30 Apr 2021 01:24:08 +0100 (BST) Received: from localhost ([::1]:40098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcGwx-0000lD-W1 for patchwork@mira.cbaines.net; Thu, 29 Apr 2021 20:24:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcGws-0000l7-P8 for guix-patches@gnu.org; Thu, 29 Apr 2021 20:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcGws-0002mD-Ge for guix-patches@gnu.org; Thu, 29 Apr 2021 20:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lcGws-0002Dj-Br for guix-patches@gnu.org; Thu, 29 Apr 2021 20:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44768] [PATCH v5] gnu: Add lightspark. References: <20201120200551.19145-1-monego@posteo.net> In-Reply-To: <20201120200551.19145-1-monego@posteo.net> Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Apr 2021 00:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 44768@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 44768-submit@debbugs.gnu.org id=B44768.16197422238509 (code B ref 44768); Fri, 30 Apr 2021 00:24:02 +0000 Received: (at 44768) by debbugs.gnu.org; 30 Apr 2021 00:23:43 +0000 Received: from localhost ([127.0.0.1]:57136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lcGwT-0002D7-PJ for submit@debbugs.gnu.org; Thu, 29 Apr 2021 20:23:42 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40661) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lcGwQ-0002Cr-VH for 44768@debbugs.gnu.org; Thu, 29 Apr 2021 20:23:36 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 6697F2400E5 for <44768@debbugs.gnu.org>; Fri, 30 Apr 2021 02:23:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1619742208; bh=FOEUUza+ZGiNZAYAYoLzMg0e6MHToV0VGb8sttzNS7A=; h=From:To:Cc:Subject:Date:From; b=OB+GuEtTwSWjP27+CufAhyKPr9ZZcdpXJImSmEOpx0aMqD5qbkOg7xqnKOC3YTfw9 DVctn0PmwYYI4J18SkiI/4sm70riTELkhEybsznHkMoAQadZH0zIaCH2PcnrHmHpJr QDuso+iHTvWA62NInOtIvc0oRvbTZveYT0yajriwBebJtgbr+z6TzEWezrUnsHijPF Z4+HQsaYfbNAoLMbqz6+rl9boJajabbjA0zu808sgb5TU+ZAUAsukqhBv68WswZ8ro Ll1Yz8gQzotoNQBpF8K4lNLoqG2fZqCriROnMJEaJp8PPPQXWglY+Aym4IXSYHGm2F ACe+djbCuoOfQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FWY4Z2w7Rz9rxM; Fri, 30 Apr 2021 02:23:25 +0200 (CEST) From: Vinicius Monego Date: Fri, 30 Apr 2021 00:22:54 +0000 Message-Id: <20210430002254.51419-1-monego@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 * gnu/packages/animation.scm (lightspark): New variable. --- Updated version to 0.8.4. Clarified some parts with comments. Disabled NPAPI and PPAPI plugins in #:configure-flags. Changed description. gnu/packages/animation.scm | 80 +++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 3a915c7fda..6b9a1cf00e 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pkill -9 -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,10 +25,12 @@ #:use-module (guix git-download) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages assembly) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages check) @@ -45,6 +47,8 @@ #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages networking) + #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) @@ -320,6 +324,80 @@ audio or video backends, ensuring good performance.") (home-page "https://www.gnu.org/software/gnash/") (license license:gpl3+)))) +;; This package provides a standalone (no browser plugin) version of +;; Lightspark. +(define-public lightspark + (package + (name "lightspark") + (version "0.8.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lightspark/lightspark") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mkvjmrjdqx4rsvavd619m144pdfkgs3jb6z7i9fmzyvh4i0jp37")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;requires Adobe Flex SDK, see README.tests + ;; Disable browser plugins because neither NPAPI nor PPAPI is + ;; supported in the browsers we have. + #:configure-flags + '("-DCOMPILE_NPAPI_PLUGIN=FALSE" + "-DCOMPILE_PPAPI_PLUGIN=FALSE") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'prepare-build-environment + (lambda _ + ;; Use relative etc path. + (substitute* "CMakeLists.txt" (("\\/etc") "etc")) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./tests")) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("nasm" ,nasm) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (inputs + `(("cairo" ,cairo) + ("curl" ,curl) + ("ffmpeg" ,ffmpeg) + ("freeglut" ,freeglut) + ("glew" ,glew) + ("glibmm" ,glibmm) + ("gnash" ,gnash) + ("gnutls" ,gnutls) + ("libjpeg" ,libjpeg-turbo) + ("openssl" ,openssl) + ("pango" ,pango) + ("pcre2" ,pcre2) + ("rtmpdump" ,rtmpdump) + ("sdl2" ,sdl2) + ("sdl2-mixer" ,sdl2-mixer) + ("zlib" ,zlib))) + (home-page "https://lightspark.github.io/") + (synopsis "Flash player implementation") + (description + "Lightspark is a Flash player implementation for playing files in the SWF +format. It supports SWF files written on all versions of the ActionScript +language.") + ;; NOTE: The bundled pugixml is a fork specific to Lightspark and + ;; incompatible with the one we have. + ;; FIXME: we also have jxrlib, but the build fails to find JXRMeta.h so we + ;; use the bundled one for now. + (license (list license:lgpl3+ ;lightspark + license:mpl2.0 ;avmplus + license:bsd-2 ;jxrlib + license:expat)))) ;pugixml, PerlinNoise + (define-public papagayo (let ((commit "e143684b30e59fe4a554f965cb655d23cbe93ee7") (revision "1"))