diff --git a/.github/release-canary-v3 b/.github/release-canary-v3 index 0cfbf08..00750ed 100644 --- a/.github/release-canary-v3 +++ b/.github/release-canary-v3 @@ -1 +1 @@ -2 +3 diff --git a/debian/control b/debian/control index 13b59cd..fbe0b0c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: video Priority: optional Maintainer: John Bradley Uploaders: Kevin Henkel -Build-Depends: debhelper (>= 9), libsimde-dev, cdbs, cmake, git, libx11-dev, libgl1-mesa-dev | libgl-dev, libpulse-dev, libvulkan-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, v4l2loopback-dkms, libwayland-dev, libpci-dev, libdrm-dev, libpipewire-0.3-dev, librist-dev, libsrt-openssl-dev, libva-dev, libuuid1, nlohmann-json3-dev, libwebsocketpp-dev, libasio-dev, amf-codec-headers, glslang-tools, glslang-dev, glslc, 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, v4l2loopback-dkms, libwayland-dev, libpci-dev, libdrm-dev, libpipewire-0.3-dev, librist-dev, libsrt-openssl-dev, libva-dev, libuuid1, nlohmann-json3-dev, libwebsocketpp-dev, libasio-dev, libvpl-dev, libqrcodegencpp-dev, libwebrtc-audio-processing-dev +Build-Depends: debhelper (>= 9), libsimde-dev, cdbs, cmake, git, libx11-dev, libgl1-mesa-dev | libgl-dev, libpulse-dev, libvulkan-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, v4l2loopback-dkms, libwayland-dev, libpci-dev, libdrm-dev, libpipewire-0.3-dev, librist-dev, libsrt-openssl-dev, libva-dev, libuuid1, nlohmann-json3-dev, libwebsocketpp-dev, libasio-dev, amf-codec-headers, glslang-tools, glslang-dev, glslc, 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, v4l2loopback-dkms, libwayland-dev, libpci-dev, libdrm-dev, libpipewire-0.3-dev, librist-dev, libsrt-openssl-dev, libva-dev, libuuid1, nlohmann-json3-dev, libwebsocketpp-dev, libasio-dev, libvpl-dev, libqrcodegencpp-dev, libwebrtc-audio-processing-dev, uthash-dev Homepage: http://obsproject.org Package: obs-studio diff --git a/patches/02_disable-obs-browser.patch b/patches/02_disable-obs-browser.patch deleted file mode 100644 index 5392165..0000000 --- a/patches/02_disable-obs-browser.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- /dev/null -+++ b/plugins/obs-browser/CMakeLists.txt -@@ -0,0 +1,6 @@ -+project(obs-browser) -+ -+option( -+ ENABLE_BROWSER -+ "Enable building OBS with browser source plugin (required Chromium Embedded Framework)" -+ ${OS_LINUX}) diff --git a/patches/encoder-rename.patch b/patches/encoder-rename.patch new file mode 100644 index 0000000..a356e3f --- /dev/null +++ b/patches/encoder-rename.patch @@ -0,0 +1,97 @@ +From 11dae1dd5a7600534807e254dfa30c9613779dd7 Mon Sep 17 00:00:00 2001 +From: GloriousEggroll +Date: Sat, 29 Apr 2023 14:46:16 -0600 +Subject: [PATCH] encoder rename + +--- + plugins/obs-ffmpeg/obs-ffmpeg-av1.c | 4 ++-- + plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c | 4 ++-- + plugins/obs-x264/obs-x264.c | 2 +- + 5 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-av1.c b/plugins/obs-ffmpeg/obs-ffmpeg-av1.c +index 0b671ae..681f728 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-av1.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-av1.c +@@ -41,13 +41,13 @@ struct av1_encoder { + static const char *aom_av1_getname(void *unused) + { + UNUSED_PARAMETER(unused); +- return "AOM AV1"; ++ return "CPU: AOM AV1 (FFmpeg)"; + } + + static const char *svt_av1_getname(void *unused) + { + UNUSED_PARAMETER(unused); +- return "SVT-AV1"; ++ return "CPU: SVT-AV1 (FFmpeg)"; + } + + static void av1_video_info(void *data, struct video_scale_info *info) +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c b/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c +index 8cd8138..add8e02 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c +@@ -45,7 +45,7 @@ struct nvenc_encoder { + extern bool ubuntu_20_04_nvenc_fallback; + #endif + +-#define ENCODER_NAME_H264 "NVIDIA NVENC H.264 (FFmpeg)" ++#define ENCODER_NAME_H264 "GPU: NVIDIA NVENC H.264 (FFmpeg)" + static const char *h264_nvenc_getname(void *unused) + { + UNUSED_PARAMETER(unused); +@@ -53,7 +53,7 @@ static const char *h264_nvenc_getname(void *unused) + } + + #ifdef ENABLE_HEVC +-#define ENCODER_NAME_HEVC "NVIDIA NVENC HEVC (FFmpeg)" ++#define ENCODER_NAME_HEVC "GPU: NVIDIA NVENC H.265/HEVC (FFmpeg)" + static const char *hevc_nvenc_getname(void *unused) + { + UNUSED_PARAMETER(unused); +diff --git a/plugins/obs-x264/obs-x264.c b/plugins/obs-x264/obs-x264.c +index 1de88d3..d4c377d 100644 +--- a/plugins/obs-x264/obs-x264.c ++++ b/plugins/obs-x264/obs-x264.c +@@ -68,7 +68,7 @@ struct obs_x264 { + static const char *obs_x264_getname(void *unused) + { + UNUSED_PARAMETER(unused); +- return "x264"; ++ return "CPU: x264"; + } + + static void obs_x264_stop(void *data); +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c b/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c +index 370f9b7..e0bbd82 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c +@@ -89,20 +89,20 @@ struct vaapi_encoder { + static const char *h264_vaapi_getname(void *unused) + { + UNUSED_PARAMETER(unused); +- return "FFmpeg VAAPI H.264"; ++ return "GPU: AMD/Intel VAAPI H.264 (FFmpeg)"; + } + + static const char *av1_vaapi_getname(void *unused) + { + UNUSED_PARAMETER(unused); +- return "FFmpeg VAAPI AV1"; ++ return "GPU: AMD/Intel VAAPI AV1 (FFmpeg)"; + } + + #ifdef ENABLE_HEVC + static const char *hevc_vaapi_getname(void *unused) + { + UNUSED_PARAMETER(unused); +- return "FFmpeg VAAPI HEVC"; ++ return "GPU: AMD/Intel VAAPI H.265/HEVC (FFmpeg)"; + } + #endif + +-- +2.40.0 + diff --git a/patches/series b/patches/series index ebfba13..4612147 100644 --- a/patches/series +++ b/patches/series @@ -1,3 +1,3 @@ 01_use-sysytem-libsimde.patch -02_disable-obs-browser.patch 03_FTBFS-Werror.patch +encoder-rename.patch