diff --git a/gobject-introspection/PKGBUILD b/gobject-introspection/PKGBUILD index e2cffdc..b73b1fd 100644 --- a/gobject-introspection/PKGBUILD +++ b/gobject-introspection/PKGBUILD @@ -6,17 +6,17 @@ pkgbase=gobject-introspection pkgname=(gobject-introspection gobject-introspection-runtime) -pkgver=1.72.0 +pkgver=1.74.0 pkgrel=01 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/Projects/GObjectIntrospection" arch=(x86_64) depends=(python-mako python-markdown) -_glibver=2.72.0 +_glibver=2.74.0 makedepends=(cairo git gtk-doc python-sphinx meson "glib2=$_glibver") options=(!emptydirs) #options=(debug) -_commit=c1ce7d179cfce327162bd206cdf2808bd9bd0cc7 # tags/1.72.0^0 +_commit=37bde613a7cb77e7399dafb25731e13208f0ae0b # tags/1.74.0^0 source=("git+https://gitlab.gnome.org/GNOME/gobject-introspection.git#commit=$_commit" "git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$_glibver") @@ -77,7 +77,10 @@ package_gobject-introspection-runtime() { license=(LGPL GPL) -validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0') # Philip Withnall +validpgpkeys=(923B7025EE03C1C59F42684CF0942E894B2EAFA0 # Philip Withnall + D4C501DA48EB797A081750939449C2F50996635F) # Marco Trevisan sha256sums=(SKIP SKIP) + + diff --git a/gobject-introspection/PKGBUILD-arch b/gobject-introspection/PKGBUILD-arch index 80f2cd5..9fd2702 100644 --- a/gobject-introspection/PKGBUILD-arch +++ b/gobject-introspection/PKGBUILD-arch @@ -3,22 +3,23 @@ pkgbase=gobject-introspection pkgname=(gobject-introspection gobject-introspection-runtime) -pkgver=1.72.0 +pkgver=1.74.0 pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/Projects/GObjectIntrospection" arch=(x86_64) license=(LGPL GPL) -_glibver=2.72.0 +_glibver=2.74.0 depends=(python-mako python-markdown) makedepends=(cairo git gtk-doc python-sphinx meson "glib2=$_glibver") options=(debug) -_commit=c1ce7d179cfce327162bd206cdf2808bd9bd0cc7 # tags/1.72.0^0 +_commit=37bde613a7cb77e7399dafb25731e13208f0ae0b # tags/1.74.0^0 source=("git+https://gitlab.gnome.org/GNOME/gobject-introspection.git#commit=$_commit" "git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$_glibver") sha512sums=('SKIP' 'SKIP') -validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0') # Philip Withnall +validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0' # Philip Withnall + 'D4C501DA48EB797A081750939449C2F50996635F') # Marco Trevisan pkgver() { cd $pkgbase diff --git a/gobject-introspection/deps b/gobject-introspection/deps index 22bf6e7..c098a6f 100644 --- a/gobject-introspection/deps +++ b/gobject-introspection/deps @@ -6,3 +6,5 @@ python-sphinx meson git bison + + diff --git a/gobject-introspection/key b/gobject-introspection/key index f3f3c39..f57c1e0 100644 --- a/gobject-introspection/key +++ b/gobject-introspection/key @@ -1 +1,2 @@ gpg -v --recv-key F0942E894B2EAFA0 +gpg -v --recv-keys 9449C2F50996635F diff --git a/librist/010-librist-disable-multicast-tests.patch b/librist/010-librist-disable-multicast-tests.patch new file mode 100644 index 0000000..8491a73 --- /dev/null +++ b/librist/010-librist-disable-multicast-tests.patch @@ -0,0 +1,12 @@ +--- a/test/rist/meson.build ++++ g/test/rist/meson.build +@@ -51,9 +51,6 @@ test('Simple profile unicast', test_send + test('Simple profile unicast packet loss 10%', test_send_receive, args: ['0', 'rist://@127.0.0.1:2234', 'rist://127.0.0.1:2234', '10'],suite: ['simple', 'unicast']) + test('Simple profile unicast packet loss 25%', test_send_receive, args: ['0', 'rist://@127.0.0.1:3234', 'rist://127.0.0.1:3234', '25'],suite: ['simple', 'unicast']) + #Multicast +-test('Simple profile multicast', test_send_receive, args: ['0', 'rist://@239.0.0.1:1234?rtt-max=10&rtt-min=1', 'rist://239.0.0.1:1234?rtt-max=10&rtt-min=1', '0'],suite: ['simple', 'multicast']) +-test('Simple profile multicast packet loss 10%', test_send_receive, args: ['0', 'rist://@239.0.0.2:2234?rtt-max=10&rtt-min=1', 'rist://239.0.0.2:2234?rtt-max=10&rtt-min=1', '10'],suite: ['simple', 'multicast']) +-test('Simple profile multicast packet loss 25%', test_send_receive, args: ['0', 'rist://@239.0.0.3:3234?rtt-max=10&rtt-min=1', 'rist://239.0.0.3:3234?rtt-max=10&rtt-min=1', '25'],suite: ['simple', 'multicast']) + + ###Main profile tests: + #Sender connecting to receiver diff --git a/librist/PKGBUILD b/librist/PKGBUILD new file mode 100644 index 0000000..31532b1 --- /dev/null +++ b/librist/PKGBUILD @@ -0,0 +1,44 @@ +#!/usr/bin/bash +# JOBoRun : Jwm OpenBox Obarun RUNit +# Maintainer : Joe Bo Run +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" +# Website : https://pozol.eu +#-----------------------------------------| DESCRIPTION |--------------------------------------- + +pkgname=librist +pkgver=0.2.7 +pkgrel=01 +pkgdesc='A library that can be used to add the RIST protocol to applications' +arch=('x86_64') +url='https://code.videolan.org/rist/librist/' +depends=('cjson' 'mbedtls') +makedepends=('meson' 'cmake' 'cmocka' 'lz4') +source=("https://code.videolan.org/rist/librist/-/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.bz2" + '010-librist-disable-multicast-tests.patch') + +prepare() { + patch -d "${pkgname}-v${pkgver}" -Np1 -i "${srcdir}/010-librist-disable-multicast-tests.patch" +} + +build() { + arch-meson build "${pkgname}-v${pkgver}" + ninja -v -C build +} + +check() { + ninja -v -C build test +} + +package() { + DESTDIR="$pkgdir" ninja -v -C build install + install -D -m644 "${pkgname}-v${pkgver}/COPYING" -t "${pkgdir}/usr/share/licenses/${pkgname}" +} + +#---- license gpg-key sha256sums ---- + +license=('BSD') + +sha256sums=(7adf2ef9e61e909020df6d22a38b4416380809e655a3f947fcd548b9af115603 # librist-v0.2.7.tar.bz2 + a9dc0c1a3690fea576252e687123ec2d7dfaec7c1a8b0e02c8518bdcb8e9b954) # 010-librist-disable-multicast-tests.patch + + diff --git a/librist/PKGBUILD-aur b/librist/PKGBUILD-aur new file mode 100644 index 0000000..1882ee3 --- /dev/null +++ b/librist/PKGBUILD-aur @@ -0,0 +1,33 @@ +# Maintainer: Daniel Bermond + +pkgname=librist +pkgver=0.2.7 +pkgrel=1 +pkgdesc='A library that can be used to add the RIST protocol to applications' +arch=('x86_64') +url='https://code.videolan.org/rist/librist/' +license=('BSD') +depends=('cjson' 'mbedtls') +makedepends=('meson' 'cmake' 'cmocka' 'lz4') +source=("https://code.videolan.org/rist/librist/-/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.bz2" + '010-librist-disable-multicast-tests.patch') +sha256sums=('7adf2ef9e61e909020df6d22a38b4416380809e655a3f947fcd548b9af115603' + 'a9dc0c1a3690fea576252e687123ec2d7dfaec7c1a8b0e02c8518bdcb8e9b954') + +prepare() { + patch -d "${pkgname}-v${pkgver}" -Np1 -i "${srcdir}/010-librist-disable-multicast-tests.patch" +} + +build() { + arch-meson build "${pkgname}-v${pkgver}" + ninja -v -C build +} + +check() { + ninja -v -C build test +} + +package() { + DESTDIR="$pkgdir" ninja -v -C build install + install -D -m644 "${pkgname}-v${pkgver}/COPYING" -t "${pkgdir}/usr/share/licenses/${pkgname}" +} diff --git a/librist/clean b/librist/clean new file mode 100644 index 0000000..de822e8 --- /dev/null +++ b/librist/clean @@ -0,0 +1 @@ +rm -rf {src,pkg,librist*.tar.bz2} diff --git a/librist/deps b/librist/deps new file mode 100644 index 0000000..424b289 --- /dev/null +++ b/librist/deps @@ -0,0 +1,5 @@ +cjson +mbedtls +meson +cmake +cmocka diff --git a/librist/time b/librist/time new file mode 100644 index 0000000..a390247 --- /dev/null +++ b/librist/time @@ -0,0 +1,6 @@ + + +real 0m25.552s +user 0m15.008s +sys 0m6.982s + diff --git a/obs-studio-git/PKGBUILD b/obs-studio-git/PKGBUILD index c0286be..1a16af4 100644 --- a/obs-studio-git/PKGBUILD +++ b/obs-studio-git/PKGBUILD @@ -6,17 +6,17 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=obs-studio-git -pkgver=27.2.0.575 +pkgver=28.0.1.61 pkgrel=01 pkgdesc="Free and open source software for video recording and live streaming. w/o systemd dependencies" arch=("x86_64") url="https://github.com/obsproject/obs-studio" depends=("ffmpeg" "jansson" "libxinerama" "libxkbcommon-x11" "mbedtls" "rnnoise" "pciutils" - "qt5-svg" "qt5-x11extras" "curl" "jack" "gtk-update-icon-cache" - "speexdsp" "libajantv2") + "qt6-svg" "curl" "jack" "gtk-update-icon-cache" + "speexdsp" "pciutils" "libajantv2" "librist") makedepends=("cmake" "git" "libfdk-aac" "libxcomposite" "x264" "vlc" "swig" "luajit" "python" "cef-minimal-obs-bin" "wayland" - "qt5-wayland" "xdg-desktop-portal" "pipewire") + "qt6-wayland" "xdg-desktop-portal" "pipewire") optdepends=("libfdk-aac: FDK AAC codec support" "libxcomposite: XComposite capture support" "libva-intel-driver: hardware encoding" @@ -34,6 +34,11 @@ source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#branch=maste "git+https://github.com/Mixer/ftl-sdk.git" "git+https://github.com/obsproject/obs-browser.git" "git+https://github.com/obsproject/obs-vst.git" + "git+https://github.com/obsproject/obs-websocket.git" + "git+https://github.com/chriskohlhoff/asio.git" + "git+https://github.com/nlohmann/json.git" + "git+https://github.com/nayuki/QR-Code-generator.git" + "git+https://github.com/zaphoyd/websocketpp.git" "fix_python_binary_loading.patch") pkgver() { @@ -47,6 +52,14 @@ prepare() { git config submodule.plugins/obs-outputs/ftl-sdk.url $srcdir/ftl-sdk git config submodule.plugins/obs-browser.url $srcdir/obs-browser git config submodule.plugins/obs-vst.url $srcdir/obs-vst + git config submodule.plugins/obs-websocket.url $srcdir/obs-websocket + git submodule update + + cd plugins/obs-websocket + git config submodule.deps/asio.url $srcdir/asio + git config submodule.deps/json.url $srcdir/json + git config submodule.deps/qr.url $srcdir/QR-Code-generator + git config submodule.deps/websocketpp.url $srcdir/websocketpp git submodule update } @@ -58,7 +71,7 @@ build() { cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_BROWSER=OFF \ + -DBUILD_BROWSER=ON \ -DCEF_ROOT_DIR="/opt/cef-obs" \ -DOBS_VERSION_OVERRIDE=$pkgver .. @@ -75,5 +88,7 @@ package() { license=("GPL2") -sha256sums=(SKIP SKIP SKIP SKIP +sha256sums=(SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP bdfbd062f080bc925588aec1989bb1df34bf779cc2fc08ac27236679cf612abd) # fix_python_binary_loading.patch + + diff --git a/obs-studio-git/PKGBUILD-aur b/obs-studio-git/PKGBUILD-aur index a96519a..bdc3bd9 100644 --- a/obs-studio-git/PKGBUILD-aur +++ b/obs-studio-git/PKGBUILD-aur @@ -3,18 +3,18 @@ # Contributor: ArcticVanguard # Contributor: ledti pkgname=obs-studio-git -pkgver=27.2.0.177 +pkgver=28.0.1.19 pkgrel=1 pkgdesc="Free and open source software for video recording and live streaming." arch=("i686" "x86_64") url="https://github.com/obsproject/obs-studio" license=("GPL2") depends=("ffmpeg" "jansson" "libxinerama" "libxkbcommon-x11" "mbedtls" - "qt5-svg" "qt5-x11extras" "curl" "jack" "gtk-update-icon-cache" - "speexdsp" "pciutils" "libajantv2") + "qt6-svg" "curl" "jack" "gtk-update-icon-cache" + "speexdsp" "pciutils" "libajantv2" "librist") makedepends=("cmake" "git" "libfdk-aac" "libxcomposite" "x264" "vlc" "swig" "luajit" "python" "cef-minimal-obs-bin" "wayland" - "qt5-wayland" "pipewire" "xdg-desktop-portal") + "qt6-wayland" "pipewire" "xdg-desktop-portal") optdepends=("libfdk-aac: FDK AAC codec support" "libxcomposite: XComposite capture support" "libva-intel-driver: hardware encoding" @@ -32,8 +32,13 @@ source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#branch=maste "git+https://github.com/Mixer/ftl-sdk.git" "git+https://github.com/obsproject/obs-browser.git" "git+https://github.com/obsproject/obs-vst.git" + "git+https://github.com/obsproject/obs-websocket.git" + "git+https://github.com/chriskohlhoff/asio.git" + "git+https://github.com/nlohmann/json.git" + "git+https://github.com/nayuki/QR-Code-generator.git" + "git+https://github.com/zaphoyd/websocketpp.git" "fix_python_binary_loading.patch") -md5sums=("SKIP" "SKIP" "SKIP" "SKIP" +md5sums=("SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "051b90f05e26bff99236b8fb1ad377d1") pkgver() { @@ -47,6 +52,14 @@ prepare() { git config submodule.plugins/obs-outputs/ftl-sdk.url $srcdir/ftl-sdk git config submodule.plugins/obs-browser.url $srcdir/obs-browser git config submodule.plugins/obs-vst.url $srcdir/obs-vst + git config submodule.plugins/obs-websocket.url $srcdir/obs-websocket + git submodule update + + cd plugins/obs-websocket + git config submodule.deps/asio.url $srcdir/asio + git config submodule.deps/json.url $srcdir/json + git config submodule.deps/qr.url $srcdir/QR-Code-generator + git config submodule.deps/websocketpp.url $srcdir/websocketpp git submodule update } diff --git a/obs-studio-git/clean b/obs-studio-git/clean index a8eb278..3487850 100644 --- a/obs-studio-git/clean +++ b/obs-studio-git/clean @@ -1 +1 @@ -rm -rf {src,pkg,obs-studio-git,ftl-sdk,obs-browser,obs-vst} +rm -rf {src,pkg,obs-studio-git,ftl-sdk,obs-browser,obs-vst,obs-websocket,asio,json,QR-Code-generator,websocketpp} diff --git a/obs-studio-git/deps b/obs-studio-git/deps index 88dd1d7..d7e9566 100644 --- a/obs-studio-git/deps +++ b/obs-studio-git/deps @@ -1,14 +1,13 @@ ffmpeg -jansson libxinerama libxkbcommon-x11 mbedtls -qt5-svg -qt5-x11extras -jack2 +rnnoise +qt6-svg gtk-update-icon-cache speexdsp libajantv2 +librist cmake git libfdk-aac @@ -20,9 +19,10 @@ luajit python cef-minimal-obs-bin wayland -qt5-wayland +qt6-wayland xdg-desktop-portal + xdg-desktop-portal-gtk -bluez-libs +jack2 pipewire -rnnoise +bluez-libs