GNU bug report logs - #67814
[PATCH 0/3] gnu: mpv: Update to 0.37.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 67814 in the body.
You can then email your comments to 67814 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: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/3] gnu: mpv: Update to 0.37.0.
Date: Thu, 14 Dec 2023 00:53:46 +0800

gnu: mpv: Update to 0.37.0.

Zheng Junjie (3):
  gnu: glad: Update to 2.0.4.
  gnu: libplacebo: Update to 6.338.1.
  gnu: mpv: Update to 0.37.0.

 gnu/packages/electronics.scm |  3 ++-
 gnu/packages/gl.scm          | 50 +++++++++++++++++++++++++++---------
 gnu/packages/video.scm       | 42 +++++++++++++++---------------
 3 files changed, 61 insertions(+), 34 deletions(-)


base-commit: 5f812344d293e5faaca44eeaab3b889fa6cb7e33
-- 
2.41.0

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

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 67814 <at> debbugs.gnu.org
Subject: [PATCH 1/3] gnu: glad: Update to 2.0.4.
Date: Thu, 14 Dec 2023 00:57:36 +0800

* gnu/packages/gl.scm (glad): Update to 2.0.4.
[inputs]: Add python-jinja2.
[arguments]<#:phases>: Adjust install-cmakelists.txt phase.
(glad-0.1): Inherit above.
gnu/packages/electronics.scm (openboardview)
[native-inputs]: Use glad-0.1 replace glad.

Change-Id: I516d44dfc9272702c3ac31773df0b6c2d68ed99c
---
 gnu/packages/electronics.scm |  3 ++-
 gnu/packages/gl.scm          | 50 +++++++++++++++++++++++++++---------
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 7d0e58aeae..13f370c285 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2021 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2021 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -310,7 +311,7 @@ (define-public openboardview
     (native-inputs
      (list pkg-config
            python
-           glad
+           glad-0.1
            stb-image
            utf8-h))
     (inputs
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index c02a6f0a84..62e8efbb98 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -18,6 +18,7 @@
 ;;; Copyright © 2021, 2022, 2023 John Kehayias <john.kehayias <at> protonmail.com>
 ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
 ;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
+;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -192,12 +193,9 @@ (define-public ftgl
 (define-public glad
   (package
     (name "glad")
-    (version "0.1.36")
+    (version "2.0.4")
     (source
      (origin
-       ;; We fetch the sources from the repository since the PyPI archive
-       ;; doesn't contain the CMakeLists.txt file which is useful for
-       ;; integration with other software, such as the openboardview package.
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/Dav1dde/glad")
@@ -205,22 +203,50 @@ (define-public glad
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0m55ya1zrmg6n2cljkajy80ilmi5sblln8742fm0k1sw9k7hzn8n"))))
+         "1pam6imhcmcyqrqi6wzzxprb23y8x6zdbvsjavnz26k72i9dbbja"))))
     (build-system python-build-system)
+    (inputs (list python-jinja2))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-cmakelists.txt
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (share (string-append out "/share/" ,name)))
-               (install-file "CMakeLists.txt" share)))))))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'install-cmakelists.txt
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let* ((out (assoc-ref outputs "out"))
+                          (share (string-append out "/share/" #$name)))
+                     (install-file "cmake/CMakeLists.txt" share)))))))
     (home-page "https://github.com/Dav1dde/glad")
     (synopsis "Multi-language GL/GLES/EGL/GLX/WGL loader generator")
     (description "Glad uses the official Khronos XML specifications to
 generate a GL/GLES/EGL/GLX/WGL loader tailored for specific requirements.")
     (license license:expat)))
 
+(define-public glad-0.1
+  (package
+    (inherit glad)
+    (name "glad")
+    (version "0.1.36")
+    (source
+     (origin
+       ;; We fetch the sources from the repository since the PyPI archive
+       ;; doesn't contain the CMakeLists.txt file which is useful for
+       ;; integration with other software, such as the openboardview package.
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Dav1dde/glad")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0m55ya1zrmg6n2cljkajy80ilmi5sblln8742fm0k1sw9k7hzn8n"))))
+    (inputs (list))
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-after 'install 'install-cmakelists.txt
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (share (string-append out "/share/" ,name)))
+                        (install-file "CMakeLists.txt" share)))))))))
+
 (define-public s2tc
   (package
     (name "s2tc")
-- 
2.41.0

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

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 67814 <at> debbugs.gnu.org
Subject: [PATCH 2/3] gnu: libplacebo: Update to 6.338.1.
Date: Thu, 14 Dec 2023 00:57:37 +0800

* gnu/packages/video.scm (libplacebo): Update to 6.338.1.
[native-inputs]: Add python-jinja2, glad.

Change-Id: Ie9c35cfd964f110ff95ed486ee1c4f5724c82314
---
 gnu/packages/video.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 51ebc2a1b2..1f339df517 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -67,6 +67,7 @@
 ;;; Copyright © 2023 Dominik Delgado Steuter <dds <at> disroot.org>
 ;;; Copyright © 2023 Saku Laesvuori <saku <at> laesvuori.fi>
 ;;; Copyright © 2023 Jaeme Sifat <jaeme <at> runbox.com>
+;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1533,7 +1534,7 @@ (define-public libmatroska
 (define-public libplacebo
   (package
     (name "libplacebo")
-    (version "4.208.0")
+    (version "6.338.1")
     (source
      (origin
        (method git-fetch)
@@ -1542,7 +1543,7 @@ (define-public libplacebo
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "161dp5781s74ca3gglaxlmchx7glyshf0wg43w98pl22n1jcm5qk"))))
+        (base32 "1miqk3gfwah01xkf4a6grwq29im0lfh94gp92y7js855gx3v169m"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
@@ -1551,7 +1552,11 @@ (define-public libplacebo
                          (assoc-ref %build-inputs "vulkan-headers")
                          "/share/vulkan/registry/vk.xml"))))
     (native-inputs
-     (list python python-mako pkg-config))
+     (list python python-mako
+           pkg-config
+           ;; This package use glad as library, so we add it.
+           python-jinja2
+           glad))
     (inputs
      (list lcms
            libepoxy
-- 
2.41.0

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

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 67814 <at> debbugs.gnu.org
Subject: [PATCH 3/3] gnu: mpv: Update to 0.37.0.
Date: Thu, 14 Dec 2023 00:57:38 +0800

* gnu/packages/video.scm (mpv): Update to 0.37.0.
[build-system]: Switch to meson-build-system.
[arguments]: <#:configure>: Adjust.
<#:phases>: Remove set-up-waf phase.
[native-inputs]: Add python-wrapper.
[inputs]: Add libplacebo, zimg. Remove python-waf.

Change-Id: I0e61761a4d086a1185730f587869c2552b7cacb0
---
 gnu/packages/video.scm | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 1f339df517..b0cdb8cda7 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2343,7 +2343,7 @@ (define-public mplayer
 (define-public mpv
   (package
     (name "mpv")
-    (version "0.36.0")
+    (version "0.37.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2351,8 +2351,8 @@ (define-public mpv
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
-               (base32 "1ri06h7pv6hrxmxxc618n9hymlgr0gfx38bqq5dcszdgnlashsgk"))))
-    (build-system waf-build-system)
+               (base32 "1xcyfpd543lbmg587wi0mahrz8vhyrlr4432054vp6wsi3s36c4b"))))
+    (build-system meson-build-system)
     (arguments
      (list
       #:phases
@@ -2369,20 +2369,15 @@ (define-public mpv
               ;; and passed as linker flags, but the order in which they are added
               ;; varies.  See <https://github.com/mpv-player/mpv/issues/7855>.
               ;; Set PYTHONHASHSEED as a workaround for deterministic results.
-              (setenv "PYTHONHASHSEED" "1")))
-          (add-before 'configure 'set-up-waf
-            (lambda* (#:key inputs #:allow-other-keys)
-              (copy-file (search-input-file inputs "bin/waf") "waf")
-              (setenv "CC" #$(cc-for-target)))))
+              (setenv "PYTHONHASHSEED" "1"))))
       #:configure-flags
-      #~(list "--enable-libmpv-shared"
-              "--enable-cdda"
-              "--enable-dvdnav"
-              "--disable-build-date")
-      ;; No check function defined.
-      #:tests? #f))
+      #~(list "-Dlibmpv=true"
+              "-Dcdda=enabled"
+              "-Ddvdnav=enabled"
+              "-Dbuild-date=false")))
     (native-inputs
-     (list perl ; for zsh completion file
+     (list python-wrapper
+           perl ; for zsh completion file
            pkg-config python-docutils))
     ;; Missing features: libguess, V4L2.
     (inputs
@@ -2400,6 +2395,7 @@ (define-public mpv
            libdvdread
            libdvdnav
            libjpeg-turbo
+           libplacebo
            libva
            libvdpau
            libx11
@@ -2410,13 +2406,11 @@ (define-public mpv
            libxrandr
            libxscrnsaver
            libxv
-           ;; XXX: lua > 5.2 is not currently supported; see
-           ;; waftools/checks/custom.py
+           ;; XXX: lua > 5.2 is not currently supported; see meson.build
            lua-5.2
            mesa
            mpg123
            pulseaudio
-           python-waf
            rsound
            shaderc
            vulkan-headers
@@ -2424,6 +2418,7 @@ (define-public mpv
            wayland
            wayland-protocols
            yt-dlp
+           zimg
            zlib))
     (home-page "https://mpv.io/")
     (synopsis "Audio and video player")
-- 
2.41.0

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

From: Hilton Chain <hako <at> ultrarare.space>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 67814-done <at> debbugs.gnu.org
Subject: Re: [bug#67814] [PATCH 0/3] gnu: mpv: Update to 0.37.0.
Date: Fri, 22 Dec 2023 22:33:32 +0800

Hi,

On Thu, 14 Dec 2023 00:53:46 +0800,
Zheng Junjie wrote:
>
> gnu: mpv: Update to 0.37.0.
>
> Zheng Junjie (3):
>   gnu: glad: Update to 2.0.4.

Moved python-jinja2 from inputs to propagated-inputs, applied as
1784ece7cb61dc72a43cf8e0ad17fdbb266320e6.

>   gnu: libplacebo: Update to 6.338.1.

Applied as fbc6683ebba637b5321e7068a9249f7d562cd65a.

>   gnu: mpv: Update to 0.37.0.

Applied as ce7b2b57aa6da0ceace94ea5fb42392c7ff97d53.

I have also made some adjustments in commit messages, gexps and inputs
order, you may notice them in above commits.

Thanks!

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

From: Andrew Tropin <andrew <at> trop.in>
To: Hilton Chain <hako <at> ultrarare.space>, Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 67814-done <at> debbugs.gnu.org
Subject: Re: bug#67814: [PATCH 0/3] gnu: mpv: Update to 0.37.0.
Date: Mon, 25 Dec 2023 14:33:41 +0300

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

On 2023-12-22 22:33, Hilton Chain via Guix-patches via wrote:

> Hi,
>
> On Thu, 14 Dec 2023 00:53:46 +0800,
> Zheng Junjie wrote:
>>
>> gnu: mpv: Update to 0.37.0.
>>
>> Zheng Junjie (3):
>>   gnu: glad: Update to 2.0.4.
>
> Moved python-jinja2 from inputs to propagated-inputs, applied as
> 1784ece7cb61dc72a43cf8e0ad17fdbb266320e6.
>
>>   gnu: libplacebo: Update to 6.338.1.
>
> Applied as fbc6683ebba637b5321e7068a9249f7d562cd65a.
>
>>   gnu: mpv: Update to 0.37.0.
>
> Applied as ce7b2b57aa6da0ceace94ea5fb42392c7ff97d53.
>
> I have also made some adjustments in commit messages, gexps and inputs
> order, you may notice them in above commits.

Hi Hilton!

It seem the mpv update breaks mpv-mpris build.  I didn't dive into
issue yet, only tried to revert this patch.

-- 
Best regards,
Andrew Tropin

[signature.asc (application/pgp-signature, inline)]

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

From: Hilton Chain <hako <at> ultrarare.space>
To: Andrew Tropin <andrew <at> trop.in>
Cc: 68044 <at> debbugs.gnu.org, Josselin Poiret <dev <at> jpoiret.xyz>,
 Zheng Junjie <zhengjunjie <at> iscas.ac.cn>, 68250 <at> debbugs.gnu.org,
 67814 <at> debbugs.gnu.org
Subject: Re: bug#67814: [PATCH 0/3] gnu: mpv: Update to 0.37.0.
Date: Fri, 05 Jan 2024 13:09:17 +0800

Hi,

On Mon, 25 Dec 2023 19:33:41 +0800,
Andrew Tropin wrote:
>
> Hi Hilton!
>
> It seem the mpv update breaks mpv-mpris build.  I didn't dive into
> issue yet, only tried to revert this patch.

It's because mpv's pkgconfig file (for libmpv) now includes all its
dependencies in Requires.private.  Sorry that I didn't check all the
dependent packages.

Josselin has sent bug#68044, which adds mpv's inputs to mpv-mpris.

However there're actually other packages depend on libmpv, so I think
the proper fix is to split libmpv from the mpv package and propagate
inputs in a new package (as mpv users are likely to include mpv in
their profiles, thus these propagated inputs are usually unwanted).

I tried to add a "lib" output for mpv first but there would be cycles.
As a result, I disabled libmpv in mpv, added a libmpv package which
inherits from mpv, and sent it to bug#68250.

Thanks

Previous Next

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