diff options
| -rw-r--r-- | .SRCINFO | 116 | ||||
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | PKGBUILD | 412 | ||||
| -rw-r--r-- | fix_mpeg-ts_typo.patch | 22 | ||||
| -rw-r--r-- | fix_ugly_slider.patch | 17 |
5 files changed, 416 insertions, 155 deletions
@@ -1,17 +1,15 @@ -# Generated by mksrcinfo v8 -# Wed Feb 13 14:55:47 UTC 2019 pkgbase = avidemux-git pkgdesc = A graphical/cli tool to edit video (filter/re-encode/split). (GIT version) - pkgver = 2.7.1.190210.ef2af6011 + pkgver = 2.8.2.240125.cdbfa6956 pkgrel = 1 url = http://www.avidemux.org arch = x86_64 license = GPL2 makedepends = git makedepends = cmake - makedepends = subversion makedepends = yasm makedepends = nasm + makedepends = aom makedepends = a52dec makedepends = aften makedepends = dcaenc @@ -23,11 +21,13 @@ pkgbase = avidemux-git makedepends = libass makedepends = libfdk-aac makedepends = libmad + makedepends = libmp4v2 makedepends = libdca makedepends = libpulse makedepends = libva makedepends = libvdpau makedepends = libvpx + makedepends = libvorbis makedepends = opencore-amr makedepends = twolame makedepends = xvidcore @@ -37,64 +37,144 @@ 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 + options = debug source = avidemux::git+https://github.com/mean00/avidemux2.git + source = git+https://github.com/mean00/avidemux2_i18n.git source = fix_verbose.patch source = add_settings_pluginui_message_error.patch source = opus_check.patch + source = fix_mpeg-ts_typo.patch + source = fix_ugly_slider.patch + sha256sums = SKIP sha256sums = SKIP sha256sums = 4f751cbb3a65f904f7c0ad68473880e2a9edcda332a293e20ad238280ec52884 sha256sums = c5b5d3d7bcdf4c588a780c12fdac7791ddb0527db438c85b4c1c078507da2f0b sha256sums = ae6d2c93163b7b760591688c7811dfdd4a952ed9074d8cbdf4953b701f0fa7db + sha256sums = a11452a93c993bdf71f0c29d686badec1c50231bc9d3c6f02f280e06cd8add7a + sha256sums = 3c91ddefadfad5f43d514941ddfa1942ea2c618525aaae36bde5a5d18f8e2067 pkgname = avidemux-core-git pkgdesc = Core libs for Avidemux. (GIT version) depends = a52dec + depends = alsa-lib + depends = libasound.so + depends = aom + depends = libaom.so depends = aften depends = dcaenc depends = faac + depends = libfaac.so depends = faad2 + depends = libfaad.so + depends = gcc-libs + depends = glibc depends = fribidi - depends = jack + depends = jack2 + depends = libjack.so depends = lame + depends = libmp3lame.so + depends = libass depends = libass.so + depends = libfdk-aac depends = libfdk-aac.so depends = libmad + depends = libmp4v2 depends = libdca depends = libpulse + depends = libpulse.so depends = libva + depends = libva.so + depends = libva-drm.so + depends = libva-x11.so depends = libvdpau + depends = libvdpau.so + depends = libvpx depends = libvpx.so + depends = libvorbis + depends = libvorbis.so + depends = libvorbisenc.so + depends = libx11 depends = opencore-amr + depends = libopencore-amrnb.so + depends = libopencore-amrwb.so + depends = opus + depends = libopus.so + depends = sqlite + depends = libsqlite3.so depends = twolame + depends = libtwolame.so + depends = xvidcore depends = libxvidcore.so - depends = sqlite depends = x264 + depends = libx264.so depends = x265 - optdepends = avidemux-qt-git: a Qt GUI for Avidemux + depends = libx265.so + depends = zlib + depends = libz.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 = 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 -pkgname = avidemux-qt-git - pkgdesc = Qt GUI for Avidemux. (GIT version) - depends = avidemux-core-git>=2.7.1.190210.ef2af6011 - depends = qt5-script - depends = libxv +pkgname = avidemux-qt5-git + pkgdesc = Qt5 GUI for Avidemux. (GIT version) + depends = avidemux-core-git=2.8.2.240125.cdbfa6956 + depends = gcc-libs + depends = glibc depends = glu - depends = desktop-file-utils - provides = avidemux-qt - conflicts = avidemux-qt4 + depends = libglvnd + depends = libOpenGL.so + depends = libx11 + depends = libxext + depends = libxv + depends = qt5-base + depends = x264 + depends = libx264.so + depends = x265 + depends = libx265.so + depends = hicolor-icon-theme + 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.8.2.240125.cdbfa6956 + depends = gcc-libs + depends = glibc + depends = glu + depends = libglvnd + depends = libOpenGL.so + depends = libx11 + depends = libxext + depends = libxv + depends = qt6-base + depends = x264 + depends = libx264.so + depends = x265 + depends = libx265.so + 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.1.190210.ef2af6011 + depends = avidemux-core-git=2.8.2.240125.cdbfa6956 depends = gcc-libs + depends = glibc provides = avidemux-cli conflicts = avidemux-cli - diff --git a/.gitignore b/.gitignore index 3bf1dcd72a99..ab5e905cd168 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ !.SRCINFO !PKGBUILD !add_settings_pluginui_message_error.patch -!build-x264-x265-status-message-add-empty-lines.patch -!fix_nvenc_check.patch !fix_verbose.patch +!fix_ugly_slider.patch +!fix_mpeg-ts_typo.patch !opus_check.patch @@ -1,59 +1,78 @@ # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com> pkgbase=avidemux-git -pkgname=('avidemux-core-git' - 'avidemux-qt-git' - 'avidemux-cli-git' - ) -pkgver=2.7.1.190210.ef2af6011 +pkgname=( + 'avidemux-core-git' + 'avidemux-qt5-git' + 'avidemux-qt6-git' + 'avidemux-cli-git' +) +pkgver=2.8.2.240125.cdbfa6956 pkgrel=1 pkgdesc="A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)" arch=('x86_64') url='http://www.avidemux.org' license=('GPL2') -makedepends=('git' - 'cmake' - 'subversion' - 'yasm' - 'nasm' - 'a52dec' - 'aften' - 'dcaenc' - 'faac' - 'faad2' - 'fribidi' - 'jack' - 'lame' - 'libass' - 'libfdk-aac' - 'libmad' - 'libdca' - 'libpulse' - 'libva' - 'libvdpau' - 'libvpx' - 'opencore-amr' - 'twolame' - 'xvidcore' - 'x264' - 'x265' - 'sqlite' - 'glu' - 'qt5-script' - 'qt5-tools' - 'libxv' - 'vapoursynth' - ) -source=('avidemux::git+https://github.com/mean00/avidemux2.git' - 'fix_verbose.patch' - 'add_settings_pluginui_message_error.patch' - 'opus_check.patch' - ) -sha256sums=('SKIP' - '4f751cbb3a65f904f7c0ad68473880e2a9edcda332a293e20ad238280ec52884' - 'c5b5d3d7bcdf4c588a780c12fdac7791ddb0527db438c85b4c1c078507da2f0b' - 'ae6d2c93163b7b760591688c7811dfdd4a952ed9074d8cbdf4953b701f0fa7db' - ) +makedepends=( + 'git' + 'cmake' + 'yasm' + 'nasm' + 'aom' + 'a52dec' + 'aften' + 'dcaenc' + 'faac' + 'faad2' + 'fribidi' + 'jack' + 'lame' + 'libass' + 'libfdk-aac' + 'libmad' + 'libmp4v2' + 'libdca' + 'libpulse' + 'libva' + 'libvdpau' + 'libvpx' + 'libvorbis' + 'opencore-amr' + 'twolame' + 'xvidcore' + 'x264' + 'x265' + 'sqlite' + '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' + 'fix_verbose.patch' + 'add_settings_pluginui_message_error.patch' + 'opus_check.patch' + 'fix_mpeg-ts_typo.patch' + 'fix_ugly_slider.patch' +) +sha256sums=( + 'SKIP' + 'SKIP' + '4f751cbb3a65f904f7c0ad68473880e2a9edcda332a293e20ad238280ec52884' + 'c5b5d3d7bcdf4c588a780c12fdac7791ddb0527db438c85b4c1c078507da2f0b' + 'ae6d2c93163b7b760591688c7811dfdd4a952ed9074d8cbdf4953b701f0fa7db' + 'a11452a93c993bdf71f0c29d686badec1c50231bc9d3c6f02f280e06cd8add7a' + '3c91ddefadfad5f43d514941ddfa1942ea2c618525aaae36bde5a5d18f8e2067' +) + +options=('debug') pkgver() { cd avidemux @@ -62,37 +81,42 @@ pkgver() { } prepare() { - mkdir -p build_core{,_plugins,_plugins_settings} - mkdir -p build_qt{,_plugins} - mkdir -p build_cli{,_plugins} - - #exit cd avidemux + git config submodule.i18n.url "${srcdir}/avidemux2_i18n" + git -c protocol.file.allow=always submodule update --init \ + avidemux/qt4/i18n + # http://avidemux.org/smif/index.php/topic,16301.0.html patch -p1 -i "${srcdir}/fix_verbose.patch" # add SETTINGS to MESSAGE(FATAL_ERROR in avidemux_plugins/CMakeLists.txt patch -p1 -i "${srcdir}/add_settings_pluginui_message_error.patch" + # Fix Typo 'Mpeg TS' -> 'Mpeg-TS' + patch -p1 -i "${srcdir}/fix_mpeg-ts_typo.patch" + + # fix ugly slider(?) + patch -p1 -i "${srcdir}/fix_ugly_slider.patch" + + # Cosmetic opus check thing patch --binary -p1 -i "${srcdir}/opus_check.patch" } build() { msg2 "Build Core Libs" - cd "${srcdir}/build_core" - cmake ../avidemux/avidemux_core \ - -DCMAKE_BUILD_TYPE=None \ + cmake -B build_core -S avidemux/avidemux_core \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DFAKEROOT="${srcdir}/fakeroot" \ -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux" - make DESTDIR="${srcdir}/fakeroot" install + cmake --build build_core + DESTDIR="${srcdir}/fakeroot" cmake --install build_core msg2 "Build Core Plugins" - cd "${srcdir}/build_core_plugins" - cmake ../avidemux/avidemux_plugins \ - -DCMAKE_BUILD_TYPE=None \ + cmake -B build_core_plugins -S avidemux/avidemux_plugins \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DPLUGIN_UI=COMMON \ -DUSE_EXTERNAL_LIBA52=ON \ @@ -101,23 +125,25 @@ build() { -DUSE_EXTERNAL_MP4V2=ON \ -DFAKEROOT="${srcdir}/fakeroot" - make DESTDIR="${srcdir}/fakeroot" install + cmake --build build_core_plugins + DESTDIR="${srcdir}/fakeroot" cmake --install build_core_plugins - msg2 "Build Qt GUI" - cd "${srcdir}/build_qt" - cmake ../avidemux/avidemux/qt4 \ - -DCMAKE_BUILD_TYPE=None \ + msg2 "Build Qt5 GUI" + cmake -B build_qt5 -S avidemux/avidemux/qt4 \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DOpenGL_GL_PREFERENCE=GLVND \ -DENABLE_QT5=ON \ -DFAKEROOT="${srcdir}/fakeroot" - make -j1 DESTDIR="${srcdir}/fakeroot" install + cmake --build build_qt5 + DESTDIR="${srcdir}/fakeroot" cmake --install build_qt5 - msg2 "Build Qt GUI Plugins" - cd ${srcdir}/build_qt_plugins - cmake ../avidemux/avidemux_plugins \ - -DCMAKE_BUILD_TYPE=None \ + msg2 "Build Qt5 GUI Plugins" + cmake -B build_qt5_plugins -S avidemux/avidemux_plugins \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DOpenGL_GL_PREFERENCE=GLVND \ -DENABLE_QT5=ON \ -DPLUGIN_UI=QT4 \ -DUSE_EXTERNAL_LIBA52=ON \ @@ -126,21 +152,50 @@ build() { -DUSE_EXTERNAL_MP4V2=ON \ -DFAKEROOT="${srcdir}/fakeroot" - make DESTDIR="${srcdir}/fakeroot" install + cmake --build build_qt5_plugins + DESTDIR="${srcdir}/fakeroot" cmake --install build_qt5_plugins + + msg2 "Build Qt6 GUI" + CXXFLAGS+=" -fPIC" \ + cmake -B build_qt6 -S avidemux/avidemux/qt4 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DOpenGL_GL_PREFERENCE=GLVND \ + -DENABLE_QT6=ON \ + -DFAKEROOT="${srcdir}/fakeroot" + + cmake --build build_qt6 + DESTDIR="${srcdir}/fakeroot" cmake --install build_qt6 + + msg2 "Build Qt6 GUI Plugins" + CXXFLAGS+=" -fPIC" \ + cmake -B build_qt6_plugins -S 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 \ + -DFAKEROOT="${srcdir}/fakeroot" + + cmake --build build_qt6_plugins + DESTDIR="${srcdir}/fakeroot" cmake --install build_qt6_plugins msg2 "Build CLI frontend" - cd "${srcdir}/build_cli" - cmake ../avidemux/avidemux/cli \ - -DCMAKE_BUILD_TYPE=None \ + cmake -B build_cli -S avidemux/avidemux/cli \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DFAKEROOT="${srcdir}/fakeroot" - make DESTDIR="${srcdir}/fakeroot" install + cmake --build build_cli + DESTDIR="${srcdir}/fakeroot" cmake --install build_cli msg2 "Build CLI plugins" - cd "${srcdir}/build_cli_plugins" - cmake ../avidemux/avidemux_plugins \ - -DCMAKE_BUILD_TYPE=None \ + cmake -B build_cli_plugins -S avidemux/avidemux_plugins \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DPLUGIN_UI=CLI \ -DUSE_EXTERNAL_LIBA52=ON \ @@ -149,12 +204,12 @@ build() { -DUSE_EXTERNAL_MP4V2=ON \ -DFAKEROOT="${srcdir}/fakeroot" - make DESTDIR="${srcdir}/fakeroot" install + cmake --build build_cli_plugins + DESTDIR="${srcdir}/fakeroot" cmake --install build_cli_plugins msg2 "Build Settings" - cd "${srcdir}/build_core_plugins_settings" - cmake ../avidemux/avidemux_plugins \ - -DCMAKE_BUILD_TYPE=None \ + cmake -B build_core_plugins_settings -S avidemux/avidemux_plugins \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DPLUGIN_UI=SETTINGS \ -DUSE_EXTERNAL_LIBA52=ON \ @@ -163,78 +218,165 @@ build() { -DUSE_EXTERNAL_MP4V2=ON \ -DFAKEROOT="${srcdir}/fakeroot" - make DESTDIR="${srcdir}/fakeroot" install + cmake --build build_core_plugins_settings + DESTDIR="${srcdir}/fakeroot" cmake --install build_core_plugins_settings } package_avidemux-core-git() { pkgdesc="Core libs for Avidemux. (GIT version)" - depends=('a52dec' - 'aften' - 'dcaenc' - 'faac' - 'faad2' - 'fribidi' - 'jack' - 'lame' - 'libass.so' - 'libfdk-aac.so' - 'libmad' - 'libdca' - 'libpulse' - 'libva' - 'libvdpau' - 'libvpx.so' - 'opencore-amr' - 'twolame' - 'libxvidcore.so' - 'sqlite' - 'x264' - 'x265' - ) - optdepends=('avidemux-qt-git: a Qt 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' - ) + depends=( + 'a52dec' # 'liba52.so' + 'alsa-lib' 'libasound.so' + 'aom' 'libaom.so' + 'aften' # 'libaften.so' + 'dcaenc' # 'libdcaenc.so' + 'faac' 'libfaac.so' + 'faad2' 'libfaad.so' + 'gcc-libs' # 'libgcc_s.so' 'libstdc++.so' + 'glibc' # 'libc.so' 'libm.so' + 'fribidi' + 'jack2' 'libjack.so' + 'lame' 'libmp3lame.so' + 'libass' 'libass.so' + 'libfdk-aac' 'libfdk-aac.so' + 'libmad' # 'libmad.so' + 'libmp4v2' # 'libmp4v2.so' + 'libdca' # 'libdca.so' + 'libpulse' 'libpulse.so' + 'libva' 'libva.so' 'libva-drm.so' 'libva-x11.so' + 'libvdpau' 'libvdpau.so' + 'libvpx' 'libvpx.so' + 'libvorbis' 'libvorbis.so' 'libvorbisenc.so' + 'libx11' # 'libX11.so' + 'opencore-amr' 'libopencore-amrnb.so' 'libopencore-amrwb.so' + 'opus' 'libopus.so' + 'sqlite' 'libsqlite3.so' + 'twolame' 'libtwolame.so' + 'xvidcore' 'libxvidcore.so' + 'x264' 'libx264.so' + 'x265' 'libx265.so' + 'zlib' 'libz.so' + ) + 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' + 'libva-intel-driver: Intel hw encoder' + 'libva-mesa-driver: Mesa hw encoder' + ) provides=('avidemux-core') conflicts=('avidemux-core') - make -C build_core DESTDIR="${pkgdir}" install - make -C build_core_plugins DESTDIR="${pkgdir}" install - make -C build_core_plugins_settings DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" cmake --install build_core + DESTDIR="${pkgdir}" cmake --install build_core_plugins + DESTDIR="${pkgdir}" cmake --install build_core_plugins_settings 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' - 'libxv' - 'glu' - 'desktop-file-utils' - ) - provides=('avidemux-qt') - conflicts=('avidemux-qt4' - 'avidemux-qt5' - 'avidemux-qt' - ) - - make -C build_qt DESTDIR="${pkgdir}" install - make -C build_qt_plugins DESTDIR="${pkgdir}" install +package_avidemux-qt5-git() { + pkgdesc="Qt5 GUI for Avidemux. (GIT version)" + depends=( + "avidemux-core-git=${pkgver}" + 'gcc-libs' # 'libgcc_s.so' 'libstdc++.so' + 'glibc' # 'libc.so' 'libm.so' + 'glu' # 'libGLU.so' + 'libglvnd' 'libOpenGL.so' + 'libx11' # 'libX11.so' + 'libxext' # 'libXext.so' + 'libxv' # 'libXv.so' + 'qt5-base' # 'libQt5Core.so' 'libQt5Gui.so' 'libQt5Network.so' 'libQt5Widgets.so' + 'x264' 'libx264.so' + 'x265' 'libx265.so' + 'hicolor-icon-theme' + ) + provides=('avidemux-qt5') + conflicts=( + 'avidemux-qt5' + 'avidemux-qt' + ) + replaces=('avidemux-qt-git') + + DESTDIR="${pkgdir}" cmake --install build_qt5 + DESTDIR="${pkgdir}" cmake --install build_qt5_plugins + + 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}" + 'gcc-libs' # 'libgcc_s.so' 'libstdc++.so' + 'glibc' # 'libc.so' 'libm.so' + 'glu' # 'libGLU.so' + 'libglvnd' 'libOpenGL.so' + 'libx11' # 'libX11.so' + 'libxext' # 'libXext.so' + 'libxv' # 'libXv.so' + 'qt6-base' # 'libQt6Core.so' 'libQt6Gui.so' 'libQt6Network.so' 'libQt6OpenGL.so' 'libQt6OpenGLWidgets.so' 'libQt6Widgets.so' + 'x264' 'libx264.so' + 'x265' 'libx265.so' + 'hicolor-icon-theme' + ) + provides=('avidemux-qt6') + conflicts=( + 'avidemux-qt6' + 'avidemux-qt' + ) + + DESTDIR="${pkgdir}" cmake --install build_qt6 + DESTDIR="${pkgdir}" cmake --install build_qt6_plugins + + 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 + + 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}" - 'gcc-libs' - ) + depends=( + "avidemux-core-git=${pkgver}" + 'gcc-libs' # 'libgcc_s.so' 'libstdc++.so' + 'glibc' # 'libc.so' 'libm.so' + ) provides=('avidemux-cli') conflicts=('avidemux-cli') - make -C build_cli DESTDIR="${pkgdir}" install - make -C build_cli_plugins DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" cmake --install build_cli + DESTDIR="${pkgdir}" cmake --install build_cli_plugins rm -fr "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders" } diff --git a/fix_mpeg-ts_typo.patch b/fix_mpeg-ts_typo.patch new file mode 100644 index 000000000000..1a08dcdfa0e5 --- /dev/null +++ b/fix_mpeg-ts_typo.patch @@ -0,0 +1,22 @@ +--- a/avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSPlugin.cpp ++++ b/avidemux_plugins/ADM_muxers/muxerffPS/muxerffPSPlugin.cpp +@@ -25,7 +25,7 @@ ADM_MUXER_BEGIN( "mpg",muxerffPS, + 1,0,0, + "ffPS", // Internal name + "ffMpeg PS muxer plugin (c) Mean 2009", +- "Mpeg-PS Muxer( ff)", // DIsplay name ++ "Mpeg-PS Muxer (ff)", // Display name + ffPSConfigure, + ps_muxer_param, //template + &psMuxerConfig, //config +--- a/avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSPlugin.cpp ++++ b/avidemux_plugins/ADM_muxers/muxerffTS/muxerffTSPlugin.cpp +@@ -34,7 +34,7 @@ ADM_MUXER_DYN_EXT( + 1,0,1, + "ffTS", // Internal name + "ffMpeg TS muxer plugin (c) Mean 2009", +- "Mpeg TS Muxer (ff)", // Display name ++ "Mpeg-TS Muxer (ff)", // Display name + ffTSConfigure, + ts_muxer_param, // template + &tsMuxerConfig, // config diff --git a/fix_ugly_slider.patch b/fix_ugly_slider.patch new file mode 100644 index 000000000000..e67c1c128264 --- /dev/null +++ b/fix_ugly_slider.patch @@ -0,0 +1,17 @@ +diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp b/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp +index 005d5cbe7..bd9153e34 100644 +--- a/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp ++++ b/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp +@@ -227,12 +227,12 @@ void MainWindow::comboChanged(int z) + ADM_mwNavSlider *qslider=(ADM_mwNavSlider *)slider; + slider->setMinimum(0); + slider->setMaximum(ADM_LARGE_SCALE); +-#if !(defined(__APPLE__) && QT_VERSION >= QT_VERSION_CHECK(5,10,0)) ++/*#if !(defined(__APPLE__) && QT_VERSION >= QT_VERSION_CHECK(5,10,0)) + slider->setTickInterval(ADM_SCALE_INCREMENT); + slider->setTickPosition(QSlider::TicksBothSides); +-#endif ++#endif*/ + connect( slider,SIGNAL(valueChanged(int)),this,SLOT(sliderValueChanged(int))); + connect( slider,SIGNAL(sliderMoved(int)),this,SLOT(sliderMoved(int))); + connect( slider,SIGNAL(sliderReleased()),this,SLOT(sliderReleased())); |