Revert "Auxiliary commit to revert individual files from baff7d0d7044d8024225d8162bf8eed4848f88dd"

This reverts commit c937aea25cb6a7dc21622fc4a37b8c774bdb9ee7.
This commit is contained in:
joborun linux 2023-04-07 19:19:06 +03:00
parent baff7d0d70
commit 94445722ae
5 changed files with 5 additions and 453 deletions

View File

@ -6,8 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=obs-studio
pkgver=29.1.beta2
#pkgver=29.0.2
pkgver=29.0.2
#pkgver=29.0.0124+ga0b5c1b3f
#pkgver=${_pkgver//-/_}
pkgrel=02
@ -37,9 +36,8 @@ optdepends=("libfdk-aac: FDK AAC codec support"
"jack2: The JACK low-latency audio server")
provides=("obs-studio=$pkgver")
conflicts=("obs-studio-git")
##_commit=8d9fc74631bb8d0f7ca71d2c158f922b702e7750 # tags/29.0.2
##source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#commit=$_commit"
source=("$pkgname::https://github.com/obsproject/obs-studio/releases/download/29.1.0-beta2/OBS-Studio-29.1-beta2.zip"
_commit=8d9fc74631bb8d0f7ca71d2c158f922b702e7750 # tags/29.0.2
source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#commit=$_commit"
#source=("$pkgname::git+https://github.com/obsproject/obs-studio.git"
# "git+https://github.com/Mixer/ftl-sdk.git"
# "git+https://github.com/obsproject/obs-browser.git"
@ -64,7 +62,7 @@ source=("$pkgname::https://github.com/obsproject/obs-studio/releases/download/29
prepare() {
# gitconf="protocol.file.allow=always"
cd $pkgname-$pkgver
cd $pkgname
patch -Np1 < "$srcdir"/fix_python_binary_loading.patch
patch -Np1 < "$srcdir"/ignore_unused_submodules.patch
@ -83,7 +81,7 @@ prepare() {
}
build() {
cmake -B build -S $pkgname-$pkgver \
cmake -B build -S $pkgname \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DENABLE_BROWSER=OFF \
-DENABLE_VST=ON \
@ -112,8 +110,6 @@ build() {
}
package() {
cd $pkgname-$pkgver
# cd $pkgname/build
#
# make install DESTDIR="$pkgdir"

View File

@ -1,144 +0,0 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=obs-studio-rc
_pkgver=29.1.0-beta2
pkgver=${_pkgver//-/_}
pkgrel=1
#epoch=5
pkgdesc="Beta cycle of the free and open source software for video recording and live streaming. With everything except service integration"
url="https://github.com/obsproject/obs-studio"
# To manage dependency rebuild easily, this will prevent you to rebuild OBS on non-updated system
_mbedtlsver=2.28
_pythonver=3.10
depends=(
"jack" "gtk-update-icon-cache" "x264" "rnnoise" "pciutils" "qt6-svg"
"mbedtls>=$_mbedtlsver"
# "libxinerama" provided by "vlc-luajit"
# "libxkbcommon-x11" provided by "qt6-base"
# "jansson" "curl" provided by "ftl-sdk"
# Needed to use Qt on Wayland platform
"qt6-wayland"
# Both needed to load linux-capture, so those two are no longer optional
"libxcomposite" "pipewire"
# Needed to use PipeWire capture
"xdg-desktop-portal"
# Needed by obs-browser
# "libxss" "libxrandr" "nss" "at-spi2-core"
# AUR Packages
"ffmpeg-obs>=6" "vlc-luajit" "ftl-sdk"
)
## About vlc-luajit
# The official VLC package will make OBS crash when a VLC source is used.
# The issue is that VLC and OBS are compiled with different lua version.
# So I also created vlc-luajit, a VLC package compiled with the same lua as OBS.
# But to make people unable to install VLC official package with obs-studio-tytan652.
# I decided to make vlc-luajit a dependency of OBS rather than an optional one.
## About ffmpeg-obs
# Read ffmpeg-obs PKGBUILD for more info
makedepends=(
"cmake" "git" "libfdk-aac" "swig" "luajit" "sndio"
"python>=$_pythonver"
# Needed by obs-websocket
'asio' 'nlohmann-json' 'websocketpp'
# AUR Packages
"libajantv2"
# needed when --browser is enabled
# "cef-minimal-obs=103.0.0_5060_shared_textures_143.2591+g4204d54+chromium_103.0.5060.134_1"
)
optdepends=(
"libfdk-aac: FDK AAC codec support"
"intel-media-driver: Hardware encoding (>= Broadwell)"
"libva-intel-driver: Hardware encoding (<= Haswell)"
"libva-mesa-driver: Hardware encoding"
"swig: Scripting"
"luajit: Lua scripting"
"python>=$_pythonver: Python scripting"
"sndio: Sndio input client"
"v4l2loopback-dkms: Virtual camera output"
"libajantv2: AJA NTV 2 support"
)
provides=("obs-studio=$pkgver" "obs-vst" "obs-websocket")
conflicts=(
"obs-studio" "obs-vst" "obs-websocket"
"obs-linuxbrowser" # This plugin is obsolete
"libva-vdpau-driver" # This driver is abandonned and make OBS segfault if it happen to be loaded, try libva-nvidia-driver is you really need Nvidia decode through VAAPI
) # "obs-browser"
options=('debug')
source=(
"obs-studio::git+https://github.com/obsproject/obs-studio.git#tag=$_pkgver"
"obs-browser::git+https://github.com/obsproject/obs-browser.git"
"obs-websocket::git+https://github.com/obsproject/obs-websocket.git"
"qr::git+https://github.com/nayuki/QR-Code-generator.git"
)
if [[ $CARCH == 'x86_64' ]]; then
optdepends+=("decklink: Blackmagic Design DeckLink support")
fi
prepare() {
cd "$srcdir/obs-studio"
git config submodule.plugins/obs-browser.url $srcdir/obs-browser
git config submodule.plugins/obs-websocket.url $srcdir/obs-websocket
git -c protocol.file.allow=always submodule update
cd plugins/obs-websocket
git config submodule.deps/qr.url $srcdir/qr
git -c protocol.file.allow=always submodule update deps/qr
}
build() {
cd "$srcdir"/obs-studio
mkdir -p build; cd build
cmake \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DENABLE_RTMPS=ON \
-DQT_VERSION=6 \
-DENABLE_LIBFDK=ON \
-DENABLE_JACK=ON \
-DENABLE_SNDIO=ON \
-DENABLE_BROWSER=OFF \
-DCEF_ROOT_DIR=/opt/cef-obs \
-DBETA="$_pkgver" ..
# -DOBS_VERSION_OVERRIDE="$_pkgver" ..
# -DRELEASE_CANDIDATE="$_pkgver" ..
sed -i "s|#define OBS_VERSION |#define OBS_VERSION \"$_pkgver-rc-$pkgrel\" //|" config/obsconfig.h
make
}
package() {
cd obs-studio/build
make install DESTDIR="$pkgdir"
}
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
license=("GPL3")
sha256sums=(a "SKIP" "SKIP" "SKIP" "SKIP")
##

View File

@ -1,143 +0,0 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=obs-studio-rc
_pkgver=29.1.0-beta2
pkgver=${_pkgver//-/_}
pkgrel=1
#epoch=5
pkgdesc="Beta cycle of the free and open source software for video recording and live streaming. With everything except service integration"
url="https://github.com/obsproject/obs-studio"
# To manage dependency rebuild easily, this will prevent you to rebuild OBS on non-updated system
_mbedtlsver=2.28
_pythonver=3.10
depends=(
"jack" "gtk-update-icon-cache" "x264" "rnnoise" "pciutils" "qt6-svg"
"mbedtls>=$_mbedtlsver"
# "libxinerama" provided by "vlc-luajit"
# "libxkbcommon-x11" provided by "qt6-base"
# "jansson" "curl" provided by "ftl-sdk"
# Needed to use Qt on Wayland platform
"qt6-wayland"
# Both needed to load linux-capture, so those two are no longer optional
"libxcomposite" "pipewire"
# Needed to use PipeWire capture
"xdg-desktop-portal"
# Needed by obs-browser
"libxss" "libxrandr" "nss" "at-spi2-core"
# AUR Packages
"ffmpeg-obs>=6" "vlc-luajit" "ftl-sdk"
)
## About vlc-luajit
# The official VLC package will make OBS crash when a VLC source is used.
# The issue is that VLC and OBS are compiled with different lua version.
# So I also created vlc-luajit, a VLC package compiled with the same lua as OBS.
# But to make people unable to install VLC official package with obs-studio-tytan652.
# I decided to make vlc-luajit a dependency of OBS rather than an optional one.
## About ffmpeg-obs
# Read ffmpeg-obs PKGBUILD for more info
makedepends=(
"cmake" "git" "libfdk-aac" "swig" "luajit" "sndio"
"python>=$_pythonver"
# Needed by obs-websocket
'asio' 'nlohmann-json' 'websocketpp'
# AUR Packages
"libajantv2"
"cef-minimal-obs=103.0.0_5060_shared_textures_143.2591+g4204d54+chromium_103.0.5060.134_1"
)
optdepends=(
"libfdk-aac: FDK AAC codec support"
"intel-media-driver: Hardware encoding (>= Broadwell)"
"libva-intel-driver: Hardware encoding (<= Haswell)"
"libva-mesa-driver: Hardware encoding"
"swig: Scripting"
"luajit: Lua scripting"
"python>=$_pythonver: Python scripting"
"sndio: Sndio input client"
"v4l2loopback-dkms: Virtual camera output"
"libajantv2: AJA NTV 2 support"
)
provides=("obs-studio=$pkgver" "obs-vst" "obs-websocket")
conflicts=(
"obs-studio" "obs-vst" "obs-websocket" "obs-browser"
"obs-linuxbrowser" # This plugin is obsolete
"libva-vdpau-driver" # This driver is abandonned and make OBS segfault if it happen to be loaded, try libva-nvidia-driver is you really need Nvidia decode through VAAPI
)
options=('debug')
source=(
"obs-studio::git+https://github.com/obsproject/obs-studio.git#tag=$_pkgver"
"obs-browser::git+https://github.com/obsproject/obs-browser.git"
"obs-websocket::git+https://github.com/obsproject/obs-websocket.git"
"qr::git+https://github.com/nayuki/QR-Code-generator.git"
)
if [[ $CARCH == 'x86_64' ]]; then
optdepends+=("decklink: Blackmagic Design DeckLink support")
fi
prepare() {
cd "$srcdir/obs-studio"
git config submodule.plugins/obs-browser.url $srcdir/obs-browser
git config submodule.plugins/obs-websocket.url $srcdir/obs-websocket
git -c protocol.file.allow=always submodule update
cd plugins/obs-websocket
git config submodule.deps/qr.url $srcdir/qr
git -c protocol.file.allow=always submodule update deps/qr
}
build() {
cd "$srcdir"/obs-studio
mkdir -p build; cd build
cmake \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DENABLE_RTMPS=ON \
-DQT_VERSION=6 \
-DENABLE_LIBFDK=ON \
-DENABLE_JACK=ON \
-DENABLE_SNDIO=ON \
-DENABLE_BROWSER=ON \
-DCEF_ROOT_DIR=/opt/cef-obs \
-DBETA="$_pkgver" ..
# -DOBS_VERSION_OVERRIDE="$_pkgver" ..
# -DRELEASE_CANDIDATE="$_pkgver" ..
sed -i "s|#define OBS_VERSION |#define OBS_VERSION \"$_pkgver-rc-$pkgrel\" //|" config/obsconfig.h
make
}
package() {
cd obs-studio/build
make install DESTDIR="$pkgdir"
}
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
license=("GPL3")
sha256sums=(a "SKIP" "SKIP" "SKIP" "SKIP")
##

View File

@ -1,133 +0,0 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=obs-studio
_pkgver=29.1.0-beta2
#pkgver=29.0.2
#pkgver=29.0.0124+ga0b5c1b3f
pkgver=${_pkgver//-/_}
pkgrel=02
#epoch=5
pkgdesc="Free and open source software for video recording and live streaming. w/o systemd pipewire pulseaudio"
url="https://github.com/obsproject/obs-studio"
depends=("ffmpeg" "jansson" "libxinerama" "libxkbcommon-x11" "mbedtls" "rnnoise" "pciutils"
"qt5-svg" "curl" "gtk-update-icon-cache" "libxcomposite")
# "speexdsp" "pciutils" "libajantv2" "librist")
makedepends=('cmake' 'libfdk-aac' 'x264' 'swig' 'python' 'luajit' 'sndio')
#makedepends=("cmake" "git" "libfdk-aac" "libxcomposite" "x264"
# "vlc" "swig" "luajit" "python"
# "cef-minimal-obs-bin" #"wayland"
# "qt5-wayland" "xdg-desktop-portal"
#"pipewire"
#)
optdepends=("libfdk-aac: FDK AAC codec support"
"libva-intel-driver: hardware encoding"
"libva-mesa-driver: hardware encoding"
"vlc: VLC Media Source"
"luajit: Lua scripting"
"python: Python scripting"
'sndio: Sndio input client'
"v4l2loopback-dkms: Virtual webcam"
"jack2: The JACK low-latency audio server")
provides=("obs-studio=$pkgver")
conflicts=("obs-studio-git")
##_commit=8d9fc74631bb8d0f7ca71d2c158f922b702e7750 # tags/29.0.2
##source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#commit=$_commit"
source=("$pkgname::https://github.com/obsproject/obs-studio/releases/download/29.1.0-beta2/OBS-Studio-29.1-beta2.zip"
#source=("$pkgname::git+https://github.com/obsproject/obs-studio.git"
# "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
ignore_unused_submodules.patch)
##pkgver() {
## cd $pkgname
## git describe --long --tags | cut -d- -f1-2 | sed "s/-/\./"
##}
#pkgver() {
# cd $pkgname
# git describe --long | sed "s/$pkgname//" | sed 's/^Release.//;s/\([^-]*-g\)/\1/;s/-/+/g;' | sed 's/+//'
#}
prepare() {
# gitconf="protocol.file.allow=always"
cd $pkgname-$pkgver
patch -Np1 < "$srcdir"/fix_python_binary_loading.patch
patch -Np1 < "$srcdir"/ignore_unused_submodules.patch
# 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 -c $gitconf 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 -c $gitconf submodule update
}
build() {
cmake -B build -S $pkgname-$pkgver \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DENABLE_BROWSER=OFF \
-DENABLE_VST=ON \
-DENABLE_VLC=OFF \
-DENABLE_NEW_MPEGTS_OUTPUT=OFF \
-DENABLE_AJA=OFF \
-DENABLE_JACK=ON \
-DENABLE_ALSA=ON \
-DENABLE_LIBFDK=ON \
-DOBS_VERSION_OVERRIDE="$pkgver-$pkgrel" \
-DENABLE_PIPEWIRE=FALSE \
-DENABLE_PULSEAUDIO=FALSE \
-Wno-dev
cmake --build build
# mkdir -p build; cd build
#
# cmake \
# -DCMAKE_INSTALL_PREFIX=/usr \
# -DCMAKE_INSTALL_LIBDIR=lib \
# -DBUILD_BROWSER=ON \
# -DCEF_ROOT_DIR="/opt/cef-obs" \
# ..
# make
}
package() {
cd $pkgname-$pkgver
# cd $pkgname/build
#
# make install DESTDIR="$pkgdir"
DESTDIR="$pkgdir" cmake --install build
}
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
license=("GPL2")
sha256sums=(SKIP #SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP
bdfbd062f080bc925588aec1989bb1df34bf779cc2fc08ac27236679cf612abd # fix_python_binary_loading.patch
60b0ee1f78df632e1a8c13cb0a7a5772b2a4b092c4a2a78f23464a7d239557c3) # ignore_unused_submodules.patch

View File

@ -1,24 +0,0 @@
cmake
git
libfdk-aac
swig
sndio
python
asio
nlohmann-json
websocketpp
libajantv2
jack2
gtk-update-icon-cache
x264
rnnoise
qt6-svg
mbedtls
qt6-wayland
libxcomposite
pipewire
xdg-desktop-portal
ffmpeg-obs
ftl-sdk