summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Alvarez2016-07-30 16:36:22 +0200
committerGustavo Alvarez2016-07-30 16:36:22 +0200
commit189595d8bd398308b4fd7fd9d504b6368b872d9e (patch)
tree1eb7c2fa46f4c14afa1bda84529fe2f2ae54abab
parentfdce89b5880590a2b81124decb8b08406f334f5f (diff)
downloadaur-189595d8bd398308b4fd7fd9d504b6368b872d9e.tar.gz
bump
-rw-r--r--.SRCINFO11
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD27
-rw-r--r--avidemux-git.install11
4 files changed, 20 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2a577daba6a..eb9d7fd8eda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed Feb 3 16:33:21 UTC 2016
+# Sat Jul 30 14:36:03 UTC 2016
pkgbase = avidemux-git
pkgdesc = A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)
- pkgver = 2.6.11.160203.dd4a5e0
+ pkgver = 2.6.12.160730.680adad
pkgrel = 1
url = http://www.avidemux.org
arch = i686
@@ -68,14 +68,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.11.160203.dd4a5e0
+ provides = avidemux-core-git=2.6.12.160730.680adad
provides = avidemux-core
conflicts = avidemux-core
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 = avidemux-core-git=2.6.12.160730.680adad
depends = qt5-script
depends = libxv
depends = glu
@@ -87,7 +86,7 @@ pkgname = avidemux-qt-git
pkgname = avidemux-cli-git
pkgdesc = CLI frontend for Avidemux. (GIT version)
- depends = avidemux-core-git=2.6.11.160203.dd4a5e0
+ depends = avidemux-core-git=2.6.12.160730.680adad
provides = avidemux-cli
conflicts = avidemux-cli
diff --git a/.gitignore b/.gitignore
index 389b7afc256..e48e0643561 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
!.gitignore
!.SRCINFO
!PKGBUILD
-!avidemux-git.install
!add_settings_pluginui_message_error.patch
!fix_nvenc_check.patch
!fix_verbose.patch
diff --git a/PKGBUILD b/PKGBUILD
index da4773accbb..ba2277fd7c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=('avidemux-core-git'
'avidemux-qt-git'
'avidemux-cli-git'
)
-pkgver=2.6.11.160203.dd4a5e0
+pkgver=2.6.12.160730.680adad
pkgrel=1
pkgdesc="A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)"
arch=('i686' 'x86_64')
@@ -70,7 +70,7 @@ prepare() {
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"
+ #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"
@@ -82,7 +82,8 @@ build() {
cmake ../avidemux/avidemux_core \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DFAKEROOT="${srcdir}/fakeroot"
+ -DFAKEROOT="${srcdir}/fakeroot" \
+ -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
make -j1
make DESTDIR="${srcdir}/fakeroot" install
@@ -104,7 +105,8 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DENABLE_QT5=ON \
- -DFAKEROOT="${srcdir}/fakeroot"
+ -DFAKEROOT="${srcdir}/fakeroot" \
+ -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
make
make DESTDIR="${srcdir}/fakeroot" install
@@ -124,7 +126,9 @@ build() {
cd "${srcdir}/build_cli"
cmake ../avidemux/avidemux/cli \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DFAKEROOT="${srcdir}/fakeroot" \
+ -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
make
make DESTDIR="${srcdir}/fakeroot" install
@@ -134,8 +138,10 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DPLUGIN_UI=CLI \
+ -DFAKEROOT="${srcdir}/fakeroot" \
-DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
make
+ make DESTDIR="${srcdir}/fakeroot" install
msg2 "Build Settings"
cd "${srcdir}/build_core_plugins_settings"
@@ -143,8 +149,10 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DPLUGIN_UI=SETTINGS \
+ -DFAKEROOT="${srcdir}/fakeroot" \
-DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
make
+ make DESTDIR="${srcdir}/fakeroot" install
}
package_avidemux-core-git() {
@@ -178,12 +186,8 @@ package_avidemux-core-git() {
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
+ 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"
}
package_avidemux-qt-git() {
@@ -196,7 +200,6 @@ package_avidemux-qt-git() {
)
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
diff --git a/avidemux-git.install b/avidemux-git.install
deleted file mode 100644
index df8436b28a1..00000000000
--- a/avidemux-git.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}