[bug#53582] [PATCH 0/2] Update obs to 27.1.3 and use new package style.

[Andrew Tropin]

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 <andrew@trop.in>
>> 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 <andrew@trop.in>
>> 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 <andrew@trop.in>
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.
-             ;; <https://bitbucket.org/chromiumembedded/cef/src/master/>
-             "-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.
+              ;; <https://bitbucket.org/chromiumembedded/cef/src/master/>
+              "-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


-- 
Best regards,
Andrew Tropin

signature.asc
Description: PGP signature