From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id EGqAD0M/EGBDEQAA0tVLHw (envelope-from ) for ; Tue, 26 Jan 2021 16:11:47 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id KDpMC0M/EGCgOgAA1q6Kng (envelope-from ) for ; Tue, 26 Jan 2021 16:11:47 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DFA419404CA for ; Tue, 26 Jan 2021 16:11:46 +0000 (UTC) Received: from localhost ([::1]:39194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4QwT-0001KP-Ln for larch@yhetil.org; Tue, 26 Jan 2021 11:11:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4Qvn-00015c-1N for guix-patches@gnu.org; Tue, 26 Jan 2021 11:11:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59180) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4Qvm-000332-Pe for guix-patches@gnu.org; Tue, 26 Jan 2021 11:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l4Qvm-00029k-Jt for guix-patches@gnu.org; Tue, 26 Jan 2021 11:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46113] [PATCH] gnu: obs: Update obs to fb347c. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Jan 2021 16:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46113 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46113@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16116774078217 (code B ref -1); Tue, 26 Jan 2021 16:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jan 2021 16:10:07 +0000 Received: from localhost ([127.0.0.1]:42493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4Qus-00028S-JH for submit@debbugs.gnu.org; Tue, 26 Jan 2021 11:10:06 -0500 Received: from lists.gnu.org ([209.51.188.17]:59354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4Quq-00028J-18 for submit@debbugs.gnu.org; Tue, 26 Jan 2021 11:10:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4Qup-0000Ci-SR for guix-patches@gnu.org; Tue, 26 Jan 2021 11:10:03 -0500 Received: from mail-lf1-x143.google.com ([2a00:1450:4864:20::143]:42375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4Qun-0002ch-ED for guix-patches@gnu.org; Tue, 26 Jan 2021 11:10:03 -0500 Received: by mail-lf1-x143.google.com with SMTP id b26so23402373lff.9 for ; Tue, 26 Jan 2021 08:10:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop-in.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version; bh=h5m/pEXUxho82WG1aNwRPt+aw9MeFeJMZQBPWmfHurc=; b=EFjk5zJFwVZ5rz3kFpDwYOdfU0m43262oEUdoqeDzLlWZ387x6tDAbnehjEV93/SRY 8mPyN2Y/iHb9uYafuoS3h/z0zuOK9P1fyUGzBx84ucFr2mw9rfydKxxHQRultqy8J9nS SoyuyMVrhZ43gXRGwyFhj6dRj+Y0zP414xcEedVMAf6RzIXR7k7YQqTylnvd50JmhryM bJd/dN0EzXTOltOXyXSsrJBRP5m751cc5IchFiY9Jczf9B3pNnOtSac6b2IWhb0K64f1 iyj9353AaVuvafIxBhvz5HLxEUiHiGLRAKfrSvs08yEW6E5M5ajiG6J+bc1HgkBKMujm c+ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=h5m/pEXUxho82WG1aNwRPt+aw9MeFeJMZQBPWmfHurc=; b=rmu5Eugnh3aeyuN9EU1Qk6T6ig/mGKy0lFaZ9xnAUSnXz+BbVFu5Jt0g/TVAxihynn 37KdWpjBGC4DhTf5CVsE4Y71SLB7Zc6LzUF+3LrWJshFIbhYgGJE1A9oYvw1u7pXnvV0 j9F9H6iGkXyTHjN3Wm2R6ZeVZOLMe7qbBpvsxEu1ppfNILDz+1AcxbUvuZ27CeUR32Xh G/oHEu8quQIiIAY5/xBXnqjCpQbamJfRvwIqPImNzMkdmyZaKCgw12EX2wHXSZHL5sCC k9Hx8HpMatdeGuPAMAWXWKUtkT/MZkT2LwmsJgNiVx8Nd3jj4hGdIL39ot+Q46lCbw5f ReJA== X-Gm-Message-State: AOAM530fPS4a8Sg0c+Tn+821pXdKZbFB9IZsLiGC2QcAYXfZdhOpgSdR MqaP8MtQvACwaIZ5Y5dEWy0wNfPSueBVDg== X-Google-Smtp-Source: ABdhPJz6wI2RpWYrdXjMIjBr5RsLlEsM5ATDjoT0wOqurXyCMnRjmDlyye9MmBFe3ix8oL0gyOVCtA== X-Received: by 2002:a19:6a12:: with SMTP id u18mr2856518lfu.591.1611677398411; Tue, 26 Jan 2021 08:09:58 -0800 (PST) Received: from ixy ([109.252.99.251]) by smtp.gmail.com with ESMTPSA id i204sm902257lfd.120.2021.01.26.08.09.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 08:09:57 -0800 (PST) From: Andrew Tropin Date: Tue, 26 Jan 2021 18:59:39 +0300 Message-ID: <87eei7wugf.fsf@trop.in> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: none client-ip=2a00:1450:4864:20::143; envelope-from=andrew@trop.in; helo=mail-lf1-x143.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.35 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20150623.gappssmtp.com header.s=20150623 header.b=EFjk5zJF; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: DFA419404CA X-Spam-Score: -1.35 X-Migadu-Scanner: scn0.migadu.com X-TUID: A09cDUr3UDin 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 28cde06f04..0f9b405261 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3076,62 +3076,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.0") - (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 - "0p8wdzm9imn3s17arr206sz92g4pkacfcpfbwvhvgkrrs4w000bx")))) - (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 commit))) + (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 -- 2.30.0