fix things

2 files changed, 8 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index efd4703f0f66..9fe85ac1a82c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -87,6 +87,8 @@ pkgname = avidemux-core-git
 	optdepends = wine: AVSload (Load Avisynth scripts on Avidemux)
 	optdepends = vapoursynth: vsProxy (Load Vapoursynth scripts on Avidemux)
 	optdepends = cuda: Nvidia hw encoder
+	optdepends = libva-intel-driver: Intel hw encoder
+	optdepends = libva-mesa-driver: Mesa hw encoder
 	provides = avidemux-core
 	conflicts = avidemux-core
 
diff --git a/PKGBUILD b/PKGBUILD
index 94fe7b7097db..2c31351b0b36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -76,11 +76,10 @@ prepare() {
   mkdir -p build_qt6{,_plugins}
   mkdir -p build_cli{,_plugins}
 
-  #exit
   cd avidemux
 
   git config submodule.i18n.url "${srcdir}/avidemux2_i18n"
-  git submodule update --init i18n
+  git submodule update --init
 
   # http://avidemux.org/smif/index.php/topic,16301.0.html
   patch -p1 -i "${srcdir}/fix_verbose.patch"
@@ -89,6 +88,9 @@ prepare() {
   patch -p1 -i "${srcdir}/add_settings_pluginui_message_error.patch"
 
   patch --binary -p1 -i "${srcdir}/opus_check.patch"
+
+  # fix build with Qt6 and Vapoursynth plugin
+  sed 's|c++11|c++17|g' -i avidemux_plugins/ADM_demuxers/VapourSynth/qt4/CMakeLists.txt
 }
 
 build() {
@@ -166,7 +168,6 @@ build() {
     -DUSE_EXTERNAL_LIBASS=ON \
     -DUSE_EXTERNAL_LIBMAD=ON \
     -DUSE_EXTERNAL_MP4V2=ON \
-    -DVAPOURSYNTH=OFF \
     -DFAKEROOT="${srcdir}/fakeroot"
 
   make DESTDIR="${srcdir}/fakeroot" install
@@ -243,6 +244,8 @@ package_avidemux-core-git() {
               'wine: AVSload (Load Avisynth scripts on Avidemux)'
               'vapoursynth: vsProxy (Load Vapoursynth scripts on Avidemux)'
               'cuda: Nvidia hw encoder'
+              'libva-intel-driver: Intel hw encoder'
+              'libva-mesa-driver: Mesa hw encoder'
               )
   provides=('avidemux-core')
   conflicts=('avidemux-core')