StreamFX 0.12.0 Beta 275

https://github.com/Xaymar/obs-StreamFX/releases/tag/0.12.0b252
https://github.com/Xaymar/obs-StreamFX/releases/tag/0.12.0b275

3 files changed, 5 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb60c9ab3679..606ded69a1ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = obs-streamfx-unstable
 	pkgdesc = Bring your stream back to life with modern effects! (unstable/testing version)
-	pkgver = 0.12.0b202
+	pkgver = 0.12.0b275
 	pkgrel = 1
 	url = https://github.com/Xaymar/obs-StreamFX
 	arch = x86_64
@@ -27,9 +27,7 @@ pkgbase = obs-streamfx-unstable
 	depends = nlohmann-json
 	provides = obs-streamfx
 	conflicts = obs-streamfx
-	source = obs-StreamFX::git+https://github.com/Xaymar/obs-StreamFX.git#tag=0.12.0b202
-	source = 00001-fix-build-on-ffmpeg-6.patch
+	source = obs-StreamFX::git+https://github.com/Xaymar/obs-StreamFX.git#tag=0.12.0b275
 	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
deleted file mode 100644
index 5bae53bbef53..000000000000
--- a/00001-fix-build-on-ffmpeg-6.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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 e446175b8d98..014eb5f03df1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Hugo Denizart <hugo at denizart dot pro>
 _pkgname=obs-StreamFX
 pkgname=${_pkgname,,}-unstable
-pkgver=0.12.0b202
+pkgver=0.12.0b275
 pkgrel=1
 pkgdesc="Bring your stream back to life with modern effects! (unstable/testing version)"
 arch=("x86_64")
@@ -16,15 +16,12 @@ makedepends=("cmake" "git" "libfdk-aac" "libxcomposite" "x264" "jack"
              "vlc" "swig" "luajit" "python" "ninja")
 provides=(${_pkgname,,})
 conflicts=(${_pkgname,,})
-source=("$_pkgname::git+$url.git#tag="$pkgver
-        "00001-fix-build-on-ffmpeg-6.patch")
-md5sums=("SKIP"
-         "e532ab3c20aa2b40099706990ec92ba0")
+source=("$_pkgname::git+$url.git#tag="$pkgver)
+md5sums=("SKIP")
 
 prepare() {
   cd $_pkgname
   git submodule update --init --recursive
-  git apply ../00001-fix-build-on-ffmpeg-6.patch
 }
 
 build() {