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

  • Done
  • quality assurance status badge
Details
2 participants
  • Andrew Tropin
  • Leo Famulari
Owner
unassigned
Submitted by
Andrew Tropin
Severity
normal
A
A
Andrew Tropin wrote on 27 Jan 2022 13:10
(address . guix-patches@gnu.org)
8735l99y3s.fsf@trop.in
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.
---
gnu/packages/video.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 1b26418eea..3ab34812f2 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3322,7 +3322,7 @@ (define-public v4l-utils
(define-public obs
(package
(name "obs")
- (version "27.0.1")
+ (version "27.1.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3332,7 +3332,7 @@ (define-public obs
(file-name (git-file-name name version))
(sha256
(base32
- "04fzsr9yizmxy0r7z2706crvnsnybpnv5kgfn77znknxxjacfhkn"))
+ "1ndiarr3d6qihymaigf34jjml0lrgbj640fnpnffz2ysj7276q0j"))
(patches
(search-patches "obs-modules-location.patch"))))
(build-system cmake-build-system)
--
2.34.0
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.
---
gnu/packages/video.scm | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (42 lines)
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.
- ;; <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* (#: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
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(-)

--
2.34.0
-----BEGIN PGP SIGNATURE-----

iQJDBAEBCgAtFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmHyjBcPHGFuZHJld0B0
cm9wLmluAAoJECII0glYwd6wqNYQAIcA2zTqS96hTQ8J4VVmyarcMKSkiY5lp6o0
97ne3XA+FDCRkvzXy1huT4nm5FnfHYdONSRO7hE/kkyEkW3rXbkAQal3+U7slHQK
jbI7gsvXi/WQnGz9bCrXTMasBKggerBwUxX/h0djIBs3yBz35pNOmde8RucDOU51
z1jt0zlxxUkasJ1BivFvvwevuvDukenHwvedOECuusMmLZBn+QeunE6kriiQ8kUh
ofo9b9maJ8aMN9MhVNvOYh8CCgRY/NiHLIEd8tB5Mx+rLkt6fqDS8qX/B0gKkgZA
S3Ink17Mqf8BcjxHkGyTZOZwkOuixijYwCF9WDXd4KWAet0TQopFIoEbankRDFOJ
A0rOF3Qn+oehRv3LdkheCOxf3W/8XpuhJ0FhhmGW0KwkXarr29KsKeQGcfr6YB/d
2yCIyPAlahvHz7jYYLHW/S+yakjFzlMYah/TH608BJt9ebgZT9hbr4IwweH0sNbd
dMLyZULaonIjTsF0O1KaaApi1E/FQbwCW9jtCb7VskaHhRAbFizI/eRxMyTHCUBL
rCMb4KCvmPgduaZiASMLJH/4dj/Gyb8a+gCCTp7Y0GI3Abbaj8vJ2ptdQp7EcsdS
CJyVYGtRPsmSUAwY9dGqzl/yM+r7tnc9N538Cr3SsNmEBEGQ7yBjFCGKJBkcc5B/
p+qDJJBx
=OwAk
-----END PGP SIGNATURE-----

L
L
Leo Famulari wrote on 28 Jan 2022 21:29
(name . Andrew Tropin)(address . andrew@trop.in)(address . 53582@debbugs.gnu.org)
YfRSHjYgh6gQechT@jasmine.lan
On Thu, Jan 27, 2022 at 03:10:16PM +0300, Andrew Tropin wrote:
Toggle quote (7 lines)
> 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

Toggle quote (7 lines)
> 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?
A
A
Andrew Tropin wrote on 31 Jan 2022 17:48
(name . Leo Famulari)(address . leo@famulari.name)(address . 53582@debbugs.gnu.org)
871r0nzw99.fsf@trop.in
On 2022-01-28 15:29, Leo Famulari wrote:

Toggle quote (27 lines)
> 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(-)

Toggle diff (97 lines)
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
-----BEGIN PGP SIGNATURE-----

iQJDBAEBCgAtFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmH4EvIPHGFuZHJld0B0
cm9wLmluAAoJECII0glYwd6wzdYP/2sm3fmcmGHDHOxzRzW74smTEleQlx0uDcIj
nS39EoyoHTdNyBkZ3tuNK92zK+Jyvl4IKXuF9yVkwFU83XP2/xwB2Spq82oaTjvr
YTz1yBYWe43c+X4DImhw8Tr+8I5/5rD4UKqCmFr/e7eQtX6fg7so59/Dll8SdWnz
A/YYWBFeu58Xw2kpKo/0J+ZOzHMyqggExqqfPGqxUiKuucz3newIe76LYq8dtg9M
M3iCWSibgr3lI5l9SWODqchjcLhuaMju7eIEuai00uVR6pUAClgMDERF4fCglS0A
EvNgThKSYCwkX8hs5sSUk0hxP6QHs6dqLhdHxVqHVIuwDXsSHRJ0F4ZlpaoMsD6u
WZId+m96Wm7PP/FKwJIbq9N+mFNc3D61G7YT8ZS7P94iuYRcDgzOGR34DV2EeDWA
kbQpQ1ocngZm95Yy6wBXj8YU4nn2d+kccjJdSig7Ys8LdT355dk0aFtpjFo24wT8
yiNUmf3Yb6eDKkBA0dFP6758glL3ajlhoz7LD/F89wilCSe3VDTvV+ROGeS1pmU4
kDHB5FcVKDBxasBzd5fLI4VSdUzcjTc9QKrjyFRafRsghfJnyLxiy4Cv5ZNl9oPz
4lwqtZ1iHStiklDcci3ARvYxK4OVpCPJYlHa4bguiGvFdUsVVKpRaQL1rONWu2Pe
lvEB+NmR
=vxpK
-----END PGP SIGNATURE-----

L
L
Leo Famulari wrote on 31 Jan 2022 20:03
(name . Andrew Tropin)(address . andrew@trop.in)(address . 53582-done@debbugs.gnu.org)
Yfgyg5Xa2iZ+2+GD@jasmine.lan
On Mon, Jan 31, 2022 at 07:48:50PM +0300, Andrew Tropin wrote:
Toggle quote (11 lines)
> 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.

Thanks! Pushed as b3a2c79fdc4ec3794639808c1161870341f175a6
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAmH4MoMACgkQJkb6MLrK
fwgzVhAA7FrjRdqcGqwAuPWWr8tZ/9woJEjXQ5P5CICuEisppy1KNsZpKr0fTRvY
1DiGfubSaNYt/u4KUkx991CFaeK30XOVLDPkjrdyO0TIDy7yHc7jKo0XQQwIDlBm
3v5RbhWoWKgZfbxq9WQFRQyr75KkpmKbksBRRYBKnQwkFUYCXfrCj3ZDK9MaqN8Z
UJWN48BFDR75sAUwK64d/tMUWj8S8giFnXOCbq3B7mXwHgf4bfEFEARZoisJ6gs8
UeCqN9zJ/+v6z7Bd1zrNOUc0eaDgefdJfBEu3nTRrVPS4ztHG9L8CQHe9mtxQ+Ap
gD/ySxNIZrNqzZq3+xTf8bA+uznC5CBbY+jaaloy9eE8GdvOptymSvdXSi7YEbxH
5KMQuCa0ZB1TlA8KIEolZp36OW8t3X2P0UvX0YCbkUWUadWf8Dgu2DVPBzaBF+6O
JFNvfoT8p5umj4vsA7SgX0fPI3AAKTxDo/o1E5pWZoyGAKYmypMxMoQl1F2i2Exn
D9xT9mqjzo3auVgY4jNi3htpmDhxKIRz/W/5O7y1Kn2S1Xx+dOkBLBpx5iobaUDL
+mwNVX9w1CHaqZCbtAkBNPaWPVucKNuyuq3Nka0Xh9OLyekUdTO6dcEXGeHOl8CU
rfbmy14wqe/wHNVhiU5Zrs7lpMkLAVpqKf7jEOamuKBGvcsxlbs=
=BUlG
-----END PGP SIGNATURE-----


Closed
?