Merge obs-streamfx-git into obs-streamfx-unstable

Add patch for ffmpeg 6 support from obs-streamfx-git.

3 files changed, 35 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e354b8307cba..0dff0b618b61 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = obs-streamfx-unstable
 	pkgdesc = Bring your stream back to life with modern effects! (unstable/testing version)
 	pkgver = 0.12.0b191
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Xaymar/obs-StreamFX
 	arch = x86_64
 	license = GPL2
@@ -28,6 +28,8 @@ pkgbase = obs-streamfx-unstable
 	provides = obs-streamfx
 	conflicts = obs-streamfx
 	source = obs-StreamFX::git+https://github.com/Xaymar/obs-StreamFX.git#tag=0.12.0b191
+	source = 00001-fix-build-on-ffmpeg-6.patch
 	md5sums = SKIP
+	md5sums = e532ab3c20aa2b40099706990ec92ba0
 
 pkgname = obs-streamfx-unstable
diff --git a/00001-fix-build-on-ffmpeg-6.patch b/00001-fix-build-on-ffmpeg-6.patch
new file mode 100644
index 000000000000..5bae53bbef53
--- /dev/null
+++ b/00001-fix-build-on-ffmpeg-6.patch
@@ -0,0 +1,26 @@
+diff --git a/source/encoders/encoder-ffmpeg.cpp b/source/encoders/encoder-ffmpeg.cpp
+index 1bfbc32c..43b05c48 100644
+--- a/source/encoders/encoder-ffmpeg.cpp
++++ b/source/encoders/encoder-ffmpeg.cpp
+@@ -1045,7 +1045,7 @@ void ffmpeg_factory::get_defaults2(obs_data_t* settings)
+ 	if (_handler)
+ 		_handler->get_defaults(settings, _avcodec, nullptr, _handler->is_hardware_encoder(this));
+ 
+-	if ((_avcodec->capabilities & AV_CODEC_CAP_INTRA_ONLY) == 0) {
++	if ((avcodec_descriptor_get(_avcodec->id)->props & AV_CODEC_PROP_INTRA_ONLY) == 0) {
+ 		obs_data_set_default_int(settings, ST_KEY_KEYFRAMES_INTERVALTYPE, 0);
+ 		obs_data_set_default_double(settings, ST_KEY_KEYFRAMES_INTERVAL_SECONDS, 2.0);
+ 		obs_data_set_default_int(settings, ST_KEY_KEYFRAMES_INTERVAL_FRAMES, 300);
+diff --git a/source/encoders/handlers/handler.cpp b/source/encoders/handlers/handler.cpp
+index bb109dac..58199952 100644
+--- a/source/encoders/handlers/handler.cpp
++++ b/source/encoders/handlers/handler.cpp
+@@ -9,7 +9,7 @@ using namespace streamfx::encoder::ffmpeg;
+ 
+ bool handler::handler::has_keyframe_support(ffmpeg_factory* instance)
+ {
+-	return (instance->get_avcodec()->capabilities & AV_CODEC_CAP_INTRA_ONLY) == 0;
++	return (avcodec_descriptor_get(instance->get_avcodec()->id)->props & AV_CODEC_PROP_INTRA_ONLY) == 0;
+ }
+ 
+ bool handler::handler::is_hardware_encoder(ffmpeg_factory* instance)
diff --git a/PKGBUILD b/PKGBUILD
index f58d24ea3915..71a7414042e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=obs-StreamFX
 pkgname=${_pkgname,,}-unstable
 pkgver=0.12.0b191
-pkgrel=1
+pkgrel=2
 pkgdesc="Bring your stream back to life with modern effects! (unstable/testing version)"
 arch=("x86_64")
 url="https://github.com/Xaymar/$_pkgname"
@@ -16,12 +16,15 @@ makedepends=("cmake" "git" "libfdk-aac" "libxcomposite" "x264" "jack"
              "vlc" "swig" "luajit" "python" "ninja")
 provides=(${_pkgname,,})
 conflicts=(${_pkgname,,})
-source=("$_pkgname::git+$url.git#tag="$pkgver)
-md5sums=('SKIP')
+source=("$_pkgname::git+$url.git#tag="$pkgver
+        "00001-fix-build-on-ffmpeg-6.patch")
+md5sums=("SKIP"
+         "e532ab3c20aa2b40099706990ec92ba0")
 
 prepare() {
   cd $_pkgname
   git submodule update --init --recursive
+  git apply ../00001-fix-build-on-ffmpeg-6.patch
 }
 
 build() {