[PATCH 1/2] gnu: Add nasm.

[PATCH 1/2] gnu: Add nasm.

[Jan Nieuwenhuizen]

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

Hi,

Trying to play an h264 video, I found this comment in gst-plugins-bad:

     ;; XXX: The following dependencies are missing:
     ;;  vo-amrwbenc, vo-aacenc, bs2b, chromaprint, directfb, daala, libdts,
     ;;  faac, flite, libgsm, libde265, libmms, libmimic, mjpegtools,
     ;;  mpeg2enc, libofa, opencv, openh264, openni2, libtimemmgr, wildmidi,

and packaged openh264 and its dependency nasm.  Find attached.

Later I found that h264 can be played by installing gst-libav.

As an aside, I wonder why gst-plugins-bad is made to depend on qt and
Wayland.

Greetings,
Jan


[-- Attachment #2: 0001-gnu-Add-nasm.patch --]
[-- Type: text/x-patch, Size: 3713 bytes --]

From bfe40f5a42edf702277a2580336138438cdb8a62 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 18 Jun 2016 22:39:33 +0200
Subject: [PATCH 1/2] gnu: Add nasm.

* gnu/packages/nasm.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
---
 gnu/local.mk          |  1 +
 gnu/packages/nasm.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 gnu/packages/nasm.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index abd05ef..f9ea769 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -242,6 +242,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/music.scm			\
   %D%/packages/mtools.scm			\
   %D%/packages/nano.scm				\
+  %D%/packages/nasm.scm				\
   %D%/packages/ncdu.scm				\
   %D%/packages/ncurses.scm			\
   %D%/packages/netpbm.scm			\
diff --git a/gnu/packages/nasm.scm b/gnu/packages/nasm.scm
new file mode 100644
index 0000000..19a1b92
--- /dev/null
+++ b/gnu/packages/nasm.scm
@@ -0,0 +1,59 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages nasm)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages texinfo))
+
+(define-public nasm
+  (package
+    (name "nasm")
+    (version "2.12.01")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.nasm.us/pub/nasm/releasebuilds/"
+                                  version "/" name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "12bl6vc5sjp9nnhf0iwy6l27vq783y0rxrjpp8sy84h5cb7a3fwx"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("ghostscript" ,ghostscript) ; ps2pdf
+                     ("perl" ,perl)  ;for test target
+                     ("texinfo" ,texinfo)))
+    (arguments
+     `(#:test-target "test"
+       #:phases (modify-phases %standard-phases
+                  (add-after 'install 'install-info
+                    (lambda _
+                      (zero? (system* "make" "install_doc")))))))
+    (home-page "http://www.nasm.us/")
+    (synopsis "80x86 and x86-64 assembler")
+    (description
+     "NASM, the Netwide Assembler, is an 80x86 and x86-64 assembler designed
+for portability and modularity.  It supports a range of object file formats,
+including Linux and *BSD a.out, ELF, COFF, Mach-O, Microsoft 16-bit OBJ,
+Windows32 and Windows64.  It will also output plain binary files.  Its syntax
+is designed to be simple and easy to understand, similar to Intel's but less
+complex.  It supports all currently known x86 architectural extensions, and
+has strong support for macros.")
+    (license license:bsd-3)))
-- 
2.8.4


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

From 950266815f8e2d8d57492c71d3cf72efc0fd9fdd Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 18 Jun 2016 22:40:51 +0200
Subject: [PATCH 2/2] gnu: Add openh264.

* gnu/packages/video.scm (openh264): New variable.
---
 gnu/packages/video.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 377caa9..2b4c99e 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2015 Andy Patterson <ajpatter@uwaterloo.ca>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Alex Vong <alexvong1995@gmail.com>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -58,6 +59,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages mp3)
+  #:use-module (gnu packages nasm)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages ocr)
   #:use-module (gnu packages perl)
@@ -1475,3 +1477,29 @@ implementation.")
 your graphical desktop and encodes it as a video.  This is a useful tool for
 making @dfn{screencasts}.")
     (license license:gpl2+)))
+
+(define-public openh264
+  (package
+    (name "openh264")
+    (version "1.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/cisco/"
+                                  name "/archive/v" version ".tar.gz"))
+              (sha256
+               (base32
+                "1d97dh5hzmy46jamfw03flvcz8md1hxp6y5n0b787h8ks7apn1wq"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("nasm" ,nasm)
+                     ("python" ,python)))
+    (arguments
+     `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       #:test-target "test"
+       #:phases (modify-phases %standard-phases
+                  ;; no configure script
+                  (delete 'configure))))
+    (home-page "http://www.openh264.org/")
+    (synopsis "H264 decoder library")
+    (description
+     "Openh264 is a library which can decode H264 video streams.")
+    (license license:bsd-3)))
-- 
2.8.4


[-- Attachment #4: Type: text/plain, Size: 154 bytes --]


-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar®  http://AvatarAcademy.nl  

Re: [PATCH 1/2] gnu: Add nasm.

[Alex Kost]

> From bfe40f5a42edf702277a2580336138438cdb8a62 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> Date: Sat, 18 Jun 2016 22:39:33 +0200
> Subject: [PATCH 1/2] gnu: Add nasm.
>
> * gnu/packages/nasm.scm: New file.
> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.

It's not related to this patch directly, but I think eventually it's
better to put 'nasm' and 'yasm' in a single module (and to name it (gnu
packages assembly) for example).  'lightning' package can also go there.

-- 
Alex

Re: [PATCH 1/2] gnu: Add nasm.

[Andreas Enge]

Hello,

On Sat, Jun 18, 2016 at 10:46:58PM +0200, Jan Nieuwenhuizen wrote:
> Trying to play an h264 video, I found this comment in gst-plugins-bad:
>      ;; XXX: The following dependencies are missing:
>      ;;  vo-amrwbenc, vo-aacenc, bs2b, chromaprint, directfb, daala, libdts,
>      ;;  faac, flite, libgsm, libde265, libmms, libmimic, mjpegtools,
>      ;;  mpeg2enc, libofa, opencv, openh264, openni2, libtimemmgr, wildmidi,
> and packaged openh264 and its dependency nasm.  Find attached.

is it a hard dependency? It looks as if nasm will only work on x86; then
openh264 would not work on any other architecture, and if we add it to some
gst-plugins, these would also not work there (well, they do not work anyway,
but that is a different story...).

Andreas

Re: [PATCH 1/2] gnu: Add nasm.

[Jan Nieuwenhuizen]

Andreas Enge writes:

> is it a hard dependency?

I thought it was, just re-checked.  It is a hard dependency on i686 or
x86_64.

It seems gas is required for (a flavour of?) arm and otherwise you'll
get c/c++ fallback functions.  See

    https://github.com/cisco/openh264

> It looks as if nasm will only work on x86; then
> openh264 would not work on any other architecture, and if we add it to some
> gst-plugins, these would also not work there (well, they do not work anyway,
> but that is a different story...).

Yeah, so not sure.  gst-libav handles h264 already, but I'm not sure
what the downside there is.  gst-plugins-bad had this comment about
openh264 missing...

Greetings,
Jan

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar®  http://AvatarAcademy.nl  

Re: [PATCH 1/2] gnu: Add nasm.

[Ludovic Courtès]

Jan Nieuwenhuizen <janneke@gnu.org> skribis:

> From bfe40f5a42edf702277a2580336138438cdb8a62 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> Date: Sat, 18 Jun 2016 22:39:33 +0200
> Subject: [PATCH 1/2] gnu: Add nasm.
>
> * gnu/packages/nasm.scm: New file.
> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.

Applied but to assembly.scm as Alex suggested; I also added a
‘supported-systems’ field.

Thanks!

Ludo’.

Re: [PATCH 1/2] gnu: Add nasm.

[Ludovic Courtès]

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

ludo@gnu.org (Ludovic Courtès) skribis:

> Jan Nieuwenhuizen <janneke@gnu.org> skribis:
>
>> From bfe40f5a42edf702277a2580336138438cdb8a62 Mon Sep 17 00:00:00 2001
>> From: Jan Nieuwenhuizen <janneke@gnu.org>
>> Date: Sat, 18 Jun 2016 22:39:33 +0200
>> Subject: [PATCH 1/2] gnu: Add nasm.
>>
>> * gnu/packages/nasm.scm: New file.
>> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
>
> Applied but to assembly.scm as Alex suggested; I also added a
> ‘supported-systems’ field.

I forgot to mention another thing: nasm is currently not
bit-reproducible, as visible with --rounds=2, due to differences in its
PDF and PS files:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 2508 bytes --]

$ diff -ur /gnu/store/0804r4rcm0gw8kdgf9dy9bhakn1xqdpl-nasm-2.12.01 /gnu/store/0804r4rcm0gw8kdgf9dy9bhakn1xqdpl-nasm-2.12.01-check
Binary files /gnu/store/0804r4rcm0gw8kdgf9dy9bhakn1xqdpl-nasm-2.12.01/doc/nasm/nasmdoc.pdf and /gnu/store/0804r4rcm0gw8kdgf9dy9bhakn1xqdpl-nasm-2.12.01-check/doc/nasm/nasmdoc.pdf differ
diff -ur /gnu/store/0804r4rcm0gw8kdgf9dy9bhakn1xqdpl-nasm-2.12.01/doc/nasm/nasmdoc.ps /gnu/store/0804r4rcm0gw8kdgf9dy9bhakn1xqdpl-nasm-2.12.01-check/doc/nasm/nasmdoc.ps
--- /gnu/store/0804r4rcm0gw8kdgf9dy9bhakn1xqdpl-nasm-2.12.01/doc/nasm/nasmdoc.ps	1970-01-01 01:00:01.000000000 +0100
+++ /gnu/store/0804r4rcm0gw8kdgf9dy9bhakn1xqdpl-nasm-2.12.01-check/doc/nasm/nasmdoc.ps	1970-01-01 01:00:01.000000000 +0100
@@ -3,30 +3,30 @@
 %%BoundingBox: 0 0 595 792
 %%Creator: (NASM psflow.pl)
 %%DocumentData: Clean7Bit
-%%DocumentFonts: Courier-Bold Times-Roman Courier Times-Italic Times-BoldItalic Times-Bold
-%%DocumentNeededFonts: Courier-Bold Times-Roman Courier Times-Italic Times-BoldItalic Times-Bold
+%%DocumentFonts: Courier-Bold Times-Roman Times-BoldItalic Times-Bold Times-Italic Courier
+%%DocumentNeededFonts: Courier-Bold Times-Roman Times-BoldItalic Times-Bold Times-Italic Courier
 %%Orientation: Portrait
 %%PageOrder: Ascend
 %%EndComments
 %%BeginProlog
-/bulladj 12 def
-/idxgutter 24 def
-/startcopyright 75 def
-/rmarg 50 def
-/idxcolumns 2 def
-/lmarg 100 def
-/topmarg 100 def
+/botmarg 100 def
 /tocpnz 24 def
-/tocdots 8 def
-/prmarg 0 def
+/idxcolumns 2 def
 /pagewidth 595 def
+/idxspace 24 def
 /plmarg 50 def
+/startcopyright 75 def
+/tocdots 8 def
+/topmarg 100 def
+/lmarg 100 def
+/pageheight 792 def
+/pymarg 50 def
 /idxindent 24 def
+/prmarg 0 def
+/rmarg 50 def
+/idxgutter 24 def
+/bulladj 12 def
 /tocind 12 def
-/pymarg 50 def
-/pageheight 792 def
-/idxspace 24 def
-/botmarg 100 def
 /colorlinks false def
 /NASMEncoding [ /.notdef  /.notdef  /.notdef  /.notdef  /.notdef  
  /.notdef  /.notdef  /.notdef  /.notdef  /.notdef  /.notdef  /.notdef  
@@ -70,10 +70,10 @@
 } def
 /Courier-Bold-NASM /Courier-Bold nasmenc
 /Times-Roman-NASM /Times-Roman nasmenc
-/Courier-NASM /Courier nasmenc
-/Times-Italic-NASM /Times-Italic nasmenc
 /Times-BoldItalic-NASM /Times-BoldItalic nasmenc
 /Times-Bold-NASM /Times-Bold nasmenc
+/Times-Italic-NASM /Times-Italic nasmenc
+/Courier-NASM /Courier nasmenc
 /tfont0 /Times-Bold-NASM findfont 20 scalefont def
 /tfont1 /Times-BoldItalic-NASM findfont 20 scalefont def
 /tfont2 /Courier-Bold-NASM findfont 20 scalefont def

[-- Attachment #3: Type: text/plain, Size: 237 bytes --]


Could you look into it?

I suspect it would be easier to simply remove these two files.  Packages
in Guix don’t usually install their PDF/PS documentation, and this one
already installs its doc as HTML.

TIA!  :-)

Ludo’.

Re: [PATCH 1/2] gnu: Add nasm.

[Jan Nieuwenhuizen]

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

Ludovic Courtès writes:

>> Applied but to assembly.scm as Alex suggested; I also added a
>> ‘supported-systems’ field.

Thanks!

> I forgot to mention another thing: nasm is currently not
> bit-reproducible, as visible with --rounds=2, due to differences in its
> PDF and PS files:

Ouch.  Sorry.

> Could you look into it?

Find patch attached.

> I suspect it would be easier to simply remove these two files.  Packages
> in Guix don’t usually install their PDF/PS documentation, and this one
> already installs its doc as HTML.

Done.  There is indeed already info, text and HTML.
Greetings,
Jan


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-nasm-Make-build-bit-reproducible.patch --]
[-- Type: text/x-patch, Size: 3441 bytes --]

From d269a1e1fbb23f584f4360534b4708890e689808 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 21 Jun 2016 18:51:02 +0200
Subject: [PATCH] gnu: nasm: Make build bit-reproducible.

* gnu/packages/patches/nasm-no-ps-pdf.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/assembly.scm (nasm): Use it.  Remove ghostscript, do not
build PS or PDF docs.  Makes build bit-reproducible.
---
 gnu/local.mk                              |  1 +
 gnu/packages/assembly.scm                 |  8 ++++----
 gnu/packages/patches/nasm-no-ps-pdf.patch | 20 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 gnu/packages/patches/nasm-no-ps-pdf.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 1ef7ef0..f8d661e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -670,6 +670,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/mumps-build-parallelism.patch		\
   %D%/packages/patches/mupen64plus-ui-console-notice.patch	\
   %D%/packages/patches/mutt-store-references.patch		\
+  %D%/packages/patches/nasm-no-ps-pdf.patch			\
   %D%/packages/patches/net-tools-bitrot.patch			\
   %D%/packages/patches/netcdf-config-date.patch			\
   %D%/packages/patches/ngircd-handle-zombies.patch		\
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index 575856a..d09e76a 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -23,7 +23,7 @@
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
-  #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages python)
@@ -39,10 +39,10 @@
                                   version "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "12bl6vc5sjp9nnhf0iwy6l27vq783y0rxrjpp8sy84h5cb7a3fwx"))))
+                "12bl6vc5sjp9nnhf0iwy6l27vq783y0rxrjpp8sy84h5cb7a3fwx"))
+              (patches (search-patches "nasm-no-ps-pdf.patch"))))
     (build-system gnu-build-system)
-    (native-inputs `(("ghostscript" ,ghostscript) ; ps2pdf
-                     ("perl" ,perl)  ;for test target
+    (native-inputs `(("perl" ,perl)  ;for doc and test target
                      ("texinfo" ,texinfo)))
     (arguments
      `(#:test-target "test"
diff --git a/gnu/packages/patches/nasm-no-ps-pdf.patch b/gnu/packages/patches/nasm-no-ps-pdf.patch
new file mode 100644
index 0000000..b03b57a
--- /dev/null
+++ b/gnu/packages/patches/nasm-no-ps-pdf.patch
@@ -0,0 +1,20 @@
+Avoid building PS and PDF docs, which do not build bit-reproducible.  NASM
+already installs doc in info and html.
+
+--- nasm-2.12.01/doc/Makefile.in.orig	2016-06-21 18:02:59.483484829 +0200
++++ nasm-2.12.01/doc/Makefile.in	2016-06-21 18:03:46.700151410 +0200
+@@ -27,7 +27,7 @@
+ PS2PDF          = @PS2PDF@		# Part of GhostScript
+ 
+ SRCS		= nasmdoc.src inslist.src changes.src
+-OUT		= info html nasmdoc.txt nasmdoc.ps nasmdoc.pdf
++OUT		= info html nasmdoc.txt
+ 
+ # exports
+ export srcdir
+@@ -100,4 +100,4 @@
+ 	$(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir)
+ 	mkdir -p $(INSTALLROOT)$(docdir)/html
+ 	$(INSTALL_DATA) html/* $(INSTALLROOT)$(docdir)/html
+-	$(INSTALL_DATA) nasmdoc.ps nasmdoc.pdf nasmdoc.txt $(INSTALLROOT)$(docdir)
++	$(INSTALL_DATA) nasmdoc.txt $(INSTALLROOT)$(docdir)
-- 
2.9.0


[-- Attachment #3: Type: text/plain, Size: 156 bytes --]



-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar®  http://AvatarAcademy.nl  

Re: [PATCH 1/2] gnu: Add nasm.

[Ludovic Courtès]

Jan Nieuwenhuizen <janneke@gnu.org> skribis:

> From d269a1e1fbb23f584f4360534b4708890e689808 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> Date: Tue, 21 Jun 2016 18:51:02 +0200
> Subject: [PATCH] gnu: nasm: Make build bit-reproducible.
>
> * gnu/packages/patches/nasm-no-ps-pdf.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/assembly.scm (nasm): Use it.  Remove ghostscript, do not
> build PS or PDF docs.  Makes build bit-reproducible.

Awesome.  Applied, thanks!

Ludo’.