From patchwork Fri Jan 5 05:06:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 58361 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 B37A127BBE9; Fri, 5 Jan 2024 05:08:25 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 75FD527BBE2 for ; Fri, 5 Jan 2024 05:08:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLcRD-0000Rj-CA; Fri, 05 Jan 2024 00:08:07 -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 1rLcRB-0000RT-E3 for guix-patches@gnu.org; Fri, 05 Jan 2024 00:08:05 -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 1rLcRB-0007t3-5k; Fri, 05 Jan 2024 00:08:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLcR8-0000L6-7z; Fri, 05 Jan 2024 00:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68250] [PATCH] gnu: Add libmpv. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 05:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68250 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68250@debbugs.gnu.org Cc: Hilton Chain , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart Received: via spool by submit@debbugs.gnu.org id=B.17044312411248 (code B ref -1); Fri, 05 Jan 2024 05:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jan 2024 05:07:21 +0000 Received: from localhost ([127.0.0.1]:56146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLcQT-0000K4-EE for submit@debbugs.gnu.org; Fri, 05 Jan 2024 00:07:21 -0500 Received: from lists.gnu.org ([2001:470:142::17]:43430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLcQO-0000Jo-Mg for submit@debbugs.gnu.org; Fri, 05 Jan 2024 00:07:20 -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 1rLcQE-0000OA-VT for guix-patches@gnu.org; Fri, 05 Jan 2024 00:07:07 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLcQC-0007o6-Q0 for guix-patches@gnu.org; Fri, 05 Jan 2024 00:07:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1704431190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ytJREIQufEQ/R/uNA1NQYlIS8XnSwxNvMy9390I2pdQ=; b=0hv9BL2buKyMPS9dkWyVsPkNQuQy+8A48ftPFrF2TnOgk04YygLJFJgTEBvGOsXlrI4s8v rewzg9REkKpOpIjAvswllTced6e5VIJWuOQuI6anmYGwHzmbqec74v5KTLxW4eLtOcABSr RSlkHS2z8w0OtMPSmnXV1gxPhpQ2b7zupNmjZU5/npWG+rlo9IPTtHFxJCCKDKRy1AvQZQ LHUtR5ceZsHqrl0yOtweFvFI3nB0PJzn9SB/gRA9XikilCC8myEzYVW4/ND6L3ivfYXF00 wZHXEmReFUlFbv9MNfJp/wqHrkH5w5I1q2+ioZhrj0UqwTT4osygvpm1WOs5gQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Fri, 5 Jan 2024 13:06:17 +0800 Message-ID: <521d0ba6e3d10b3b8aa98b35862d819c82223412.1704430613.git.hako@ultrarare.space> MIME-Version: 1.0 X-Spamd-Bar: + Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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 (libmpv): New variable. (mpv)[arguments]<#:configure-flags>: Remove libmpv library. (celluloid,mpv-mpris)[inputs]: Replace mpv with libmpv. * gnu/packages/kde-plasma.scm (plasmatube)[inputs]: Likewise. * gnu/packages/python-xyz.scm (python-mpv)[inputs]: Likewise. Change-Id: I7c0a808f9d54f9bfd98b3d2632316c7d58b67896 --- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/video.scm | 24 ++++++++++++++++++++---- 3 files changed, 22 insertions(+), 6 deletions(-) base-commit: be1d05c10766a979dd0720b677889ed950d3b895 diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 331ab28cd1..0527fa136a 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -1611,12 +1611,12 @@ (define-public plasmatube (list kconfig kirigami ki18n + libmpv qtbase-5 qtdeclarative-5 qtmultimedia-5 qtquickcontrols2-5 qtsvg-5 - mpv youtube-dl)) (home-page "https://apps.kde.org/plasmatube/") (synopsis "Kirigami YouTube video player") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2afce6c667..b23eaaadfc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -33948,7 +33948,7 @@ (define-public python-mpv (setenv "HOME" (getcwd))))))) (native-inputs (list python-xvfbwrapper)) ; needed for tests only - (inputs (list mpv)) + (inputs (list libmpv)) (propagated-inputs (list python-pillow)) ; for raw screenshots (home-page "https://github.com/jaseg/python-mpv") (synopsis "Python interface to the mpv media player") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6da4897a57..b532181225 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -867,7 +867,7 @@ (define-public celluloid pkg-config python-wrapper)) ; for generate-authors.py (inputs - (list gtk libadwaita libepoxy mpv)) + (list gtk libadwaita libepoxy libmpv)) (home-page "https://github.com/celluloid-player/celluloid") (synopsis "GTK+ frontend for the mpv media player") (description "Celluloid is a simple GTK+ frontend for the mpv media player. @@ -2367,8 +2367,7 @@ (define-public mpv ;; Set PYTHONHASHSEED as a workaround for deterministic results. (setenv "PYTHONHASHSEED" "1")))) #:configure-flags - #~(list "-Dlibmpv=true" - "-Dcdda=enabled" + #~(list "-Dcdda=enabled" "-Ddvdnav=enabled" "-Dbuild-date=false"))) (native-inputs @@ -2422,6 +2421,23 @@ (define-public mpv projects while introducing many more.") (license license:gpl2+))) +(define-public libmpv + (package + (inherit mpv) + (name "libmpv") + (arguments + (substitute-keyword-arguments (package-arguments mpv) + ((#:configure-flags flags ''()) + #~(cons* "-Dcplayer=false" + "-Dlibmpv=true" + #$flags)))) + (native-inputs + (modify-inputs (package-native-inputs mpv) + (delete "perl" "python-docutils"))) + (propagated-inputs (package-inputs mpv)) + (inputs '()) + (synopsis "mpv media player client library"))) + (define-public smplayer (package (name "smplayer") @@ -2524,7 +2540,7 @@ (define-public mpv-mpris (native-inputs (list pkg-config)) (inputs - (list ffmpeg glib mpv)) + (list ffmpeg glib libmpv)) (home-page "https://github.com/hoyon/mpv-mpris") (synopsis "MPRIS plugin for mpv") (description "This package provides an @dfn{MPRIS} (Media Player Remote