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 WJH3Ge8huF/INgAA0tVLHw (envelope-from ) for ; Fri, 20 Nov 2020 20:07:11 +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 yFzyFe8huF9FEgAA1q6Kng (envelope-from ) for ; Fri, 20 Nov 2020 20:07:11 +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 C1EC69402A5 for ; Fri, 20 Nov 2020 20:07:10 +0000 (UTC) Received: from localhost ([::1]:49256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kgCgX-00008X-KR for larch@yhetil.org; Fri, 20 Nov 2020 15:07:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgCgQ-00008O-Nd for guix-patches@gnu.org; Fri, 20 Nov 2020 15:07:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kgCgQ-0006jd-Fk for guix-patches@gnu.org; Fri, 20 Nov 2020 15:07:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kgCgQ-00052O-AU for guix-patches@gnu.org; Fri, 20 Nov 2020 15:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44768] [PATCH 1/2] gnu: Add gnash. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Nov 2020 20:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44768@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160590279219321 (code B ref -1); Fri, 20 Nov 2020 20:07:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Nov 2020 20:06:32 +0000 Received: from localhost ([127.0.0.1]:44334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kgCfp-00051T-Io for submit@debbugs.gnu.org; Fri, 20 Nov 2020 15:06:32 -0500 Received: from lists.gnu.org ([209.51.188.17]:36784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kgCfk-00051J-DK for submit@debbugs.gnu.org; Fri, 20 Nov 2020 15:06:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgCfj-00084C-SQ for guix-patches@gnu.org; Fri, 20 Nov 2020 15:06:20 -0500 Received: from mout01.posteo.de ([185.67.36.65]:56017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgCfZ-0006Oo-Qd for guix-patches@gnu.org; Fri, 20 Nov 2020 15:06:19 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id A198516005F for ; Fri, 20 Nov 2020 21:06:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1605902764; bh=yTjevAPywaNp52pvYG1iPTdiPp9syUgW/gzx/uyHn04=; h=From:To:Cc:Subject:Date:From; b=SqfSS6Myn4paFg9VtColErdZ0I7hZDJalSsc+0gluFVgtsYLhygmMiKIYkO2Kg1Kh mUU6itl42hf3QO0GI0Cud3h6qn0uq5Hit6uSW2mCIc7yig1shF5OR1CH7KaRO47jjP a4OiPn/dx6vVbDYTeoFBDrkbFgLHRocUyTCZBVDYS3MMrnAbc9XOo3lGDIPXa/oE0V VBLoK+V2/r/tT3gRO+kPsR4VEi2Vhs3qjl/U0mDGA4VYN0bL/mrmCnw8tD722Igjs1 poivP2Rk+Kg1bwQRZWMbiLjYclZ9FsqsmUNZSqop7xQ2t+dMpa/4EmJw8vCwizn1QO ZccpkHLNAWP6Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Cd6xQ5r23z9rxS; Fri, 20 Nov 2020 21:06:02 +0100 (CET) From: Vinicius Monego Date: Fri, 20 Nov 2020 17:05:51 -0300 Message-Id: <20201120200551.19145-1-monego@posteo.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=monego@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -0.0 (/) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=posteo.net header.s=2017 header.b=SqfSS6My; 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-Spam-Score: 1.09 X-TUID: 3BMetbzDA5oB * gnu/packages/animation.scm (gnash): New variable. * gnu/packages/patches/gnash-do-not-depend-on-pangox: New file. * gnu/packages/patches/gnash-fix-giflib-version: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- Patch sources: https://savannah.gnu.org/patch/download.php?file_id=48366 https://savannah.gnu.org/patch/download.php?file_id=47859 gnu/local.mk | 3 + gnu/packages/animation.scm | 94 ++++++++++++++++++- .../gnash-do-not-depend-on-pangox.patch | 35 +++++++ .../patches/gnash-fix-giflib-version.patch | 13 +++ 4 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gnash-do-not-depend-on-pangox.patch create mode 100644 gnu/packages/patches/gnash-fix-giflib-version.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3a8f1e30fc..94ff78a3d4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -38,6 +38,7 @@ # Copyright © 2020 Tanguy Le Carrour # Copyright © 2020 Martin Becze # Copyright © 2020 Malte Frank Gerdes +# Copyright © 2020 Vinicius Monego # # This file is part of GNU Guix. # @@ -1083,6 +1084,8 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-supported-locales.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ + %D%/packages/patches/gnash-do-not-depend-on-pangox.patch \ + %D%/packages/patches/gnash-fix-giflib-version.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-shell-disable-test.patch \ %D%/packages/patches/gnome-settings-daemon-gc.patch \ diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 3176a1237a..3df3ce3eba 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pkill -9 +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,19 +28,27 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages compression) + #:use-module (gnu packages curl) + #:use-module (gnu packages dejagnu) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gettext) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages qt) - #:use-module (gnu packages video)) + #:use-module (gnu packages sdl) + #:use-module (gnu packages video) + #:use-module (gnu packages xiph)) ;; ETL, synfig, and Synfig Studio are updated in tandem. (define synfig-version "1.2.2") @@ -301,3 +310,86 @@ waveform until they line up with the proper sounds.") lets you create traditional hand-drawn animations (cartoons) using both bitmap and vector graphics.") (license license:gpl2))) + +;; This package provides a standalone (no browser plugin) version of Gnash. +(define-public gnash + ;; The last tagged release of Gnash was in 2012. + (let ((commit "583ccbc1275c7701dc4843ec12142ff86bb305b4") + (revision "0")) + (package + (name "gnash") + (version (git-version "0.8.11" ;upstream has no version number + revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/gnash.git/") + (commit commit))) + (file-name (git-file-name name version)) + (patches (search-patches "gnash-do-not-depend-on-pangox.patch" + "gnash-fix-giflib-version.patch")) + (sha256 + (base32 "0fh0bljn0i6ypyh6l99afi855p7ki7lm869nq1qj6k8hrrwhmfry")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--disable-static" + ;; Plugins are based on XULRunner and NPAPI only. Disable. + "--disable-plugins" + "--disable-jemalloc" ;FIXME: not found by pkg-config + "--enable-gui=gtk" + "--enable-media=ffmpeg" + (string-append "--with-boost-incl=" + (assoc-ref %build-inputs "boost") "/include") + (string-append "--with-boost-lib=" + (assoc-ref %build-inputs "boost") "/lib") + (string-append "--with-ffmpeg-incl=" + (assoc-ref %build-inputs "ffmpeg") + "/include/libavcodec") + (string-append "--with-speex-incl=" + (assoc-ref %build-inputs "speex") "/include") + (string-append "--with-speex-lib=" + (assoc-ref %build-inputs "speex") "/lib") + (string-append "--with-jpeg-incl=" + (assoc-ref %build-inputs "libjpeg") "/include") + (string-append "--with-zlib-incl=" + (assoc-ref %build-inputs "zlib") "/include") + (string-append "--with-png-incl=" + (assoc-ref %build-inputs "libpng") + "/include")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("dejagnu" ,dejagnu) ;for tests + ("gettext" ,gettext-minimal) + ("libtool" ,libtool) + ("perl" ,perl) + ("pkg-config" ,pkg-config))) + (inputs + `(("agg" ,agg) + ("atk" ,atk) + ("boost" ,boost) + ("curl" ,curl) + ("ffmpeg" ,ffmpeg-2.8) + ("freeglut" ,freeglut) + ("gconf" ,gconf) + ("giflib" ,giflib) + ("glib" ,glib) + ("gtk+" ,gtk+-2) + ("gtkglext" ,gtkglext) + ;;("jemalloc" ,jemalloc) + ("libjpeg" ,libjpeg-turbo) + ("libltdl" ,libltdl) + ("libpng" ,libpng) + ("pango" ,pango) + ("sdl" ,sdl) + ("speex" ,speex))) + (synopsis "Flash movie player") + (description + "Gnash is a Flash movie player. It supports SWF version v7 and some +of v8 and v9. It is possible to configure Gnash to use several differemt +audio or video backends, ensuring good performance.") + (home-page "https://www.gnu.org/software/gnash/") + (license license:gpl3+)))) + diff --git a/gnu/packages/patches/gnash-do-not-depend-on-pangox.patch b/gnu/packages/patches/gnash-do-not-depend-on-pangox.patch new file mode 100644 index 0000000000..489baa089c --- /dev/null +++ b/gnu/packages/patches/gnash-do-not-depend-on-pangox.patch @@ -0,0 +1,35 @@ +From c63b5843ca1bb56bb825ba0521c3df81861f88c4 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Thu, 6 Feb 2020 23:59:49 +0100 +Subject: [PATCH] Do not depend on pangox + +pangox has been removed from Pango years ago breaking the build +on modern distros. + +Gnash does not actually use pango directly at all. It looks like +it was added for static linking against GTK when not using pkg-config +but it was not updated or limited to non-pkg-config GTK builds +(pkg-config would provide the necessary transitive dependencies automatically). + +The proper solution would be removing all the pango checks and relying +on pkg-config but as a quick hack this should suffice. +--- + macros/pango.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/macros/pango.m4 b/macros/pango.m4 +index 96f0457e2..6f24eb2a2 100644 +--- a/macros/pango.m4 ++++ b/macros/pango.m4 +@@ -34,7 +34,7 @@ AC_DEFUN([GNASH_PATH_PANGO], + if test x$windows = xyes; then + pango_pkg=pangowin32 + else +- pango_pkg=pangox ++ pango_pkg=pango + fi + + if test x$cross_compiling = xno; then +-- +2.25.0 + diff --git a/gnu/packages/patches/gnash-fix-giflib-version.patch b/gnu/packages/patches/gnash-fix-giflib-version.patch new file mode 100644 index 0000000000..37213dac9b --- /dev/null +++ b/gnu/packages/patches/gnash-fix-giflib-version.patch @@ -0,0 +1,13 @@ +diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp +index 2ae5ddb..b87b1e7 100644 +--- a/libbase/GnashImageGif.cpp ++++ b/libbase/GnashImageGif.cpp +@@ -120,7 +120,7 @@ GifInput::GifInput(std::shared_ptr in) + GifInput::~GifInput() + { + // Clean up allocated data. +-#if GIFLIB_MAJOR==5 && GIFLIB_MINOR==1 ++#if GIFLIB_MAJOR==5 && GIFLIB_MINOR!=0 + DGifCloseFile(_gif, 0); + #else + DGifCloseFile(_gif); -- 2.20.1