GNU bug report logs - #40902
[PATCH] gnu: Add edid-decode.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 40902 in the body.
You can then email your comments to 40902 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Add edid-decode.
Date: Mon, 27 Apr 2020 15:55:50 +0200

* gnu/packages/hardware.scm (edid-decode): New variable.
---
 gnu/packages/hardware.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 189c73ee3c..3284733095 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -89,6 +89,36 @@ calibrated, and restored when the calibration is applied.")
     (license (list license:bsd-3        ; FindDDCUtil.cmake
                    license:gpl2+))))    ; everything else
 
+(define-public edid-decode
+  (let ((commit "74b64180d67bb009d8d9ea1b6f18ad41aaa16396") ; 2020-04-22
+        (revision "1"))
+   (package
+     (name "edid-decode")
+     (version (git-version "0.0.0" revision commit))
+     (source
+      (origin
+        (method git-fetch)
+        (file-name (git-file-name name version))
+        (uri (git-reference
+              (url "git://linuxtv.org/edid-decode.git")
+              (commit commit)))
+        (sha256
+         (base32 "0nirp5bza08zj5d8bjgcm0p869hdg3qg3mwa7999pjdrzmn7s2ah"))))
+     (build-system gnu-build-system)
+     (arguments
+      `(#:tests? #f                     ; No test suite
+        #:make-flags
+        (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))
+              "bindir=/bin" "mandir=/share/man")
+        #:phases
+        (modify-phases %standard-phases
+          (delete 'configure))))
+     (home-page "https://git.linuxtv.org/edid-decode.git/")
+     (synopsis "Decode @dfn{EDID} data in human-readable format")
+     (description "edid-decode decodes @dfn{EDID} monitor description data in
+human-readable format and check if it conforms to the standards.")
+     (license license:expat))))
+
 ;; Distinct from memtest86, which is obsolete.
 (define-public memtest86+
   (package
-- 
2.26.0

Message #8 received at 40902 <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <m.othacehe <at> gmail.com>
To: Brice Waegeneire <brice <at> waegenei.re>
Cc: 40902 <at> debbugs.gnu.org
Subject: Re: [bug#40902] [PATCH] gnu: Add edid-decode.
Date: Tue, 28 Apr 2020 09:46:38 +0200

Hello Brice,

You can add your copyright.

> +(define-public edid-decode
> +  (let ((commit "74b64180d67bb009d8d9ea1b6f18ad41aaa16396") ; 2020-04-22
> +        (revision "1"))
> +   (package
> +     (name "edid-decode")
> +     (version (git-version "0.0.0" revision commit))

The indentation of the block seems wrong.

> +     (source
> +      (origin
> +        (method git-fetch)
> +        (file-name (git-file-name name version))
> +        (uri (git-reference
> +              (url "git://linuxtv.org/edid-decode.git")
> +              (commit commit)))
> +        (sha256
> +         (base32 "0nirp5bza08zj5d8bjgcm0p869hdg3qg3mwa7999pjdrzmn7s2ah"))))
> +     (build-system gnu-build-system)
> +     (arguments
> +      `(#:tests? #f                     ; No test suite
> +        #:make-flags
> +        (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))
> +              "bindir=/bin" "mandir=/share/man")
> +        #:phases
> +        (modify-phases %standard-phases
> +          (delete 'configure))))

When cross-compiling, a native binary is produced. This is because CXX
is set to 'g++' I guess. You need to do something similar to what is
done in the 'maradns' package.

Thanks,

Mathieu

Message #11 received at 40902 <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: 40902 <at> debbugs.gnu.org
Cc: m.othacehe <at> gmail.com
Subject: [PATCH v2] gnu: Add edid-decode.
Date: Tue, 28 Apr 2020 11:53:23 +0200

* gnu/packages/hardware.scm (edid-decode): New variable.
---

Fix identation.  Add phase 'fix-cross-compilation'.

 gnu/packages/hardware.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 189c73ee3c..0128832f28 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -89,6 +89,43 @@ calibrated, and restored when the calibration is applied.")
     (license (list license:bsd-3        ; FindDDCUtil.cmake
                    license:gpl2+))))    ; everything else
 
+(define-public edid-decode
+  (let ((commit "74b64180d67bb009d8d9ea1b6f18ad41aaa16396") ; 2020-04-22
+        (revision "1"))
+    (package
+      (name "edid-decode")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (file-name (git-file-name name version))
+         (uri (git-reference
+               (url "git://linuxtv.org/edid-decode.git")
+               (commit commit)))
+         (sha256
+          (base32 "0nirp5bza08zj5d8bjgcm0p869hdg3qg3mwa7999pjdrzmn7s2ah"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f                     ; No test suite
+         #:make-flags
+         (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))
+               "bindir=/bin" "mandir=/share/man")
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'fix-cross-compilation
+             (lambda* (#:key native-inputs target #:allow-other-keys)
+               (when target
+                 (substitute* "Makefile"
+                 (("\\$\\(CXX\\)")
+                  (string-append (assoc-ref native-inputs "gcc") "/bin/g++"))))
+               #t))
+           (delete 'configure))))
+      (home-page "https://git.linuxtv.org/edid-decode.git/")
+      (synopsis "Decode @dfn{EDID} data in human-readable format")
+      (description "edid-decode decodes @dfn{EDID} monitor description data in
+human-readable format and check if it conforms to the standards.")
+      (license license:expat))))
+
 ;; Distinct from memtest86, which is obsolete.
 (define-public memtest86+
   (package
-- 
2.26.0

Message #14 received at 40902 <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: Mathieu Othacehe <m.othacehe <at> gmail.com>
Cc: 40902 <at> debbugs.gnu.org
Subject: Re: [bug#40902] [PATCH] gnu: Add edid-decode.
Date: Tue, 28 Apr 2020 09:54:06 +0000

Hello Mathieu,

Thank you for taking the time to review this patch.

On 2020-04-28 07:46, Mathieu Othacehe wrote:
> Hello Brice,
> 
> You can add your copyright.

I already added it in #40607[0], an unmerged patch adding usbguard.

>> +(define-public edid-decode
>> +  (let ((commit "74b64180d67bb009d8d9ea1b6f18ad41aaa16396") ; 
>> 2020-04-22
>> +        (revision "1"))
>> +   (package
>> +     (name "edid-decode")
>> +     (version (git-version "0.0.0" revision commit))
> 
> The indentation of the block seems wrong.

You are correct, “guix lint” didn't mentioned it though. Fixed in v2.

>> +     (source
>> +      (origin
>> +        (method git-fetch)
>> +        (file-name (git-file-name name version))
>> +        (uri (git-reference
>> +              (url "git://linuxtv.org/edid-decode.git")
>> +              (commit commit)))
>> +        (sha256
>> +         (base32 
>> "0nirp5bza08zj5d8bjgcm0p869hdg3qg3mwa7999pjdrzmn7s2ah"))))
>> +     (build-system gnu-build-system)
>> +     (arguments
>> +      `(#:tests? #f                     ; No test suite
>> +        #:make-flags
>> +        (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))
>> +              "bindir=/bin" "mandir=/share/man")
>> +        #:phases
>> +        (modify-phases %standard-phases
>> +          (delete 'configure))))
> 
> When cross-compiling, a native binary is produced. This is because CXX
> is set to 'g++' I guess. You need to do something similar to what is
> done in the 'maradns' package.

I never thought of testing that, I should start doing it. Fixed in v2.

[0]: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40607#28

- Brice

Message #19 received at 40902-done <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <m.othacehe <at> gmail.com>
To: Brice Waegeneire <brice <at> waegenei.re>
Cc: 40902-done <at> debbugs.gnu.org
Subject: Re: [PATCH v2] gnu: Add edid-decode.
Date: Wed, 29 Apr 2020 11:41:07 +0200

Hello Brice,

> +               (when target
> +                 (substitute* "Makefile"
> +                 (("\\$\\(CXX\\)")
> +                  (string-append (assoc-ref native-inputs "gcc") "/bin/g++"))))

Doing that you are still using the native compiler. I changed it to:

--8<---------------cut here---------------start------------->8---
               (when target
                 (substitute* "Makefile"
                   (("\\$\\(CXX\\)")
                    (string-append target "-g++"))))
--8<---------------cut here---------------end--------------->8---

and pushed!

Thanks,

Mathieu

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.