From patchwork Thu Jan 27 12:10:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Tropin X-Patchwork-Id: 36844 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 D080627BBEA; Thu, 27 Jan 2022 12:27:09 +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.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 5529E27BBE9 for ; Thu, 27 Jan 2022 12:27:09 +0000 (GMT) Received: from localhost ([::1]:54858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD3ro-0002jm-Bq for patchwork@mira.cbaines.net; Thu, 27 Jan 2022 07:27:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD3eA-0000Nq-82 for guix-patches@gnu.org; Thu, 27 Jan 2022 07:13:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD3e9-0007t7-UM for guix-patches@gnu.org; Thu, 27 Jan 2022 07:13:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nD3e9-0006sa-MD for guix-patches@gnu.org; Thu, 27 Jan 2022 07:13:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53582] [PATCH 0/2] Update obs to 27.1.3 and use new package style. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Jan 2022 12:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53582@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164328553926384 (code B ref -1); Thu, 27 Jan 2022 12:13:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Jan 2022 12:12:19 +0000 Received: from localhost ([127.0.0.1]:54528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nD3dS-0006rU-QN for submit@debbugs.gnu.org; Thu, 27 Jan 2022 07:12:19 -0500 Received: from lists.gnu.org ([209.51.188.17]:41778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nD3dR-0006rM-0t for submit@debbugs.gnu.org; Thu, 27 Jan 2022 07:12:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD3dQ-0007ZJ-Hv for guix-patches@gnu.org; Thu, 27 Jan 2022 07:12:16 -0500 Received: from [2a00:1450:4864:20::231] (port=37396 helo=mail-lj1-x231.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD3dO-0007pR-EG for guix-patches@gnu.org; Thu, 27 Jan 2022 07:12:16 -0500 Received: by mail-lj1-x231.google.com with SMTP id z7so4020961ljj.4 for ; Thu, 27 Jan 2022 04:12:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop-in.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:mime-version; bh=c+cRgcEMGGbXMMOOkqk/TyucgZg2pam3H+S52UFH2xc=; b=WU8b4phFD1cKxvIQgw6prN40wy6jCUdJaB4JW1b65txxIs1Pk3ub4lhY3v5QdPT5aO eNvCpZshtXS+0iwtTzbtlGrNxgGStJzClIT0BdJuZAbRFAj6cNV/Tt3dzrEmeWUttXvH wRmGM0GhceWfsFRY/MRMbawSW6SQQMT2YuA3xck/dubSSxg3GhTMrNr/oEPti/NHHVVR k8kE6xGLU1cD/cZYYZHRAjjtHCf7Q2lImafYzbeKazXYbi8KmYciKZItxUaYLtt3pEXI vqlmYve1ZgayrYfL7IydIg07pjGJ9FHyvDr0V33cE1zsRKKDoPxpWLkrpMaYcEHqzVOg UkMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=c+cRgcEMGGbXMMOOkqk/TyucgZg2pam3H+S52UFH2xc=; b=jun8OH2EfHW1jGleFI+AndhfAJ5xYjfOX1FEOoG/IBKiK/4BcUwohlsamxbgQfqPaZ Xx5TWcOUMPQkE1jL3O7IDyOauPY5pReybBep61mZ3JtH/8YBP5Pjxp4ANnCGZwG4pYh4 9MiE+W8/XzY5gDZNUAZiXCoU1FzPbCqnW9x4B1I1gfcZVw6z4CZ0A/oorlMrTbUlb2Oo kv7kZhN/j56s4EtQkyMoy4uTl/MLUdxnLhllkeQNUlY2Py1rVikMVwU5hCz/CLipirHJ 3FbSDgUt/GZJ+0CmWn30jPWnd+ofr+TGG/iFPUOpTUREBxMSMlA5sf6AGwPY+3PkOKVF wgjQ== X-Gm-Message-State: AOAM532hKW5zlh+kir2IYnDXPUubXJEuyIBWhyFykJQcpVTctW2rsra+ Ce5M8gFMy1Wbf0fpXkFkRjxb26yiPYlIsw== X-Google-Smtp-Source: ABdhPJwplKiiOoF7fb1Kum319+T7YZKtJCCXY+5GgHfpfBb5tYJZD1zrd70B2Bm7Hl6uPA6vmqJYvw== X-Received: by 2002:a05:651c:198f:: with SMTP id bx15mr631021ljb.314.1643285531688; Thu, 27 Jan 2022 04:12:11 -0800 (PST) Received: from localhost (109-252-135-33.dynamic.spd-mgts.ru. [109.252.135.33]) by smtp.gmail.com with ESMTPSA id g8sm2157881lfv.118.2022.01.27.04.12.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 04:12:11 -0800 (PST) From: Andrew Tropin Date: Thu, 27 Jan 2022 15:10:16 +0300 Message-ID: <8735l99y3s.fsf@trop.in> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::231 (failed) Received-SPF: none client-ip=2a00:1450:4864:20::231; envelope-from=andrew@trop.in; helo=mail-lj1-x231.google.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_NONE=0.001, URIBL_SBL_A=0.1 autolearn=no 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Andrew Tropin (2): gnu: obs: Update to 27.1.3. gnu: obs: Use new package style. gnu/packages/video.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) From eb09c0cf30606564e3794b7a0afe409e0b48a9a1 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 27 Jan 2022 14:54:22 +0300 Subject: [PATCH 2/2] gnu: obs: Use new package style. * gnu/packages/video.scm (obs): Use new package style. --- gnu/packages/video.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 3ab34812f2..932fb9165d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3337,21 +3337,21 @@ (define-public obs (search-patches "obs-modules-location.patch")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - (list (string-append "-DOBS_VERSION_OVERRIDE=" ,version) - "-DENABLE_UNIT_TESTS=TRUE" - ;; Browser plugin requires cef, but it is not packaged yet. - ;; - "-DBUILD_BROWSER=FALSE") + (list + #:configure-flags + #~(list (string-append "-DOBS_VERSION_OVERRIDE=" #$version) + "-DENABLE_UNIT_TESTS=TRUE" + ;; Browser plugin requires cef, but it is not packaged yet. + ;; + "-DBUILD_BROWSER=FALSE") #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-executable - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (plugin-path (getenv "QT_PLUGIN_PATH"))) - (wrap-program (string-append out "/bin/obs") - `("QT_PLUGIN_PATH" ":" prefix (,plugin-path)))) - #t))))) + #~(modify-phases %standard-phases + (add-after 'install 'wrap-executable + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (plugin-path (getenv "QT_PLUGIN_PATH"))) + (wrap-program (string-append out "/bin/obs") + `("QT_PLUGIN_PATH" ":" prefix (,plugin-path))))))))) (native-search-paths (list (search-path-specification (variable "OBS_PLUGINS_DIRECTORY") -- 2.34.0