multimedia-packages/obs-studio
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try updating to lunar

Browse Source
This commit is contained in:
Ward Nakchbandi (Cosmic Fusion) 2023-04-30 20:05:22 +03:00 committed by GitHub
parent a2cd65a975
commit 154e3ed57c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 88 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
obs-studio (29.0.2.git7ceb39b-99pika1.lunar) lunar; urgency=low
Update to lunar
-- Kevin Henkel <obs.goldace@gmail.com> Sat, 04 Feb 2023 12:48:06 +0100
obs-studio (29.0.2-0obsproject1~kinetic) kinetic; urgency=low
OBS Studio 29.0.2

67
debian/control vendored
View File

@ -3,7 +3,72 @@ Section: video
Priority: optional
Maintainer: John Bradley <jrb@turrettech.com>
Uploaders: Kevin Henkel <obs.goldace@gmail.com>
Build-Depends: debhelper (>= 9), cdbs, cmake, git, libx11-dev, libgl1-mesa-dev | libgl-dev, libpulse-dev, libxcb-composite0-dev, libxinerama-dev, libv4l-dev, libudev-dev, libfreetype6-dev, libfontconfig-dev, qt6-base-dev, qt6-base-private-dev, libqt6svg6-dev, libx264-dev, libxcb-xinerama0-dev, libxcb-shm0-dev, libavformat-dev, libavcodec-dev, libavutil-dev, libswscale-dev, libswresample-dev, libavdevice-dev, libavfilter-dev, libfdk-aac-dev, libjack-jackd2-dev, libcurl4-openssl-dev, libspeexdsp-dev, libvlc-dev, libasound2-dev, libluajit-5.1-dev, python3-dev, swig, libmbedtls-dev, pkg-config, libxcb-randr0-dev, libxcb-xfixes0-dev, libx11-xcb-dev, libxcb1-dev, libjansson-dev, libnss3-dev, libxtst-dev, libatspi2.0-dev, libatk-bridge2.0-dev, libatk1.0-dev, libgtk2.0-dev, libgtkglext1-dev, libxss-dev, linux-generic, v4l2loopback-dkms, libwayland-dev, libpci-dev, libdrm-dev, libpipewire-0.3-dev, librist-dev, libsrt-openssl-dev, libva-dev
Build-Depends: debhelper (>= 9), \
cmake, \
ninja-build, \
pkg-config, \
clang, \
clang-format, \
build-essential, \
curl, \
ccache, \
git, \
libffmpeg-amf-dev, \
libavcodec-dev, \
libavdevice-dev, \
libnss3-dev, \
libnspr4-dev, \
libpipewire-0.3-dev, \
libavfilter-dev, \
libavformat-dev, \
libavutil-dev, \
libswresample-dev, \
libswscale-dev, \
libx264-dev, \
libcurl4-openssl-dev, \
libmbedtls-dev, \
libgl1-mesa-dev, \
libjansson-dev, \
libluajit-5.1-dev, \
python3-dev, \
libx11-dev, \
libxcb-randr0-dev, \
libxcb-shm0-dev, \
libxcb-xinerama0-dev, \
libxcb-composite0-dev, \
libxcomposite-dev, \
libxinerama-dev, \
libxcb1-dev, \
libx11-xcb-dev, \
libxcb-xfixes0-dev, \
swig, \
libcmocka-dev, \
libxss-dev, \
libglvnd-dev, \
libgles2-mesa, \
libgles2-mesa-dev, \
libwayland-dev, \
librist-dev, \
libsrt-openssl-dev, \
libpci-dev, \
qt6-base-dev, \
qt6-base-private-dev, \
libqt6svg6-dev, \
qt6-wayland, \
qt6-image-formats-plugins, \
libasound2-dev, \
libfdk-aac-dev, \
libfontconfig-dev, \
libfreetype6-dev, \
libjack-jackd2-dev, \
libpulse-dev, \
libsndio-dev, \
libspeexdsp-dev, \
libudev-dev, \
libv4l-dev, \
libva-dev, \
libvlc-dev, \
libdrm-dev
Homepage: http://obsproject.org
Package: obs-studio

8
debian/rules vendored
View File

@ -1,11 +1,11 @@
#!/usr/bin/make -f
BASE_DIR := $(CURDIR)
CEF_DIR := $(BASE_DIR)/build_dependencies/cef_binary_5060_linux64
#AJA_DIR := $(BASE_DIR)/build_dependencies/aja
CEF_DIR := $(BASE_DIR)/plugins/cef_binary_5060_linux64
AJA_DIR := $(BASE_DIR)/plugins/aja
%:
dh $@
override_dh_auto_configure:
dh_auto_configure -- -DOBS_VERSION_OVERRIDE="29.0.2" -DBUILD_FOR_PPA=ON -DTWITCH_CLIENTID='unla3~mb`xq9`1dhr?1lhhg`65mah0' -DTWITCH_HASH='2D4A98C454B4B0B6' -DRESTREAM_CLIENTID='ml6b16ec(n9?1#9g?m#>9f0,gnkojhhd;oh6' -DRESTREAM_HASH='2DE8E8C514397EE9' -DYOUTUBE_CLIENTID='153066229607$$;a7mw2ig756r?vc<f{`3tr3|i4gq167?$$lrpw,``jbnerwb{ibltals!fjo' -DYOUTUBE_CLIENTID_HASH='2DA97470255F7240' -DYOUTUBE_SECRET=';kV4NTXP5r>D`7bdLO^>gT8U' -DYOUTUBE_SECRET_HASH='F6215E72FC78C76F' -DENABLE_PIPEWIRE=ON -DENABLE_NEW_MPEGTS_OUTPUT=ON -DCEF_ROOT_DIR=$(CEF_DIR)
dh_auto_configure -- -DOBS_VERSION_OVERRIDE="29.0.2" -DBUILD_FOR_PPA=ON -DTWITCH_CLIENTID='unla3~mb`xq9`1dhr?1lhhg`65mah0' -DTWITCH_HASH='2D4A98C454B4B0B6' -DRESTREAM_CLIENTID='ml6b16ec(n9?1#9g?m#>9f0,gnkojhhd;oh6' -DRESTREAM_HASH='2DE8E8C514397EE9' -DYOUTUBE_CLIENTID='153066229607$$;a7mw2ig756r?vc<f{`3tr3|i4gq167?$$lrpw,``jbnerwb{ibltals!fjo' -DYOUTUBE_CLIENTID_HASH='2DA97470255F7240' -DYOUTUBE_SECRET=';kV4NTXP5r>D`7bdLO^>gT8U' -DYOUTUBE_SECRET_HASH='F6215E72FC78C76F' -DENABLE_PIPEWIRE=ON -DENABLE_AJA=ON -DENABLE_NEW_MPEGTS_OUTPUT=ON -DCMAKE_PREFIX_PATH=$(AJA_DIR) -DCEF_ROOT_DIR=$(CEF_DIR) -DCMAKE_BUILD_TYPE=Release

20
main.sh
View File

@ -7,9 +7,14 @@ add-apt-repository ppa:pikaos/pika
add-apt-repository ppa:kubuntu-ppa/backports
# Clone Upstream
git clone --recursive https://github.com/obsproject/obs-studio.git
git checkout 7ceb39bd5630c4363543d121a0c2c753492e3f97
cp -rvf ./debian ./obs-studio/
cd ./obs-studio
cd ./plugins
wget https://cdn-fastly.obsproject.com/downloads/cef_binary_5060_linux64.tar.bz2
tar -xf ./cef_binary_5060_linux64.tar.bz2 -C ./
# remove -Werror flag to mitigate FTBFS with ffmpeg
sed -i 's|-Werror-implicit-function-declaration||g' CMakeLists.txt
@ -21,18 +26,11 @@ sed -i 's| -Wswitch||g' cmake/Modules/CompilerConfig.cmake
for i in ../patches/*.patch; do patch -Np1 -i $i ;done
# Get build deps brute force
apt-get install -y cmake ninja-build pkg-config clang clang-format build-essential curl ccache git libffmpeg-amf-dev
apt-get install -y libavcodec-dev libavdevice-dev libnss3-dev libnspr4-dev libpipewire-0.3-dev libavfilter-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev libcurl4-openssl-dev libmbedtls-dev libgl1-mesa-dev libjansson-dev libluajit-5.1-dev python3-dev libx11-dev libxcb-randr0-dev libxcb-shm0-dev libxcb-xinerama0-dev libxcb-composite0-dev libxcomposite-dev libxinerama-dev libxcb1-dev libx11-xcb-dev libxcb-xfixes0-dev swig libcmocka-dev libxss-dev libglvnd-dev libgles2-mesa libgles2-mesa-dev libwayland-dev librist-dev libsrt-openssl-dev libpci-dev
apt-get install -y qt6-base-dev qt6-base-private-dev libqt6svg6-dev qt6-wayland qt6-image-formats-plugins
apt-get install -y libasound2-dev libfdk-aac-dev libfontconfig-dev libfreetype6-dev libjack-jackd2-dev libpulse-dev libsndio-dev libspeexdsp-dev libudev-dev libv4l-dev libva-dev libvlc-dev libdrm-dev
apt-get build-dep -y ./
./CI/linux/01_install_dependencies.sh
./CI/linux/02_build_obs.sh
./CI/linux/03_package_obs.sh
dpkg-buildpackage --no-sign
# Move the debs to output
mkdir -p ../output
ls build/
mv build/*.deb ../output/
cd ../
mkdir -p ./output
mv ./*.deb ./output/

27
patches/encoder-rename.patch
View File

@ -20,7 +20,7 @@ index 7b247c8..5c4be0f 100644
{
UNUSED_PARAMETER(type_data);
- return "NVIDIA NVENC H.264";
+ return "GPU: Nvidia NVENC H.264";
+ return "GPU: Nvidia NVENC H.264/AVC";
}
#ifdef ENABLE_HEVC
@ -61,7 +61,7 @@ index f0f7747..b5f5d0d 100644
#endif
-#define ENCODER_NAME_H264 "NVIDIA NVENC H.264 (FFmpeg)"
+#define ENCODER_NAME_H264 "GPU: Nvidia NVENC H.264"
+#define ENCODER_NAME_H264 "GPU: Nvidia NVENC H.264/AVC"
static const char *h264_nvenc_getname(void *unused)
{
UNUSED_PARAMETER(unused);
@ -74,28 +74,7 @@ index f0f7747..b5f5d0d 100644
static const char *hevc_nvenc_getname(void *unused)
{
UNUSED_PARAMETER(unused);
diff --git a/plugins/obs-ffmpeg/texture-amf.cpp b/plugins/obs-ffmpeg/texture-amf.cpp
index 7916cf8..92e57e0 100644
--- a/plugins/obs-ffmpeg/texture-amf.cpp
+++ b/plugins/obs-ffmpeg/texture-amf.cpp
@@ -1173,7 +1173,7 @@ static obs_properties_t *amf_av1_properties(void *unused)
static const char *amf_avc_get_name(void *)
{
- return "AMD HW H.264 (AVC)";
+ return "GPU: AMD AMF H.264";
}
static inline int get_avc_preset(amf_base *enc, const char *preset)
@@ -1508,7 +1508,7 @@ static void register_avc()
static const char *amf_hevc_get_name(void *)
{
- return "AMD HW H.265 (HEVC)";
+ return "GPU: AMD AMF H.265/HEVC";
}
static inline int get_hevc_preset(amf_base *enc, const char *preset)
diff --git a/plugins/obs-x264/obs-x264.c b/plugins/obs-x264/obs-x264.c
index 3955dff..b60e990 100644
--- a/plugins/obs-x264/obs-x264.c