From: the-maldridge <the-maldridge@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] WIP: Update OBS to 30.0.0
Date: Mon, 13 Nov 2023 20:44:17 +0100 [thread overview]
Message-ID: <20231113194417.LhjVTYlqECt4iZPBHQr5Y8Fv2O6rcV-KyX4R0efVY4s@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46233@inbox.vuxu.org>
[-- 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/
next prev parent reply other threads:[~2023-11-13 19:44 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-24 23:03 [PR PATCH] " 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 [this message]
2023-11-14 1:39 ` [PR PATCH] [Merged]: " the-maldridge
2023-11-14 8:59 ` Johnnynator
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231113194417.LhjVTYlqECt4iZPBHQr5Y8Fv2O6rcV-KyX4R0efVY4s@z \
--to=the-maldridge@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).