From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Lepiller Subject: add aegisub Date: Sat, 22 Oct 2016 22:30:37 +0200 Message-ID: <20161022223037.7bf91855@lepiller.eu> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/OfZMF=B4Br3wSto/F.DHAIR" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1by2wU-0001UX-5E for guix-devel@gnu.org; Sat, 22 Oct 2016 16:30:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1by2wP-0006RP-Ll for guix-devel@gnu.org; Sat, 22 Oct 2016 16:30:58 -0400 Received: from dau94-h03-89-91-205-84.dsl.sta.abo.bbox.fr ([89.91.205.84]:42151 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 1by2wP-0006Q6-2Y for guix-devel@gnu.org; Sat, 22 Oct 2016 16:30:53 -0400 Received: from localhost (localhost [127.0.0.1]) by skaro.lepiller.eu (Postfix) with ESMTP id 8054A81D04 for ; Sat, 22 Oct 2016 22:29:06 +0200 (CEST) Received: from skaro.lepiller.eu ([127.0.0.1]) by localhost (skaro.lepiller.eu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7PwRpGh6CGZ1 for ; Sat, 22 Oct 2016 22:29:00 +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 E834F81D01 for ; Sat, 22 Oct 2016 22:28:59 +0200 (CEST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --MP_/OfZMF=B4Br3wSto/F.DHAIR Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, I made three patches to add aegisub. It needs icu support in boost. Currently, the window acts strangely. Widgets resize when resizing the window, but not when maximizing it, they don't all show at first. The video part should resize with the mouse wheel, but the containing frame only resizes after resizing the window. sliders don't visually move, but they are functionnal. Sound can't play (it defaults to alsa which doesn't work on my system, and crashes when selecting pulseaudio with "Assertion 'c->callback' failed at pulsecore/socket-client.c:126, function do_call(). Aborting."). So I need some help here. Also the testing suite depends on a lua package that is not in guix yet and has a lot of dependencies not in guix. So I disabled it for now. --MP_/OfZMF=B4Br3wSto/F.DHAIR Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-Add-ffms2.patch >From c4d6b152f51c89f15115385ed09ee4135abdefd4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 22 Oct 2016 18:21:57 +0200 Subject: [PATCH 1/3] gnu: Add ffms2. * gnu/packages/video.scm(ffms2): New variable. --- gnu/packages/video.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 954f142..3320a3c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -586,6 +586,32 @@ audio/video codec library.") flag)) ,flags)))))) +(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 + (define-public vlc (package (name "vlc") -- 2.10.1 --MP_/OfZMF=B4Br3wSto/F.DHAIR Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-gnu-boost-Add-icu-support.patch >From 280dac9337290630f55af5a3eb051d780031b617 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 22 Oct 2016 18:23:40 +0200 Subject: [PATCH 2/3] gnu: boost: Add icu support. * gnu/packages/boost.scm (boost): Add icu4c as input. --- gnu/packages/boost.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index ab31fa8..c4a607e 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -27,6 +27,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)) @@ -45,7 +46,8 @@ (base32 "0h5nk7pgxf7xsvvshj9qfpsfp9wx6gq9r78n3nx736pxq83bsix5")))) (build-system gnu-build-system) - (inputs `(("zlib" ,zlib))) + (inputs `(("zlib" ,zlib) + ("icu4c" ,icu4c))) (native-inputs `(("perl" ,perl) ("python" ,python-2) @@ -86,7 +88,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.10.1 --MP_/OfZMF=B4Br3wSto/F.DHAIR Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0003-gnu-Add-aegisub.patch >From 7ca390e44e4bd5a8a44966af8773b1bd29793294 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 22 Oct 2016 18:30:45 +0200 Subject: [PATCH 3/3] gnu: Add aegisub * gun/packages/video.scm(aegisub): New variable. --- gnu/packages/video.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 3320a3c..95cb6ed 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -88,6 +88,10 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) + #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages boost) + #:use-module (gnu packages gnome) + #:use-module (gnu packages libreoffice) ; hunspell #:use-module (gnu packages assembly) #:use-module (gnu packages zip)) @@ -612,6 +616,51 @@ programmers to access a standard API to open and decompress media files") ; 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") + (home-page "http://www.aegisub.org/") + (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") + ;#:test-target "test")) ;; requires 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" ,wxwidgets))) + (native-inputs `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (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 + ; src/MatroskaParser.(c|h) is under bsd-3 with permission from the author + (define-public vlc (package (name "vlc") -- 2.10.1 --MP_/OfZMF=B4Br3wSto/F.DHAIR--