From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id SKkfHOWJGWCyDQAA0tVLHw (envelope-from ) for ; Tue, 02 Feb 2021 17:20:37 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id WOX1F+WJGWBxYwAA1q6Kng (envelope-from ) for ; Tue, 02 Feb 2021 17:20:37 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 78A829403A3 for ; Tue, 2 Feb 2021 17:20:36 +0000 (UTC) Received: from localhost ([::1]:54402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6zLv-0001Du-9p for larch@yhetil.org; Tue, 02 Feb 2021 12:20:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6zEc-0000xQ-QE for guix-patches@gnu.org; Tue, 02 Feb 2021 12:13:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52786) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6zEc-0002uf-IN for guix-patches@gnu.org; Tue, 02 Feb 2021 12:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l6zEc-0004PC-Cv for guix-patches@gnu.org; Tue, 02 Feb 2021 12:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44768] [PATCH v3 2/2] gnu: Add lightspark. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Feb 2021 17:13: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: Christopher Baines Received: via spool by 44768-submit@debbugs.gnu.org id=B44768.161228594416888 (code B ref 44768); Tue, 02 Feb 2021 17:13:02 +0000 Received: (at 44768) by debbugs.gnu.org; 2 Feb 2021 17:12:24 +0000 Received: from localhost ([127.0.0.1]:36099 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6zE0-0004OK-7L for submit@debbugs.gnu.org; Tue, 02 Feb 2021 12:12:24 -0500 Received: from mout01.posteo.de ([185.67.36.65]:40265) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6zDv-0004O2-CC for 44768@debbugs.gnu.org; Tue, 02 Feb 2021 12:12:23 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 438DE160063 for <44768@debbugs.gnu.org>; Tue, 2 Feb 2021 18:12:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1612285932; bh=9qC2cLKYHodKILyON9Yyms19DT4bNJCt3otMvtDHHeA=; h=From:To:Cc:Subject:Date:From; b=DGR64aiefhOOY+1sGyVCHj4vj7ZZ6p0yYOZmrYXAQLtavb2anvYoOLOBPitJq00O5 JV7BYX0xSHEJblI7hnCZkdpMgGdFHYGbdrNa3HXEzngNdgeBWHNDor0R96N2CYjPFG 4csmNvZnggthoDbfN0gGDooB6PeNYX7BrLcDNeqr6VH8whz3fWOeXGR78qC97RxMZC 6p5jabACqG1sbR9ZQJvZSaQ7Vyh0oxFatlHTp6ib0NYWktBvgvdbsT/hs7NcDQbg/0 UbkZqMd1Njdyk3nZFmEtfWmBvgEVx17JxIAr71L/ocCcSRb3/nJBkEgOOwX2RhYkmh 5dcefkcHIn5EA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DVWZc2Zbkz6tmN; Tue, 2 Feb 2021 18:12:07 +0100 (CET) References: <20201125171857.28120-1-monego@posteo.net> <20201125171857.28120-2-monego@posteo.net> <875z5ptq4a.fsf@cbaines.net> User-agent: mu4e 1.4.14; emacs 27.1 From: Vinicius Monego In-reply-to: <875z5ptq4a.fsf@cbaines.net> Message-ID: <877dnqpf9f.fsf@posteo.net> Date: Tue, 02 Feb 2021 14:10:20 -0300 MIME-Version: 1.0 Content-Type: text/plain 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: , Cc: 44768@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.26 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=DGR64aie; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 78A829403A3 X-Spam-Score: -1.26 X-Migadu-Scanner: scn1.migadu.com X-TUID: UOfQBViYBsfE Christopher Baines writes: > Vinicius Monego writes: > >> * gnu/packages/animation.scm (lightspark): New variable. >> --- >> Rebased on the previous commit > > Thanks for the patch, the main thing I noticed with this is that there's > some bundled code, at least I spotted pugixml included in the lightspark > code, and Guix already has a package for pugixml. > > If possible, lightspark should be built with pugixml from Guix. > Hello, Sorry for the late response. I noticed that jxrlib is also in Guix, and tried to unbundle both jxrlib and pugixml unsuccesfully. In the case of jxrlib, JXRGlue fails to include JXRMeta: #include ^~~~~~~~~~~ IIUC the include syntax is jxrlib/JXRMeta.h. It also fails in the Debian package from where Guix pulls from. In the case of pugixml the build fails with undefined references. I also found this comment in the changelog: * switch to internal xml parsing (based on pugixml) which implies that the bundled pugixml is a fork and not a snapshot. >> gnu/packages/animation.scm | 64 ++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 64 insertions(+) >> >> diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm >> index 102b0f47f7..9b94c1d214 100644 >> --- a/gnu/packages/animation.scm >> +++ b/gnu/packages/animation.scm >> @@ -25,9 +25,11 @@ >> #: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 (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 compression) >> @@ -43,6 +45,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) >> @@ -397,3 +401,63 @@ audio or video backends, ensuring good performance.") >> (home-page "https://www.gnu.org/software/gnash/") >> (license license:gpl3+)))) >> >> +(define-public lightspark >> + (package >> + (name "lightspark") >> + (version "0.8.3") >> + (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 "0rgqqppnv4n3kv623sgr1zpc2fdsnrqzfiqgk4clcmfl5ipklg6f")))) >> + (build-system cmake-build-system) >> + (arguments >> + `(#:tests? #f ;requires Adobe Flex SDK, see README.tests >> + #:phases >> + (modify-phases %standard-phases >> + (add-after 'unpack 'relative-etc-dir >> + ;; Write default config file to ./etc instead of /etc. >> + (lambda _ >> + (substitute* "CMakeLists.txt" (("\\/etc") "etc")) >> + #t)) >> + (replace 'check >> + (lambda* (#:key tests? #:allow-other-keys) >> + (if tests? >> + (begin >> + (invoke "./tests")) >> + #t)))))) > > I'd normally write this as: > > (when tests? > (invoke "./tests")) > #t > Ok, I will send an update soon with this change and an update to the license list because I initially overlooked the 3rd party bundles. >> + (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) >> + ("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. Lightspark can run as a web browser plugin or as a standalone >> +application. Lightspark supports SWF files written on all versions of the >> +ActionScript language.") >> + (license license:lgpl3+)))