From patchwork Fri May 24 04:31:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 64864 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 DCB1027BBE9; Fri, 24 May 2024 05:33:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 6CDB927BBE2 for ; Fri, 24 May 2024 05:33:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAMc2-0003wq-6u; Fri, 24 May 2024 00:33:02 -0400 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 1sAMbx-0003ue-8r for guix-patches@gnu.org; Fri, 24 May 2024 00:32:58 -0400 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 1sAMbw-0004pn-Sx for guix-patches@gnu.org; Fri, 24 May 2024 00:32:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sAMc3-0003EV-Iv for guix-patches@gnu.org; Fri, 24 May 2024 00:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71161] [PATCH 5/5] gnu: obs: Update to 30.1.2. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 May 2024 04:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71161 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71161@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 71161-submit@debbugs.gnu.org id=B71161.171652513812391 (code B ref 71161); Fri, 24 May 2024 04:33:03 +0000 Received: (at 71161) by debbugs.gnu.org; 24 May 2024 04:32:18 +0000 Received: from localhost ([127.0.0.1]:34731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAMbK-0003Dm-1F for submit@debbugs.gnu.org; Fri, 24 May 2024 00:32:18 -0400 Received: from mail.envs.net ([5.199.136.28]:43580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAMbG-0003DV-MJ for 71161@debbugs.gnu.org; Fri, 24 May 2024 00:32:15 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 5615A38A36A0; Fri, 24 May 2024 04:32:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1716525127; bh=o9GdTCTycTq56EbYlB/Cg0QouyIY09t0dAVmOQ+nQf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Km31OVbMO0xbzaxCKFwizS6BZqTfIN2Q7HNHFW2ieIITcQN2dkCAXOJ3Upol2zoQs WFQ4g6mltYcxN3ly1HmDw9ti/RVb25lkc+UlFiOg/k/QQork5wENwnfR4w333oYcnm wl/VDnn5vWaGORNVtUF3E5xGVh2qPS6nNh+2w0bZa08SyM7B5/rqUX4fQM4sI9g24G +4gBqUpxI1DC4RNvtCk7qwVBRgJ77IOa046213OZrFaX9LUTkXex250fUCi0r7ghgO SzHM89TZ6OEh09k9Ydjs5eW99PHc2oILDSNHpqoJ4/6mGXhKoqm6f98qWXqf//PZSH glmOLmckTFAmLKTY0zDsZ3Z6kmWfJuWoGOzKkDAWFmlGxCfTuPlai7er1c3wMHUIlb mDDbg8ZIGifI7lDcncpBx+b47Nh40rPo1ekRND/00JT/CkkdHU8L1b22CHUizsLs5M CKU7AsMo6IALv0UepW0kgvFnbaoZaKlKfQ8fs62M2MZ8iZJAPLyYAal7KN8E8zMxuT 8Slk2k6qW5Vxmzeyun1uZUAiV5HO0489GulmQCq1K1apaiXe7UQLXGlNOiuyXR5ttu JQsdITb+j7J536xpKMYztexQF0qmhIALiBN/gUTrUZCcgZnr8Lce5lxDB9WQ4IiOnl BQ1vZcSYy5T1EAMUqgf/nQiQ= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ImsRiXdO4FZ0; Fri, 24 May 2024 04:32:04 +0000 (UTC) Received: from localhost (unknown [36.170.58.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Fri, 24 May 2024 04:32:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id c44b0daa; Fri, 24 May 2024 04:31:54 +0000 (UTC) Date: Fri, 24 May 2024 12:31:46 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 From: 宋文武 * gnu/packages/video.scm (obs): Update to 30.1.2. [arguments]: Add "-DENABLE_QSV11=OFF" to configure-flags. Add MESA to LD_LIBRARY_PATH for 'obs'. [inputs]: Add libdatachannel, qrcodegen-cpp and vulkan-headers. Replace ffmpeg-4 with ffmpeg, Qt 5 with Qt 6. Change-Id: Id74c52512eb18727b0c8c8a0a7ed4c892a5e76c2 --- gnu/packages/video.scm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2e7ba6d10e..3782198a17 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -109,6 +109,7 @@ (define-module (gnu packages video) #:use-module (guix build-system waf) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages aidc) #:use-module (gnu packages algebra) #:use-module (gnu packages assembly) #:use-module (gnu packages audio) @@ -3965,7 +3966,7 @@ (define-public v4l-utils (define-public obs (package (name "obs") - (version "29.1.3") + (version "30.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -3975,7 +3976,7 @@ (define-public obs (file-name (git-file-name name version)) (sha256 (base32 - "192p7m3g8ynbkq3s894w6a0w6gix3k237q5jwqrrr8idwfwwyh0g")) + "02pm6397h7l0xhdpscbh1kq8y98zx236z95wvw60kbhq38s0i0ik")) (patches (search-patches "obs-modules-location.patch")))) (build-system cmake-build-system) @@ -3986,6 +3987,7 @@ (define-public obs "-DENABLE_UNIT_TESTS=ON" "-DENABLE_NEW_MPEGTS_OUTPUT=OFF" "-DENABLE_AJA=OFF" + "-DENABLE_QSV11=OFF" ;; Browser plugin requires cef, but it is not packaged yet. ;; "-DBUILD_BROWSER=OFF") @@ -3998,6 +4000,9 @@ (define-public obs `("QT_PLUGIN_PATH" ":" prefix (,plugin-path)) `("LD_LIBRARY_PATH" ":" prefix (,(string-append #$(this-package-input "vlc") + "/lib") + ;; TODO: Remove this once our mesa has glvnd support. + ,(string-append #$(this-package-input "mesa") "/lib")))))))))) (native-search-paths (list (search-path-specification @@ -4017,12 +4022,13 @@ (define-public obs bash-minimal curl eudev - ffmpeg-4 + ffmpeg fontconfig freetype glib jack-1 jansson + libdatachannel libglvnd libva libx264 @@ -4036,12 +4042,13 @@ (define-public obs pipewire pulseaudio python - qtbase-5 - qtsvg-5 - qtx11extras - qtwayland-5 + qrcodegen-cpp + qtbase + qtsvg + qtwayland speexdsp v4l-utils + vulkan-headers vlc wayland wayland-protocols