Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Difference Between Revision 5 and Multimedia / obs-studio

obs-studio.changes Changed

@@ -1,4 +1,1857 @@
 -------------------------------------------------------------------
+Wed Oct  9 00:40:12 UTC 2024 - packman@nordisch.org
+
+- we need at least ffmpeg 6.1, lets force 7 right away 
+
+-------------------------------------------------------------------
+Wed Oct  9 00:10:22 UTC 2024 - packman@nordisch.org
+
+- leap 15.6 needs a compiler that supports C++ standard 17 at least
+  force gcc 13
+
+-------------------------------------------------------------------
+Tue Oct  8 23:28:51 UTC 2024 - packman@nordisch.org
+
+- pkgconfig(nlohmann_json) is also needed outside of the websocket
+  scope
+- new general BR:
+  rnnoise, ffnvcodec, vpl, uthash-devel
+- new websockets BR:
+  libdatachannel-devel, qrcodecgencpp
+- disable websockets for now until we get qrcodecgencpp
+- needs 2 new downgrades of errors to warnings:
+  -Wno-error=switch -Wno-error=catch-value=
+- drop 0002-Include-diverse-luajit.patch
+
+-------------------------------------------------------------------
+Tue Oct 08 22:41:12 UTC 2024 - packman@nordisch.org
+
+- Update to version 31.0.0~beta1:
+  * CI: Fix sparkle-appcast comment syntax
+  * shared/opts-parser: Fix crash when no options were given to the parser
+  * libobs/graphics: Remove unused source file graphics-magick.c
+  * UI: Avoid path<->string conversion when refreshing profile cache
+  * obs-ffmpeg: Fix deadlock on shutting down muxer
+  * win-update: Remove legacy CMake file
+  * UI: Fix locale key for rename profile text
+  * obs-nvenc: Add missing locale text
+  * UI: Fix settings mismatch
+  * libobs/util: Crash on bmalloc(0)
+  * linux-pipewire: Avoid trying to allocate 0 byte
+  * linux-capture: Fix potential null pointer dereference
+  * libobs/util: Prevent null pointer deref with dstr_cmp
+  * cmake: Use fixed SOVERSION everywhere
+  * Update translations from Crowdin
+  * CI: Fix translation download script bugs
+  * plugins: Update translations from Crowdin
+  * CI: Use correct commit hash for translation download
+  * CI: Bump Crowdin Sync to fix translation download
+  * libobs: Update version to 31.0.0
+  * .git-blame-ignore-revs: Add change from column limit increase
+  * clang-format: Increase column limit from 80 to 120
+  * shared/obs-hook-config: Update graphics hook to 1.8.4
+  * libobs: Update version to 30.2.3
+  * libobs/util: Improve inhibit functions on Linux
+  * UI: Enable first-party YouTube Chat features in OBS
+  * UI: Use shared cookie manager for YT Control Panel
+  * shared/bpm: Fixed crash when using Stream Delay
+  * UI: Replace themeID and style hints with class property
+  * libobs: Assure large enough buffer in dstr_from_cfstring
+  * plugins/test: Remove legacy CMake remnants
+  * libobs: Remove unused is_in_bundle() method
+  * UI: Set NV12 as preferred format for multitrack video encoders
+  * libobs: Do not attempt to reconnect if stop event is set
+  * UI: Fix What's New increment settings mismatch
+  * libobs: Deprecate obs_scene_sceneitem_from_source
+  * UI: Replace usage of obs_scene_sceneitem_from_source
+  * UI: Fix crash when creating scene collections with "unsafe" names
+  * UI: Fix error color at clipping is not displayed on horizontal meter
+  * libobs: Fix sending unclamped audio to output handler
+  * libobs: Fix source profiling inactive sources
+  * libobs: Disable transform debug logging by default
+  * libobs: Fix crop values for new nested scene sources being incorrect
+  * libobs: Do not allow reconnect if stop code is OBS_OUTPUT_INVALID_STREAM
+  * UI: Fix missing support for portable configuration files
+  * cmake: Change library discovery order in LuaJIT find module
+  * cmake: Disable discovery of Homebrew libraries for dependencies
+  * rtmp-services: Remove defunct servers/services
+  * CI: Update deps to 2024-09-12 release
+  * UI: Fix low value of std::clamp gets greater than high value
+  * CI: Set default values for have* outputs in macos-codesigning action
+  * UI: Fix config class mismatch in OBSApp class
+  * CI: Extend condition check for language file upload
+  * CI: Update build script for Ubuntu to require Ubuntu 24.04
+  * CI: Remove experimental aarch64 support in build script
+  * CI: Update build and package scripts to require Zsh 5.9
+  * CI: Update qt-xml-validator action to use check-changes action
+  * CI: Update build-project workflow to use Xcode 15.4 for macOS builds
+  * CI: Update wrangler-action action
+  * CI: Update sphinx-publish-actions action
+  * CI: Add documentation to XSLT files for Sparkle Appcast action
+  * CI: Add documentation to complex shell script constructs
+  * CI: Remove Ccache restoration for Windows builds
+  * CI: Update flatpak-builder-lint
+  * docs: Add obs_frontend_get_user_config
+  * libobs: Deselect scene item before removing
+  * libobs: Remove obs_output_signal_delay
+  * UI: Fix outdated scene collection and profile method names
+  * CI: Use Windows 11 SDK 10.0.22621.0
+  * cmake: Update use of MbedTLS to support update to version 3.6.0
+  * CI: Update softprops/action-gh-release to v2.0.8
+  * CI: Update peter-evans/create-pull-request to v7.0.2
+  * build-aux: Use fallback-x11 instead of x11
+  * obs-qsv11: Initialize allocator response
+  * obs-qsv11: Add AV1 Screen Content Tools
+  * cmake: Update supported CMake version range to 3.28 and 3.30
+  * obs-ffmpeg: Add logging of audio track
+  * libobs: Add obs_encoder_get_mixer_index
+  * cmake: Disable CCache for local builds and enable by default for CI
+  * mac-virtualcam: Compare camera UUIDs using CFUUID
+  * libobs: Update macOS platform implementation
+  * UI: Rewrite scene collection system to enable user-provided storage
+  * UI: Rewrite profile system to enable user-provided storage location
+  * UI: Split global config into app and user config
+  * libobs-opengl: Relax texture format copy check
+  * rtmp-services: Remove outdated Dolby Millicast locations
+  * CI: Remove run-cmake-format action
+  * cmake: Remove remaining cmake-format comments
+  * obs-webrtc: Add STUN support to Link header parse
+  * Remove legacy_check CMake macro
+  * obs-nvenc: Fix reading uninitialized variable
+  * CI: Fix condition for changed files in upload locales action
+  * obs-nvenc: Check if device index in settings object is actually set
+  * obs-nvenc: Support new error code for too many sessions
+  * UI: Fix multitrack video autoconfig option
+  * nv-filters: Remove unused flag in cmake
+  * obs-filters: Fix building of noise reduction
+  * CI: Enable diagnostics color on CI build on Ubuntu
+  * cmake/linux: Move color diagnostics setting to preset for ubuntu-ci
+  * obs-qsv11: Fix CBR Spike
+  * cmake: Avoid breaking ABI through major version bump on Linux
+  * win-capture: Fix segfault when calling data.free()
+  * CI: Pin actions/upload-artifact to v4.3.5 for windows-patches
+  * rtmp-services: Refactor Twitch/Amazon IVS support
+  * UI: Add Amazon IVS auto config QoL changes
+  * rtmp-services: Add Amazon IVS auto server entries
+  * rtmp-services: Load Twitch/Amazon IVS rtmps URLs when refreshing
+  * rtmp-services: Add Amazon IVS ingest refresh infrastructure
+  * rtmp-services: Extract Twitch specific info from ingest update code
+  * rtmp-services: Add more granular Amazon IVS service servers
+  * build-aux: Update Flatpak modules
+  * CI: Update deps to 2024-09-05 release
+  * UI: Enable BPM for multitrack video
+  * shared/bpm: Add BPM (Broadcast Performance Metrics)
+  * libobs: Add a packet callback mechanism
+  * libobs: Add encoder packet timing support
+  * libobs/util: Add `os_nstime_to_timespec`
+  * obs-websocket: Update version to 5.5.3
+  * win-capture: Fix display capture capturing on create
+  * win-capture: Fix window capture capturing random windows
+  * linux-capture: Fix xshm capturing first display on creation
+  * linux-capture: Fix xcomp capturing random windows
+  * linux-capture: Add xcomp func for comparing encoded window IDs
+  * linux-capture: Fix potential null pointer dereference
+  * linux-capture: Move xcomp window ID decoding to its own func
+  * linux-capture: Set xcomposite capture retry interval to 2sec
+  * libobs: Always set initial scene item pos to top-left corner
+  * UI: Fix Qt UIC warning in settings UI
+  * UI: Replace remaining SIGNAL/SLOT macros
+  * cmake: Exclude macOS .DS_Store from resources
+  * shared/qt: Remove unused graphics include from qt-wrappers
+  * shared/qt: Unlink slider-ignorewheel from libobs
+  * build-aux: Update Flatpak CEF from 103/5060 to 127/6533
+  * CI: Update CEF from 103/5060 to 127/6533
+  * obs-browser: Update version to 2.24.2
+  * CI: Update flatpak-builder and flat-manager actions
+  * shared/properties-view: Remove Qt 6.2 cmake code
+  * shared/properties-view: Use IconLabel for help icon
+  * shared/qt: Add IconLabel widget
+  * docs,libobs: Remove deprecated service APIs
+  * docs,libobs: Remove master volume functions
+  * docs,libobs: Remove deprecated scene item transition functions
+  * libobs: Rename OBS_NIX_PLATFORM_X11_GLX to OBS_NIX_PLATFORM_INVALID
+  * libobs: Remove obs_hotkey_enable_strict_modifiers()
+  * libobs: Remove base_set_allocator()
+  * docs,libobs: Remove/internalize deprecated addref functions
+  * libobs: Remove obs_volmeter_{get,set}_update_interval()
+  * libobs: Remove obs_proprety_text_type()
+  * docs,libobs: Remove obs_render_main_view()
+  * libobs: Remove obs_get_default_rect_effect()
+  * libobs: Remove obs_{duplicate,free}_encoder_packet
+  * libobs: Fix Windows x86 CMake when using reduced obs-deps package
+  * win-dshow: Fix CMake preventing Virtual Camera from working
+  * Remove CMake legacy code path
+  * UI: Add migration for relative coordinate system
+  * docs: Add new relative positioning scene functions
+  * libobs: Allow scene items to use legacy absolute mode
+  * libobs: Change scene items to using relative coordinates
+  * libobs: Force sceneitem transform update if scene dimensions change
+  * UI: Fix warning color
+  * UI: Add warning to Custom FFmpeg mode
+  * mac-capture: Remove disp_finished event
+  * UI: Use std::clamp instead of macro
+  * obs-ffmpeg: Remove unexisting class name declaration
+  * UI: Inline macOS 13 check
+  * UI: Force UpdateEditMenu on UI Thread
+  * rtmp-services: Add NFHS Network
+  * obs-filters: Add NVIDIA Blur Filter & Background Blur
+  * libobs: Add `OBS_ENCODER_CAP_SCALING`
+  * libobs: Remove broken rescale modification logic

obs-studio.spec Changed

@@ -1,7 +1,7 @@
 
 # Chromium Embedded Framework
 %ifarch x86_64
-%bcond_without cef
+%bcond_with cef
 %define cef_binary cef_binary_5060_linux64
 %else
 %bcond_with cef
@@ -12,10 +12,25 @@
 %else
 %define qt_version 5
 %endif
-%bcond_without websockets
+%bcond_with websockets
+
+# 31.0.0~beta1 wants at least 6.1 lets just use 7 straight away
+# zypper info --provides $(zypper se -t package -s ffmpeg-7 | awk -F '|' '/devel/ {print $2}') | grep pkgconfig | perl -p -e 's|^\s+pkgconfig$(^$+)\) = (\S+)|%global minimum_$1_version $2|g'
+%global minimum_libavcodec_version 61.19.100
+%global minimum_libavdevice_version 61.3.100
+%global minimum_libavfilter_version 10.4.100
+%global minimum_libavformat_version 61.7.100
+%global minimum_libavutil_version 59.39.100
+%global minimum_libpostproc_version 58.3.100
+%global minimum_libswresample_version 5.3.100
+%global minimum_libswscale_version 8.3.100
+
+%if 0%{?suse_version} && 0%{?suse_version} < 1600
+%global force_gcc_version 13
+%endif
 
 Name:           obs-studio
-Version:        29.1.3
+Version:        31.0.0~beta1
 Release:        0
 Summary:        A recording/broadcasting program
 Group:          Productivity/Multimedia/Video/Editors and Convertors
@@ -27,17 +42,15 @@
 %if %{with cef}
 Source17:       %{cef_binary}.tar.bz2
 %endif
-Patch0:         0002-Include-diverse-luajit.patch
 Patch1:         0001-Prefix-modinfo-with-sbin-since-not-in-normal-path.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  update-desktop-files
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  fdk-aac-devel
 BuildRequires:  fdupes
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype2-devel
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
+BuildRequires:  gcc%{?force_gcc_version}
+BuildRequires:  gcc%{?force_gcc_version}-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libXcomposite-devel
 BuildRequires:  libXinerama-devel
@@ -66,27 +79,32 @@
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(libavcodec)
-BuildRequires:  pkgconfig(libavdevice)
-BuildRequires:  pkgconfig(libavfilter)
-BuildRequires:  pkgconfig(libavformat)
-BuildRequires:  pkgconfig(libavutil)
+BuildRequires:  pkgconfig(libavcodec)  >= %{minimum_libavcodec_version}
+BuildRequires:  pkgconfig(libavdevice) >= %{minimum_libavdevice_version}
+BuildRequires:  pkgconfig(libavfilter) >= %{minimum_libavfilter_version}
+BuildRequires:  pkgconfig(libavformat) >= %{minimum_libavformat_version}
+BuildRequires:  pkgconfig(libavutil)   >= %{minimum_libavutil_version}
 %ifarch %{ix86} x86_64
 # comment out until resolved: nothing provides pkgconfig(libmfx)
 # BuildRequires:  pkgconfig(libmfx)
 %endif
 BuildRequires:  pkgconfig(librist)
-BuildRequires:  pkgconfig(libswresample)
-BuildRequires:  pkgconfig(libswscale)
+BuildRequires:  pkgconfig(libswresample) >= %{minimum_libswresample_version}
+BuildRequires:  pkgconfig(libswscale)    >= %{minimum_libswscale_version}
 BuildRequires:  pkgconfig(libva)
 BuildRequires:  pkgconfig(lua)
 BuildRequires:  pkgconfig(luajit)
 BuildRequires:  pkgconfig(srt) >= 1.4
 BuildRequires:  pkgconfig(uuid)
-%if %{with websockets}
+BuildRequires:  pkgconfig(rnnoise)
+BuildRequires:  pkgconfig(ffnvcodec)
+BuildRequires:  pkgconfig(vpl)
+BuildRequires:  libdatachannel-devel
 BuildRequires:  pkgconfig(nlohmann_json) >= 3
+%if %{with websockets}
 BuildRequires:  pkgconfig(websocketpp) >= 0.8.0
 BuildRequires:  pkgconfig(asio) >= 1.12.1
+BuildRequires:  pkgconfig(qrcodegencpp)
 %endif
 BuildRequires:  python3-devel
 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
@@ -94,6 +112,7 @@
 %endif
 BuildRequires:  sndio-devel
 BuildRequires:  swig
+BuildRequires:  uthash-devel
 BuildRequires:  vlc-devel
 %if %{with cef}
 BuildRequires:  mozilla-nss
@@ -128,11 +147,16 @@
 %endif
 
 %build
+%if 0%{?force_gcc_version}
+export CC="gcc-%{?force_gcc_version}"
+export CXX="g++-%{?force_gcc_version}"
+%endif
+
 mkdir -p build && cd build
 # does not like cmake macro as it fails to link in math.h (-lma
 # the compile flags must be relaxed in order to compile obs-studio successfully
-export CFLAGS="%{optflags} -Wno-error=type-limits -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-error=return-type -Wno-error=unused-but-set-variable -Wno-error=pointer-sign -Wno-error=reorder"
-export CXXFLAGS="%{optflags} -Wno-error=type-limits -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-error=return-type -Wno-error=unused-but-set-variable -Wno-error=pointer-sign -Wno-error=reorder"
+export CFLAGS="%{optflags} -Wno-error=type-limits -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-error=return-type -Wno-error=unused-but-set-variable -Wno-error=pointer-sign -Wno-error=reorder -Wno-error=switch -Wno-error=catch-value="
+export CXXFLAGS="%{optflags} -Wno-error=type-limits -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-error=return-type -Wno-error=unused-but-set-variable -Wno-error=pointer-sign -Wno-error=reorder -Wno-error=switch -Wno-error=catch-value="
 
 cmake \
   -DCMAKE_CXX_STANDARD=17 \
@@ -182,6 +206,7 @@
 %files
 %{_bindir}/obs
 %{_bindir}/obs-ffmpeg-mux
+%{_bindir}/obs-nvenc-test
 # Upstream forces libs dir regardless of arch and building plugins is encumbered
 # by moving them to the proper directory.
 %{_libdir}/obs-plugins/
@@ -191,7 +216,7 @@
 %{_libdir}/libobs-scripting.so.*
 %{_libdir}/obs-scripting/
 %dir %{_datadir}/metainfo
-%{_datadir}/metainfo/com.obsproject.Studio.appdata.xml
+%{_datadir}/metainfo/com.obsproject.Studio.metainfo.xml
 %{_datadir}/applications/com.obsproject.Studio.desktop
 %{_datadir}/icons/hicolor
 %{_datadir}/obs
@@ -204,5 +229,6 @@
 %{_libdir}/cmake
 %{_libdir}/pkgconfig/libobs.pc
 %{_includedir}/obs
+%{_libdir}/pkgconfig/obs-frontend-api.pc
 
 %changelog

0002-Include-diverse-luajit.patch Deleted

_service Changed

_servicedata Changed

cef_binary_5060_linux64.tar.bz2 Deleted

obs-studio-29.1.3.tar.xz Deleted

obs-studio-31.0.0~beta1.tar.xz Added