summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Alvarez2016-02-03 17:34:54 +0100
committerGustavo Alvarez2016-02-03 17:36:06 +0100
commitfdce89b5880590a2b81124decb8b08406f334f5f (patch)
tree6fee200980184ef68abe88aa1fbd8e11c80e2c74
parentf00200688e20992acc688b6dd5be37255151208f (diff)
downloadaur-fdce89b5880590a2b81124decb8b08406f334f5f.tar.gz
Update PKGBUILD
- Removing Qt4 and GTK builds - add/change/remove some patches
-rw-r--r--.SRCINFO57
-rw-r--r--.gitignore6
-rw-r--r--PKGBUILD313
-rw-r--r--add_settings_pluginui_message_error.patch13
-rw-r--r--avidemux-git.install (renamed from avidemux.install)0
-rw-r--r--fix_nvenc_check.patch27
-rw-r--r--fix_verbose.patch10
-rw-r--r--fix_vf_hflip_plugin_name.patch18
8 files changed, 243 insertions, 201 deletions
diff --git a/.SRCINFO b/.SRCINFO
index af8b7da8ae2..2a577daba6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,10 @@
+# Generated by mksrcinfo v8
+# Wed Feb 3 16:33:21 UTC 2016
pkgbase = avidemux-git
pkgdesc = A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)
- pkgver = 2.6.10.150607.4c23a42c229
+ pkgver = 2.6.11.160203.dd4a5e0
pkgrel = 1
- url = http://www.avidemux.org/
+ url = http://www.avidemux.org
arch = i686
arch = x86_64
license = GPL2
@@ -27,13 +29,21 @@ pkgbase = avidemux-git
makedepends = xvidcore
makedepends = x265
makedepends = sqlite
- makedepends = qt4
makedepends = glu
makedepends = qt5-script
makedepends = qt5-tools
makedepends = libxv
+ makedepends = vapoursynth
source = avidemux::git+https://github.com/mean00/avidemux2.git
+ source = fix_verbose.patch
+ source = fix_nvenc_check.patch
+ source = add_settings_pluginui_message_error.patch
+ source = fix_vf_hflip_plugin_name.patch
sha1sums = SKIP
+ sha1sums = 4b61f11627278578a180d4bdc3b6100544107f32
+ sha1sums = 19bcbe1c3aa6df8fdee2d10ecb9626b46de00175
+ sha1sums = 4162d53297ec9d77633723ae911c605d8fdca3f1
+ sha1sums = 54ffd680b4a18a945f8a03c650abbccb48952d70
pkgname = avidemux-core-git
pkgdesc = Core libs for Avidemux. (GIT version)
@@ -54,41 +64,30 @@ pkgname = avidemux-core-git
depends = sqlite
depends = libx264
depends = x265
- optdepends = avidemux-qt4-git: a Qt4 GUI for Avidemux. (GIT Version) (install from "avidemux-git" package)
- optdepends = avidemux-qt5-git: a Qt5 GUI for Avidemux. (GIT Version) (install from "avidemux-git" package)
- optdepends = avidemux-gtk-git: a Gtk3 GUI for Avidemux. (GIT Version) (install from "avidemux-git" package)
- optdepends = avidemux-cli-git: a CLI frontend for Avidemux. (GIT Version) (install from "avidemux-git" package)
- optdepends = wine: AVSload
- provides = avidemux-core-git=2.6.10.150607.4c23a42c229
+ optdepends = avidemux-qt-git: a Qt 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
+ provides = avidemux-core-git=2.6.11.160203.dd4a5e0
provides = avidemux-core
+ conflicts = avidemux-core
-pkgname = avidemux-qt4-git
- pkgdesc = Qt4 GUI for Avidemux. (GIT version)
- install = avidemux.install
- depends = avidemux-core-git=2.6.10.150607.4c23a42c229
- depends = qt4
- depends = glu
- depends = libx264
- depends = x265
- provides = avidemux-qt4-git=2.6.10.150607.4c23a42c229
- conflicts = avidemux-qt4
-
-pkgname = avidemux-qt5-git
- pkgdesc = Qt5 GUI for Avidemux. (GIT version)
- install = avidemux.install
- depends = avidemux-core-git=2.6.10.150607.4c23a42c229
+pkgname = avidemux-qt-git
+ pkgdesc = Qt GUI for Avidemux. (GIT version)
+ install = avidemux-git.install
+ depends = avidemux-core-git=2.6.11.160203.dd4a5e0
depends = qt5-script
depends = libxv
+ depends = glu
depends = desktop-file-utils
- depends = libx264
- depends = x265
- provides = avidemux-qt5-git=2.6.10.150607.4c23a42c229
+ provides = avidemux-qt
+ conflicts = avidemux-qt4
conflicts = avidemux-qt5
+ conflicts = avidemux-qt
pkgname = avidemux-cli-git
pkgdesc = CLI frontend for Avidemux. (GIT version)
- depends = avidemux-core-git=2.6.10.150607.4c23a42c229
- provides = avidemux-cli-git=2.6.10.150607.4c23a42c229
+ depends = avidemux-core-git=2.6.11.160203.dd4a5e0
provides = avidemux-cli
conflicts = avidemux-cli
diff --git a/.gitignore b/.gitignore
index 6608cfd829f..389b7afc256 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,8 @@
!.gitignore
!.SRCINFO
!PKGBUILD
-!avidemux.install
+!avidemux-git.install
+!add_settings_pluginui_message_error.patch
+!fix_nvenc_check.patch
+!fix_verbose.patch
+!fix_vf_hflip_plugin_name.patch
diff --git a/PKGBUILD b/PKGBUILD
index a9b3e8e82e1..da4773accbb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,79 @@
# Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
-makedepends=('git' 'cmake' 'subversion' 'yasm' 'aften' 'dcaenc' 'faac' 'faad2' 'fribidi' 'jack2' 'lame' 'libdca' 'libpulse' 'libva'
- 'libvpx' 'libx264' 'opencore-amr' 'twolame' 'xvidcore' 'x265' 'sqlite'
- 'qt4' 'glu'
- 'qt5-script' 'qt5-tools' 'libxv') #'gtk3'
pkgbase=avidemux-git
-pkgname=('avidemux-core-git' 'avidemux-qt4-git' 'avidemux-qt5-git' 'avidemux-cli-git') #avidemux-gtk-git
-pkgver=2.6.10.150607.4c23a42c229
+pkgname=('avidemux-core-git'
+ 'avidemux-qt-git'
+ 'avidemux-cli-git'
+ )
+pkgver=2.6.11.160203.dd4a5e0
pkgrel=1
pkgdesc="A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)"
-url="http://www.avidemux.org/"
-license=('GPL2')
arch=('i686' 'x86_64')
-source=('avidemux::git+https://github.com/mean00/avidemux2.git')
-sha1sums=('SKIP')
+url='http://www.avidemux.org'
+license=('GPL2')
+makedepends=('git'
+ 'cmake'
+ 'subversion'
+ 'yasm'
+ 'aften'
+ 'dcaenc'
+ 'faac'
+ 'faad2'
+ 'fribidi'
+ 'jack2'
+ 'lame'
+ 'libdca'
+ 'libpulse'
+ 'libva'
+ 'libvpx'
+ 'libx264'
+ 'opencore-amr'
+ 'twolame'
+ 'xvidcore'
+ 'x265'
+ 'sqlite'
+ 'glu'
+ 'qt5-script'
+ 'qt5-tools'
+ 'libxv'
+ 'vapoursynth'
+ )
+source=('avidemux::git+https://github.com/mean00/avidemux2.git'
+ 'fix_verbose.patch'
+ 'fix_nvenc_check.patch'
+ 'add_settings_pluginui_message_error.patch'
+ 'fix_vf_hflip_plugin_name.patch'
+ )
+sha1sums=('SKIP'
+ '4b61f11627278578a180d4bdc3b6100544107f32'
+ '19bcbe1c3aa6df8fdee2d10ecb9626b46de00175'
+ '4162d53297ec9d77633723ae911c605d8fdca3f1'
+ '54ffd680b4a18a945f8a03c650abbccb48952d70'
+ )
pkgver() {
cd avidemux
- _ver="$(cat cmake/avidemuxVersion.cmake | grep -e CPACK_PACKAGE_VERSION_MAJOR -e CPACK_PACKAGE_VERSION_MINOR -e CPACK_PACKAGE_VERSION_P| head -n3 | cut -d '"' -f2)"
- echo "$(echo ${_ver} | tr ' ' .).$(date -u +%g%m%d).$(git log --format=oneline -1 | head -c 11)"
+ _ver="$(cat cmake/avidemuxVersion.cmake | grep -m3 -e CPACK_PACKAGE_VERSION_MAJOR -e CPACK_PACKAGE_VERSION_MINOR -e CPACK_PACKAGE_VERSION_P | grep -o "[[:digit:]]*" | paste -sd'.')"
+ echo -e "${_ver}.$(date -u +%g%m%d).$(git rev-parse --short HEAD | head -c 11)"
}
prepare() {
mkdir -p build_core{,_plugins,_plugins_settings}
- mkdir -p build_qt4{,_plugins}
- mkdir -p build_qt5{,_plugins}
-# mkdir -p build_gtk{,_plugins}
+ mkdir -p build_qt{,_plugins}
mkdir -p build_cli{,_plugins}
+ cd avidemux
# http://avidemux.org/smuf/index.php/topic,16302.msg71463.html#msg71463
- sed 's|hf_hflip|vf_hflip|g' -i avidemux/avidemux_plugins/ADM_videoFilters6/horizontalFlip/CMakeLists.txt
+ patch -p1 -i "${srcdir}/fix_vf_hflip_plugin_name.patch"
+
+ # http://avidemux.org/smif/index.php/topic,16301.0.html
+ patch -p1 -i "${srcdir}/fix_verbose.patch"
+
+ # http://avidemux.org/smif/index.php/topic,16451.0.html
+ patch --binary -p1 -i "${srcdir}/fix_nvenc_check.patch"
+
+ # add SETTINGS to MESSAGE(FATAL_ERROR in avidemux_plugins/CMakeLists.txt
+ patch -p1 -i "${srcdir}/add_settings_pluginui_message_error.patch"
}
build() {
@@ -38,10 +82,9 @@ build() {
cmake ../avidemux/avidemux_core \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DFAKEROOT="${srcdir}/fakeroot" \
- -DVERBOSE=
- make VERBOSE= -j1
- make VERBOSE= DESTDIR="${srcdir}/fakeroot" install
+ -DFAKEROOT="${srcdir}/fakeroot"
+ make -j1
+ make DESTDIR="${srcdir}/fakeroot" install
msg2 "Build Common Plugins"
cd "${srcdir}/build_core_plugins"
@@ -51,90 +94,39 @@ build() {
-DPLUGIN_UI=COMMON \
-DQTSCRIPT=OFF \
-DFAKEROOT="${srcdir}/fakeroot" \
- -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux" \
- -DVERBOSE=
- make VERBOSE=
- make VERBOSE= DESTDIR="${srcdir}/fakeroot" install
+ -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
+ make
+ make DESTDIR="${srcdir}/fakeroot" install
- msg2 "Build Qt4 GUI"
- cd "${srcdir}/build_qt4"
- cmake ../avidemux/avidemux/qt4 \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DFAKEROOT="${srcdir}/fakeroot" \
- -DVERBOSE=
- make VERBOSE=
- make VERBOSE= DESTDIR="${srcdir}/fakeroot" install
-
- msg2 "Build Qt4 GUI Plugins"
- cd "${srcdir}/build_qt4_plugins"
- cmake ../avidemux/avidemux_plugins \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPLUGIN_UI=QT4 \
- -DFAKEROOT="${srcdir}/fakeroot" \
- -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux" \
- -DVERBOSE=
- make VERBOSE=
- make VERBOSE= DESTDIR="${srcdir}/fakeroot" install
-
- msg2 "Build Qt5 GUI"
- cd "${srcdir}/build_qt5"
+ msg2 "Build Qt GUI"
+ cd "${srcdir}/build_qt"
cmake ../avidemux/avidemux/qt4 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DENABLE_QT5=ON \
- -DFAKEROOT="${srcdir}/fakeroot" \
- -DVERBOSE=
- make VERBOSE=
- make VERBOSE= DESTDIR="${srcdir}/fakeroot" install
+ -DFAKEROOT="${srcdir}/fakeroot"
+ make
+ make DESTDIR="${srcdir}/fakeroot" install
- msg2 "Build Qt5 GUI Plugins"
- cd ${srcdir}/build_qt5_plugins
- cmake "../avidemux/avidemux_plugins" \
+ msg2 "Build Qt GUI Plugins"
+ cd ${srcdir}/build_qt_plugins
+ cmake ../avidemux/avidemux_plugins \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DENABLE_QT5=ON \
-DPLUGIN_UI=QT4 \
- -DQT_LRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5 \
-DFAKEROOT="${srcdir}/fakeroot" \
- -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux" \
- -DVERBOSE=
- make VERBOSE=
- make VERBOSE= DESTDIR="${srcdir}/fakeroot" install
-
-#
-# msg2 "Build Gtk GUI"
-# cd "${srcdir}/build_gtk"
-# cmake ../avidemux/avidemux/gtk \
-# -DCMAKE_BUILD_TYPE=Release \
-# -DCMAKE_INSTALL_PREFIX=/usr \
-# -DFAKEROOT="${srcdir}/fakeroot" \
-# -DVERBOSE=
-# make VERBOSE=
-# make VERBOSE= DESTDIR="${srcdir}/fakeroot" install
-#
-# msg2 "Build Gtk GUI plugins"
-# cd ${srcdir}/build_gtk_plugins
-# cmake "../avidemux/avidemux_plugins" \
-# -DCMAKE_BUILD_TYPE=Release \
-# -DCMAKE_INSTALL_PREFIX=/usr \
-# -DPLUGIN_UI=GTK \
-# -DFAKEROOT="${srcdir}/fakeroot" \
-# -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux" \
-# -DVERBOSE=
-# make VERBOSE=
-# make VERBOSE= DESTDIR="${srcdir}/fakeroot" install
+ -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
+ make
+ make DESTDIR="${srcdir}/fakeroot" install
msg2 "Build CLI frontend"
cd "${srcdir}/build_cli"
cmake ../avidemux/avidemux/cli \
- -DFAKEROOT="${srcdir}/fakeroot" \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DVERBOSE=
- make VERBOSE=
- make VERBOSE= DESTDIR="${srcdir}/fakeroot" install
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+ make DESTDIR="${srcdir}/fakeroot" install
msg2 "Build CLI plugins"
cd "${srcdir}/build_cli_plugins"
@@ -142,110 +134,89 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DPLUGIN_UI=CLI \
- -DFAKEROOT="${srcdir}/fakeroot" \
- -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux" \
- -DVERBOSE=
- make VERBOSE=
- make VERBOSE= DESTDIR="${srcdir}/fakeroot" install
+ -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
+ make
msg2 "Build Settings"
cd "${srcdir}/build_core_plugins_settings"
cmake ../avidemux/avidemux_plugins \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DFAKEROOT="${srcdir}/fakeroot" \
- -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux" \
-DPLUGIN_UI=SETTINGS \
- -DVERBOSE=
- make VERBOSE=
- make VERBOSE= DESTDIR="${srcdir}/fakeroot" install
+ -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
+ make
}
package_avidemux-core-git() {
- depends=('aften' 'dcaenc' 'faac' 'faad2' 'fribidi' 'jack2' 'lame' 'libdca' 'libpulse' 'libva' 'libvpx' 'opencore-amr' 'twolame' 'xvidcore' 'sqlite' 'libx264' 'x265')
pkgdesc="Core libs for Avidemux. (GIT version)"
+ depends=('aften'
+ 'dcaenc'
+ 'faac'
+ 'faad2'
+ 'fribidi'
+ 'jack2'
+ 'lame'
+ 'libdca'
+ 'libpulse'
+ 'libva'
+ 'libvpx'
+ 'opencore-amr'
+ 'twolame'
+ 'xvidcore'
+ 'sqlite'
+ 'libx264'
+ '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')
provides=("avidemux-core-git=${pkgver}" 'avidemux-core')
- optdepends=('avidemux-qt4-git: a Qt4 GUI for Avidemux. (GIT Version) (install from "avidemux-git" package)'
- 'avidemux-qt5-git: a Qt5 GUI for Avidemux. (GIT Version) (install from "avidemux-git" package)'
- 'avidemux-gtk-git: a Gtk3 GUI for Avidemux. (GIT Version) (install from "avidemux-git" package)'
- 'avidemux-cli-git: a CLI frontend for Avidemux. (GIT Version) (install from "avidemux-git" package)'
- 'wine: AVSload')
-
- make VERBOSE= -C build_core DESTDIR="${pkgdir}" install
- make VERBOSE= -C build_core_plugins DESTDIR="${pkgdir}" install
- make VERBOSE= -C build_core_plugins_settings DESTDIR="${pkgdir}" install
-
- for i in 4 5; do
- if [ -f fakeroot/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x26${i}_other.so ]; then
- install -Dm755 fakeroot/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x26${i}_other.so "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x26${i}_other.so"
- fi
- done
+ 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
+
+ if [ -f fakeroot/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so ]; then
+ install -Dm755 fakeroot/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so"
+ fi
+ if [ -f fakeroot/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.so ]; then
+ install -Dm755 fakeroot/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.so "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.so"
+ fi
}
-package_avidemux-qt4-git() {
- depends=("avidemux-core-git=${pkgver}" 'qt4' 'glu' 'libx264' 'x265')
- pkgdesc="Qt4 GUI for Avidemux. (GIT version)"
- provides=("avidemux-qt4-git=${pkgver}")
- conflicts=('avidemux-qt4')
- install=avidemux.install
-
- make VERBOSE= -C build_qt4 DESTDIR="${pkgdir}" install
- make VERBOSE= -C build_qt4_plugins DESTDIR="${pkgdir}" install
-
- install -Dm644 avidemux/avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt4.desktop"
- sed -e 's|Icon=avidemux|Icon=avidemux-qt4|g' \
- -e 's|Exec=avidemux2_gtk|Exec=avidemux3_qt4|g' \
- -e 's|Name=avidemux2|Name=Avidemux Qt4|' \
- -i "${pkgdir}/usr/share/applications/avidemux-qt4.desktop"
- install -Dm644 avidemux/avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux-qt4.png"
-}
-
-package_avidemux-qt5-git() {
- depends=("avidemux-core-git=${pkgver}" 'qt5-script' 'libxv' 'desktop-file-utils' 'libx264' 'x265')
- pkgdesc="Qt5 GUI for Avidemux. (GIT version)"
- provides=("avidemux-qt5-git=${pkgver}")
- conflicts=('avidemux-qt5')
- install=avidemux.install
-
- make VERBOSE= -C build_qt5 DESTDIR="${pkgdir}" install
- make VERBOSE= -C build_qt5_plugins DESTDIR="${pkgdir}" install
-
- install -Dm644 avidemux/avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt5.desktop"
- sed -e 's|Icon=avidemux|Icon=avidemux-qt5|g' \
+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')
+ install=avidemux-git.install
+
+ make -C build_qt DESTDIR="${pkgdir}" install
+ make -C build_qt_plugins DESTDIR="${pkgdir}" install
+
+ install -Dm644 avidemux/avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+ sed -e 's|Icon=avidemux|Icon=avidemux-qt|g' \
-e 's|Exec=avidemux2_gtk|Exec=avidemux3_qt5|g' \
- -e 's|Name=avidemux2|Name=Avidemux Qt5|' \
- -i "${pkgdir}/usr/share/applications/avidemux-qt5.desktop"
- install -Dm644 avidemux/avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux-qt5.png"
+ -e 's|Name=avidemux2|Name=Avidemux Qt|' \
+ -i "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+ install -Dm644 avidemux/avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux-qt.png"
}
-# package_avidemux-gtk-git() {
-# depends=("avidemux-core-git=${pkgver}" 'gtk3' 'libxv' 'sdl' 'desktop-file-utils')
-# pkgdesc="Gtk3 GUI for Avidemux. (GIT version)"
-# provides=("avidemux-gtk-git=${pkgver}" 'avidemux-gtk')
-# conflicts=('avidemux-gtk')
-# install=avidemux.install
-#
-# make VERBOSE= -C build_gtk DESTDIR="${pkgdir}" install
-# make VERBOSE= -C build_gtk_plugins DESTDIR="${pkgdir}" install
-#
-# install -Dm644 avidemux/avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-# sed -e 's|Icon=avidemux|Icon=avidemux-gtk|g' \
-# -e 's|Exec=avidemux2_gtk|Exec=avidemux3_gtk|g' \
-# -e 's|Name=avidemux2|Name=Avidemux Gtk|' \
-# -i "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-# install -Dm644 avidemux/avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux-gtk.png"
-#
-# rm -fr "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/"
-# }
-
package_avidemux-cli-git() {
- depends=("avidemux-core-git=${pkgver}")
pkgdesc="CLI frontend for Avidemux. (GIT version)"
- provides=("avidemux-cli-git=${pkgver}" 'avidemux-cli')
+ depends=("avidemux-core-git=${pkgver}")
+ provides=('avidemux-cli')
conflicts=('avidemux-cli')
- make VERBOSE= -C build_cli DESTDIR="${pkgdir}" install
- make VERBOSE= -C build_cli_plugins DESTDIR="${pkgdir}" install
+ make -C build_cli DESTDIR="${pkgdir}" install
+ make -C build_cli_plugins DESTDIR="${pkgdir}" install
rm -fr "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/"
}
diff --git a/add_settings_pluginui_message_error.patch b/add_settings_pluginui_message_error.patch
new file mode 100644
index 00000000000..5fe56981882
--- /dev/null
+++ b/add_settings_pluginui_message_error.patch
@@ -0,0 +1,13 @@
+diff --git a/avidemux_plugins/CMakeLists.txt b/avidemux_plugins/CMakeLists.txt
+index ee7148c..eb34e95 100644
+--- a/avidemux_plugins/CMakeLists.txt
++++ b/avidemux_plugins/CMakeLists.txt
+@@ -61,7 +61,7 @@ SET(DO_CLI 0)
+ SET(DO_SETTINGS 0)
+
+ IF (NOT PLUGIN_UI)
+- MESSAGE(FATAL_ERROR "Please add -DPLUGIN_UI=[ALL|QT4|GTK|CLI|COMMON]")
++ MESSAGE(FATAL_ERROR "Please add -DPLUGIN_UI=[ALL|QT4|GTK|CLI|COMMON|SETTINGS]")
+ ENDIF (NOT PLUGIN_UI)
+
+ if(PLUGIN_UI MATCHES "ALL")
diff --git a/avidemux.install b/avidemux-git.install
index df8436b28a1..df8436b28a1 100644
--- a/avidemux.install
+++ b/avidemux-git.install
diff --git a/fix_nvenc_check.patch b/fix_nvenc_check.patch
new file mode 100644
index 00000000000..ffd8bae6b0b
--- /dev/null
+++ b/fix_nvenc_check.patch
@@ -0,0 +1,27 @@
+diff --git a/cmake/admCheckNvEnc.cmake b/cmake/admCheckNvEnc.cmake
+index 43e2472..f1c292d 100644
+--- a/cmake/admCheckNvEnc.cmake
++++ b/cmake/admCheckNvEnc.cmake
+@@ -7,11 +7,12 @@ MACRO(checkNvEnc)
+
+ IF (NVENC)
+ FIND_PATH(NVENC_INCLUDE_DIR nvEncodeAPI.h
+- PATHS /usr/include/x86_64-linux-gnu) # Needed for 64 bits linux
++ PATHS /usr/include/nvidia-video-sdk) # Needed for 64 bits linux
+ IF(NVENC_INCLUDE_DIR)
+ MESSAGE(STATUS " nvenc header Found ")
+ SET(USE_NVENC True)
+ SET(NVENC_FOUND 1)
++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/usr/include/nvidia-video-sdk")
+ ELSE(NVENC_INCLUDE_DIR)
+ MESSAGE(STATUS " nvenc header not Found ")
+ SET(NVENC_FOUND 0)
+@@ -20,7 +21,7 @@ MACRO(checkNvEnc)
+ ENDIF (NVENC)
+
+ MESSAGE("")
+- APPEND_SUMMARY_LIST("Video Encoder" "NVENC" "${NVENC_FOUND}")
++ APPEND_SUMMARY_LIST("Video Encoder" "NVENC" "${NVENC_CHECKED}")
+ ENDIF (NOT NVENC_CHECKED)
+
+ ENDMACRO(checkNvEnc)
diff --git a/fix_verbose.patch b/fix_verbose.patch
new file mode 100644
index 00000000000..3b8b3dc4687
--- /dev/null
+++ b/fix_verbose.patch
@@ -0,0 +1,10 @@
+diff --git a/cmake/admCoreIncludes.cmake b/cmake/admCoreIncludes.cmake
+index 5263ded..47b8afb 100644
+--- a/cmake/admCoreIncludes.cmake
++++ b/cmake/admCoreIncludes.cmake
+@@ -1,5 +1,4 @@
+ # eclipse
+-SET(CMAKE_VERBOSE_MAKEFILE ON)
+ IF(CMAKE_COMPILER_IS_GNUCC)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmessage-length=0")
+ ENDIF(CMAKE_COMPILER_IS_GNUCC)
diff --git a/fix_vf_hflip_plugin_name.patch b/fix_vf_hflip_plugin_name.patch
new file mode 100644
index 00000000000..18598cc584a
--- /dev/null
+++ b/fix_vf_hflip_plugin_name.patch
@@ -0,0 +1,18 @@
+diff --git a/avidemux_plugins/ADM_videoFilters6/horizontalFlip/CMakeLists.txt b/avidemux_plugins/ADM_videoFilters6/horizontalFlip/CMakeLists.txt
+index 578ed4a..426588b 100644
+--- a/avidemux_plugins/ADM_videoFilters6/horizontalFlip/CMakeLists.txt
++++ b/avidemux_plugins/ADM_videoFilters6/horizontalFlip/CMakeLists.txt
+@@ -1,9 +1,9 @@
+ INCLUDE(vf_plugin)
+
+
+-SET(ADM_hf_hflip_SRCS horizontalFlip.cpp)
++SET(ADM_vf_hflip_SRCS horizontalFlip.cpp)
+
+-ADD_VIDEO_FILTER(ADM_hf_hflip ${ADM_hf_hflip_SRCS})
++ADD_VIDEO_FILTER(ADM_vf_hflip ${ADM_vf_hflip_SRCS})
+
+-INIT_VIDEO_FILTER(ADM_hf_hflip)
+-INSTALL_VIDEO_FILTER(ADM_hf_hflip)
++INIT_VIDEO_FILTER(ADM_vf_hflip)
++INSTALL_VIDEO_FILTER(ADM_vf_hflip)