bug#26934: [PATCH 1/3] gnu: video: add libzen

bug#26934: [PATCH 1/3] gnu: video: add libzen

[Ethan R. Jones]

---
 gnu/packages/video.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dde404144..1eaba0dd5 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -18,6 +18,7 @@
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
+;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2059,3 +2060,44 @@ 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 libzen
+  (package
+    (name "libzen")
+    (version "0.4.35")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://mediaarea.net/download/source/"
+                                  name
+                                  "/"
+                                  version
+                                  "/"
+                                  name
+                                  "_"
+                                  version
+                                  ".tar.bz2"))
+              (file-name (string-append name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "12a1icgcffgv503ii2k1453kxg5hfly09mf4zjcc80aq8a6rf8by"))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       ;; build scripts not in root of archive
+       (modify-phases %standard-phases
+         (add-before
+             'configure 'pre-configure
+           (lambda _
+             (chdir "Project/GNU/Library")))
+         (add-before 'configure 'autogen
+           (lambda _
+             (zero? (system* "./autogen.sh")))))))
+    (home-page "https://mediaarea.net/en/MediaInfo")
+    (synopsis "Library for libmediainfo")
+    (description "Shared library for libmediainfo and mediainfo.")
+    (license license:bsd-2)))
+
-- 
2.13.0

bug#26933: [PATCH 2/3] gnu: video: add libmediainfo

[Ethan R. Jones]

---
 gnu/packages/video.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 1eaba0dd5..d04bfab96 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2101,3 +2101,49 @@ practically any type of media.")
     (description "Shared library for libmediainfo and mediainfo.")
     (license license:bsd-2)))
 
+(define-public libmediainfo
+  (package
+    (name "libmediainfo")
+    (version "0.7.95")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://mediaarea.net/download/source/"
+                                  name
+                                  "/"
+                                  version
+                                  "/"
+                                  name
+                                  "_"
+                                  version
+                                  ".tar.bz2"))
+              (file-name (string-append name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1kchh6285b07z5nixv619hc9gml2ysdayicdiv30frrlqiyxqw4b"))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)
+       ("zlib" ,zlib)
+       ("tinyxml2" ,tinyxml2)
+       ("curl" ,curl)
+       ("libzen" ,libzen)))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f ; test currently requires an external video file
+       #:phases
+       ;; build scripts not in root of archive
+       (modify-phases %standard-phases
+         (add-before
+             'configure 'pre-configure
+           (lambda _
+             (chdir "Project/GNU/Library")))
+         (add-before 'configure 'autogen
+           (lambda _
+             (zero? (system* "./autogen.sh")))))))
+    (home-page "https://mediaarea.net/en/MediaInfo")
+    (synopsis "Library for mediainfo")
+    (description "Shared library for mediainfo.")
+    (license license:bsd-2)))
+
-- 
2.13.0

bug#26935: [PATCH 3/3] gnu: video: add mediainfo

[Ethan R. Jones]

---
 gnu/packages/video.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index d04bfab96..b91874dad 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1506,11 +1506,11 @@ format changes.")
      '(#:phases
        (modify-phases %standard-phases
          (add-before
-          'configure 'pre-configure
-          (lambda _
-            (chdir "build/generic")
-            (substitute* "configure"
-              (("#! /bin/sh") (string-append "#!" (which "sh")))))))
+             'configure 'pre-configure
+           (lambda _
+             (chdir "build/generic")
+             (substitute* "configure"
+               (("#! /bin/sh") (string-append "#!" (which "sh")))))))
        ;; No 'check' target.
        #:tests? #f))
     (home-page "https://www.xvid.com/")
@@ -2147,3 +2147,49 @@ practically any type of media.")
     (description "Shared library for mediainfo.")
     (license license:bsd-2)))
 
+;; TODO also have a GUI version available
+(define-public mediainfo
+  (package
+    (name "mediainfo")
+    (version "0.7.95")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://mediaarea.net/download/source/"
+                                  name
+                                  "/"
+                                  version
+                                  "/"
+                                  name
+                                  "_"
+                                  version
+                                  ".tar.bz2"))
+              (file-name (string-append name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0dy51a3i79jppmg1gi4f6h7jx4hcgnkmfim4d7d3gmnlbkjh8anv"))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)
+       ("zlib" ,zlib)
+       ("libmediainfo", libmediainfo)
+       ("libzen" ,libzen)))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f ; lacks tests
+       #:phases
+       ;; build scripts not in root of archive
+       (modify-phases %standard-phases
+         (add-before
+             'configure 'pre-configure
+           (lambda _
+             (chdir "Project/GNU/CLI")))
+         (add-before 'configure 'autogen
+           (lambda _
+             (zero? (system* "./autogen.sh")))))))
+    (home-page "https://mediaarea.net/en/MediaInfo")
+    (synopsis "Display media tags")
+    (description "MediaInfo is a convenient unified display of the most
+relevant technical and tag data for video and audio files.")
+    (license license:bsd-2)))
-- 
2.13.0

bug#26934: [PATCH 1/3] gnu: video: add libzen

[Ludovic Courtès]

Hello Ethan,

Thanks for the patch set.  Overall the patches look good to me modulo
minor issues that I’ll comment on:

"Ethan R. Jones" <doubleplusgood23@gmail.com> skribis:

> ---
>  gnu/packages/video.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 42 insertions(+)

Could you provide ChangeLog-style commit logs?  See ‘git log’ for
examples and <https://gnu.org/s/guix/manual/html_node/Submitting-Patches.html>.

> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "https://mediaarea.net/download/source/"
> +                                  name
> +                                  "/"
> +                                  version
> +                                  "/"
> +                                  name
> +                                  "_"
> +                                  version
> +                                  ".tar.bz2"))

Could you squeeze that on one or two lines?

> +    (native-inputs
> +     `(("autoconf" ,autoconf)
> +       ("automake" ,automake)
> +       ("libtool" ,libtool)))

[...]

> +         (add-before 'configure 'autogen
> +           (lambda _
> +             (zero? (system* "./autogen.sh")))))))

Please double-check that this is needed.  Usually, but not always,
projects that use Autoconf & co. provide self-contained tarballs such
that one doesn’t need to run ./autogen.sh.

> +    (home-page "https://mediaarea.net/en/MediaInfo")
> +    (synopsis "Library for libmediainfo")
> +    (description "Shared library for libmediainfo and mediainfo.")

Could you improve the synopsis and description according to the
guidelines at
<https://gnu.org/s/guix/manual/html_node/Synopses-and-Descriptions.html>?

Please take a look at
<https://gnu.org/s/guix/manual/html_node/Submitting-Patches.html> if you
haven’t already.

Could you send updated patches?

Thanks in advance!

Ludo’.

bug#26934: Re: bug#26934: [PATCH 1/3] gnu: video: add libzen

[Ethan R. Jones]

<#secure method=pgp mode=sign>
Thanks for the response.
>> ---
>>  gnu/packages/video.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 42 insertions(+)

>Could you provide ChangeLog-style commit logs?  See ‘git log’ for
>examples and <https://gnu.org/s/guix/manual/html_node/Submitting-Patches.html>.

So I should independently `git add --patch` each addition, then do a multi-line
`git commit` like so:

    gnu: foo: Update to 1.0.
    
    * gnu/packages/foo.scm (foo): Update to 1.0
    * gnu/packages/foo.scm (libbar): New shared library.

>Could you squeeze that on one or two lines?

Is there a style on when to squeeze and when to not?

>Please double-check that this is needed.

Yup, all packages lack a proper configure script.

>Could you improve the synopsis and description

Do you have any ideas of what to add? I wasn't sure where to start
myself

Thanks!

dpg

bug#26934: [PATCH 1/3] gnu: video: add libzen

[Ludovic Courtès]

Hi Ethan,

doubleplusgood23@gmail.com (Ethan R. Jones) skribis:

>>> ---
>>>  gnu/packages/video.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
>>>  1 file changed, 42 insertions(+)
>
>>Could you provide ChangeLog-style commit logs?  See ‘git log’ for
>>examples and <https://gnu.org/s/guix/manual/html_node/Submitting-Patches.html>.
>
> So I should independently `git add --patch` each addition, then do a multi-line
> `git commit` like so:
>
>     gnu: foo: Update to 1.0.
>     
>     * gnu/packages/foo.scm (foo): Update to 1.0
>     * gnu/packages/foo.scm (libbar): New shared library.

(“New variable”, not “new shared library”, because technically ‘libbar’
is a variable in foo.scm.  :-))  But yes, as noted there, it should
typically be one patch per addition.

>>Could you squeeze that on one or two lines?
>
> Is there a style on when to squeeze and when to not?

There’s no written guideline for that, but you can check what other
files do.  Essentially, if this can fit in two 80-column lines rather
than 5 lines, just choose the former.

>>Please double-check that this is needed.
>
> Yup, all packages lack a proper configure script.

OK, perfect.

>>Could you improve the synopsis and description
>
> Do you have any ideas of what to add? I wasn't sure where to start
> myself

I don’t know those pieces of software, but a good start for the
description is typically their Web page or their ‘README’ file.

Thanks in advance!

Ludo’.

bug#26934: [PATCH 1/3] gnu: video: add libzen

[Ethan R. Jones]

Hello, I resubmitted the patches, you'll probably want to close this bug.
Sorry for the wait.