summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Alvarez2016-08-08 20:06:13 +0200
committerGustavo Alvarez2016-08-08 20:08:19 +0200
commit7f94b9349d4a971ebf70d659254aba536f83f73b (patch)
tree63c7933e940bd6e6f21e36256d14f2ad2db49f1e
parent189595d8bd398308b4fd7fd9d504b6368b872d9e (diff)
downloadaur-7f94b9349d4a971ebf70d659254aba536f83f73b.tar.gz
bump
-rw-r--r--.SRCINFO12
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD20
-rw-r--r--fix_vf_hflip_plugin_name.patch18
4 files changed, 14 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eb9d7fd8eda..76e02b7bb4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Jul 30 14:36:03 UTC 2016
+# Mon Aug 8 18:06:53 UTC 2016
pkgbase = avidemux-git
pkgdesc = A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)
- pkgver = 2.6.12.160730.680adad
+ pkgver = 2.6.12.160808.493c064
pkgrel = 1
url = http://www.avidemux.org
arch = i686
@@ -38,12 +38,10 @@ pkgbase = avidemux-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)
@@ -68,13 +66,13 @@ pkgname = avidemux-core-git
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.12.160730.680adad
+ provides = avidemux-core-git=2.6.12.160808.493c064
provides = avidemux-core
conflicts = avidemux-core
pkgname = avidemux-qt-git
pkgdesc = Qt GUI for Avidemux. (GIT version)
- depends = avidemux-core-git=2.6.12.160730.680adad
+ depends = avidemux-core-git=2.6.12.160808.493c064
depends = qt5-script
depends = libxv
depends = glu
@@ -86,7 +84,7 @@ pkgname = avidemux-qt-git
pkgname = avidemux-cli-git
pkgdesc = CLI frontend for Avidemux. (GIT version)
- depends = avidemux-core-git=2.6.12.160730.680adad
+ depends = avidemux-core-git=2.6.12.160808.493c064
provides = avidemux-cli
conflicts = avidemux-cli
diff --git a/.gitignore b/.gitignore
index e48e0643561..8f61c3578cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@
!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 ba2277fd7c0..c4fa8f5d2d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=('avidemux-core-git'
'avidemux-qt-git'
'avidemux-cli-git'
)
-pkgver=2.6.12.160730.680adad
+pkgver=2.6.12.160808.493c064
pkgrel=1
pkgdesc="A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)"
arch=('i686' 'x86_64')
@@ -42,13 +42,11 @@ 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() {
@@ -63,8 +61,6 @@ prepare() {
mkdir -p build_cli{,_plugins}
cd avidemux
- # http://avidemux.org/smuf/index.php/topic,16302.msg71463.html#msg71463
- 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"
@@ -105,8 +101,7 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DENABLE_QT5=ON \
- -DFAKEROOT="${srcdir}/fakeroot" \
- -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
+ -DFAKEROOT="${srcdir}/fakeroot"
make
make DESTDIR="${srcdir}/fakeroot" install
@@ -127,8 +122,7 @@ build() {
cmake ../avidemux/avidemux/cli \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DFAKEROOT="${srcdir}/fakeroot" \
- -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
+ -DFAKEROOT="${srcdir}/fakeroot"
make
make DESTDIR="${srcdir}/fakeroot" install
@@ -178,7 +172,8 @@ package_avidemux-core-git() {
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')
+ 'vapoursynth: vsProxy (Load Vapoursynth scripts on Avidemux'
+ )
provides=("avidemux-core-git=${pkgver}" 'avidemux-core')
conflicts=('avidemux-core')
@@ -199,7 +194,10 @@ package_avidemux-qt-git() {
'desktop-file-utils'
)
provides=('avidemux-qt')
- conflicts=('avidemux-qt4' 'avidemux-qt5' 'avidemux-qt')
+ conflicts=('avidemux-qt4'
+ 'avidemux-qt5'
+ 'avidemux-qt'
+ )
make -C build_qt DESTDIR="${pkgdir}" install
make -C build_qt_plugins DESTDIR="${pkgdir}" install
diff --git a/fix_vf_hflip_plugin_name.patch b/fix_vf_hflip_plugin_name.patch
deleted file mode 100644
index 18598cc584a..00000000000
--- a/fix_vf_hflip_plugin_name.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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)