From patchwork Wed Jan 27 09:45:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Tropin X-Patchwork-Id: 26664 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 7525427BC1A; Wed, 27 Jan 2021 09:50:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BA1DF27BC1B for ; Wed, 27 Jan 2021 09:50:11 +0000 (GMT) Received: from localhost ([::1]:40620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4hSk-0006sN-Uk for patchwork@mira.cbaines.net; Wed, 27 Jan 2021 04:50:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4hSb-0006ro-Ui for guix-patches@gnu.org; Wed, 27 Jan 2021 04:50:01 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4hSb-0006Mf-MJ for guix-patches@gnu.org; Wed, 27 Jan 2021 04:50:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l4hSb-0002wn-Kg for guix-patches@gnu.org; Wed, 27 Jan 2021 04:50:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46113] [PATCH] gnu: obs: Update to fb347c. References: <87eei7wugf.fsf@trop.in> In-Reply-To: <87eei7wugf.fsf@trop.in> Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Jan 2021 09:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46113 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Received: via spool by 46113-submit@debbugs.gnu.org id=B46113.161174096311270 (code B ref 46113); Wed, 27 Jan 2021 09:50:01 +0000 Received: (at 46113) by debbugs.gnu.org; 27 Jan 2021 09:49:23 +0000 Received: from localhost ([127.0.0.1]:43838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4hRy-0002vi-QR for submit@debbugs.gnu.org; Wed, 27 Jan 2021 04:49:23 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:40109) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4hRw-0002vR-GC for 46113@debbugs.gnu.org; Wed, 27 Jan 2021 04:49:22 -0500 Received: by mail-lf1-f67.google.com with SMTP id v24so1760476lfr.7 for <46113@debbugs.gnu.org>; Wed, 27 Jan 2021 01:49:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version; bh=OfP1lbKelaN3wpNNNmlY3RTKV3Omeq828zVyoX1+kfw=; b=OcbazdxSKkaB4z6rlxn6WNhVu4VyAHinxtuSXjyJKxvNLkHYMYAMtk0Nh9//DG7ip9 TuvamCjfMKgM6oC1yk3r2ldCcqCdlvenBaOfq55fSRv8PCuFwPBiCbC33hvpu2iqLMM4 lO2LshVLht0YJoS4gEudzY5DcpKFqvw9W6EjjM1XZ1YruuLd9B4XGEz5PcX+kMSSUhz3 4oraDbHktM1yxdxTM4r+Ud+S6BRYgQ6yc+E94WWy80803HN8VocySWUc5vGD4s1YP6nW t0fwOBi9tV0hvlFUSxzk0v6boQWvwHb5QtwD6chN4z4XDi4jeZp4L5L7P2pjrCVTZvwa PsKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version; bh=OfP1lbKelaN3wpNNNmlY3RTKV3Omeq828zVyoX1+kfw=; b=mVdiSWEhZ9vSL5R2mR1wPbHOo8D23i2NW8pe6uPrG1BQnCffopHhEOstq6qD4xHM69 R1SiBjniUJY5avtL7pYEjxB4B5sgx6i8uzgiXlrlP7Z0gFOkMFF2gOlI3KNwT5dIgju2 L39Az9L0SvdAdENxtN/Kc2nrpO4kWsS+vb2eE1KfFOM6JDV75unYA0RS8kFHPDQzRS1G Kb5lxLr1qR3vgbcGITK49TFcLYp3P2CJUhtqKZ+eFaNesCb4xDwhuwjifCkkZJiouN41 9MWsQ85aM45iCqV/QVjQfCZmPpXgQ4xklmcdqKjhBPRk6IDo00H8dJJxnzFFRsbJb/p6 HefQ== X-Gm-Message-State: AOAM531H6skjpht4+dsKzaG/cOlxgp5iVj35+swnqSKvTbGCv3LkF+ht tes5zBJUFDqzCrskWlizixUSvZMb4lw0aQ== X-Google-Smtp-Source: ABdhPJyDg5O3epTbkCZrzlwP+p2QG215sDfkGZcrtVcnnFmlMgfCSqsE0yt72qngAsOXjvlfSEu7bg== X-Received: by 2002:a19:c8e:: with SMTP id 136mr4799154lfm.636.1611740953865; Wed, 27 Jan 2021 01:49:13 -0800 (PST) Received: from ixy ([109.252.99.251]) by smtp.gmail.com with ESMTPSA id 24sm368421lfy.32.2021.01.27.01.49.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 01:49:13 -0800 (PST) From: Andrew Tropin Date: Wed, 27 Jan 2021 12:45:30 +0300 Message-ID: <87wnvyiuav.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: , Cc: 46113@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This version of obs adds support for OBS_PLUGINS*_PATH environment variables, which are required to be able to load plugins, which are present in profile. It will make it possible for following packages to work: http://issues.guix.gnu.org/45961 http://issues.guix.gnu.org/45960 * gnu/packages/video.scm (obs): Update to fb347c. --- gnu/packages/video.scm | 116 ++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 53 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 97cb7d6837..f9741dc843 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3077,62 +3077,72 @@ be used for realtime video capture via Linux-specific APIs.") (license (list license:lgpl2.1+ license:gpl2)))) (define-public obs - (package - (name "obs") - (version "26.1.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/obsproject/obs-studio") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1k1asqiqw757v59ayx0w029ril947hs0lcp8n91knzjl891fr4nc")))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags - (list (string-append "-DOBS_VERSION_OVERRIDE=" ,version) - "-DENABLE_UNIT_TESTS=TRUE") - #: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))))) - (native-inputs - `(("cmocka" ,cmocka) - ("pkg-config" ,pkg-config))) - (inputs - `(("alsa-lib" ,alsa-lib) - ("curl" ,curl) - ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("jack" ,jack-1) - ("jansson" ,jansson) - ("libx264" ,libx264) - ("libxcomposite" ,libxcomposite) - ("mbedtls" ,mbedtls-apache) - ("mesa" ,mesa) - ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) - ("qtsvg" ,qtsvg) - ("qtx11extras" ,qtx11extras) - ("speexdsp" ,speexdsp) - ("v4l-utils" ,v4l-utils) - ("zlib" ,zlib))) - (synopsis "Live streaming software") - (description "Open Broadcaster Software provides a graphical interface for + (let ((commit "fb347c3c62ced2ea302769e449d300fd923c2d4b") + (revision "1")) + (package + (name "obs") + (version (git-version "26.1.2" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/obsproject/obs-studio") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "017llgj1hlfvk2622qa44d8iz6d0kahhckn421dypj09a4n6aajz")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list (string-append "-DOBS_VERSION_OVERRIDE=" ,version) + "-DENABLE_UNIT_TESTS=TRUE") + #: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))))) + (native-inputs + `(("cmocka" ,cmocka) + ("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("curl" ,curl) + ("eudev" ,eudev) + ("ffmpeg" ,ffmpeg) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("jack" ,jack-1) + ("jansson" ,jansson) + ("libx264" ,libx264) + ("libxcomposite" ,libxcomposite) + ("mbedtls" ,mbedtls-apache) + ("mesa" ,mesa) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras) + ("speexdsp" ,speexdsp) + ("v4l-utils" ,v4l-utils) + ("zlib" ,zlib))) + (native-search-paths + (list + (search-path-specification + (variable "OBS_PLUGINS_DATA_PATH") + (files '("share/obs/obs-plugins"))) + (search-path-specification + (variable "OBS_PLUGINS_PATH") + (files '("lib/obs-plugins"))))) + (synopsis "Live streaming software") + (description "Open Broadcaster Software provides a graphical interface for video recording and live streaming. OBS supports capturing audio and video from many input sources such as webcams, X11 (for screencasting), PulseAudio, and JACK.") - (home-page "https://obsproject.com") - (license license:gpl2+))) + (home-page "https://obsproject.com") + (license license:gpl2+)))) (define-public libvdpau (package