From patchwork Mon Jan 31 16:48:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Tropin X-Patchwork-Id: 36913 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 5165A27BBEA; Mon, 31 Jan 2022 16:54:43 +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 BE3CD27BBE9 for ; Mon, 31 Jan 2022 16:54:42 +0000 (GMT) Received: from localhost ([::1]:52352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEZwv-0003FI-7C for patchwork@mira.cbaines.net; Mon, 31 Jan 2022 11:54:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEZsR-00081O-4w for guix-patches@gnu.org; Mon, 31 Jan 2022 11:50:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nEZsQ-0004iF-Oi for guix-patches@gnu.org; Mon, 31 Jan 2022 11:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nEZsQ-0001TO-MZ for guix-patches@gnu.org; Mon, 31 Jan 2022 11:50:02 -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: Mon, 31 Jan 2022 16:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 53582@debbugs.gnu.org Received: via spool by 53582-submit@debbugs.gnu.org id=B53582.16436477435572 (code B ref 53582); Mon, 31 Jan 2022 16:50:02 +0000 Received: (at 53582) by debbugs.gnu.org; 31 Jan 2022 16:49:03 +0000 Received: from localhost ([127.0.0.1]:40483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEZrT-0001Ro-17 for submit@debbugs.gnu.org; Mon, 31 Jan 2022 11:49:03 -0500 Received: from mail-lf1-f54.google.com ([209.85.167.54]:46786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEZrR-0001R3-5d for 53582@debbugs.gnu.org; Mon, 31 Jan 2022 11:49:01 -0500 Received: by mail-lf1-f54.google.com with SMTP id z19so27996069lfq.13 for <53582@debbugs.gnu.org>; Mon, 31 Jan 2022 08:49:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop-in.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=X75l8tg2FFoDA5kr8Z1OKbmdjBSZAp3KqHXlZivFfdo=; b=Ta08QLfjeg+m581NGf/lusdytI864C/DXk8a7qFdZyHHFO0rh5PumhOobaGtmwJ9Fp S/M/xtLFr0AgfbyDhNrnnNzFctlioUVmXTFuus8uYqJeI9Mj/LH5flMzxPQcJ5SIDcO4 s052YPqkgbCdac5MYvg4eE+PPgxHw0HkrtKA3tVe7YEAyTXfjsnNBzY/SJ1n7HPIOzd9 hUxv//jrf6FPvNq7xjighNqa82Kcxgrf4OYGWhZfCdh6AXqVdR2uqMLhWzNCyyS686Ch g4C7Ut2JhNkP4Ikstt0CTFODnqbaVdjc4LEsAqJXX29wy+TboZyhJSA3CGSuJR1oqe7j A0Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=X75l8tg2FFoDA5kr8Z1OKbmdjBSZAp3KqHXlZivFfdo=; b=lJGsPM9FxAq1cmM1kxLos7OabDxwZLAPkjum+RcyBvuk0VZrjucapcPm5etn4/CTp2 25QV+N5DZeosbPVALBIz9EuNFWmoSncyRH3D6XTEweSjDctaxClg+4DJM3pupiA/ja32 7FYoc899wVDXRyOqjgY9eAYOv3e/lGPWLsvhuyZQmG5SXtXgOz/GULIK9oTCk4d1rkFj X8DGcWYav0JV+dMf6qDjM8Jv92DMCaN/2kaXhytZS3+WC8yZK/BZ1NfvtNNEDg3Dfw4Q MNzIK5st79v8tjqQNENx420AcUnyzNOnqpEAYpqEdDUmY5w5LafFE71/6pwCno30tNHW opBA== X-Gm-Message-State: AOAM533khVnkKOFXzj8VL3jfOmK0tO4q4su7AKA+qkIzwR9eHd+kNxrY eZ+xjFg5aGxGMQlWgXNs34HCS5Bf46YpMQ== X-Google-Smtp-Source: ABdhPJyGp6KcHPq6mk5sRjDfqj9sCVGWiZNw0aET1un/IknLqlSzarlCwILmvruAms4N3L5B4unaLQ== X-Received: by 2002:a05:6512:3086:: with SMTP id z6mr10043382lfd.85.1643647734035; Mon, 31 Jan 2022 08:48:54 -0800 (PST) Received: from localhost (109-252-135-33.dynamic.spd-mgts.ru. [109.252.135.33]) by smtp.gmail.com with ESMTPSA id h23sm2502497lfv.46.2022.01.31.08.48.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 08:48:53 -0800 (PST) From: Andrew Tropin In-Reply-To: References: <8735l99y3s.fsf@trop.in> Date: Mon, 31 Jan 2022 19:48:50 +0300 Message-ID: <871r0nzw99.fsf@trop.in> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches On 2022-01-28 15:29, Leo Famulari wrote: > On Thu, Jan 27, 2022 at 03:10:16PM +0300, Andrew Tropin wrote: >> From c985af51a431656ad5e9389b9f8f132e7ac193b7 Mon Sep 17 00:00:00 2001 >> From: Andrew Tropin >> Date: Thu, 27 Jan 2022 13:09:07 +0300 >> Subject: [PATCH 1/2] gnu: obs: Update to 27.1.3. >> >> * gnu/packages/video.scm (obs): Update to 27.1.3. > > Thanks! I pushed this patch as 10d1125f71205f094a6030c51c498b0f8dab5f73 > >> 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. > > I did not push this patch, because it only changes some elements to the > new style. > > It still uses the old style of inputs (with labels) and it also > continues to use labels in the arguments, for example for "out". > > Instead of (assoc-ref outputs "out"), you should use the gexp #$output. > > Can you send a revised patch to address those issues? Hi, thank you for merging, attaching updated version of the second patch: From ce003ac1cf2561eff6cba80985afe532bacd836d Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 27 Jan 2022 14:54:22 +0300 Subject: [PATCH v2] gnu: obs: Use new package style. * gnu/packages/video.scm (obs): Use new package style. --- gnu/packages/video.scm | 76 +++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 94562d52ae..de9fb42904 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3360,21 +3360,20 @@ (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* _ + (let ((plugin-path (getenv "QT_PLUGIN_PATH"))) + (wrap-program (string-append #$output "/bin/obs") + `("QT_PLUGIN_PATH" ":" prefix (,plugin-path))))))))) (native-search-paths (list (search-path-specification (variable "OBS_PLUGINS_DIRECTORY") @@ -3387,30 +3386,31 @@ (define-public obs (native-inputs (list cmocka pkg-config)) (inputs - `(("alsa-lib" ,alsa-lib) - ("curl" ,curl) - ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("jack" ,jack-1) - ("jansson" ,jansson) - ("libx264" ,libx264) - ("libxcomposite" ,libxcomposite) - ("mbedtls" ,mbedtls-apache) - ("mesa" ,mesa) - ("pipewire" ,pipewire-0.3) - ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) - ("qtx11extras" ,qtx11extras) - ("qtwayland" ,qtwayland) - ("speexdsp" ,speexdsp) - ("v4l-utils" ,v4l-utils) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) - ("zlib" ,zlib))) + (list + alsa-lib + curl + eudev + ffmpeg + fontconfig + freetype + glib + jack-1 + jansson + libx264 + libxcomposite + mbedtls-apache + mesa + pipewire-0.3 + pulseaudio + qtbase-5 + qtsvg + qtx11extras + qtwayland + speexdsp + v4l-utils + wayland + wayland-protocols + zlib)) (synopsis "Live streaming software") (description "Open Broadcaster Software provides a graphical interface for video recording and live streaming. OBS supports capturing audio and video -- 2.34.0