From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1rC7-0003tg-4Y for guix-patches@gnu.org; Sat, 22 Apr 2017 05:19:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1rC3-00081i-1Y for guix-patches@gnu.org; Sat, 22 Apr 2017 05:19:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34983) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d1rC2-00081e-T7 for guix-patches@gnu.org; Sat, 22 Apr 2017 05:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d1rC2-0002f0-Oe for guix-patches@gnu.org; Sat, 22 Apr 2017 05:19:02 -0400 Subject: bug#26602: Add aegisub Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1rBi-0003tU-Qk for guix-patches@gnu.org; Sat, 22 Apr 2017 05:18:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1rBe-00080C-Oi for guix-patches@gnu.org; Sat, 22 Apr 2017 05:18:42 -0400 Received: from dau94-h03-89-91-205-84.dsl.sta.abo.bbox.fr ([89.91.205.84]:60151 helo=skaro.lepiller.eu) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1rBe-0007zw-5H for guix-patches@gnu.org; Sat, 22 Apr 2017 05:18:38 -0400 Received: from localhost (localhost [127.0.0.1]) by skaro.lepiller.eu (Postfix) with ESMTP id A6CF4810B1 for ; Sat, 22 Apr 2017 11:18:35 +0200 (CEST) Received: from skaro.lepiller.eu ([127.0.0.1]) by localhost (lepiller.eu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xltNzFReb6b9 for ; Sat, 22 Apr 2017 11:18:29 +0200 (CEST) Received: from localhost (89-93-157-164.hfc.dyn.abo.bbox.fr [89.93.157.164]) by skaro.lepiller.eu (Postfix) with ESMTPSA id D1E997FD07 for ; Sat, 22 Apr 2017 11:18:28 +0200 (CEST) Date: Sat, 22 Apr 2017 11:18:24 +0200 From: Julien Lepiller Message-ID: <20170422111824.70b34716@lepiller.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/IZ2JOQn1lmRVE0bFVc2SP9/" 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: 26602@debbugs.gnu.org --MP_/IZ2JOQn1lmRVE0bFVc2SP9/ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, here are three patches to add aegisub, a subtitle editor. Should the change to boost go in another branch? core-updates? --MP_/IZ2JOQn1lmRVE0bFVc2SP9/ Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-boost-Build-with-icu4c.patch >From 2ade2478712cda0acdaeb0aae4b32c4e357f5e58 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 21 Apr 2017 21:42:55 +0200 Subject: [PATCH 1/3] gnu: boost: Build with icu4c. * gnu/packages/boost.scm (boost)[inputs]: Add icu4c. [arguments]: Add icu4c configure flag. --- gnu/packages/boost.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index dfaa85353..b1bafc887 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -28,6 +28,7 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages compression) + #:use-module (gnu packages icu4c) #:use-module (gnu packages python) #:use-module (gnu packages shells) #:use-module (gnu packages perl)) @@ -46,7 +47,9 @@ (base32 "1c5kzhcqahnic55dxcnw7r80qvwx5sfa2sa97yzv7xjrywljbbmy")))) (build-system gnu-build-system) - (inputs `(("zlib" ,zlib))) + (inputs + `(("icu4c" ,icu4c) + ("zlib" ,zlib))) (native-inputs `(("perl" ,perl) ("python" ,python-2) @@ -87,7 +90,8 @@ (zero? (system* "./bootstrap.sh" (string-append "--prefix=" out) - "--with-toolset=gcc"))))) + "--with-toolset=gcc" + "--with-icu"))))) (replace 'build (lambda* (#:key outputs make-flags #:allow-other-keys) -- 2.12.2 --MP_/IZ2JOQn1lmRVE0bFVc2SP9/ Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-gnu-Add-ffms2.patch >From 9cb5d20c914f036619197c2d5d4a114d27f9208a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 21 Apr 2017 23:29:06 +0200 Subject: [PATCH 2/3] gnu: Add ffms2. * gnu/packages/video.scm (ffms2): New variable. --- gnu/packages/video.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 082826aca..19446f98d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2039,3 +2039,32 @@ file format that has been used as a multimedia file format in a variety of platf applications. It is a very powerful and extensible format that can accommodate practically any type of media.") (license license:mpl1.1))) + +(define-public ffms2 + (package + (name "ffms2") + (version "2.23") + (home-page "https://github.com/FFMS/ffms2/") + (source (origin + (method url-fetch) + (uri (string-append home-page "archive/" version ".tar.gz")) + (sha256 + (base32 + "1vbkab8vrplxz5xgag8ggzkwp4f7nf285pd0l2a7zy66n6i2m6xh")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags + (list "--enable-avresample"))) + (inputs + `(("zlib" ,zlib))) + (propagated-inputs + `(("ffmpeg" ,ffmpeg))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (synopsis "Cross-plateform wrapper around ffmpeg/libav") + (description + "FFMpegSource is a wrapper library around ffmpeg/libav that allows +programmers to access a standard API to open and decompress media files") + (license license:gpl2+))); inherits from ffmpeg + ;; sources are distributed under a different license that the binary. + ;; see https://github.com/FFMS/ffms2/blob/master/COPYING -- 2.12.2 --MP_/IZ2JOQn1lmRVE0bFVc2SP9/ Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0003-gnu-Add-aegisub.patch >From f3cc54a35c9ecef9e85f9db77cccf0d709a35b79 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 22 Apr 2017 09:51:26 +0200 Subject: [PATCH 3/3] gnu: Add aegisub. * gnu/packages/video.scm (aegisub): New variable. --- gnu/packages/video.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 19446f98d..ec694f5d2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -55,6 +55,7 @@ #:use-module (gnu packages avahi) #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages cdrom) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -76,6 +77,7 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages m4) @@ -2068,3 +2070,49 @@ programmers to access a standard API to open and decompress media files") (license license:gpl2+))); inherits from ffmpeg ;; sources are distributed under a different license that the binary. ;; see https://github.com/FFMS/ffms2/blob/master/COPYING + +(define-public aegisub + (package + (name "aegisub") + (version "3.2.2") + (source (origin + (method url-fetch) + (uri (string-append + "http://ftp.aegisub.org/pub/archives/releases/source/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--disable-update-checker" + "--without-portaudio" + "--without-openal" + "--without-oss") + ;; tests require busted, a lua package we don't have yet + #:tests? #f)) + (inputs + `(("boost" ,boost) + ("desktop-file-utils" ,desktop-file-utils) + ("ffms2" ,ffms2) + ("fftw" ,fftw) + ("hunspell" ,hunspell) + ("mesa" ,mesa) + ("libass" ,libass) + ("alsa-lib" ,alsa-lib) + ("pulseaudio" ,pulseaudio) + ("libx11" ,libx11) + ("freetype" ,freetype) + ("wxwidgets-gtk2" ,wxwidgets-gtk2))) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (home-page "http://www.aegisub.org/") + (synopsis "Subtitle engine") + (description "Aegisub helps translators create subtitles for video") + (license (list license:bsd-3 ; the package is licensed under the bsd-3, except + license:mpl1.1 ; for vendor/universalchardet under the mpl1.1 + license:expat)))) ; and src/gl that is under a license similar + ; the the Expat license, with a rewording (Software -> Materials). (called MIT + ; by upstream). See https://github.com/Aegisub/Aegisub/blob/master/LICENCE -- 2.12.2 --MP_/IZ2JOQn1lmRVE0bFVc2SP9/--