bump

3 files changed, 13 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f0c7d0c267fb..8f4f2bebc86b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Jan  9 19:53:13 UTC 2017
+# Sun May  7 12:09:53 UTC 2017
 pkgbase = avidemux-git
 	pkgdesc = A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)
-	pkgver = 2.6.18.170109.036d6686
+	pkgver = 2.7.0.170507.509571b14
 	pkgrel = 1
 	url = http://www.avidemux.org
 	arch = i686
@@ -49,7 +49,7 @@ pkgbase = avidemux-git
 	sha256sums = c5b5d3d7bcdf4c588a780c12fdac7791ddb0527db438c85b4c1c078507da2f0b
 	sha256sums = 0b66d6813c0ae190239d62eb2440bf479e0603c4c0f36433dafe6e7e9a325de8
 	sha256sums = ae6d2c93163b7b760591688c7811dfdd4a952ed9074d8cbdf4953b701f0fa7db
-	sha256sums = a6541c04d693b8a42c4b8c6371eebb79cf2ba36a37d6558b80f5e27d2c1d93fc
+	sha256sums = eb911280ef2d0c9f27e6464512933b43f57242a8c09168e273367f2a4e6ea32c
 
 pkgname = avidemux-core-git
 	pkgdesc = Core libs for Avidemux. (GIT version)
@@ -78,13 +78,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.18.170109.036d6686
+	provides = avidemux-core-git=2.7.0.170507.509571b14
 	provides = avidemux-core
 	conflicts = avidemux-core
 
 pkgname = avidemux-qt-git
 	pkgdesc = Qt GUI for Avidemux. (GIT version)
-	depends = avidemux-core-git=2.6.18.170109.036d6686
+	depends = avidemux-core-git=2.7.0.170507.509571b14
 	depends = qt5-script
 	depends = libxv
 	depends = glu
@@ -96,7 +96,7 @@ pkgname = avidemux-qt-git
 
 pkgname = avidemux-cli-git
 	pkgdesc = CLI frontend for Avidemux. (GIT version)
-	depends = avidemux-core-git=2.6.18.170109.036d6686
+	depends = avidemux-core-git=2.7.0.170507.509571b14
 	provides = avidemux-cli
 	conflicts = avidemux-cli
 
diff --git a/PKGBUILD b/PKGBUILD
index 6bbd0f37a071..f3078dbfda92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=('avidemux-core-git'
          'avidemux-qt-git'
          'avidemux-cli-git'
          )
-pkgver=2.6.18.170109.036d6686
+pkgver=2.7.0.170507.509571b14
 pkgrel=1
 pkgdesc="A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)"
 arch=('i686' 'x86_64')
@@ -54,7 +54,7 @@ sha256sums=('SKIP'
             'c5b5d3d7bcdf4c588a780c12fdac7791ddb0527db438c85b4c1c078507da2f0b'
             '0b66d6813c0ae190239d62eb2440bf479e0603c4c0f36433dafe6e7e9a325de8'
             'ae6d2c93163b7b760591688c7811dfdd4a952ed9074d8cbdf4953b701f0fa7db'
-            'a6541c04d693b8a42c4b8c6371eebb79cf2ba36a37d6558b80f5e27d2c1d93fc'
+            'eb911280ef2d0c9f27e6464512933b43f57242a8c09168e273367f2a4e6ea32c'
             )
 
 pkgver() {
@@ -82,7 +82,7 @@ prepare() {
 
   patch --binary -p1 -i "${srcdir}/opus_check.patch"
 
-  patch -p1 -i "${srcdir}/build-x264-x265-status-message-add-empty-lines.patch"
+  patch --binary -p1 -i "${srcdir}/build-x264-x265-status-message-add-empty-lines.patch"
 }
 
 build() {
@@ -170,6 +170,10 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr  \
     -DPLUGIN_UI=SETTINGS \
+    -DUSE_EXTERNAL_LIBA52=ON \
+    -DUSE_EXTERNAL_LIBASS=ON \
+    -DUSE_EXTERNAL_LIBMAD=ON \
+    -DUSE_EXTERNAL_MP4V2=ON \
     -DFAKEROOT="${srcdir}/fakeroot"
 
   make
diff --git a/build-x264-x265-status-message-add-empty-lines.patch b/build-x264-x265-status-message-add-empty-lines.patch
index 6e2e4a962a7f..5c2e18cb77ae 100644
--- a/build-x264-x265-status-message-add-empty-lines.patch
+++ b/build-x264-x265-status-message-add-empty-lines.patch
@@ -53,15 +53,3 @@ index 06c0314..5346f4b 100644
  	ENDIF (NOT X265_CHECKED)
  
  	APPEND_SUMMARY_LIST("Video Encoder" "x265" "${USE_X265}")
-diff --git a/cmake/ve_settings_plugin.cmake b/cmake/ve_settings_plugin.cmake
-index d6a1d58..1a0f1bd 100644
---- a/cmake/ve_settings_plugin.cmake
-+++ b/cmake/ve_settings_plugin.cmake
-@@ -11,6 +11,7 @@ MACRO(INSTALL_VIDEO_ENCODER_SETTINGS PLUGIN)
-                         ${ARGN})   
-     MESSAGE(STATUS "Will install plugin ${PLUGIN} version ${SETTINGS_VERSION}") 
-     MESSAGE(STATUS "Will install ${SETTINGS_FILES} ") 
-+    MESSAGE("")
-     INSTALL(FILES ${SETTINGS_FILES} 
-                 DESTINATION "${VE_SETTINGS_DIR}/${PLUGIN}/${SETTINGS_VERSION}/"
-                 COMPONENT   settings