bug#26602: Add aegisub

bug#26602: Add aegisub

[Julien Lepiller]

[-- Attachment #1: Type: text/plain, Size: 125 bytes --]

Hi,

here are three patches to add aegisub, a subtitle editor. Should the
change to boost go in another branch? core-updates?

[-- Attachment #2: 0001-gnu-boost-Build-with-icu4c.patch --]
[-- Type: text/x-patch, Size: 1557 bytes --]

From 2ade2478712cda0acdaeb0aae4b32c4e357f5e58 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
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


[-- Attachment #3: 0002-gnu-Add-ffms2.patch --]
[-- Type: text/x-patch, Size: 1792 bytes --]

From 9cb5d20c914f036619197c2d5d4a114d27f9208a Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
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


[-- Attachment #4: 0003-gnu-Add-aegisub.patch --]
[-- Type: text/x-patch, Size: 3136 bytes --]

From f3cc54a35c9ecef9e85f9db77cccf0d709a35b79 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
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

bug#26602: Add aegisub

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1794 bytes --]

On Sat, Apr 22, 2017 at 11:18:24AM +0200, Julien Lepiller wrote:
> Hi,
> 
> here are three patches to add aegisub, a subtitle editor. Should the
> change to boost go in another branch? core-updates?

Assuming that `guix refresh -l boost` is accurate, I think it would be
appropriate for the next staging cycle (or core-updates, if that comes
first).

> From 2ade2478712cda0acdaeb0aae4b32c4e357f5e58 Mon Sep 17 00:00:00 2001
> From: Julien Lepiller <julien@lepiller.eu>
> 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.

If you need this for aegisub, perhaps you could add a boost-with-icu
package just for aegisub, and then remove it after the primary boost
package has been rebuilt with icu4c.

> Subject: [PATCH 2/3] gnu: Add ffms2.
> 
> * gnu/packages/video.scm (ffms2): New variable.

> +   (synopsis "Cross-plateform wrapper around ffmpeg/libav")

s/plateform/platform

> +   (description
> +     "FFMpegSource is a wrapper library around ffmpeg/libav that allows
> +programmers to access a standard API to open and decompress media files")

Please end the sentence with a period (I think `guix lint` will catch
this).

> Subject: [PATCH 3/3] gnu: Add aegisub.
> 
> * gnu/packages/video.scm (aegisub): New variable.

> +    (synopsis "Subtitle engine")
> +    (description "Aegisub helps translators create subtitles for video")

How about this (based on text from the home-page)?

"Aegisub is a tool for creating and modifying subtitles.  Aegisub makes
it quick and easy to time subtitles to audio, and features many powerful
tools for styling them, including a built-in real-time video preview."

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#26602] Add aegisub

[Ricardo Wurmus]

Hi Julien,

> here are three patches to add aegisub, a subtitle editor.

have you been able to implement the changes suggested by Leo?  I think
it would be nice to add aegisub.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

[bug#26602] Add aegisub

[Julien Lepiller]

Le Sun, 18 Jun 2017 13:13:22 +0200,
Ricardo Wurmus <rekado@elephly.net> a écrit :

> Hi Julien,
> 
> > here are three patches to add aegisub, a subtitle editor.  
> 
> have you been able to implement the changes suggested by Leo?  I think
> it would be nice to add aegisub.
> 

Yes, but now it doesn't build anymore. I get this error:

ld: /tmp/guix-build-aegisub-wip-3.2.2.drv-0/aegisub-3.2.2/lib/libaegisub.a(dispatch.o):
undefined reference to symbol
'pthread_create@@GLIBC_2.2.5' /gnu/store/rmjlycdgiq8pfy5hfi42qhw3k7p6kdav-glibc-2.25/lib/libpthread.so.0:
error adding symbols: DSO missing from command line collect2: error: ld

Any idea ?

[bug#26602] Add aegisub

[Ludovic Courtès]

Julien Lepiller <julien@lepiller.eu> skribis:

> Le Sun, 18 Jun 2017 13:13:22 +0200,
> Ricardo Wurmus <rekado@elephly.net> a écrit :
>
>> Hi Julien,
>> 
>> > here are three patches to add aegisub, a subtitle editor.  
>> 
>> have you been able to implement the changes suggested by Leo?  I think
>> it would be nice to add aegisub.
>> 
>
> Yes, but now it doesn't build anymore. I get this error:
>
> ld: /tmp/guix-build-aegisub-wip-3.2.2.drv-0/aegisub-3.2.2/lib/libaegisub.a(dispatch.o):
> undefined reference to symbol
> 'pthread_create@@GLIBC_2.2.5' /gnu/store/rmjlycdgiq8pfy5hfi42qhw3k7p6kdav-glibc-2.25/lib/libpthread.so.0:
> error adding symbols: DSO missing from command line collect2: error: ld
>
> Any idea ?

Perhaps you need to add “-pthread” to the command line that led to this
error?

Ludo’.

[bug#26602] Add aegisub

[Ricardo Wurmus]

Hi Julien,

Ludovic Courtès <ludo@gnu.org> writes:

> Julien Lepiller <julien@lepiller.eu> skribis:
>
>> Le Sun, 18 Jun 2017 13:13:22 +0200,
>> Ricardo Wurmus <rekado@elephly.net> a écrit :
>>
>>> Hi Julien,
>>> 
>>> > here are three patches to add aegisub, a subtitle editor.  
>>> 
>>> have you been able to implement the changes suggested by Leo?  I think
>>> it would be nice to add aegisub.
>>> 
>>
>> Yes, but now it doesn't build anymore. I get this error:
>>
>> ld: /tmp/guix-build-aegisub-wip-3.2.2.drv-0/aegisub-3.2.2/lib/libaegisub.a(dispatch.o):
>> undefined reference to symbol
>> 'pthread_create@@GLIBC_2.2.5' /gnu/store/rmjlycdgiq8pfy5hfi42qhw3k7p6kdav-glibc-2.25/lib/libpthread.so.0:
>> error adding symbols: DSO missing from command line collect2: error: ld
>>
>> Any idea ?
>
> Perhaps you need to add “-pthread” to the command line that led to this
> error?

Have you been able to try this yet?

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

[bug#26602] Add aegisub

[julien lepiller]

Le 2017-10-19 00:55, Ricardo Wurmus a écrit :
> Hi Julien,
> 
> Ludovic Courtès <ludo@gnu.org> writes:
> 
>> Julien Lepiller <julien@lepiller.eu> skribis:
>> 
>>> Le Sun, 18 Jun 2017 13:13:22 +0200,
>>> Ricardo Wurmus <rekado@elephly.net> a écrit :
>>> 
>>>> Hi Julien,
>>>> 
>>>> > here are three patches to add aegisub, a subtitle editor.
>>>> 
>>>> have you been able to implement the changes suggested by Leo?  I 
>>>> think
>>>> it would be nice to add aegisub.
>>>> 
>>> 
>>> Yes, but now it doesn't build anymore. I get this error:
>>> 
>>> ld: 
>>> /tmp/guix-build-aegisub-wip-3.2.2.drv-0/aegisub-3.2.2/lib/libaegisub.a(dispatch.o):
>>> undefined reference to symbol
>>> 'pthread_create@@GLIBC_2.2.5' 
>>> /gnu/store/rmjlycdgiq8pfy5hfi42qhw3k7p6kdav-glibc-2.25/lib/libpthread.so.0:
>>> error adding symbols: DSO missing from command line collect2: error: 
>>> ld
>>> 
>>> Any idea ?
>> 
>> Perhaps you need to add “-pthread” to the command line that led to 
>> this
>> error?
> 
> Have you been able to try this yet?

Oh yes, it works and I forgot about it. I think I will finally push it 
this week-end, although I still can't hear any sound from aegisub in 
GuixSD, and it crashes when I try to select pulseaudio in the 
parameters...

bug#26602: Add aegisub

[Julien Lepiller]

Le Thu, 19 Oct 2017 12:05:25 +0200,
julien lepiller <julien@lepiller.eu> a écrit :

> Le 2017-10-19 00:55, Ricardo Wurmus a écrit :
> [...]
> > 
> > Have you been able to try this yet?  
> 
> Oh yes, it works and I forgot about it. I think I will finally push
> it this week-end, although I still can't hear any sound from aegisub
> in GuixSD, and it crashes when I try to select pulseaudio in the 
> parameters...
> 
> 

Pushed as c812f46058ad7f4baedd521ad4f0933737d82ae9.