* [PR PATCH] WIP: Update OBS to 30.0.0
@ 2023-09-24 23:03 the-maldridge
2023-09-24 23:12 ` [PR PATCH] [Updated] " the-maldridge
` (16 more replies)
0 siblings, 17 replies; 18+ messages in thread
From: the-maldridge @ 2023-09-24 23:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 492 bytes --]
There is a new pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages obs-next
https://github.com/void-linux/void-packages/pull/46233
WIP: Update OBS to 30.0.0
WIP PR to stage this update so we can submit it when the final release happens. Since this release deprecates FTL in favor of WHIP, the dependencies for that get added.
A patch file from https://github.com/void-linux/void-packages/pull/46233.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-obs-next-46233.patch --]
[-- Type: text/x-diff, Size: 8010 bytes --]
From 3497b821c8199ae2212a08477236c72fd9b09234 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:38:52 -0500
Subject: [PATCH 1/5] New package: oneVPL-2023.3.1.
---
common/shlibs | 1 +
srcpkgs/oneVPL-examples | 1 +
srcpkgs/oneVPL/template | 25 +++++++++++++++++++++++++
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/oneVPL-examples
create mode 100644 srcpkgs/oneVPL/template
diff --git a/common/shlibs b/common/shlibs
index 2d7f32eee393b..fa757670a581b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4287,3 +4287,4 @@ libchafa.so.0 libchafa-1.12.5_1
libcppdap.so cppdap-1.58.0+a_1
libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
+libvpl.so.2 oneVPL-2023.3.1_1
diff --git a/srcpkgs/oneVPL-examples b/srcpkgs/oneVPL-examples
new file mode 120000
index 0000000000000..03776a5d59e14
--- /dev/null
+++ b/srcpkgs/oneVPL-examples
@@ -0,0 +1 @@
+oneVPL
\ No newline at end of file
diff --git a/srcpkgs/oneVPL/template b/srcpkgs/oneVPL/template
new file mode 100644
index 0000000000000..1ca5cd01158bc
--- /dev/null
+++ b/srcpkgs/oneVPL/template
@@ -0,0 +1,25 @@
+# Template file for 'oneVPL'
+pkgname=oneVPL
+version=2023.3.1
+revision=1
+build_style=cmake
+hostmakedepends="libva-devel libX11-devel"
+short_desc="Intel oneAPI Video Processing Library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/oneapi-src/oneVPL"
+changelog="https://github.com/oneapi-src/oneVPL/blob/master/CHANGELOG.md"
+distfiles="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$version.tar.gz"
+checksum=4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5
+
+post_install() {
+ vlicense LICENSE
+}
+
+oneVPL-examples_package() {
+ short_desc+=" - examples"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/share/vpl/examples
+ }
+}
From 638b3641fd156d175c7795b7ca755ce8245c6de2 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:56:49 -0500
Subject: [PATCH 2/5] New package: plog-1.1.10.
---
srcpkgs/plog/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/plog/template
diff --git a/srcpkgs/plog/template b/srcpkgs/plog/template
new file mode 100644
index 0000000000000..106c810787157
--- /dev/null
+++ b/srcpkgs/plog/template
@@ -0,0 +1,15 @@
+# Template file for 'plog'
+pkgname=plog
+version=1.1.10
+revision=1
+build_style=cmake
+short_desc="Portables, simple and extensible C++ logging library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/SergiusTheBest/plog/archive/refs/tags/$version.tar.gz"
+checksum=55a090fc2b46ab44d0dde562a91fe5fc15445a3caedfaedda89fe3925da4705a
+
+post_install() {
+ vlicense LICENSE
+}
From 52863239ac3f93c80905588685f75789becef555 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 17:14:38 -0500
Subject: [PATCH 3/5] New package: usrsctp-0.9.5.0.
---
common/shlibs | 1 +
srcpkgs/usrsctp/template | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
create mode 100644 srcpkgs/usrsctp/template
diff --git a/common/shlibs b/common/shlibs
index fa757670a581b..c682ecbb8dbcd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4288,3 +4288,4 @@ libcppdap.so cppdap-1.58.0+a_1
libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
libvpl.so.2 oneVPL-2023.3.1_1
+libusrsctp.so.2 usrsctp-0.9.5.0_1
diff --git a/srcpkgs/usrsctp/template b/srcpkgs/usrsctp/template
new file mode 100644
index 0000000000000..3bf41f8106c93
--- /dev/null
+++ b/srcpkgs/usrsctp/template
@@ -0,0 +1,17 @@
+# Template file for 'usrsctp'
+pkgname=usrsctp
+version=0.9.5.0
+revision=1
+build_style=cmake
+configure_args="-Dsctp_werror=off -Dsctp_build_shared_lib=on"
+short_desc="Portable SCTP userland stack"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/sctplab/usrsctp/archive/refs/tags/$version.tar.gz"
+checksum=260107caf318650a57a8caa593550e39bca6943e93f970c80d6c17e59d62cd92
+
+post_install() {
+ vlicense LICENSE.md
+ rm $DESTDIR/usr/lib64
+}
From 14208d909a33fd81cc4f1656c2106b3018af40f4 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:53:57 -0500
Subject: [PATCH 4/5] New package: libdatachannel-0.19.1.
---
common/shlibs | 1 +
srcpkgs/libdatachannel-devel | 1 +
srcpkgs/libdatachannel/template | 23 +++++++++++++++++++++++
3 files changed, 25 insertions(+)
create mode 120000 srcpkgs/libdatachannel-devel
create mode 100644 srcpkgs/libdatachannel/template
diff --git a/common/shlibs b/common/shlibs
index c682ecbb8dbcd..da85d1778c088 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4289,3 +4289,4 @@ libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
+libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
diff --git a/srcpkgs/libdatachannel-devel b/srcpkgs/libdatachannel-devel
new file mode 120000
index 0000000000000..2e91a7b97b155
--- /dev/null
+++ b/srcpkgs/libdatachannel-devel
@@ -0,0 +1 @@
+libdatachannel
\ No newline at end of file
diff --git a/srcpkgs/libdatachannel/template b/srcpkgs/libdatachannel/template
new file mode 100644
index 0000000000000..41f8d0814e73b
--- /dev/null
+++ b/srcpkgs/libdatachannel/template
@@ -0,0 +1,23 @@
+# Template file for 'libdatachannel'
+pkgname=libdatachannel
+version=0.19.1
+revision=1
+build_style=cmake
+configure_args="-DPREFER_SYSTEM_LIB=ON -DUSE_NICE=ON -DNO_EXAMPLES=ON"
+makedepends="plog openssl-devel libnice-devel libsrtp-devel usrsctp"
+short_desc="C/C++ WebRTC network library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://libdatachannel.org/"
+distfiles="https://github.com/paullouisageneau/libdatachannel/archive/refs/tags/v$version.tar.gz"
+checksum=3687bbdc30ce24d98cc602dee1da9583bf6863d53dc2a598e590f522be719233
+
+libdatachannel-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From 0bc1ddf2aacb1749c99f294e89a54dc0c1fbf56f Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:22:11 -0500
Subject: [PATCH 5/5] obs: Update to 30.0.0
---
srcpkgs/obs/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e13c595e114a2..2ecd7dd0c8382 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
# Template file for 'obs'
pkgname=obs
-version=29.1.3
+version=30.0.0
revision=1
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
@@ -12,15 +12,15 @@ makedepends="LuaJIT-devel fdk-aac-devel ffmpeg-devel glu-devel
pulseaudio-devel python3-devel speexdsp-devel v4l-utils-devel
vlc-devel qt6-svg-devel x264-devel mbedtls-devel jansson-devel
wayland-devel pipewire-devel libxkbcommon-devel pciutils-devel
- librist-devel srt-devel"
+ librist-devel srt-devel oneVPL libdatachannel-devel"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
homepage="https://obsproject.com"
changelog="https://github.com/obsproject/obs-studio/releases"
-distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=9d9cfbdbdd255f48a23feeefb60089769a65f52bbca24fa31d74125f3bbb0e90
+distfiles="https://github.com/obsproject/obs-studio/archive/refs/tags/30.0.0-beta3.tar.gz"
+checksum=3b3faa4a7062bbbb11b178b2641eef43b1644acf37feb84b6ad8d7c91d175cd2
pre_configure() {
# it's not enough to use -DENABLE_BROWSER ...
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
@ 2023-09-24 23:12 ` the-maldridge
2023-09-24 23:18 ` the-maldridge
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: the-maldridge @ 2023-09-24 23:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
There is an updated pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages obs-next
https://github.com/void-linux/void-packages/pull/46233
WIP: Update OBS to 30.0.0
WIP PR to stage this update so we can submit it when the final release happens. Since this release deprecates FTL in favor of WHIP, the dependencies for that get added.
A patch file from https://github.com/void-linux/void-packages/pull/46233.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-obs-next-46233.patch --]
[-- Type: text/x-diff, Size: 8003 bytes --]
From 3497b821c8199ae2212a08477236c72fd9b09234 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:38:52 -0500
Subject: [PATCH 1/5] New package: oneVPL-2023.3.1.
---
common/shlibs | 1 +
srcpkgs/oneVPL-examples | 1 +
srcpkgs/oneVPL/template | 25 +++++++++++++++++++++++++
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/oneVPL-examples
create mode 100644 srcpkgs/oneVPL/template
diff --git a/common/shlibs b/common/shlibs
index 2d7f32eee393b..fa757670a581b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4287,3 +4287,4 @@ libchafa.so.0 libchafa-1.12.5_1
libcppdap.so cppdap-1.58.0+a_1
libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
+libvpl.so.2 oneVPL-2023.3.1_1
diff --git a/srcpkgs/oneVPL-examples b/srcpkgs/oneVPL-examples
new file mode 120000
index 0000000000000..03776a5d59e14
--- /dev/null
+++ b/srcpkgs/oneVPL-examples
@@ -0,0 +1 @@
+oneVPL
\ No newline at end of file
diff --git a/srcpkgs/oneVPL/template b/srcpkgs/oneVPL/template
new file mode 100644
index 0000000000000..1ca5cd01158bc
--- /dev/null
+++ b/srcpkgs/oneVPL/template
@@ -0,0 +1,25 @@
+# Template file for 'oneVPL'
+pkgname=oneVPL
+version=2023.3.1
+revision=1
+build_style=cmake
+hostmakedepends="libva-devel libX11-devel"
+short_desc="Intel oneAPI Video Processing Library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/oneapi-src/oneVPL"
+changelog="https://github.com/oneapi-src/oneVPL/blob/master/CHANGELOG.md"
+distfiles="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$version.tar.gz"
+checksum=4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5
+
+post_install() {
+ vlicense LICENSE
+}
+
+oneVPL-examples_package() {
+ short_desc+=" - examples"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/share/vpl/examples
+ }
+}
From 638b3641fd156d175c7795b7ca755ce8245c6de2 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:56:49 -0500
Subject: [PATCH 2/5] New package: plog-1.1.10.
---
srcpkgs/plog/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/plog/template
diff --git a/srcpkgs/plog/template b/srcpkgs/plog/template
new file mode 100644
index 0000000000000..106c810787157
--- /dev/null
+++ b/srcpkgs/plog/template
@@ -0,0 +1,15 @@
+# Template file for 'plog'
+pkgname=plog
+version=1.1.10
+revision=1
+build_style=cmake
+short_desc="Portables, simple and extensible C++ logging library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/SergiusTheBest/plog/archive/refs/tags/$version.tar.gz"
+checksum=55a090fc2b46ab44d0dde562a91fe5fc15445a3caedfaedda89fe3925da4705a
+
+post_install() {
+ vlicense LICENSE
+}
From 469ac920f67ecd0f754544b51afb69cb9d40d28c Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 17:14:38 -0500
Subject: [PATCH 3/5] New package: usrsctp-0.9.5.0.
---
common/shlibs | 1 +
srcpkgs/usrsctp/template | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
create mode 100644 srcpkgs/usrsctp/template
diff --git a/common/shlibs b/common/shlibs
index fa757670a581b..c682ecbb8dbcd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4288,3 +4288,4 @@ libcppdap.so cppdap-1.58.0+a_1
libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
libvpl.so.2 oneVPL-2023.3.1_1
+libusrsctp.so.2 usrsctp-0.9.5.0_1
diff --git a/srcpkgs/usrsctp/template b/srcpkgs/usrsctp/template
new file mode 100644
index 0000000000000..f9a4cfe09701e
--- /dev/null
+++ b/srcpkgs/usrsctp/template
@@ -0,0 +1,17 @@
+# Template file for 'usrsctp'
+pkgname=usrsctp
+version=0.9.5.0
+revision=1
+build_style=cmake
+configure_args="-Dsctp_werror=off -Dsctp_build_shared_lib=on"
+short_desc="Portable SCTP userland stack"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/sctplab/usrsctp/archive/refs/tags/$version.tar.gz"
+checksum=260107caf318650a57a8caa593550e39bca6943e93f970c80d6c17e59d62cd92
+
+post_install() {
+ vlicense LICENSE.md
+ rm $DESTDIR/usr/lib64
+}
From 7aa77fa7360377585f79d2f659e01946f243db83 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:53:57 -0500
Subject: [PATCH 4/5] New package: libdatachannel-0.19.1.
---
common/shlibs | 1 +
srcpkgs/libdatachannel-devel | 1 +
srcpkgs/libdatachannel/template | 23 +++++++++++++++++++++++
3 files changed, 25 insertions(+)
create mode 120000 srcpkgs/libdatachannel-devel
create mode 100644 srcpkgs/libdatachannel/template
diff --git a/common/shlibs b/common/shlibs
index c682ecbb8dbcd..da85d1778c088 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4289,3 +4289,4 @@ libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
+libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
diff --git a/srcpkgs/libdatachannel-devel b/srcpkgs/libdatachannel-devel
new file mode 120000
index 0000000000000..2e91a7b97b155
--- /dev/null
+++ b/srcpkgs/libdatachannel-devel
@@ -0,0 +1 @@
+libdatachannel
\ No newline at end of file
diff --git a/srcpkgs/libdatachannel/template b/srcpkgs/libdatachannel/template
new file mode 100644
index 0000000000000..41f8d0814e73b
--- /dev/null
+++ b/srcpkgs/libdatachannel/template
@@ -0,0 +1,23 @@
+# Template file for 'libdatachannel'
+pkgname=libdatachannel
+version=0.19.1
+revision=1
+build_style=cmake
+configure_args="-DPREFER_SYSTEM_LIB=ON -DUSE_NICE=ON -DNO_EXAMPLES=ON"
+makedepends="plog openssl-devel libnice-devel libsrtp-devel usrsctp"
+short_desc="C/C++ WebRTC network library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://libdatachannel.org/"
+distfiles="https://github.com/paullouisageneau/libdatachannel/archive/refs/tags/v$version.tar.gz"
+checksum=3687bbdc30ce24d98cc602dee1da9583bf6863d53dc2a598e590f522be719233
+
+libdatachannel-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From e45e515d6da6cd452af0fe9e8f45b02a8a61828d Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:22:11 -0500
Subject: [PATCH 5/5] obs: Update to 30.0.0
---
srcpkgs/obs/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e13c595e114a2..2ecd7dd0c8382 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
# Template file for 'obs'
pkgname=obs
-version=29.1.3
+version=30.0.0
revision=1
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
@@ -12,15 +12,15 @@ makedepends="LuaJIT-devel fdk-aac-devel ffmpeg-devel glu-devel
pulseaudio-devel python3-devel speexdsp-devel v4l-utils-devel
vlc-devel qt6-svg-devel x264-devel mbedtls-devel jansson-devel
wayland-devel pipewire-devel libxkbcommon-devel pciutils-devel
- librist-devel srt-devel"
+ librist-devel srt-devel oneVPL libdatachannel-devel"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
homepage="https://obsproject.com"
changelog="https://github.com/obsproject/obs-studio/releases"
-distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=9d9cfbdbdd255f48a23feeefb60089769a65f52bbca24fa31d74125f3bbb0e90
+distfiles="https://github.com/obsproject/obs-studio/archive/refs/tags/30.0.0-beta3.tar.gz"
+checksum=3b3faa4a7062bbbb11b178b2641eef43b1644acf37feb84b6ad8d7c91d175cd2
pre_configure() {
# it's not enough to use -DENABLE_BROWSER ...
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
2023-09-24 23:12 ` [PR PATCH] [Updated] " the-maldridge
@ 2023-09-24 23:18 ` the-maldridge
2023-09-24 23:21 ` the-maldridge
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: the-maldridge @ 2023-09-24 23:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
There is an updated pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages obs-next
https://github.com/void-linux/void-packages/pull/46233
WIP: Update OBS to 30.0.0
WIP PR to stage this update so we can submit it when the final release happens. Since this release deprecates FTL in favor of WHIP, the dependencies for that get added.
A patch file from https://github.com/void-linux/void-packages/pull/46233.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-obs-next-46233.patch --]
[-- Type: text/x-diff, Size: 8072 bytes --]
From 6177222c860e4c5a68d8741e390565f592978ffa Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:38:52 -0500
Subject: [PATCH 1/5] New package: oneVPL-2023.3.1.
---
common/shlibs | 1 +
srcpkgs/oneVPL-examples | 1 +
srcpkgs/oneVPL/template | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 120000 srcpkgs/oneVPL-examples
create mode 100644 srcpkgs/oneVPL/template
diff --git a/common/shlibs b/common/shlibs
index 2d7f32eee393b..fa757670a581b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4287,3 +4287,4 @@ libchafa.so.0 libchafa-1.12.5_1
libcppdap.so cppdap-1.58.0+a_1
libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
+libvpl.so.2 oneVPL-2023.3.1_1
diff --git a/srcpkgs/oneVPL-examples b/srcpkgs/oneVPL-examples
new file mode 120000
index 0000000000000..03776a5d59e14
--- /dev/null
+++ b/srcpkgs/oneVPL-examples
@@ -0,0 +1 @@
+oneVPL
\ No newline at end of file
diff --git a/srcpkgs/oneVPL/template b/srcpkgs/oneVPL/template
new file mode 100644
index 0000000000000..9ceeea7ccc737
--- /dev/null
+++ b/srcpkgs/oneVPL/template
@@ -0,0 +1,26 @@
+# Template file for 'oneVPL'
+pkgname=oneVPL
+version=2023.3.1
+revision=1
+build_style=cmake
+hostmakedepends="libva-devel libX11-devel"
+hostmakedepends="pkg-config"
+short_desc="Intel oneAPI Video Processing Library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/oneapi-src/oneVPL"
+changelog="https://github.com/oneapi-src/oneVPL/blob/master/CHANGELOG.md"
+distfiles="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$version.tar.gz"
+checksum=4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5
+
+post_install() {
+ vlicense LICENSE
+}
+
+oneVPL-examples_package() {
+ short_desc+=" - examples"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/share/vpl/examples
+ }
+}
From 38714abbfba0eef48e645420b7130c6a9e4d8630 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:56:49 -0500
Subject: [PATCH 2/5] New package: plog-1.1.10.
---
srcpkgs/plog/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/plog/template
diff --git a/srcpkgs/plog/template b/srcpkgs/plog/template
new file mode 100644
index 0000000000000..106c810787157
--- /dev/null
+++ b/srcpkgs/plog/template
@@ -0,0 +1,15 @@
+# Template file for 'plog'
+pkgname=plog
+version=1.1.10
+revision=1
+build_style=cmake
+short_desc="Portables, simple and extensible C++ logging library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/SergiusTheBest/plog/archive/refs/tags/$version.tar.gz"
+checksum=55a090fc2b46ab44d0dde562a91fe5fc15445a3caedfaedda89fe3925da4705a
+
+post_install() {
+ vlicense LICENSE
+}
From 5ade63ab84a44ae49e9078431349adce1eab9505 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 17:14:38 -0500
Subject: [PATCH 3/5] New package: usrsctp-0.9.5.0.
---
common/shlibs | 1 +
srcpkgs/usrsctp/template | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
create mode 100644 srcpkgs/usrsctp/template
diff --git a/common/shlibs b/common/shlibs
index fa757670a581b..c682ecbb8dbcd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4288,3 +4288,4 @@ libcppdap.so cppdap-1.58.0+a_1
libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
libvpl.so.2 oneVPL-2023.3.1_1
+libusrsctp.so.2 usrsctp-0.9.5.0_1
diff --git a/srcpkgs/usrsctp/template b/srcpkgs/usrsctp/template
new file mode 100644
index 0000000000000..dd32e283515c0
--- /dev/null
+++ b/srcpkgs/usrsctp/template
@@ -0,0 +1,18 @@
+# Template file for 'usrsctp'
+pkgname=usrsctp
+version=0.9.5.0
+revision=1
+build_style=cmake
+configure_args="-Dsctp_werror=off -Dsctp_build_shared_lib=on"
+short_desc="Portable SCTP userland stack"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/sctplab/usrsctp/archive/refs/tags/$version.tar.gz"
+checksum=260107caf318650a57a8caa593550e39bca6943e93f970c80d6c17e59d62cd92
+
+post_install() {
+ vlicense LICENSE.md
+ rm -f $DESTDIR/usr/lib64
+ rm -f $DESTDIR/usr/lib32
+}
From 226c08a7c0a830ab9aecf4a5a226da79786e39fd Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:53:57 -0500
Subject: [PATCH 4/5] New package: libdatachannel-0.19.1.
---
common/shlibs | 1 +
srcpkgs/libdatachannel-devel | 1 +
srcpkgs/libdatachannel/template | 23 +++++++++++++++++++++++
3 files changed, 25 insertions(+)
create mode 120000 srcpkgs/libdatachannel-devel
create mode 100644 srcpkgs/libdatachannel/template
diff --git a/common/shlibs b/common/shlibs
index c682ecbb8dbcd..da85d1778c088 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4289,3 +4289,4 @@ libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
+libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
diff --git a/srcpkgs/libdatachannel-devel b/srcpkgs/libdatachannel-devel
new file mode 120000
index 0000000000000..2e91a7b97b155
--- /dev/null
+++ b/srcpkgs/libdatachannel-devel
@@ -0,0 +1 @@
+libdatachannel
\ No newline at end of file
diff --git a/srcpkgs/libdatachannel/template b/srcpkgs/libdatachannel/template
new file mode 100644
index 0000000000000..41f8d0814e73b
--- /dev/null
+++ b/srcpkgs/libdatachannel/template
@@ -0,0 +1,23 @@
+# Template file for 'libdatachannel'
+pkgname=libdatachannel
+version=0.19.1
+revision=1
+build_style=cmake
+configure_args="-DPREFER_SYSTEM_LIB=ON -DUSE_NICE=ON -DNO_EXAMPLES=ON"
+makedepends="plog openssl-devel libnice-devel libsrtp-devel usrsctp"
+short_desc="C/C++ WebRTC network library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://libdatachannel.org/"
+distfiles="https://github.com/paullouisageneau/libdatachannel/archive/refs/tags/v$version.tar.gz"
+checksum=3687bbdc30ce24d98cc602dee1da9583bf6863d53dc2a598e590f522be719233
+
+libdatachannel-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From cf9aa2c84c937999267c3dc73d8b70970bf1e87e Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:22:11 -0500
Subject: [PATCH 5/5] obs: Update to 30.0.0
---
srcpkgs/obs/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e13c595e114a2..2ecd7dd0c8382 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
# Template file for 'obs'
pkgname=obs
-version=29.1.3
+version=30.0.0
revision=1
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
@@ -12,15 +12,15 @@ makedepends="LuaJIT-devel fdk-aac-devel ffmpeg-devel glu-devel
pulseaudio-devel python3-devel speexdsp-devel v4l-utils-devel
vlc-devel qt6-svg-devel x264-devel mbedtls-devel jansson-devel
wayland-devel pipewire-devel libxkbcommon-devel pciutils-devel
- librist-devel srt-devel"
+ librist-devel srt-devel oneVPL libdatachannel-devel"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
homepage="https://obsproject.com"
changelog="https://github.com/obsproject/obs-studio/releases"
-distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=9d9cfbdbdd255f48a23feeefb60089769a65f52bbca24fa31d74125f3bbb0e90
+distfiles="https://github.com/obsproject/obs-studio/archive/refs/tags/30.0.0-beta3.tar.gz"
+checksum=3b3faa4a7062bbbb11b178b2641eef43b1644acf37feb84b6ad8d7c91d175cd2
pre_configure() {
# it's not enough to use -DENABLE_BROWSER ...
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
2023-09-24 23:12 ` [PR PATCH] [Updated] " the-maldridge
2023-09-24 23:18 ` the-maldridge
@ 2023-09-24 23:21 ` the-maldridge
2023-09-24 23:24 ` the-maldridge
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: the-maldridge @ 2023-09-24 23:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
There is an updated pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages obs-next
https://github.com/void-linux/void-packages/pull/46233
WIP: Update OBS to 30.0.0
WIP PR to stage this update so we can submit it when the final release happens. Since this release deprecates FTL in favor of WHIP, the dependencies for that get added.
A patch file from https://github.com/void-linux/void-packages/pull/46233.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-obs-next-46233.patch --]
[-- Type: text/x-diff, Size: 8734 bytes --]
From 6177222c860e4c5a68d8741e390565f592978ffa Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:38:52 -0500
Subject: [PATCH 1/6] New package: oneVPL-2023.3.1.
---
common/shlibs | 1 +
srcpkgs/oneVPL-examples | 1 +
srcpkgs/oneVPL/template | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 120000 srcpkgs/oneVPL-examples
create mode 100644 srcpkgs/oneVPL/template
diff --git a/common/shlibs b/common/shlibs
index 2d7f32eee393b..fa757670a581b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4287,3 +4287,4 @@ libchafa.so.0 libchafa-1.12.5_1
libcppdap.so cppdap-1.58.0+a_1
libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
+libvpl.so.2 oneVPL-2023.3.1_1
diff --git a/srcpkgs/oneVPL-examples b/srcpkgs/oneVPL-examples
new file mode 120000
index 0000000000000..03776a5d59e14
--- /dev/null
+++ b/srcpkgs/oneVPL-examples
@@ -0,0 +1 @@
+oneVPL
\ No newline at end of file
diff --git a/srcpkgs/oneVPL/template b/srcpkgs/oneVPL/template
new file mode 100644
index 0000000000000..9ceeea7ccc737
--- /dev/null
+++ b/srcpkgs/oneVPL/template
@@ -0,0 +1,26 @@
+# Template file for 'oneVPL'
+pkgname=oneVPL
+version=2023.3.1
+revision=1
+build_style=cmake
+hostmakedepends="libva-devel libX11-devel"
+hostmakedepends="pkg-config"
+short_desc="Intel oneAPI Video Processing Library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/oneapi-src/oneVPL"
+changelog="https://github.com/oneapi-src/oneVPL/blob/master/CHANGELOG.md"
+distfiles="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$version.tar.gz"
+checksum=4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5
+
+post_install() {
+ vlicense LICENSE
+}
+
+oneVPL-examples_package() {
+ short_desc+=" - examples"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/share/vpl/examples
+ }
+}
From 38714abbfba0eef48e645420b7130c6a9e4d8630 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:56:49 -0500
Subject: [PATCH 2/6] New package: plog-1.1.10.
---
srcpkgs/plog/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/plog/template
diff --git a/srcpkgs/plog/template b/srcpkgs/plog/template
new file mode 100644
index 0000000000000..106c810787157
--- /dev/null
+++ b/srcpkgs/plog/template
@@ -0,0 +1,15 @@
+# Template file for 'plog'
+pkgname=plog
+version=1.1.10
+revision=1
+build_style=cmake
+short_desc="Portables, simple and extensible C++ logging library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/SergiusTheBest/plog/archive/refs/tags/$version.tar.gz"
+checksum=55a090fc2b46ab44d0dde562a91fe5fc15445a3caedfaedda89fe3925da4705a
+
+post_install() {
+ vlicense LICENSE
+}
From 5ade63ab84a44ae49e9078431349adce1eab9505 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 17:14:38 -0500
Subject: [PATCH 3/6] New package: usrsctp-0.9.5.0.
---
common/shlibs | 1 +
srcpkgs/usrsctp/template | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
create mode 100644 srcpkgs/usrsctp/template
diff --git a/common/shlibs b/common/shlibs
index fa757670a581b..c682ecbb8dbcd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4288,3 +4288,4 @@ libcppdap.so cppdap-1.58.0+a_1
libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
libvpl.so.2 oneVPL-2023.3.1_1
+libusrsctp.so.2 usrsctp-0.9.5.0_1
diff --git a/srcpkgs/usrsctp/template b/srcpkgs/usrsctp/template
new file mode 100644
index 0000000000000..dd32e283515c0
--- /dev/null
+++ b/srcpkgs/usrsctp/template
@@ -0,0 +1,18 @@
+# Template file for 'usrsctp'
+pkgname=usrsctp
+version=0.9.5.0
+revision=1
+build_style=cmake
+configure_args="-Dsctp_werror=off -Dsctp_build_shared_lib=on"
+short_desc="Portable SCTP userland stack"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/sctplab/usrsctp/archive/refs/tags/$version.tar.gz"
+checksum=260107caf318650a57a8caa593550e39bca6943e93f970c80d6c17e59d62cd92
+
+post_install() {
+ vlicense LICENSE.md
+ rm -f $DESTDIR/usr/lib64
+ rm -f $DESTDIR/usr/lib32
+}
From 1757d715382f20143d8423865f606512f9d9a8ce Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 18:21:43 -0500
Subject: [PATCH 4/6] tmp
---
srcpkgs/usrsctp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/usrsctp/template b/srcpkgs/usrsctp/template
index dd32e283515c0..061a4a375020a 100644
--- a/srcpkgs/usrsctp/template
+++ b/srcpkgs/usrsctp/template
@@ -14,5 +14,5 @@ checksum=260107caf318650a57a8caa593550e39bca6943e93f970c80d6c17e59d62cd92
post_install() {
vlicense LICENSE.md
rm -f $DESTDIR/usr/lib64
- rm -f $DESTDIR/usr/lib32
+ rm -f $DESTDIR/usr/lib32
}
From a19d8493d94d8f1ee049e3658877472cb9f40996 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:53:57 -0500
Subject: [PATCH 5/6] New package: libdatachannel-0.19.1.
---
common/shlibs | 1 +
srcpkgs/libdatachannel-devel | 1 +
srcpkgs/libdatachannel/template | 23 +++++++++++++++++++++++
3 files changed, 25 insertions(+)
create mode 120000 srcpkgs/libdatachannel-devel
create mode 100644 srcpkgs/libdatachannel/template
diff --git a/common/shlibs b/common/shlibs
index c682ecbb8dbcd..da85d1778c088 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4289,3 +4289,4 @@ libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
+libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
diff --git a/srcpkgs/libdatachannel-devel b/srcpkgs/libdatachannel-devel
new file mode 120000
index 0000000000000..2e91a7b97b155
--- /dev/null
+++ b/srcpkgs/libdatachannel-devel
@@ -0,0 +1 @@
+libdatachannel
\ No newline at end of file
diff --git a/srcpkgs/libdatachannel/template b/srcpkgs/libdatachannel/template
new file mode 100644
index 0000000000000..41f8d0814e73b
--- /dev/null
+++ b/srcpkgs/libdatachannel/template
@@ -0,0 +1,23 @@
+# Template file for 'libdatachannel'
+pkgname=libdatachannel
+version=0.19.1
+revision=1
+build_style=cmake
+configure_args="-DPREFER_SYSTEM_LIB=ON -DUSE_NICE=ON -DNO_EXAMPLES=ON"
+makedepends="plog openssl-devel libnice-devel libsrtp-devel usrsctp"
+short_desc="C/C++ WebRTC network library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://libdatachannel.org/"
+distfiles="https://github.com/paullouisageneau/libdatachannel/archive/refs/tags/v$version.tar.gz"
+checksum=3687bbdc30ce24d98cc602dee1da9583bf6863d53dc2a598e590f522be719233
+
+libdatachannel-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From deaac852083cdc285c960a307e99cc25618969c9 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:22:11 -0500
Subject: [PATCH 6/6] obs: Update to 30.0.0
---
srcpkgs/obs/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e13c595e114a2..2ecd7dd0c8382 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
# Template file for 'obs'
pkgname=obs
-version=29.1.3
+version=30.0.0
revision=1
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
@@ -12,15 +12,15 @@ makedepends="LuaJIT-devel fdk-aac-devel ffmpeg-devel glu-devel
pulseaudio-devel python3-devel speexdsp-devel v4l-utils-devel
vlc-devel qt6-svg-devel x264-devel mbedtls-devel jansson-devel
wayland-devel pipewire-devel libxkbcommon-devel pciutils-devel
- librist-devel srt-devel"
+ librist-devel srt-devel oneVPL libdatachannel-devel"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
homepage="https://obsproject.com"
changelog="https://github.com/obsproject/obs-studio/releases"
-distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=9d9cfbdbdd255f48a23feeefb60089769a65f52bbca24fa31d74125f3bbb0e90
+distfiles="https://github.com/obsproject/obs-studio/archive/refs/tags/30.0.0-beta3.tar.gz"
+checksum=3b3faa4a7062bbbb11b178b2641eef43b1644acf37feb84b6ad8d7c91d175cd2
pre_configure() {
# it's not enough to use -DENABLE_BROWSER ...
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
` (2 preceding siblings ...)
2023-09-24 23:21 ` the-maldridge
@ 2023-09-24 23:24 ` the-maldridge
2023-09-25 0:11 ` the-maldridge
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: the-maldridge @ 2023-09-24 23:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
There is an updated pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages obs-next
https://github.com/void-linux/void-packages/pull/46233
WIP: Update OBS to 30.0.0
WIP PR to stage this update so we can submit it when the final release happens. Since this release deprecates FTL in favor of WHIP, the dependencies for that get added.
A patch file from https://github.com/void-linux/void-packages/pull/46233.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-obs-next-46233.patch --]
[-- Type: text/x-diff, Size: 8065 bytes --]
From 6177222c860e4c5a68d8741e390565f592978ffa Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:38:52 -0500
Subject: [PATCH 1/5] New package: oneVPL-2023.3.1.
---
common/shlibs | 1 +
srcpkgs/oneVPL-examples | 1 +
srcpkgs/oneVPL/template | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 120000 srcpkgs/oneVPL-examples
create mode 100644 srcpkgs/oneVPL/template
diff --git a/common/shlibs b/common/shlibs
index 2d7f32eee393b..fa757670a581b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4287,3 +4287,4 @@ libchafa.so.0 libchafa-1.12.5_1
libcppdap.so cppdap-1.58.0+a_1
libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
+libvpl.so.2 oneVPL-2023.3.1_1
diff --git a/srcpkgs/oneVPL-examples b/srcpkgs/oneVPL-examples
new file mode 120000
index 0000000000000..03776a5d59e14
--- /dev/null
+++ b/srcpkgs/oneVPL-examples
@@ -0,0 +1 @@
+oneVPL
\ No newline at end of file
diff --git a/srcpkgs/oneVPL/template b/srcpkgs/oneVPL/template
new file mode 100644
index 0000000000000..9ceeea7ccc737
--- /dev/null
+++ b/srcpkgs/oneVPL/template
@@ -0,0 +1,26 @@
+# Template file for 'oneVPL'
+pkgname=oneVPL
+version=2023.3.1
+revision=1
+build_style=cmake
+hostmakedepends="libva-devel libX11-devel"
+hostmakedepends="pkg-config"
+short_desc="Intel oneAPI Video Processing Library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/oneapi-src/oneVPL"
+changelog="https://github.com/oneapi-src/oneVPL/blob/master/CHANGELOG.md"
+distfiles="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$version.tar.gz"
+checksum=4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5
+
+post_install() {
+ vlicense LICENSE
+}
+
+oneVPL-examples_package() {
+ short_desc+=" - examples"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/share/vpl/examples
+ }
+}
From 38714abbfba0eef48e645420b7130c6a9e4d8630 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:56:49 -0500
Subject: [PATCH 2/5] New package: plog-1.1.10.
---
srcpkgs/plog/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/plog/template
diff --git a/srcpkgs/plog/template b/srcpkgs/plog/template
new file mode 100644
index 0000000000000..106c810787157
--- /dev/null
+++ b/srcpkgs/plog/template
@@ -0,0 +1,15 @@
+# Template file for 'plog'
+pkgname=plog
+version=1.1.10
+revision=1
+build_style=cmake
+short_desc="Portables, simple and extensible C++ logging library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/SergiusTheBest/plog/archive/refs/tags/$version.tar.gz"
+checksum=55a090fc2b46ab44d0dde562a91fe5fc15445a3caedfaedda89fe3925da4705a
+
+post_install() {
+ vlicense LICENSE
+}
From ed4eaa1ea7b6027a08d674526cca2fa8e331a087 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 17:14:38 -0500
Subject: [PATCH 3/5] New package: usrsctp-0.9.5.0.
---
common/shlibs | 1 +
srcpkgs/usrsctp/template | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
create mode 100644 srcpkgs/usrsctp/template
diff --git a/common/shlibs b/common/shlibs
index fa757670a581b..c682ecbb8dbcd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4288,3 +4288,4 @@ libcppdap.so cppdap-1.58.0+a_1
libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
libvpl.so.2 oneVPL-2023.3.1_1
+libusrsctp.so.2 usrsctp-0.9.5.0_1
diff --git a/srcpkgs/usrsctp/template b/srcpkgs/usrsctp/template
new file mode 100644
index 0000000000000..061a4a375020a
--- /dev/null
+++ b/srcpkgs/usrsctp/template
@@ -0,0 +1,18 @@
+# Template file for 'usrsctp'
+pkgname=usrsctp
+version=0.9.5.0
+revision=1
+build_style=cmake
+configure_args="-Dsctp_werror=off -Dsctp_build_shared_lib=on"
+short_desc="Portable SCTP userland stack"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/sctplab/usrsctp/archive/refs/tags/$version.tar.gz"
+checksum=260107caf318650a57a8caa593550e39bca6943e93f970c80d6c17e59d62cd92
+
+post_install() {
+ vlicense LICENSE.md
+ rm -f $DESTDIR/usr/lib64
+ rm -f $DESTDIR/usr/lib32
+}
From 1f8828df4b47a06aa2d519ebfbde004284f0f385 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:53:57 -0500
Subject: [PATCH 4/5] New package: libdatachannel-0.19.1.
---
common/shlibs | 1 +
srcpkgs/libdatachannel-devel | 1 +
srcpkgs/libdatachannel/template | 23 +++++++++++++++++++++++
3 files changed, 25 insertions(+)
create mode 120000 srcpkgs/libdatachannel-devel
create mode 100644 srcpkgs/libdatachannel/template
diff --git a/common/shlibs b/common/shlibs
index c682ecbb8dbcd..da85d1778c088 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4289,3 +4289,4 @@ libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
+libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
diff --git a/srcpkgs/libdatachannel-devel b/srcpkgs/libdatachannel-devel
new file mode 120000
index 0000000000000..2e91a7b97b155
--- /dev/null
+++ b/srcpkgs/libdatachannel-devel
@@ -0,0 +1 @@
+libdatachannel
\ No newline at end of file
diff --git a/srcpkgs/libdatachannel/template b/srcpkgs/libdatachannel/template
new file mode 100644
index 0000000000000..41f8d0814e73b
--- /dev/null
+++ b/srcpkgs/libdatachannel/template
@@ -0,0 +1,23 @@
+# Template file for 'libdatachannel'
+pkgname=libdatachannel
+version=0.19.1
+revision=1
+build_style=cmake
+configure_args="-DPREFER_SYSTEM_LIB=ON -DUSE_NICE=ON -DNO_EXAMPLES=ON"
+makedepends="plog openssl-devel libnice-devel libsrtp-devel usrsctp"
+short_desc="C/C++ WebRTC network library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://libdatachannel.org/"
+distfiles="https://github.com/paullouisageneau/libdatachannel/archive/refs/tags/v$version.tar.gz"
+checksum=3687bbdc30ce24d98cc602dee1da9583bf6863d53dc2a598e590f522be719233
+
+libdatachannel-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From f760729349b555383d699bddc38167162f284ca2 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:22:11 -0500
Subject: [PATCH 5/5] obs: Update to 30.0.0
---
srcpkgs/obs/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e13c595e114a2..2ecd7dd0c8382 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
# Template file for 'obs'
pkgname=obs
-version=29.1.3
+version=30.0.0
revision=1
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
@@ -12,15 +12,15 @@ makedepends="LuaJIT-devel fdk-aac-devel ffmpeg-devel glu-devel
pulseaudio-devel python3-devel speexdsp-devel v4l-utils-devel
vlc-devel qt6-svg-devel x264-devel mbedtls-devel jansson-devel
wayland-devel pipewire-devel libxkbcommon-devel pciutils-devel
- librist-devel srt-devel"
+ librist-devel srt-devel oneVPL libdatachannel-devel"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
homepage="https://obsproject.com"
changelog="https://github.com/obsproject/obs-studio/releases"
-distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=9d9cfbdbdd255f48a23feeefb60089769a65f52bbca24fa31d74125f3bbb0e90
+distfiles="https://github.com/obsproject/obs-studio/archive/refs/tags/30.0.0-beta3.tar.gz"
+checksum=3b3faa4a7062bbbb11b178b2641eef43b1644acf37feb84b6ad8d7c91d175cd2
pre_configure() {
# it's not enough to use -DENABLE_BROWSER ...
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
` (3 preceding siblings ...)
2023-09-24 23:24 ` the-maldridge
@ 2023-09-25 0:11 ` the-maldridge
2023-10-15 2:00 ` the-maldridge
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: the-maldridge @ 2023-09-25 0:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
There is an updated pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages obs-next
https://github.com/void-linux/void-packages/pull/46233
WIP: Update OBS to 30.0.0
WIP PR to stage this update so we can submit it when the final release happens. Since this release deprecates FTL in favor of WHIP, the dependencies for that get added.
A patch file from https://github.com/void-linux/void-packages/pull/46233.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-obs-next-46233.patch --]
[-- Type: text/x-diff, Size: 8205 bytes --]
From 6177222c860e4c5a68d8741e390565f592978ffa Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:38:52 -0500
Subject: [PATCH 1/5] New package: oneVPL-2023.3.1.
---
common/shlibs | 1 +
srcpkgs/oneVPL-examples | 1 +
srcpkgs/oneVPL/template | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 120000 srcpkgs/oneVPL-examples
create mode 100644 srcpkgs/oneVPL/template
diff --git a/common/shlibs b/common/shlibs
index 2d7f32eee393b..fa757670a581b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4287,3 +4287,4 @@ libchafa.so.0 libchafa-1.12.5_1
libcppdap.so cppdap-1.58.0+a_1
libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
+libvpl.so.2 oneVPL-2023.3.1_1
diff --git a/srcpkgs/oneVPL-examples b/srcpkgs/oneVPL-examples
new file mode 120000
index 0000000000000..03776a5d59e14
--- /dev/null
+++ b/srcpkgs/oneVPL-examples
@@ -0,0 +1 @@
+oneVPL
\ No newline at end of file
diff --git a/srcpkgs/oneVPL/template b/srcpkgs/oneVPL/template
new file mode 100644
index 0000000000000..9ceeea7ccc737
--- /dev/null
+++ b/srcpkgs/oneVPL/template
@@ -0,0 +1,26 @@
+# Template file for 'oneVPL'
+pkgname=oneVPL
+version=2023.3.1
+revision=1
+build_style=cmake
+hostmakedepends="libva-devel libX11-devel"
+hostmakedepends="pkg-config"
+short_desc="Intel oneAPI Video Processing Library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/oneapi-src/oneVPL"
+changelog="https://github.com/oneapi-src/oneVPL/blob/master/CHANGELOG.md"
+distfiles="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$version.tar.gz"
+checksum=4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5
+
+post_install() {
+ vlicense LICENSE
+}
+
+oneVPL-examples_package() {
+ short_desc+=" - examples"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/share/vpl/examples
+ }
+}
From 38714abbfba0eef48e645420b7130c6a9e4d8630 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:56:49 -0500
Subject: [PATCH 2/5] New package: plog-1.1.10.
---
srcpkgs/plog/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/plog/template
diff --git a/srcpkgs/plog/template b/srcpkgs/plog/template
new file mode 100644
index 0000000000000..106c810787157
--- /dev/null
+++ b/srcpkgs/plog/template
@@ -0,0 +1,15 @@
+# Template file for 'plog'
+pkgname=plog
+version=1.1.10
+revision=1
+build_style=cmake
+short_desc="Portables, simple and extensible C++ logging library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/SergiusTheBest/plog/archive/refs/tags/$version.tar.gz"
+checksum=55a090fc2b46ab44d0dde562a91fe5fc15445a3caedfaedda89fe3925da4705a
+
+post_install() {
+ vlicense LICENSE
+}
From ed4eaa1ea7b6027a08d674526cca2fa8e331a087 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 17:14:38 -0500
Subject: [PATCH 3/5] New package: usrsctp-0.9.5.0.
---
common/shlibs | 1 +
srcpkgs/usrsctp/template | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
create mode 100644 srcpkgs/usrsctp/template
diff --git a/common/shlibs b/common/shlibs
index fa757670a581b..c682ecbb8dbcd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4288,3 +4288,4 @@ libcppdap.so cppdap-1.58.0+a_1
libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
libvpl.so.2 oneVPL-2023.3.1_1
+libusrsctp.so.2 usrsctp-0.9.5.0_1
diff --git a/srcpkgs/usrsctp/template b/srcpkgs/usrsctp/template
new file mode 100644
index 0000000000000..061a4a375020a
--- /dev/null
+++ b/srcpkgs/usrsctp/template
@@ -0,0 +1,18 @@
+# Template file for 'usrsctp'
+pkgname=usrsctp
+version=0.9.5.0
+revision=1
+build_style=cmake
+configure_args="-Dsctp_werror=off -Dsctp_build_shared_lib=on"
+short_desc="Portable SCTP userland stack"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/sctplab/usrsctp/archive/refs/tags/$version.tar.gz"
+checksum=260107caf318650a57a8caa593550e39bca6943e93f970c80d6c17e59d62cd92
+
+post_install() {
+ vlicense LICENSE.md
+ rm -f $DESTDIR/usr/lib64
+ rm -f $DESTDIR/usr/lib32
+}
From 1f8828df4b47a06aa2d519ebfbde004284f0f385 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:53:57 -0500
Subject: [PATCH 4/5] New package: libdatachannel-0.19.1.
---
common/shlibs | 1 +
srcpkgs/libdatachannel-devel | 1 +
srcpkgs/libdatachannel/template | 23 +++++++++++++++++++++++
3 files changed, 25 insertions(+)
create mode 120000 srcpkgs/libdatachannel-devel
create mode 100644 srcpkgs/libdatachannel/template
diff --git a/common/shlibs b/common/shlibs
index c682ecbb8dbcd..da85d1778c088 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4289,3 +4289,4 @@ libkeyfinder.so.2 libkeyfinder-2.2.7_1
libb64.so.0 libb64-1.2.1_1
libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
+libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
diff --git a/srcpkgs/libdatachannel-devel b/srcpkgs/libdatachannel-devel
new file mode 120000
index 0000000000000..2e91a7b97b155
--- /dev/null
+++ b/srcpkgs/libdatachannel-devel
@@ -0,0 +1 @@
+libdatachannel
\ No newline at end of file
diff --git a/srcpkgs/libdatachannel/template b/srcpkgs/libdatachannel/template
new file mode 100644
index 0000000000000..41f8d0814e73b
--- /dev/null
+++ b/srcpkgs/libdatachannel/template
@@ -0,0 +1,23 @@
+# Template file for 'libdatachannel'
+pkgname=libdatachannel
+version=0.19.1
+revision=1
+build_style=cmake
+configure_args="-DPREFER_SYSTEM_LIB=ON -DUSE_NICE=ON -DNO_EXAMPLES=ON"
+makedepends="plog openssl-devel libnice-devel libsrtp-devel usrsctp"
+short_desc="C/C++ WebRTC network library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://libdatachannel.org/"
+distfiles="https://github.com/paullouisageneau/libdatachannel/archive/refs/tags/v$version.tar.gz"
+checksum=3687bbdc30ce24d98cc602dee1da9583bf6863d53dc2a598e590f522be719233
+
+libdatachannel-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From 61cf39da5ed161495b1b9c9c0d19da590cf2776f Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:22:11 -0500
Subject: [PATCH 5/5] obs: Update to 30.0.0
---
srcpkgs/obs/template | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e13c595e114a2..b2dd3115e5c1e 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
# Template file for 'obs'
pkgname=obs
-version=29.1.3
+version=30.0.0
revision=1
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
@@ -12,15 +12,24 @@ makedepends="LuaJIT-devel fdk-aac-devel ffmpeg-devel glu-devel
pulseaudio-devel python3-devel speexdsp-devel v4l-utils-devel
vlc-devel qt6-svg-devel x264-devel mbedtls-devel jansson-devel
wayland-devel pipewire-devel libxkbcommon-devel pciutils-devel
- librist-devel srt-devel"
+ librist-devel srt-devel libdatachannel-devel"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
homepage="https://obsproject.com"
changelog="https://github.com/obsproject/obs-studio/releases"
-distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=9d9cfbdbdd255f48a23feeefb60089769a65f52bbca24fa31d74125f3bbb0e90
+distfiles="https://github.com/obsproject/obs-studio/archive/refs/tags/30.0.0-beta3.tar.gz"
+checksum=3b3faa4a7062bbbb11b178b2641eef43b1644acf37feb84b6ad8d7c91d175cd2
+
+case "$XBPS_TARGET_MACHINE" in
+ aarch64*)
+ configure_args+=" -DENABLE_QSV11=off"
+ ;;
+ *)
+ makedepends+=" oneVPL"
+ ;;
+esac
pre_configure() {
# it's not enough to use -DENABLE_BROWSER ...
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
` (4 preceding siblings ...)
2023-09-25 0:11 ` the-maldridge
@ 2023-10-15 2:00 ` the-maldridge
2023-10-17 11:36 ` Lolzen
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: the-maldridge @ 2023-10-15 2:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
There is an updated pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages obs-next
https://github.com/void-linux/void-packages/pull/46233
WIP: Update OBS to 30.0.0
WIP PR to stage this update so we can submit it when the final release happens. Since this release deprecates FTL in favor of WHIP, the dependencies for that get added.
A patch file from https://github.com/void-linux/void-packages/pull/46233.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-obs-next-46233.patch --]
[-- Type: text/x-diff, Size: 8327 bytes --]
From 6b50d3b500d8a98c53a196ffc9c0971003a7952b Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:38:52 -0500
Subject: [PATCH 1/5] New package: oneVPL-2023.3.1.
---
common/shlibs | 1 +
srcpkgs/oneVPL-examples | 1 +
srcpkgs/oneVPL/template | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 120000 srcpkgs/oneVPL-examples
create mode 100644 srcpkgs/oneVPL/template
diff --git a/common/shlibs b/common/shlibs
index cb2757a48ffa3..51d857f8f0f08 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4267,3 +4267,4 @@ libgrass_gproj.8.3.so grass-8.3.0_1
libgrass_imagery.8.3.so grass-8.3.0_1
libgrass_raster.8.3.so grass-8.3.0_1
libgrass_vector.8.3.so grass-8.3.0_1
+libvpl.so.2 oneVPL-2023.3.1_1
diff --git a/srcpkgs/oneVPL-examples b/srcpkgs/oneVPL-examples
new file mode 120000
index 0000000000000..03776a5d59e14
--- /dev/null
+++ b/srcpkgs/oneVPL-examples
@@ -0,0 +1 @@
+oneVPL
\ No newline at end of file
diff --git a/srcpkgs/oneVPL/template b/srcpkgs/oneVPL/template
new file mode 100644
index 0000000000000..9ceeea7ccc737
--- /dev/null
+++ b/srcpkgs/oneVPL/template
@@ -0,0 +1,26 @@
+# Template file for 'oneVPL'
+pkgname=oneVPL
+version=2023.3.1
+revision=1
+build_style=cmake
+hostmakedepends="libva-devel libX11-devel"
+hostmakedepends="pkg-config"
+short_desc="Intel oneAPI Video Processing Library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/oneapi-src/oneVPL"
+changelog="https://github.com/oneapi-src/oneVPL/blob/master/CHANGELOG.md"
+distfiles="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$version.tar.gz"
+checksum=4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5
+
+post_install() {
+ vlicense LICENSE
+}
+
+oneVPL-examples_package() {
+ short_desc+=" - examples"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/share/vpl/examples
+ }
+}
From 701c8f8d484b5b6e8c3f0f54c9bd45b3f2e0563d Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:56:49 -0500
Subject: [PATCH 2/5] New package: plog-1.1.10.
---
srcpkgs/plog/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/plog/template
diff --git a/srcpkgs/plog/template b/srcpkgs/plog/template
new file mode 100644
index 0000000000000..106c810787157
--- /dev/null
+++ b/srcpkgs/plog/template
@@ -0,0 +1,15 @@
+# Template file for 'plog'
+pkgname=plog
+version=1.1.10
+revision=1
+build_style=cmake
+short_desc="Portables, simple and extensible C++ logging library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/SergiusTheBest/plog/archive/refs/tags/$version.tar.gz"
+checksum=55a090fc2b46ab44d0dde562a91fe5fc15445a3caedfaedda89fe3925da4705a
+
+post_install() {
+ vlicense LICENSE
+}
From 0f91d089e2860009c8b94e8b6f59029d9a495e8c Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 17:14:38 -0500
Subject: [PATCH 3/5] New package: usrsctp-0.9.5.0.
---
common/shlibs | 1 +
srcpkgs/usrsctp/template | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
create mode 100644 srcpkgs/usrsctp/template
diff --git a/common/shlibs b/common/shlibs
index 51d857f8f0f08..bf3e3183ab4e6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4268,3 +4268,4 @@ libgrass_imagery.8.3.so grass-8.3.0_1
libgrass_raster.8.3.so grass-8.3.0_1
libgrass_vector.8.3.so grass-8.3.0_1
libvpl.so.2 oneVPL-2023.3.1_1
+libusrsctp.so.2 usrsctp-0.9.5.0_1
diff --git a/srcpkgs/usrsctp/template b/srcpkgs/usrsctp/template
new file mode 100644
index 0000000000000..061a4a375020a
--- /dev/null
+++ b/srcpkgs/usrsctp/template
@@ -0,0 +1,18 @@
+# Template file for 'usrsctp'
+pkgname=usrsctp
+version=0.9.5.0
+revision=1
+build_style=cmake
+configure_args="-Dsctp_werror=off -Dsctp_build_shared_lib=on"
+short_desc="Portable SCTP userland stack"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/sctplab/usrsctp/archive/refs/tags/$version.tar.gz"
+checksum=260107caf318650a57a8caa593550e39bca6943e93f970c80d6c17e59d62cd92
+
+post_install() {
+ vlicense LICENSE.md
+ rm -f $DESTDIR/usr/lib64
+ rm -f $DESTDIR/usr/lib32
+}
From 8f726bf0a0185398d06d3fb36a9dc3879bc2b6d1 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:53:57 -0500
Subject: [PATCH 4/5] New package: libdatachannel-0.19.1.
---
common/shlibs | 1 +
srcpkgs/libdatachannel-devel | 1 +
srcpkgs/libdatachannel/template | 23 +++++++++++++++++++++++
3 files changed, 25 insertions(+)
create mode 120000 srcpkgs/libdatachannel-devel
create mode 100644 srcpkgs/libdatachannel/template
diff --git a/common/shlibs b/common/shlibs
index bf3e3183ab4e6..9339bcccff903 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4269,3 +4269,4 @@ libgrass_raster.8.3.so grass-8.3.0_1
libgrass_vector.8.3.so grass-8.3.0_1
libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
+libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
diff --git a/srcpkgs/libdatachannel-devel b/srcpkgs/libdatachannel-devel
new file mode 120000
index 0000000000000..2e91a7b97b155
--- /dev/null
+++ b/srcpkgs/libdatachannel-devel
@@ -0,0 +1 @@
+libdatachannel
\ No newline at end of file
diff --git a/srcpkgs/libdatachannel/template b/srcpkgs/libdatachannel/template
new file mode 100644
index 0000000000000..41f8d0814e73b
--- /dev/null
+++ b/srcpkgs/libdatachannel/template
@@ -0,0 +1,23 @@
+# Template file for 'libdatachannel'
+pkgname=libdatachannel
+version=0.19.1
+revision=1
+build_style=cmake
+configure_args="-DPREFER_SYSTEM_LIB=ON -DUSE_NICE=ON -DNO_EXAMPLES=ON"
+makedepends="plog openssl-devel libnice-devel libsrtp-devel usrsctp"
+short_desc="C/C++ WebRTC network library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://libdatachannel.org/"
+distfiles="https://github.com/paullouisageneau/libdatachannel/archive/refs/tags/v$version.tar.gz"
+checksum=3687bbdc30ce24d98cc602dee1da9583bf6863d53dc2a598e590f522be719233
+
+libdatachannel-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From a603a2c1067ba08c2a86538aaebbac2750a916aa Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:22:11 -0500
Subject: [PATCH 5/5] obs: Update to 30.0.0
---
srcpkgs/obs/template | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index b43b10ef935e9..45766291efb35 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
-version=29.1.3
-revision=2
+version=30.0.0
+revision=1
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -12,15 +12,24 @@ makedepends="LuaJIT-devel fdk-aac-devel ffmpeg-devel glu-devel
pulseaudio-devel python3-devel speexdsp-devel v4l-utils-devel
vlc-devel qt6-svg-devel x264-devel mbedtls-devel jansson-devel
wayland-devel pipewire-devel libxkbcommon-devel pciutils-devel
- librist-devel srt-devel"
+ librist-devel srt-devel libdatachannel-devel"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
homepage="https://obsproject.com"
changelog="https://github.com/obsproject/obs-studio/releases"
-distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=9d9cfbdbdd255f48a23feeefb60089769a65f52bbca24fa31d74125f3bbb0e90
+distfiles="https://github.com/obsproject/obs-studio/archive/refs/tags/30.0.0-rc1.tar.gz"
+checksum=77d1d0bef0e156e5e5b19646dc9372ea99a046e39de985496e291e9f23e60764
+
+case "$XBPS_TARGET_MACHINE" in
+ aarch64*)
+ configure_args+=" -DENABLE_QSV11=off"
+ ;;
+ *)
+ makedepends+=" oneVPL"
+ ;;
+esac
pre_configure() {
# it's not enough to use -DENABLE_BROWSER ...
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
` (5 preceding siblings ...)
2023-10-15 2:00 ` the-maldridge
@ 2023-10-17 11:36 ` Lolzen
2023-10-23 0:16 ` 10leej
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Lolzen @ 2023-10-17 11:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
New comment by Lolzen on void-packages repository
https://github.com/void-linux/void-packages/pull/46233#issuecomment-1766232091
Comment:
As the browser plugin is enabled by default, can we get that?
https://obsproject.com/wiki/Building-OBS-Studio
@Duncaen
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
` (6 preceding siblings ...)
2023-10-17 11:36 ` Lolzen
@ 2023-10-23 0:16 ` 10leej
2023-10-23 1:23 ` lemmi
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: 10leej @ 2023-10-23 0:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
New comment by 10leej on void-packages repository
https://github.com/void-linux/void-packages/pull/46233#issuecomment-1774244259
Comment:
Can this PR use the git master branch rather than the release tarballs as I mentioned in #46835 that way websocket support can be enabled?
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
` (7 preceding siblings ...)
2023-10-23 0:16 ` 10leej
@ 2023-10-23 1:23 ` lemmi
2023-10-24 12:11 ` m3tav3rse
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: lemmi @ 2023-10-23 1:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 597 bytes --]
New comment by lemmi on void-packages repository
https://github.com/void-linux/void-packages/pull/46233#issuecomment-1774281599
Comment:
We can certainly look into adding websocket support once `30.0` has been released.
Using `master` is [almost certainly out of the question](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements). Same goes for the browser plug-in, since that one has a [rather annoying dependency](https://github.com/obsproject/obs-studio/wiki/Build-Instructions-For-Linux#prerequisites-1) which requires packaging another browser.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
` (8 preceding siblings ...)
2023-10-23 1:23 ` lemmi
@ 2023-10-24 12:11 ` m3tav3rse
2023-10-27 19:25 ` Lolzen
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: m3tav3rse @ 2023-10-24 12:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
New comment by m3tav3rse on void-packages repository
https://github.com/void-linux/void-packages/pull/46233#issuecomment-1777086420
Comment:
[Upstream said](https://github.com/obsproject/obs-studio/pull/7475#issuecomment-1663961298) github tarballs will contain all submodules (including websocket) "sometime after the next release".
Upstream issue https://github.com/obsproject/obs-studio/issues/7407
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
` (9 preceding siblings ...)
2023-10-24 12:11 ` m3tav3rse
@ 2023-10-27 19:25 ` Lolzen
2023-11-13 7:29 ` [PR PATCH] [Updated] " the-maldridge
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Lolzen @ 2023-10-27 19:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 789 bytes --]
New comment by Lolzen on void-packages repository
https://github.com/void-linux/void-packages/pull/46233#issuecomment-1783400863
Comment:
> We can certainly look into adding websocket support once `30.0` has been released. Using `master` is [almost certainly out of the question](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements). Same goes for the browser plug-in, since that one has a [rather annoying dependency](https://github.com/obsproject/obs-studio/wiki/Build-Instructions-For-Linux#prerequisites-1) which requires packaging another browser.
For now i'm simply enhancing the default template, it's not that hard to download a second tarbal imho. But i might just miss your point.
https://pastebin.com/Ug9mw7Ln -> modified template
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
` (10 preceding siblings ...)
2023-10-27 19:25 ` Lolzen
@ 2023-11-13 7:29 ` the-maldridge
2023-11-13 19:40 ` the-maldridge
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: the-maldridge @ 2023-11-13 7:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
There is an updated pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages obs-next
https://github.com/void-linux/void-packages/pull/46233
WIP: Update OBS to 30.0.0
WIP PR to stage this update so we can submit it when the final release happens. Since this release deprecates FTL in favor of WHIP, the dependencies for that get added.
A patch file from https://github.com/void-linux/void-packages/pull/46233.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-obs-next-46233.patch --]
[-- Type: text/x-diff, Size: 8325 bytes --]
From f7f5434473978d16caf87816c5995563725c0145 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:38:52 -0500
Subject: [PATCH 1/5] New package: oneVPL-2023.3.1.
---
common/shlibs | 1 +
srcpkgs/oneVPL-examples | 1 +
srcpkgs/oneVPL/template | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 120000 srcpkgs/oneVPL-examples
create mode 100644 srcpkgs/oneVPL/template
diff --git a/common/shlibs b/common/shlibs
index ede20ee14a683..6dc7159f792a8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4267,3 +4267,4 @@ libgrass_gproj.8.3.so grass-8.3.0_1
libgrass_imagery.8.3.so grass-8.3.0_1
libgrass_raster.8.3.so grass-8.3.0_1
libgrass_vector.8.3.so grass-8.3.0_1
+libvpl.so.2 oneVPL-2023.3.1_1
diff --git a/srcpkgs/oneVPL-examples b/srcpkgs/oneVPL-examples
new file mode 120000
index 0000000000000..03776a5d59e14
--- /dev/null
+++ b/srcpkgs/oneVPL-examples
@@ -0,0 +1 @@
+oneVPL
\ No newline at end of file
diff --git a/srcpkgs/oneVPL/template b/srcpkgs/oneVPL/template
new file mode 100644
index 0000000000000..9ceeea7ccc737
--- /dev/null
+++ b/srcpkgs/oneVPL/template
@@ -0,0 +1,26 @@
+# Template file for 'oneVPL'
+pkgname=oneVPL
+version=2023.3.1
+revision=1
+build_style=cmake
+hostmakedepends="libva-devel libX11-devel"
+hostmakedepends="pkg-config"
+short_desc="Intel oneAPI Video Processing Library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/oneapi-src/oneVPL"
+changelog="https://github.com/oneapi-src/oneVPL/blob/master/CHANGELOG.md"
+distfiles="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$version.tar.gz"
+checksum=4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5
+
+post_install() {
+ vlicense LICENSE
+}
+
+oneVPL-examples_package() {
+ short_desc+=" - examples"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/share/vpl/examples
+ }
+}
From cb5d3f70f3f5a43e7f443863b47970e6b7e8844a Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:56:49 -0500
Subject: [PATCH 2/5] New package: plog-1.1.10.
---
srcpkgs/plog/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/plog/template
diff --git a/srcpkgs/plog/template b/srcpkgs/plog/template
new file mode 100644
index 0000000000000..106c810787157
--- /dev/null
+++ b/srcpkgs/plog/template
@@ -0,0 +1,15 @@
+# Template file for 'plog'
+pkgname=plog
+version=1.1.10
+revision=1
+build_style=cmake
+short_desc="Portables, simple and extensible C++ logging library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/SergiusTheBest/plog/archive/refs/tags/$version.tar.gz"
+checksum=55a090fc2b46ab44d0dde562a91fe5fc15445a3caedfaedda89fe3925da4705a
+
+post_install() {
+ vlicense LICENSE
+}
From 05d01752d3beb41b9212014b7643e0014915a590 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 17:14:38 -0500
Subject: [PATCH 3/5] New package: usrsctp-0.9.5.0.
---
common/shlibs | 1 +
srcpkgs/usrsctp/template | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
create mode 100644 srcpkgs/usrsctp/template
diff --git a/common/shlibs b/common/shlibs
index 6dc7159f792a8..337faa6ae8d09 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4268,3 +4268,4 @@ libgrass_imagery.8.3.so grass-8.3.0_1
libgrass_raster.8.3.so grass-8.3.0_1
libgrass_vector.8.3.so grass-8.3.0_1
libvpl.so.2 oneVPL-2023.3.1_1
+libusrsctp.so.2 usrsctp-0.9.5.0_1
diff --git a/srcpkgs/usrsctp/template b/srcpkgs/usrsctp/template
new file mode 100644
index 0000000000000..061a4a375020a
--- /dev/null
+++ b/srcpkgs/usrsctp/template
@@ -0,0 +1,18 @@
+# Template file for 'usrsctp'
+pkgname=usrsctp
+version=0.9.5.0
+revision=1
+build_style=cmake
+configure_args="-Dsctp_werror=off -Dsctp_build_shared_lib=on"
+short_desc="Portable SCTP userland stack"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/sctplab/usrsctp/archive/refs/tags/$version.tar.gz"
+checksum=260107caf318650a57a8caa593550e39bca6943e93f970c80d6c17e59d62cd92
+
+post_install() {
+ vlicense LICENSE.md
+ rm -f $DESTDIR/usr/lib64
+ rm -f $DESTDIR/usr/lib32
+}
From df409905b35ca1710ef3c34074f5f5b0313fe42d Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:53:57 -0500
Subject: [PATCH 4/5] New package: libdatachannel-0.19.1.
---
common/shlibs | 1 +
srcpkgs/libdatachannel-devel | 1 +
srcpkgs/libdatachannel/template | 23 +++++++++++++++++++++++
3 files changed, 25 insertions(+)
create mode 120000 srcpkgs/libdatachannel-devel
create mode 100644 srcpkgs/libdatachannel/template
diff --git a/common/shlibs b/common/shlibs
index 337faa6ae8d09..dc08c7989c039 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4269,3 +4269,4 @@ libgrass_raster.8.3.so grass-8.3.0_1
libgrass_vector.8.3.so grass-8.3.0_1
libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
+libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
diff --git a/srcpkgs/libdatachannel-devel b/srcpkgs/libdatachannel-devel
new file mode 120000
index 0000000000000..2e91a7b97b155
--- /dev/null
+++ b/srcpkgs/libdatachannel-devel
@@ -0,0 +1 @@
+libdatachannel
\ No newline at end of file
diff --git a/srcpkgs/libdatachannel/template b/srcpkgs/libdatachannel/template
new file mode 100644
index 0000000000000..41f8d0814e73b
--- /dev/null
+++ b/srcpkgs/libdatachannel/template
@@ -0,0 +1,23 @@
+# Template file for 'libdatachannel'
+pkgname=libdatachannel
+version=0.19.1
+revision=1
+build_style=cmake
+configure_args="-DPREFER_SYSTEM_LIB=ON -DUSE_NICE=ON -DNO_EXAMPLES=ON"
+makedepends="plog openssl-devel libnice-devel libsrtp-devel usrsctp"
+short_desc="C/C++ WebRTC network library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://libdatachannel.org/"
+distfiles="https://github.com/paullouisageneau/libdatachannel/archive/refs/tags/v$version.tar.gz"
+checksum=3687bbdc30ce24d98cc602dee1da9583bf6863d53dc2a598e590f522be719233
+
+libdatachannel-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From 4521f5f392544bc58d83e83df8f90f413f39c1a3 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:22:11 -0500
Subject: [PATCH 5/5] obs: Update to 30.0.0
---
srcpkgs/obs/template | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 5d1d5e887409e..90d903a7b982c 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
-version=29.1.3
-revision=3
+version=30.0.0
+revision=1
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -12,15 +12,24 @@ makedepends="LuaJIT-devel fdk-aac-devel ffmpeg-devel glu-devel
pulseaudio-devel python3-devel speexdsp-devel v4l-utils-devel
vlc-devel qt6-svg-devel x264-devel mbedtls-devel jansson-devel
wayland-devel pipewire-devel libxkbcommon-devel pciutils-devel
- librist-devel srt-devel"
+ librist-devel srt-devel libdatachannel-devel"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
homepage="https://obsproject.com"
changelog="https://github.com/obsproject/obs-studio/releases"
-distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=9d9cfbdbdd255f48a23feeefb60089769a65f52bbca24fa31d74125f3bbb0e90
+distfiles="https://github.com/obsproject/obs-studio/archive/refs/tags/$version.tar.gz"
+checksum=c23dd463862b1a8f40365d84fd52105d7eafc3614fb3d470b695ba28a6e4da06
+
+case "$XBPS_TARGET_MACHINE" in
+ aarch64*)
+ configure_args+=" -DENABLE_QSV11=off"
+ ;;
+ *)
+ makedepends+=" oneVPL"
+ ;;
+esac
pre_configure() {
# it's not enough to use -DENABLE_BROWSER ...
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
` (11 preceding siblings ...)
2023-11-13 7:29 ` [PR PATCH] [Updated] " the-maldridge
@ 2023-11-13 19:40 ` the-maldridge
2023-11-13 19:44 ` [PR PATCH] [Updated] " the-maldridge
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: the-maldridge @ 2023-11-13 19:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 396 bytes --]
New comment by the-maldridge on void-packages repository
https://github.com/void-linux/void-packages/pull/46233#issuecomment-1808913947
Comment:
@Lolzen the browser plugin is unlikely to ever be accepted to the main template for the stated reasons above. You can, however, install obs-plugin-browser-bin which may or may not work at any given time.
Websockets are enabled in the build now.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
` (12 preceding siblings ...)
2023-11-13 19:40 ` the-maldridge
@ 2023-11-13 19:44 ` the-maldridge
2023-11-13 19:44 ` the-maldridge
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: the-maldridge @ 2023-11-13 19:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
There is an updated pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages obs-next
https://github.com/void-linux/void-packages/pull/46233
WIP: Update OBS to 30.0.0
WIP PR to stage this update so we can submit it when the final release happens. Since this release deprecates FTL in favor of WHIP, the dependencies for that get added.
A patch file from https://github.com/void-linux/void-packages/pull/46233.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-obs-next-46233.patch --]
[-- Type: text/x-diff, Size: 9867 bytes --]
From f7f5434473978d16caf87816c5995563725c0145 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:38:52 -0500
Subject: [PATCH 1/6] New package: oneVPL-2023.3.1.
---
common/shlibs | 1 +
srcpkgs/oneVPL-examples | 1 +
srcpkgs/oneVPL/template | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 120000 srcpkgs/oneVPL-examples
create mode 100644 srcpkgs/oneVPL/template
diff --git a/common/shlibs b/common/shlibs
index ede20ee14a683..6dc7159f792a8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4267,3 +4267,4 @@ libgrass_gproj.8.3.so grass-8.3.0_1
libgrass_imagery.8.3.so grass-8.3.0_1
libgrass_raster.8.3.so grass-8.3.0_1
libgrass_vector.8.3.so grass-8.3.0_1
+libvpl.so.2 oneVPL-2023.3.1_1
diff --git a/srcpkgs/oneVPL-examples b/srcpkgs/oneVPL-examples
new file mode 120000
index 0000000000000..03776a5d59e14
--- /dev/null
+++ b/srcpkgs/oneVPL-examples
@@ -0,0 +1 @@
+oneVPL
\ No newline at end of file
diff --git a/srcpkgs/oneVPL/template b/srcpkgs/oneVPL/template
new file mode 100644
index 0000000000000..9ceeea7ccc737
--- /dev/null
+++ b/srcpkgs/oneVPL/template
@@ -0,0 +1,26 @@
+# Template file for 'oneVPL'
+pkgname=oneVPL
+version=2023.3.1
+revision=1
+build_style=cmake
+hostmakedepends="libva-devel libX11-devel"
+hostmakedepends="pkg-config"
+short_desc="Intel oneAPI Video Processing Library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/oneapi-src/oneVPL"
+changelog="https://github.com/oneapi-src/oneVPL/blob/master/CHANGELOG.md"
+distfiles="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$version.tar.gz"
+checksum=4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5
+
+post_install() {
+ vlicense LICENSE
+}
+
+oneVPL-examples_package() {
+ short_desc+=" - examples"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/share/vpl/examples
+ }
+}
From cb5d3f70f3f5a43e7f443863b47970e6b7e8844a Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:56:49 -0500
Subject: [PATCH 2/6] New package: plog-1.1.10.
---
srcpkgs/plog/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/plog/template
diff --git a/srcpkgs/plog/template b/srcpkgs/plog/template
new file mode 100644
index 0000000000000..106c810787157
--- /dev/null
+++ b/srcpkgs/plog/template
@@ -0,0 +1,15 @@
+# Template file for 'plog'
+pkgname=plog
+version=1.1.10
+revision=1
+build_style=cmake
+short_desc="Portables, simple and extensible C++ logging library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/SergiusTheBest/plog/archive/refs/tags/$version.tar.gz"
+checksum=55a090fc2b46ab44d0dde562a91fe5fc15445a3caedfaedda89fe3925da4705a
+
+post_install() {
+ vlicense LICENSE
+}
From 05d01752d3beb41b9212014b7643e0014915a590 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 17:14:38 -0500
Subject: [PATCH 3/6] New package: usrsctp-0.9.5.0.
---
common/shlibs | 1 +
srcpkgs/usrsctp/template | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
create mode 100644 srcpkgs/usrsctp/template
diff --git a/common/shlibs b/common/shlibs
index 6dc7159f792a8..337faa6ae8d09 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4268,3 +4268,4 @@ libgrass_imagery.8.3.so grass-8.3.0_1
libgrass_raster.8.3.so grass-8.3.0_1
libgrass_vector.8.3.so grass-8.3.0_1
libvpl.so.2 oneVPL-2023.3.1_1
+libusrsctp.so.2 usrsctp-0.9.5.0_1
diff --git a/srcpkgs/usrsctp/template b/srcpkgs/usrsctp/template
new file mode 100644
index 0000000000000..061a4a375020a
--- /dev/null
+++ b/srcpkgs/usrsctp/template
@@ -0,0 +1,18 @@
+# Template file for 'usrsctp'
+pkgname=usrsctp
+version=0.9.5.0
+revision=1
+build_style=cmake
+configure_args="-Dsctp_werror=off -Dsctp_build_shared_lib=on"
+short_desc="Portable SCTP userland stack"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/sctplab/usrsctp/archive/refs/tags/$version.tar.gz"
+checksum=260107caf318650a57a8caa593550e39bca6943e93f970c80d6c17e59d62cd92
+
+post_install() {
+ vlicense LICENSE.md
+ rm -f $DESTDIR/usr/lib64
+ rm -f $DESTDIR/usr/lib32
+}
From df409905b35ca1710ef3c34074f5f5b0313fe42d Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:53:57 -0500
Subject: [PATCH 4/6] New package: libdatachannel-0.19.1.
---
common/shlibs | 1 +
srcpkgs/libdatachannel-devel | 1 +
srcpkgs/libdatachannel/template | 23 +++++++++++++++++++++++
3 files changed, 25 insertions(+)
create mode 120000 srcpkgs/libdatachannel-devel
create mode 100644 srcpkgs/libdatachannel/template
diff --git a/common/shlibs b/common/shlibs
index 337faa6ae8d09..dc08c7989c039 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4269,3 +4269,4 @@ libgrass_raster.8.3.so grass-8.3.0_1
libgrass_vector.8.3.so grass-8.3.0_1
libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
+libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
diff --git a/srcpkgs/libdatachannel-devel b/srcpkgs/libdatachannel-devel
new file mode 120000
index 0000000000000..2e91a7b97b155
--- /dev/null
+++ b/srcpkgs/libdatachannel-devel
@@ -0,0 +1 @@
+libdatachannel
\ No newline at end of file
diff --git a/srcpkgs/libdatachannel/template b/srcpkgs/libdatachannel/template
new file mode 100644
index 0000000000000..41f8d0814e73b
--- /dev/null
+++ b/srcpkgs/libdatachannel/template
@@ -0,0 +1,23 @@
+# Template file for 'libdatachannel'
+pkgname=libdatachannel
+version=0.19.1
+revision=1
+build_style=cmake
+configure_args="-DPREFER_SYSTEM_LIB=ON -DUSE_NICE=ON -DNO_EXAMPLES=ON"
+makedepends="plog openssl-devel libnice-devel libsrtp-devel usrsctp"
+short_desc="C/C++ WebRTC network library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://libdatachannel.org/"
+distfiles="https://github.com/paullouisageneau/libdatachannel/archive/refs/tags/v$version.tar.gz"
+checksum=3687bbdc30ce24d98cc602dee1da9583bf6863d53dc2a598e590f522be719233
+
+libdatachannel-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From 4521f5f392544bc58d83e83df8f90f413f39c1a3 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:22:11 -0500
Subject: [PATCH 5/6] obs: Update to 30.0.0
---
srcpkgs/obs/template | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 5d1d5e887409e..90d903a7b982c 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
-version=29.1.3
-revision=3
+version=30.0.0
+revision=1
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -12,15 +12,24 @@ makedepends="LuaJIT-devel fdk-aac-devel ffmpeg-devel glu-devel
pulseaudio-devel python3-devel speexdsp-devel v4l-utils-devel
vlc-devel qt6-svg-devel x264-devel mbedtls-devel jansson-devel
wayland-devel pipewire-devel libxkbcommon-devel pciutils-devel
- librist-devel srt-devel"
+ librist-devel srt-devel libdatachannel-devel"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
homepage="https://obsproject.com"
changelog="https://github.com/obsproject/obs-studio/releases"
-distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=9d9cfbdbdd255f48a23feeefb60089769a65f52bbca24fa31d74125f3bbb0e90
+distfiles="https://github.com/obsproject/obs-studio/archive/refs/tags/$version.tar.gz"
+checksum=c23dd463862b1a8f40365d84fd52105d7eafc3614fb3d470b695ba28a6e4da06
+
+case "$XBPS_TARGET_MACHINE" in
+ aarch64*)
+ configure_args+=" -DENABLE_QSV11=off"
+ ;;
+ *)
+ makedepends+=" oneVPL"
+ ;;
+esac
pre_configure() {
# it's not enough to use -DENABLE_BROWSER ...
From 5006d811c65722411bbe2bb374fc82c58ff1ce0d Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Mon, 13 Nov 2023 13:44:01 -0600
Subject: [PATCH 6/6] obs-plugin-browser-bin: Update to 30.0.0.
---
srcpkgs/obs-plugin-browser-bin/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/obs-plugin-browser-bin/template b/srcpkgs/obs-plugin-browser-bin/template
index 1a99bd8fbf7b3..b2df46d720950 100644
--- a/srcpkgs/obs-plugin-browser-bin/template
+++ b/srcpkgs/obs-plugin-browser-bin/template
@@ -1,14 +1,14 @@
# Template file for 'obs-plugin-browser-bin'
pkgname=obs-plugin-browser-bin
-version=29.0.2 # This is actually the version of obs to extract the plugin from
+version=30.0.0 # This is actually the version of obs to extract the plugin from
revision=1
archs="x86_64"
short_desc="CEF-based OBS Studio browser plugin"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://obsproject.com/kb/browser-source"
-distfiles="https://launchpad.net/~obsproject/+archive/ubuntu/obs-studio/+files/obs-studio_29.0.2-0obsproject1~kinetic_amd64.deb"
-checksum=1fcc84fa3c917c8bb60c8d70c1b0961ceeb4db6b8f09483611b9b1e015b268c4
+distfiles="https://launchpad.net/~obsproject/+archive/ubuntu/obs-studio/+files/obs-studio_$version-0obsproject1~mantic_amd64.deb"
+checksum=3fe8c1f8788f7b718e3d59ac80f83400e2c21e725d5649fc623e49c73129c911
do_install() {
vinstall lib/x86_64-linux-gnu/obs-plugins/obs-browser.so 0644 usr/lib/obs-plugins/
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] WIP: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
` (13 preceding siblings ...)
2023-11-13 19:44 ` [PR PATCH] [Updated] " the-maldridge
@ 2023-11-13 19:44 ` the-maldridge
2023-11-14 1:39 ` [PR PATCH] [Merged]: " the-maldridge
2023-11-14 8:59 ` Johnnynator
16 siblings, 0 replies; 18+ messages in thread
From: the-maldridge @ 2023-11-13 19:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
There is an updated pull request by the-maldridge against master on the void-packages repository
https://github.com/the-maldridge/void-packages obs-next
https://github.com/void-linux/void-packages/pull/46233
WIP: Update OBS to 30.0.0
WIP PR to stage this update so we can submit it when the final release happens. Since this release deprecates FTL in favor of WHIP, the dependencies for that get added.
A patch file from https://github.com/void-linux/void-packages/pull/46233.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-obs-next-46233.patch --]
[-- Type: text/x-diff, Size: 9867 bytes --]
From 42a6f281f8a855362cfa4d314c4562df98a1fdf0 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:38:52 -0500
Subject: [PATCH 1/6] New package: oneVPL-2023.3.1.
---
common/shlibs | 1 +
srcpkgs/oneVPL-examples | 1 +
srcpkgs/oneVPL/template | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+)
create mode 120000 srcpkgs/oneVPL-examples
create mode 100644 srcpkgs/oneVPL/template
diff --git a/common/shlibs b/common/shlibs
index ede20ee14a683..6dc7159f792a8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4267,3 +4267,4 @@ libgrass_gproj.8.3.so grass-8.3.0_1
libgrass_imagery.8.3.so grass-8.3.0_1
libgrass_raster.8.3.so grass-8.3.0_1
libgrass_vector.8.3.so grass-8.3.0_1
+libvpl.so.2 oneVPL-2023.3.1_1
diff --git a/srcpkgs/oneVPL-examples b/srcpkgs/oneVPL-examples
new file mode 120000
index 0000000000000..03776a5d59e14
--- /dev/null
+++ b/srcpkgs/oneVPL-examples
@@ -0,0 +1 @@
+oneVPL
\ No newline at end of file
diff --git a/srcpkgs/oneVPL/template b/srcpkgs/oneVPL/template
new file mode 100644
index 0000000000000..9ceeea7ccc737
--- /dev/null
+++ b/srcpkgs/oneVPL/template
@@ -0,0 +1,26 @@
+# Template file for 'oneVPL'
+pkgname=oneVPL
+version=2023.3.1
+revision=1
+build_style=cmake
+hostmakedepends="libva-devel libX11-devel"
+hostmakedepends="pkg-config"
+short_desc="Intel oneAPI Video Processing Library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/oneapi-src/oneVPL"
+changelog="https://github.com/oneapi-src/oneVPL/blob/master/CHANGELOG.md"
+distfiles="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$version.tar.gz"
+checksum=4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5
+
+post_install() {
+ vlicense LICENSE
+}
+
+oneVPL-examples_package() {
+ short_desc+=" - examples"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/share/vpl/examples
+ }
+}
From a6e5ce30b09fa456d284b0448d35ecf249b490d6 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:56:49 -0500
Subject: [PATCH 2/6] New package: plog-1.1.10.
---
srcpkgs/plog/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/plog/template
diff --git a/srcpkgs/plog/template b/srcpkgs/plog/template
new file mode 100644
index 0000000000000..106c810787157
--- /dev/null
+++ b/srcpkgs/plog/template
@@ -0,0 +1,15 @@
+# Template file for 'plog'
+pkgname=plog
+version=1.1.10
+revision=1
+build_style=cmake
+short_desc="Portables, simple and extensible C++ logging library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/SergiusTheBest/plog/archive/refs/tags/$version.tar.gz"
+checksum=55a090fc2b46ab44d0dde562a91fe5fc15445a3caedfaedda89fe3925da4705a
+
+post_install() {
+ vlicense LICENSE
+}
From ee38d3852327ecd77d2a428a3e06ff84d7441061 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 17:14:38 -0500
Subject: [PATCH 3/6] New package: usrsctp-0.9.5.0.
---
common/shlibs | 1 +
srcpkgs/usrsctp/template | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
create mode 100644 srcpkgs/usrsctp/template
diff --git a/common/shlibs b/common/shlibs
index 6dc7159f792a8..337faa6ae8d09 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4268,3 +4268,4 @@ libgrass_imagery.8.3.so grass-8.3.0_1
libgrass_raster.8.3.so grass-8.3.0_1
libgrass_vector.8.3.so grass-8.3.0_1
libvpl.so.2 oneVPL-2023.3.1_1
+libusrsctp.so.2 usrsctp-0.9.5.0_1
diff --git a/srcpkgs/usrsctp/template b/srcpkgs/usrsctp/template
new file mode 100644
index 0000000000000..061a4a375020a
--- /dev/null
+++ b/srcpkgs/usrsctp/template
@@ -0,0 +1,18 @@
+# Template file for 'usrsctp'
+pkgname=usrsctp
+version=0.9.5.0
+revision=1
+build_style=cmake
+configure_args="-Dsctp_werror=off -Dsctp_build_shared_lib=on"
+short_desc="Portable SCTP userland stack"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/SergiusTheBest/plog"
+distfiles="https://github.com/sctplab/usrsctp/archive/refs/tags/$version.tar.gz"
+checksum=260107caf318650a57a8caa593550e39bca6943e93f970c80d6c17e59d62cd92
+
+post_install() {
+ vlicense LICENSE.md
+ rm -f $DESTDIR/usr/lib64
+ rm -f $DESTDIR/usr/lib32
+}
From 4ae13ad2c221cc8925bfba3350b4fcfc48b54aef Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:53:57 -0500
Subject: [PATCH 4/6] New package: libdatachannel-0.19.1.
---
common/shlibs | 1 +
srcpkgs/libdatachannel-devel | 1 +
srcpkgs/libdatachannel/template | 23 +++++++++++++++++++++++
3 files changed, 25 insertions(+)
create mode 120000 srcpkgs/libdatachannel-devel
create mode 100644 srcpkgs/libdatachannel/template
diff --git a/common/shlibs b/common/shlibs
index 337faa6ae8d09..dc08c7989c039 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4269,3 +4269,4 @@ libgrass_raster.8.3.so grass-8.3.0_1
libgrass_vector.8.3.so grass-8.3.0_1
libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
+libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
diff --git a/srcpkgs/libdatachannel-devel b/srcpkgs/libdatachannel-devel
new file mode 120000
index 0000000000000..2e91a7b97b155
--- /dev/null
+++ b/srcpkgs/libdatachannel-devel
@@ -0,0 +1 @@
+libdatachannel
\ No newline at end of file
diff --git a/srcpkgs/libdatachannel/template b/srcpkgs/libdatachannel/template
new file mode 100644
index 0000000000000..41f8d0814e73b
--- /dev/null
+++ b/srcpkgs/libdatachannel/template
@@ -0,0 +1,23 @@
+# Template file for 'libdatachannel'
+pkgname=libdatachannel
+version=0.19.1
+revision=1
+build_style=cmake
+configure_args="-DPREFER_SYSTEM_LIB=ON -DUSE_NICE=ON -DNO_EXAMPLES=ON"
+makedepends="plog openssl-devel libnice-devel libsrtp-devel usrsctp"
+short_desc="C/C++ WebRTC network library"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://libdatachannel.org/"
+distfiles="https://github.com/paullouisageneau/libdatachannel/archive/refs/tags/v$version.tar.gz"
+checksum=3687bbdc30ce24d98cc602dee1da9583bf6863d53dc2a598e590f522be719233
+
+libdatachannel-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From b2b179442013d73a812002b144f3c3a5bad0b9b6 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Sep 2023 16:22:11 -0500
Subject: [PATCH 5/6] obs: Update to 30.0.0
---
srcpkgs/obs/template | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 5d1d5e887409e..90d903a7b982c 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
# Template file for 'obs'
pkgname=obs
-version=29.1.3
-revision=3
+version=30.0.0
+revision=1
archs="i686* x86_64* ppc64le* aarch64*"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@@ -12,15 +12,24 @@ makedepends="LuaJIT-devel fdk-aac-devel ffmpeg-devel glu-devel
pulseaudio-devel python3-devel speexdsp-devel v4l-utils-devel
vlc-devel qt6-svg-devel x264-devel mbedtls-devel jansson-devel
wayland-devel pipewire-devel libxkbcommon-devel pciutils-devel
- librist-devel srt-devel"
+ librist-devel srt-devel libdatachannel-devel"
depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-or-later"
homepage="https://obsproject.com"
changelog="https://github.com/obsproject/obs-studio/releases"
-distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=9d9cfbdbdd255f48a23feeefb60089769a65f52bbca24fa31d74125f3bbb0e90
+distfiles="https://github.com/obsproject/obs-studio/archive/refs/tags/$version.tar.gz"
+checksum=c23dd463862b1a8f40365d84fd52105d7eafc3614fb3d470b695ba28a6e4da06
+
+case "$XBPS_TARGET_MACHINE" in
+ aarch64*)
+ configure_args+=" -DENABLE_QSV11=off"
+ ;;
+ *)
+ makedepends+=" oneVPL"
+ ;;
+esac
pre_configure() {
# it's not enough to use -DENABLE_BROWSER ...
From 8ca3abed2ac8c3e5df2a8301b7a0452516e544e5 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Mon, 13 Nov 2023 13:44:01 -0600
Subject: [PATCH 6/6] obs-plugin-browser-bin: Update to 30.0.0.
---
srcpkgs/obs-plugin-browser-bin/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/obs-plugin-browser-bin/template b/srcpkgs/obs-plugin-browser-bin/template
index 1a99bd8fbf7b3..b2df46d720950 100644
--- a/srcpkgs/obs-plugin-browser-bin/template
+++ b/srcpkgs/obs-plugin-browser-bin/template
@@ -1,14 +1,14 @@
# Template file for 'obs-plugin-browser-bin'
pkgname=obs-plugin-browser-bin
-version=29.0.2 # This is actually the version of obs to extract the plugin from
+version=30.0.0 # This is actually the version of obs to extract the plugin from
revision=1
archs="x86_64"
short_desc="CEF-based OBS Studio browser plugin"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://obsproject.com/kb/browser-source"
-distfiles="https://launchpad.net/~obsproject/+archive/ubuntu/obs-studio/+files/obs-studio_29.0.2-0obsproject1~kinetic_amd64.deb"
-checksum=1fcc84fa3c917c8bb60c8d70c1b0961ceeb4db6b8f09483611b9b1e015b268c4
+distfiles="https://launchpad.net/~obsproject/+archive/ubuntu/obs-studio/+files/obs-studio_$version-0obsproject1~mantic_amd64.deb"
+checksum=3fe8c1f8788f7b718e3d59ac80f83400e2c21e725d5649fc623e49c73129c911
do_install() {
vinstall lib/x86_64-linux-gnu/obs-plugins/obs-browser.so 0644 usr/lib/obs-plugins/
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Merged]: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
` (14 preceding siblings ...)
2023-11-13 19:44 ` the-maldridge
@ 2023-11-14 1:39 ` the-maldridge
2023-11-14 8:59 ` Johnnynator
16 siblings, 0 replies; 18+ messages in thread
From: the-maldridge @ 2023-11-14 1:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
There's a merged pull request on the void-packages repository
Update OBS to 30.0.0
https://github.com/void-linux/void-packages/pull/46233
Description:
WIP PR to stage this update so we can submit it when the final release happens. Since this release deprecates FTL in favor of WHIP, the dependencies for that get added.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Update OBS to 30.0.0
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
` (15 preceding siblings ...)
2023-11-14 1:39 ` [PR PATCH] [Merged]: " the-maldridge
@ 2023-11-14 8:59 ` Johnnynator
16 siblings, 0 replies; 18+ messages in thread
From: Johnnynator @ 2023-11-14 8:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/46233#issuecomment-1809790733
Comment:
> Websockets are enabled in the build now.
Nope, websockets are not in the template/build.
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2023-11-14 8:59 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-24 23:03 [PR PATCH] WIP: Update OBS to 30.0.0 the-maldridge
2023-09-24 23:12 ` [PR PATCH] [Updated] " the-maldridge
2023-09-24 23:18 ` the-maldridge
2023-09-24 23:21 ` the-maldridge
2023-09-24 23:24 ` the-maldridge
2023-09-25 0:11 ` the-maldridge
2023-10-15 2:00 ` the-maldridge
2023-10-17 11:36 ` Lolzen
2023-10-23 0:16 ` 10leej
2023-10-23 1:23 ` lemmi
2023-10-24 12:11 ` m3tav3rse
2023-10-27 19:25 ` Lolzen
2023-11-13 7:29 ` [PR PATCH] [Updated] " the-maldridge
2023-11-13 19:40 ` the-maldridge
2023-11-13 19:44 ` [PR PATCH] [Updated] " the-maldridge
2023-11-13 19:44 ` the-maldridge
2023-11-14 1:39 ` [PR PATCH] [Merged]: " the-maldridge
2023-11-14 8:59 ` Johnnynator
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).