Bump and add support for Qt6 build

2 files changed, 163 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b71598bdcd88..efd4703f0f66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = avidemux-git
 	pkgdesc = A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)
-	pkgver = 2.7.5.200221.73b12dfc2
+	pkgver = 2.7.9.210922.1d0187359
 	pkgrel = 1
 	url = http://www.avidemux.org
 	arch = x86_64
@@ -27,6 +27,7 @@ pkgbase = avidemux-git
 	makedepends = libva
 	makedepends = libvdpau
 	makedepends = libvpx
+	makedepends = libvorbis
 	makedepends = opencore-amr
 	makedepends = twolame
 	makedepends = xvidcore
@@ -36,9 +37,12 @@ pkgbase = avidemux-git
 	makedepends = glu
 	makedepends = qt5-script
 	makedepends = qt5-tools
+	makedepends = qt6-base
+	makedepends = qt6-tools
 	makedepends = libxv
 	makedepends = vapoursynth
 	makedepends = hicolor-icon-theme
+	makedepends = setconf
 	source = avidemux::git+https://github.com/mean00/avidemux2.git
 	source = git+https://github.com/mean00/avidemux2_i18n.git
 	source = fix_verbose.patch
@@ -53,11 +57,11 @@ pkgbase = avidemux-git
 pkgname = avidemux-core-git
 	pkgdesc = Core libs for Avidemux. (GIT version)
 	depends = a52dec
-	depends = aom
+	depends = libaom.so
 	depends = aften
 	depends = dcaenc
-	depends = faac
-	depends = faad2
+	depends = libfaac.so
+	depends = libfaad.so
 	depends = fribidi
 	depends = jack
 	depends = lame
@@ -66,38 +70,53 @@ pkgname = avidemux-core-git
 	depends = libmad
 	depends = libmp4v2
 	depends = libdca
-	depends = libpulse
-	depends = libva
+	depends = libpulse.so
+	depends = libva.so
 	depends = libvdpau
 	depends = libvpx.so
-	depends = opencore-amr
-	depends = twolame
+	depends = libvorbis.so
+	depends = libopencore-amrnb.so
+	depends = libopencore-amrwb.so
+	depends = libtwolame.so
 	depends = libxvidcore.so
-	depends = x264
-	depends = x265
-	optdepends = avidemux-qt-git: a Qt GUI for Avidemux
+	depends = libx264.so
+	depends = libx265.so
+	optdepends = avidemux-qt5-git: a Qt5 GUI for Avidemux
+	optdepends = avidemux-qt6-git: a Qt6 GUI for Avidemux
 	optdepends = avidemux-cli-git: a CLI frontend for Avidemux
 	optdepends = wine: AVSload (Load Avisynth scripts on Avidemux)
 	optdepends = vapoursynth: vsProxy (Load Vapoursynth scripts on Avidemux)
+	optdepends = cuda: Nvidia hw encoder
 	provides = avidemux-core
 	conflicts = avidemux-core
 
-pkgname = avidemux-qt-git
-	pkgdesc = Qt GUI for Avidemux. (GIT version)
-	depends = avidemux-core-git>=2.7.5.200221.73b12dfc2
-	depends = qt5-script
+pkgname = avidemux-qt5-git
+	pkgdesc = Qt5 GUI for Avidemux. (GIT version)
+	depends = avidemux-core-git=2.7.9.210922.1d0187359
+	depends = qt5-base
 	depends = libxv
 	depends = glu
 	depends = desktop-file-utils
 	depends = hicolor-icon-theme
-	provides = avidemux-qt
-	conflicts = avidemux-qt4
+	provides = avidemux-qt5
 	conflicts = avidemux-qt5
 	conflicts = avidemux-qt
+	replaces = avidemux-qt-git
+
+pkgname = avidemux-qt6-git
+	pkgdesc = Qt6 GUI for Avidemux. (GIT version)
+	depends = avidemux-core-git=2.7.9.210922.1d0187359
+	depends = qt6-base
+	depends = libxv
+	depends = glu
+	depends = desktop-file-utils
+	depends = hicolor-icon-theme
+	provides = avidemux-qt6
+	conflicts = avidemux-qt6
+	conflicts = avidemux-qt
 
 pkgname = avidemux-cli-git
 	pkgdesc = CLI frontend for Avidemux. (GIT version)
-	depends = avidemux-core-git>=2.7.5.200221.73b12dfc2
+	depends = avidemux-core-git=2.7.9.210922.1d0187359
 	provides = avidemux-cli
 	conflicts = avidemux-cli
-
diff --git a/PKGBUILD b/PKGBUILD
index dbfecf744fb6..94fe7b7097db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,11 @@
 
 pkgbase=avidemux-git
 pkgname=('avidemux-core-git'
-         'avidemux-qt-git'
+         'avidemux-qt5-git'
+         'avidemux-qt6-git'
          'avidemux-cli-git'
          )
-pkgver=2.7.5.200221.73b12dfc2
+pkgver=2.7.9.210922.1d0187359
 pkgrel=1
 pkgdesc="A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)"
 arch=('x86_64')
@@ -33,6 +34,7 @@ makedepends=('git'
              'libva'
              'libvdpau'
              'libvpx'
+             'libvorbis'
              'opencore-amr'
              'twolame'
              'xvidcore'
@@ -42,9 +44,12 @@ makedepends=('git'
              'glu'
              'qt5-script'
              'qt5-tools'
+             'qt6-base'
+             'qt6-tools'
              'libxv'
              'vapoursynth'
              'hicolor-icon-theme'
+             'setconf'
              )
 source=('avidemux::git+https://github.com/mean00/avidemux2.git'
         'git+https://github.com/mean00/avidemux2_i18n.git'
@@ -67,14 +72,15 @@ pkgver() {
 
 prepare() {
   mkdir -p build_core{,_plugins,_plugins_settings}
-  mkdir -p build_qt{,_plugins}
+  mkdir -p build_qt5{,_plugins}
+  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
+  git submodule update --init i18n
 
   # http://avidemux.org/smif/index.php/topic,16301.0.html
   patch -p1 -i "${srcdir}/fix_verbose.patch"
@@ -89,7 +95,7 @@ build() {
   msg2 "Build Core Libs"
   cd "${srcdir}/build_core"
   cmake ../avidemux/avidemux_core \
-    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DFAKEROOT="${srcdir}/fakeroot" \
     -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
@@ -99,7 +105,7 @@ build() {
   msg2 "Build Core Plugins"
   cd "${srcdir}/build_core_plugins"
   cmake ../avidemux/avidemux_plugins \
-    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPLUGIN_UI=COMMON \
     -DUSE_EXTERNAL_LIBA52=ON \
@@ -110,10 +116,10 @@ build() {
 
   make DESTDIR="${srcdir}/fakeroot" install
 
-  msg2 "Build Qt GUI"
-  cd "${srcdir}/build_qt"
+  msg2 "Build Qt5 GUI"
+  cd "${srcdir}/build_qt5"
   cmake ../avidemux/avidemux/qt4 \
-    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DOpenGL_GL_PREFERENCE=GLVND \
     -DENABLE_QT5=ON \
@@ -121,10 +127,10 @@ build() {
 
   make -j1 DESTDIR="${srcdir}/fakeroot" install
 
-  msg2 "Build Qt GUI Plugins"
-  cd ${srcdir}/build_qt_plugins
+  msg2 "Build Qt5 GUI Plugins"
+  cd "${srcdir}/build_qt5_plugins"
   cmake ../avidemux/avidemux_plugins \
-    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DOpenGL_GL_PREFERENCE=GLVND \
     -DENABLE_QT5=ON \
@@ -137,10 +143,38 @@ build() {
 
   make DESTDIR="${srcdir}/fakeroot" install
 
+  msg2 "Build Qt6 GUI"
+  cd "${srcdir}/build_qt6"
+  CXXFLAGS+=" -fPIC" cmake ../avidemux/avidemux/qt4 \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DOpenGL_GL_PREFERENCE=GLVND \
+    -DENABLE_QT6=ON \
+    -DFAKEROOT="${srcdir}/fakeroot"
+
+  make -j1 DESTDIR="${srcdir}/fakeroot" install
+
+  msg2 "Build Qt6 GUI Plugins"
+  cd "${srcdir}/build_qt6_plugins"
+  CXXFLAGS+=" -fPIC" cmake ../avidemux/avidemux_plugins \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DOpenGL_GL_PREFERENCE=GLVND \
+    -DENABLE_QT6=ON \
+    -DPLUGIN_UI=QT4 \
+    -DUSE_EXTERNAL_LIBA52=ON \
+    -DUSE_EXTERNAL_LIBASS=ON \
+    -DUSE_EXTERNAL_LIBMAD=ON \
+    -DUSE_EXTERNAL_MP4V2=ON \
+    -DVAPOURSYNTH=OFF \
+    -DFAKEROOT="${srcdir}/fakeroot"
+
+  make DESTDIR="${srcdir}/fakeroot" install
+
   msg2 "Build CLI frontend"
   cd "${srcdir}/build_cli"
   cmake ../avidemux/avidemux/cli \
-    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DFAKEROOT="${srcdir}/fakeroot"
 
@@ -149,7 +183,7 @@ build() {
   msg2 "Build CLI plugins"
   cd "${srcdir}/build_cli_plugins"
   cmake ../avidemux/avidemux_plugins \
-    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPLUGIN_UI=CLI \
     -DUSE_EXTERNAL_LIBA52=ON \
@@ -163,7 +197,7 @@ build() {
   msg2 "Build Settings"
   cd "${srcdir}/build_core_plugins_settings"
   cmake ../avidemux/avidemux_plugins \
-    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr  \
     -DPLUGIN_UI=SETTINGS \
     -DUSE_EXTERNAL_LIBA52=ON \
@@ -178,11 +212,11 @@ build() {
 package_avidemux-core-git() {
   pkgdesc="Core libs for Avidemux. (GIT version)"
   depends=('a52dec'
-           'aom'
+           'libaom.so'
            'aften'
            'dcaenc'
-           'faac'
-           'faad2'
+           'libfaac.so'
+           'libfaad.so'
            'fribidi'
            'jack'
            'lame'
@@ -191,20 +225,24 @@ package_avidemux-core-git() {
            'libmad'
            'libmp4v2'
            'libdca'
-           'libpulse'
-           'libva'
+           'libpulse.so'
+           'libva.so'
            'libvdpau'
            'libvpx.so'
-           'opencore-amr'
-           'twolame'
+           'libvorbis.so'
+           'libopencore-amrnb.so'
+           'libopencore-amrwb.so'
+           'libtwolame.so'
            'libxvidcore.so'
-           'x264'
-           'x265'
+           'libx264.so'
+           'libx265.so'
            )
-  optdepends=('avidemux-qt-git: a Qt GUI for Avidemux'
+  optdepends=('avidemux-qt5-git: a Qt5 GUI for Avidemux'
+              'avidemux-qt6-git: a Qt6 GUI for Avidemux'
               'avidemux-cli-git: a CLI frontend for Avidemux'
               'wine: AVSload (Load Avisynth scripts on Avidemux)'
               'vapoursynth: vsProxy (Load Vapoursynth scripts on Avidemux)'
+              'cuda: Nvidia hw encoder'
               )
   provides=('avidemux-core')
   conflicts=('avidemux-core')
@@ -215,30 +253,82 @@ package_avidemux-core-git() {
 
   install -Dm755 fakeroot/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so"
   install -Dm755 fakeroot/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.so "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.so"
+  install -Dm755 fakeroot/usr/lib/ADM_plugins6/shaderDemo/1/zigzag.shader "${pkgdir}/usr/lib/ADM_plugins6/shaderDemo/1/zigzag.shader"
+  install -Dm755 fakeroot/usr/lib/ADM_plugins6/shaderDemo/1/ripple.shader "${pkgdir}/usr/lib/ADM_plugins6/shaderDemo/1/ripple.shader"
+  install -Dm755 fakeroot/usr/lib/ADM_plugins6/shaderDemo/1/lightning.shader "${pkgdir}/usr/lib/ADM_plugins6/shaderDemo/1/lightning.shader"
+  install -Dm755 fakeroot/usr/lib/ADM_plugins6/shaderDemo/1/bump.shader "${pkgdir}/usr/lib/ADM_plugins6/shaderDemo/1/bump.shader"
+
 }
 
-package_avidemux-qt-git() {
-  pkgdesc="Qt GUI for Avidemux. (GIT version)"
-  depends=("avidemux-core-git>=${pkgver}"
-           'qt5-script'
+package_avidemux-qt5-git() {
+  pkgdesc="Qt5 GUI for Avidemux. (GIT version)"
+  depends=("avidemux-core-git=${pkgver}"
+           'qt5-base'
            'libxv'
            'glu'
            'desktop-file-utils'
            'hicolor-icon-theme'
            )
-  provides=('avidemux-qt')
-  conflicts=('avidemux-qt4'
-             'avidemux-qt5'
+  provides=('avidemux-qt5')
+  conflicts=('avidemux-qt5'
              'avidemux-qt'
              )
+  replaces=('avidemux-qt-git')
+
+  make -C build_qt5 DESTDIR="${pkgdir}" install
+  make -C build_qt5_plugins DESTDIR="${pkgdir}" install
+
+  rm -fr "${pkgdir}/usr/lib/ADM_plugins6/shaderDemo"
+
+  mv "${pkgdir}/usr/share/applications/org.avidemux.Avidemux.desktop" "${pkgdir}/usr/share/applications/org.avidemux.Avidemux_qt5.desktop"
+  mv "${pkgdir}/usr/share/icons/hicolor/128x128/apps/org.avidemux.Avidemux.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/org.avidemux.Avidemux_qt5.png"
+  mv "${pkgdir}/usr/share/metainfo/org.avidemux.Avidemux.appdata.xml" "${pkgdir}/usr/share/metainfo/org.avidemux.Avidemux_qt5.appdata.xml"
+
+  setconf "${pkgdir}/usr/share/applications/org.avidemux.Avidemux_qt5.desktop" Name="Avidemux Qt5"
+  setconf "${pkgdir}/usr/share/applications/org.avidemux.Avidemux_qt5.desktop" Icon=org.avidemux.Avidemux_qt5
+
+  sed -e 's|org.avidemux.Avidemux|&_qt5|g' \
+      -e 's|<name>Avidemux|& Qt5|g' \
+      -i "${pkgdir}/usr/share/metainfo/org.avidemux.Avidemux_qt5.appdata.xml"
+}
+
+package_avidemux-qt6-git() {
+  pkgdesc="Qt6 GUI for Avidemux. (GIT version)"
+  depends=("avidemux-core-git=${pkgver}"
+           'qt6-base'
+           'libxv'
+           'glu'
+           'desktop-file-utils'
+           'hicolor-icon-theme'
+           )
+  provides=('avidemux-qt6')
+  conflicts=('avidemux-qt6'
+             'avidemux-qt'
+             )
+
+  make -C build_qt6 DESTDIR="${pkgdir}" install
+  make -C build_qt6_plugins DESTDIR="${pkgdir}" install
+
+  rm -fr "${pkgdir}/usr/lib/ADM_plugins6/shaderDemo"
+
+  mv "${pkgdir}/usr/share/applications/org.avidemux.Avidemux.desktop" "${pkgdir}/usr/share/applications/org.avidemux.Avidemux_qt6.desktop"
+  mv "${pkgdir}/usr/share/icons/hicolor/128x128/apps/org.avidemux.Avidemux.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/org.avidemux.Avidemux_qt6.png"
+  mv "${pkgdir}/usr/share/metainfo/org.avidemux.Avidemux.appdata.xml" "${pkgdir}/usr/share/metainfo/org.avidemux.Avidemux_qt6.appdata.xml"
+
+  setconf "${pkgdir}/usr/share/applications/org.avidemux.Avidemux_qt6.desktop" Name="Avidemux Qt6"
+  setconf "${pkgdir}/usr/share/applications/org.avidemux.Avidemux_qt6.desktop" Icon=org.avidemux.Avidemux_qt6
 
-  make -C build_qt DESTDIR="${pkgdir}" install
-  make -C build_qt_plugins DESTDIR="${pkgdir}" install
+  sed -e 's|org.avidemux.Avidemux|&_qt6|g' \
+      -e 's|<name>Avidemux|& Qt6|g' \
+      -i "${pkgdir}/usr/share/metainfo/org.avidemux.Avidemux_qt6.appdata.xml"
+  sed 's|qt5|qt6|g' \
+    -i "${pkgdir}/usr/share/applications/org.avidemux.Avidemux_qt6.desktop" \
+    -i "${pkgdir}/usr/share/metainfo/org.avidemux.Avidemux_qt6.appdata.xml"
 }
 
 package_avidemux-cli-git() {
   pkgdesc="CLI frontend for Avidemux. (GIT version)"
-  depends=("avidemux-core-git>=${pkgver}")
+  depends=("avidemux-core-git=${pkgver}")
   provides=('avidemux-cli')
   conflicts=('avidemux-cli')