GNU bug report logs - #56984
[PATCH] gnu: openh264: Update to 2.3.0.

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 56984 in the body.
You can then email your comments to 56984 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: kiasoc5 <kiasoc5 <at> disroot.org>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: openh264: Update to 2.3.0.
Date: Thu, 4 Aug 2022 20:37:26 +0000

[Message part 1 (text/plain, inline)]

[0001-gnu-openh264-Update-to-2.3.0.patch (text/x-patch, attachment)]

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

From: "(" <paren <at> disroot.org>
To: "kiasoc5" <kiasoc5 <at> disroot.org>, <56984 <at> debbugs.gnu.org>
Subject: Re: [bug#56984] [PATCH] gnu: openh264: Update to 2.3.0.
Date: Thu, 04 Aug 2022 21:53:37 +0100

And here :)

    -- (

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

From: kiasoc5 <kiasoc5 <at> disroot.org>
To: 56984 <at> debbugs.gnu.org
Cc: kiasoc5 <kiasoc5 <at> disroot.org>, paren <at> disroot.org
Subject: [PATCH V2] gnu: openh264: Update to 2.3.0 and use gexps.
Date: Fri,  5 Aug 2022 00:44:53 -0400

* gnu/packages/video.scm (openh264): Update to 2.3.0.
[arguments]: Use gexps.
---
 gnu/packages/video.scm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 04049fd9c8..b9e2c54eb7 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3940,7 +3940,7 @@ (define-public intel-vaapi-driver
 (define-public openh264
   (package
     (name "openh264")
-    (version "2.1.1")
+    (version "2.3.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -3949,17 +3949,20 @@ (define-public openh264
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0ffav46pz3sbj92nipd62z03fibyqgclfq9w8lgr80s6za6zdk5s"))))
+                "1yr6nsjpnazq4z6dvjfyanljwgwnyjh3ddxa0sq6hl9qc59yq91r"))))
     (build-system gnu-build-system)
     (native-inputs
      (list nasm python))
     (arguments
-     '(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
-                          "CC=gcc")
-       #:test-target "test"
-       #:phases (modify-phases %standard-phases
-                  ;; no configure script
-                  (delete 'configure))))
+     (list
+      #:make-flags
+      #~(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+                             "CC=gcc")
+      #:test-target "test"
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; no configure script
+          (delete 'configure))))
     (home-page "https://www.openh264.org/")
     (synopsis "H264 decoder library")
     (description
-- 
2.37.1

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

From: kiasoc5 <kiasoc5 <at> disroot.org>
To: 56984 <at> debbugs.gnu.org
Cc: kiasoc5 <kiasoc5 <at> disroot.org>, paren <at> disroot.org
Subject: [PATCH V3] gnu: ugrep: Use gexps and add zstd lib to inputs.
Date: Fri,  5 Aug 2022 01:04:09 -0400

* gnu/packages/search.scm (ugrep)[snippets]: Remove trailing #t.
[snippets]: Use gexps.
[arguments]: Likewise.
[inputs]: Add zstd lib.
---
 gnu/packages/search.scm | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index db5579a708..620c8dbe1f 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -32,6 +32,7 @@ (define-module (gnu packages search)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
@@ -687,8 +688,7 @@ (define-public ugrep
                   (delete-file-recursively "bin") ; pre-built executables
                   (for-each delete-file (find-files "tests" "^archive\\..*"))
                   (for-each delete-file (find-files "tests" "^.*\\.pdf$"))
-                  (for-each delete-file (find-files "tests" "^.*\\.class$"))
-                  #t))))
+                  (for-each delete-file (find-files "tests" "^.*\\.class$"))))))
     (build-system gnu-build-system)
     (inputs
      (list bzip2
@@ -696,18 +696,20 @@ (define-public ugrep
            lz4
            lzip ;; lzma
            pcre2
-           zlib))
+           zlib
+           zstd))
     (arguments
-     `(#:tests? #f                  ; no way to rebuild the binary input files
-       #:test-target "test"
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'check-setup
-           (lambda _
-             ;; Unpatch shebangs in tests.
-             (substitute* '("tests/Hello.bat"
-                            "tests/Hello.sh")
-               (("#!/gnu/store/.*/bin/sh") "#!/bin/sh")))))))
+     (list
+      #:tests? #f                  ; no way to rebuild the binary input files
+      #:test-target "test"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'check-setup
+            (lambda _
+              ;; Unpatch shebangs in tests.
+              (substitute* '("tests/Hello.bat"
+                             "tests/Hello.sh")
+                (("#!/gnu/store/.*/bin/sh") "#!/bin/sh")))))))
     (home-page "https://github.com/Genivia/ugrep/")
     (synopsis "Faster grep with an interactive query UI")
     (description "Ugrep is a ultra fast searcher of file systems, text
-- 
2.37.1

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

From: kiasoc5 <kiasoc5 <at> disroot.org>
To: 56984 <at> debbugs.gnu.org
Cc: kiasoc5 <kiasoc5 <at> disroot.org>
Subject: [PATCH] gnu: ugrep: Use gexps and add zstd lib to inputs.
Date: Fri,  5 Aug 2022 01:10:00 -0400

Last email had old version of patch, please use this one. Sorry paren
for using cc instead of reply-to.

* gnu/packages/search.scm (ugrep)[snippets]: Use gexps. Remove trailing #t.
[snippets]: Use gexps.
[arguments]: Likewise.
[inputs]: Add zstd lib.
---
 gnu/packages/search.scm | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index db5579a708..65a642c259 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -32,6 +32,7 @@ (define-module (gnu packages search)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
@@ -681,14 +682,12 @@ (define-public ugrep
               (sha256
                (base32 "03b3lahc3zzsznaqnrk47f1cnd5jwakvwrkz0r4m2crk09cpfv57"))
               (file-name (git-file-name name version))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
+              (snippet #~(begin
+                  (use-modules (guix build utils))
                   (delete-file-recursively "bin") ; pre-built executables
                   (for-each delete-file (find-files "tests" "^archive\\..*"))
                   (for-each delete-file (find-files "tests" "^.*\\.pdf$"))
-                  (for-each delete-file (find-files "tests" "^.*\\.class$"))
-                  #t))))
+                  (for-each delete-file (find-files "tests" "^.*\\.class$"))))))
     (build-system gnu-build-system)
     (inputs
      (list bzip2
@@ -696,18 +695,20 @@ (define-public ugrep
            lz4
            lzip ;; lzma
            pcre2
-           zlib))
+           zlib
+           `(,zstd "lib"))
     (arguments
-     `(#:tests? #f                  ; no way to rebuild the binary input files
-       #:test-target "test"
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'check-setup
-           (lambda _
-             ;; Unpatch shebangs in tests.
-             (substitute* '("tests/Hello.bat"
-                            "tests/Hello.sh")
-               (("#!/gnu/store/.*/bin/sh") "#!/bin/sh")))))))
+     (list
+      #:tests? #f                  ; no way to rebuild the binary input files
+      #:test-target "test"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'check-setup
+            (lambda _
+              ;; Unpatch shebangs in tests.
+              (substitute* '("tests/Hello.bat"
+                             "tests/Hello.sh")
+                (("#!/gnu/store/.*/bin/sh") "#!/bin/sh")))))))
     (home-page "https://github.com/Genivia/ugrep/")
     (synopsis "Faster grep with an interactive query UI")
     (description "Ugrep is a ultra fast searcher of file systems, text
-- 
2.37.1

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

From: 宋文武 <iyzsong <at> envs.net>
To: kiasoc5 <kiasoc5 <at> disroot.org>
Cc: paren <at> disroot.org, 56984-done <at> debbugs.gnu.org
Subject: Re: bug#56984: [PATCH] gnu: openh264: Update to 2.3.0.
Date: Wed, 10 Aug 2022 16:29:19 +0800

kiasoc5 <kiasoc5 <at> disroot.org> writes:

> * gnu/packages/video.scm (openh264): Update to 2.3.0.
> [arguments]: Use gexps.
> ---
>  gnu/packages/video.scm | 19 +++++++++++--------
>  1 file changed, 11 insertions(+), 8 deletions(-)

I changed '(assoc-ref %outputs "out")' to '#$output'.

Pushed now, thank you for the patch and ( for the review!

Previous Next

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