Updated patch - mkv outputs don't work, use mp4

3 files changed, 44 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b87ef98a3c26..847d45cd8bfd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = obs-hevc-vaapi-git
 	pkgdesc = Free and open source software for video recording and live streaming. With VAAPI HEVC support.
-	pkgver = 25.0.7.r198.gaa313a1fb
+	pkgver = 25.0.7.r530.g0c41bef84
 	pkgrel = 1
 	url = https://github.com/obsproject/obs-studio
 	arch = i686
@@ -8,22 +8,16 @@ pkgbase = obs-hevc-vaapi-git
 	license = GPL2
 	makedepends = cmake
 	makedepends = git
-	makedepends = libfdk-aac
-	makedepends = libxcomposite
 	makedepends = x264
 	makedepends = jack
 	makedepends = vlc
 	makedepends = swig
-	makedepends = luajit
-	makedepends = python
 	makedepends = cef-minimal
 	depends = ffmpeg
 	depends = jansson
 	depends = libxinerama
-	depends = libxkbcommon-x11
 	depends = qt5-x11extras
-	depends = curl
-	depends = gtk-update-icon-cache
+	depends = mbedtls
 	optdepends = libfdk-aac: FDK AAC codec support
 	optdepends = libxcomposite: XComposite capture support
 	optdepends = jack: JACK Support
@@ -31,7 +25,8 @@ pkgbase = obs-hevc-vaapi-git
 	optdepends = swig: Scripting
 	optdepends = luajit: Lua scripting
 	optdepends = python: Python scripting
-	provides = obs-studio=25.0.7.r198.gaa313a1fb
+	optdepends = qt5-svg: svg support
+	provides = obs-studio=25.0.7.r530.g0c41bef84
 	conflicts = obs-studio
 	source = obs-hevc-vaapi-git::git+https://github.com/obsproject/obs-studio.git
 	source = git+https://github.com/Mixer/ftl-sdk.git
@@ -40,7 +35,7 @@ pkgbase = obs-hevc-vaapi-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = b277507b6589923382a039e01da7f28a0a8bce80e7ba282b5fd6d179b5431c7c
+	sha256sums = 3244a2549e1fba1f8e451de4a2bb7d64a0a8f8af72a4096ae683c995dba524ea
 
 pkgname = obs-hevc-vaapi-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 8619b7a7313b..57d04875a821 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,30 @@
-# Maintainer   zanny <zan@420blaze.it>
-# Contributor  Benjamin Klettbach <b dot klettbach at gmail dot com >
-# Contributor: Jonathan Steel <jsteel at archlinux.org>
-# Contributor: ArcticVanguard <LideEmily at gmail dot com>
-# Contributor: ledti <antergist at gmail dot com>
+# Maintainer    zan <zan@420blaze.it>
+
 pkgname=obs-hevc-vaapi-git
-pkgver=25.0.7.r293.gbb890a674
+pkgver=25.0.7.r530.g0c41bef84
 pkgrel=1
 pkgdesc="Free and open source software for video recording and live streaming. With VAAPI HEVC support."
-arch=("i686" "x86_64")
+arch=(i686 x86_64)
 url="https://github.com/obsproject/obs-studio"
-license=("GPL2")
-depends=("ffmpeg" "jansson" "libxinerama" "libxkbcommon-x11"
-         "qt5-x11extras" "curl" "gtk-update-icon-cache")
-makedepends=("cmake" "git" "libfdk-aac" "libxcomposite" "x264" "jack"
-             "vlc" "swig" "luajit" "python" "cef-minimal")
+license=(GPL2)
+depends=(ffmpeg jansson libxinerama qt5-x11extras mbedtls)
+makedepends=(cmake git x264 jack vlc swig cef-minimal)
 optdepends=("libfdk-aac: FDK AAC codec support"
             "libxcomposite: XComposite capture support"
             "jack: JACK Support"
             "vlc: VLC Media Source"
             "swig: Scripting"
             "luajit: Lua scripting"
-            "python: Python scripting")
+            "python: Python scripting"
+            "qt5-svg: svg support")
 provides=("obs-studio=$pkgver")
-conflicts=("obs-studio")
+conflicts=(obs-studio)
 source=("$pkgname::git+https://github.com/obsproject/obs-studio.git"
         "git+https://github.com/Mixer/ftl-sdk.git"
         "git+https://github.com/obsproject/obs-browser.git"
         "hevc-vaapi.diff")
 sha256sums=("SKIP" "SKIP" "SKIP" 
-            "b277507b6589923382a039e01da7f28a0a8bce80e7ba282b5fd6d179b5431c7c")
+            "3244a2549e1fba1f8e451de4a2bb7d64a0a8f8af72a4096ae683c995dba524ea")
 
 pkgver() {
   cd $pkgname
@@ -53,5 +49,3 @@ build() {
 package() {
   DESTDIR="$pkgdir" cmake --install build
 }
-
-# vim: ts=2:sw=2:expandtab
diff --git a/hevc-vaapi.diff b/hevc-vaapi.diff
index 32dc2317e247..c9e1d05272c8 100644
--- a/hevc-vaapi.diff
+++ b/hevc-vaapi.diff
@@ -1,5 +1,29 @@
+diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
+index a7063d85..a55cd647 100644
+--- a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
++++ b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
+@@ -547,17 +547,14 @@ static inline int open_output_file(struct ffmpeg_mux *ffm)
+ 	}
+ 
+ 	ret = avformat_write_header(ffm->output, &dict);
++	av_dict_free(&dict);
+ 	if (ret < 0) {
+-		fprintf(stderr, "Error opening '%s': %s", ffm->params.file,
++		fprintf(stderr, "Error opening '%s': %s\n", ffm->params.file,
+ 			av_err2str(ret));
+ 
+-		av_dict_free(&dict);
+-
+ 		return ret == -22 ? FFM_UNSUPPORTED : FFM_ERROR;
+ 	}
+ 
+-	av_dict_free(&dict);
+-
+ 	return FFM_SUCCESS;
+ }
+ 
 diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c b/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
-index 9f2660a4..b8f5c289 100644
+index 9f2660a4..cdf8f8a8 100644
 --- a/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
 +++ b/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
 @@ -69,10 +69,35 @@ struct vaapi_encoder {
@@ -163,7 +187,7 @@ index 9f2660a4..b8f5c289 100644
  
  	obs_properties_t *props = obs_properties_create();
  	obs_property_t *list;
-@@ -544,41 +581,52 @@ static obs_properties_t *vaapi_properties(void *unused)
+@@ -544,41 +581,44 @@ static obs_properties_t *vaapi_properties(void *unused)
  		}
  	}
  
@@ -195,14 +219,6 @@ index 9f2660a4..b8f5c289 100644
 -	obs_property_list_add_int(list, "5.1", 51);
 -	obs_property_list_add_int(list, "5.2", 52);
 +	if (codec->id == AV_CODEC_ID_H264) {
-+		list = obs_properties_add_list(props, "vaapi_codec",
-+					       "VAAPI Codec",
-+					       OBS_COMBO_TYPE_LIST,
-+					       OBS_COMBO_FORMAT_INT);
-+
-+		obs_property_list_add_int(list, "H.264 (default)",
-+					  AV_CODEC_ID_H264);
-+
 +		list = obs_properties_add_list(props, "profile", "Profile",
 +					OBS_COMBO_TYPE_LIST,
 +					OBS_COMBO_FORMAT_INT);
@@ -246,7 +262,7 @@ index 9f2660a4..b8f5c289 100644
  
  	obs_property_set_modified_callback(list, rate_control_modified);
  
-@@ -597,6 +645,7 @@ static obs_properties_t *vaapi_properties(void *unused)
+@@ -597,6 +637,7 @@ static obs_properties_t *vaapi_properties(void *unused)
  			       obs_module_text("KeyframeIntervalSec"), 0, 20,
  			       1);
  
@@ -254,7 +270,7 @@ index 9f2660a4..b8f5c289 100644
  	return props;
  }
  
-@@ -626,11 +675,26 @@ struct obs_encoder_info vaapi_encoder_info = {
+@@ -626,11 +667,26 @@ struct obs_encoder_info vaapi_encoder_info = {
  	.create = vaapi_create,
  	.destroy = vaapi_destroy,
  	.encode = vaapi_encode,