From patchwork Wed Dec 13 16:57:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 57573 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 447D927BBE2; Wed, 13 Dec 2023 17:00:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EAC0927BBE9 for ; Wed, 13 Dec 2023 17:00:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDSaO-0004vO-JU; Wed, 13 Dec 2023 11:59:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rDSaJ-0004uY-Hk for guix-patches@gnu.org; Wed, 13 Dec 2023 11:59:49 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rDSaJ-0005ET-8j for guix-patches@gnu.org; Wed, 13 Dec 2023 11:59:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDSaZ-00047F-7V for guix-patches@gnu.org; Wed, 13 Dec 2023 12:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67814] [PATCH 3/3] gnu: mpv: Update to 0.37.0. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Dec 2023 17:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67814 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67814@debbugs.gnu.org Received: via spool by 67814-submit@debbugs.gnu.org id=B67814.170248675815715 (code B ref 67814); Wed, 13 Dec 2023 17:00:03 +0000 Received: (at 67814) by debbugs.gnu.org; 13 Dec 2023 16:59:18 +0000 Received: from localhost ([127.0.0.1]:59614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDSZp-00045O-KF for submit@debbugs.gnu.org; Wed, 13 Dec 2023 11:59:18 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:37236 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDSZl-00044c-EW for 67814@debbugs.gnu.org; Wed, 13 Dec 2023 11:59:15 -0500 Received: from localhost.localdomain (unknown [111.0.51.71]) by APP-05 (Coremail) with SMTP id zQCowAD3_m7C4nllBzsOAQ--.2099S4; Thu, 14 Dec 2023 00:58:43 +0800 (CST) From: Zheng Junjie Date: Thu, 14 Dec 2023 00:57:38 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAD3_m7C4nllBzsOAQ--.2099S4 X-Coremail-Antispam: 1UD129KBjvJXoWxAFy7XF1kWF1xJry8Cr1kGrg_yoW5WryrpF WfuF9akr95GFyrtws0qF429r4rWrZ7Ca1Du39rXa10kanIvFW0vryjyFWFkF9rXr97J3Wx Wa40qa1UurW5ZFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9jb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kE wVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0cI8IcVCY1x 0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26r4j6F4UM28EF7xvwVC2z280aVCY1x02 67AKxVW8JVW8Jr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7x kEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E 67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCw CI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1x MIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvf C2KfnxnUUI43ZEXa7IU53cTJUUUUU== X-Originating-IP: [111.0.51.71] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 . ;; 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")