bump

7 files changed, 145 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 76e02b7bb4e5..7878fae84ea9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Aug  8 18:06:53 UTC 2016
+# Thu Sep  1 17:55:35 UTC 2016
 pkgbase = avidemux-git
 	pkgdesc = A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)
-	pkgver = 2.6.12.160808.493c064
+	pkgver = 2.6.13.160901.811311c
 	pkgrel = 1
 	url = http://www.avidemux.org
 	arch = i686
@@ -38,10 +38,16 @@ pkgbase = avidemux-git
 	source = fix_verbose.patch
 	source = fix_nvenc_check.patch
 	source = add_settings_pluginui_message_error.patch
+	source = ffmpeg-parallel-build-use-processorcount.patch
+	source = opus_check.patch
+	source = build-x264-x265-status-message-add-empty-lines.patch
 	sha1sums = SKIP
 	sha1sums = 4b61f11627278578a180d4bdc3b6100544107f32
 	sha1sums = 19bcbe1c3aa6df8fdee2d10ecb9626b46de00175
-	sha1sums = 4162d53297ec9d77633723ae911c605d8fdca3f1
+	sha1sums = 7f249fef96f44c235c62b7d5d86a6421d87251a1
+	sha1sums = 66da0d2f30e03c5b06df694a96fe82c0b47d1871
+	sha1sums = 3ed60a05b2900c90dfa4f8e4d230aedfec4e2d02
+	sha1sums = 15c343c81139ab84354effd60bda534082a8855b
 
 pkgname = avidemux-core-git
 	pkgdesc = Core libs for Avidemux. (GIT version)
@@ -66,13 +72,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.160808.493c064
+	provides = avidemux-core-git=2.6.13.160901.811311c
 	provides = avidemux-core
 	conflicts = avidemux-core
 
 pkgname = avidemux-qt-git
 	pkgdesc = Qt GUI for Avidemux. (GIT version)
-	depends = avidemux-core-git=2.6.12.160808.493c064
+	depends = avidemux-core-git=2.6.13.160901.811311c
 	depends = qt5-script
 	depends = libxv
 	depends = glu
@@ -84,7 +90,7 @@ pkgname = avidemux-qt-git
 
 pkgname = avidemux-cli-git
 	pkgdesc = CLI frontend for Avidemux. (GIT version)
-	depends = avidemux-core-git=2.6.12.160808.493c064
+	depends = avidemux-core-git=2.6.13.160901.811311c
 	provides = avidemux-cli
 	conflicts = avidemux-cli
 
diff --git a/.gitignore b/.gitignore
index 8f61c3578cc4..0aa9138c7792 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,8 @@
 !.SRCINFO
 !PKGBUILD
 !add_settings_pluginui_message_error.patch
+!build-x264-x265-status-message-add-empty-lines.patch
+!ffmpeg-parallel-build-use-processorcount.patch
 !fix_nvenc_check.patch
 !fix_verbose.patch
+!opus_check.patch
diff --git a/PKGBUILD b/PKGBUILD
index c4fa8f5d2d47..47cd732ae1c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=('avidemux-core-git'
          'avidemux-qt-git'
          'avidemux-cli-git'
          )
-pkgver=2.6.12.160808.493c064
+pkgver=2.6.13.160901.811311c
 pkgrel=1
 pkgdesc="A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)"
 arch=('i686' 'x86_64')
@@ -42,13 +42,20 @@ source=('avidemux::git+https://github.com/mean00/avidemux2.git'
         'fix_verbose.patch'
         'fix_nvenc_check.patch'
         'add_settings_pluginui_message_error.patch'
+        'ffmpeg-parallel-build-use-processorcount.patch'
+        'opus_check.patch'
+        'build-x264-x265-status-message-add-empty-lines.patch'
         )
 sha1sums=('SKIP'
           '4b61f11627278578a180d4bdc3b6100544107f32'
           '19bcbe1c3aa6df8fdee2d10ecb9626b46de00175'
-          '4162d53297ec9d77633723ae911c605d8fdca3f1'
+          '7f249fef96f44c235c62b7d5d86a6421d87251a1'
+          '66da0d2f30e03c5b06df694a96fe82c0b47d1871'
+          '3ed60a05b2900c90dfa4f8e4d230aedfec4e2d02'
+          '15c343c81139ab84354effd60bda534082a8855b'
           )
 
+
 pkgver() {
   cd avidemux
   _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'.')"
@@ -60,6 +67,7 @@ prepare() {
   mkdir -p build_qt{,_plugins}
   mkdir -p build_cli{,_plugins}
 
+  #exit
   cd avidemux
 
   # http://avidemux.org/smif/index.php/topic,16301.0.html
@@ -70,6 +78,13 @@ prepare() {
 
   # add SETTINGS to MESSAGE(FATAL_ERROR in avidemux_plugins/CMakeLists.txt
   patch -p1 -i "${srcdir}/add_settings_pluginui_message_error.patch"
+
+  # http://avidemux.org/smif/index.php/topic,16351.0.html
+  patch -p1 -i "${srcdir}/ffmpeg-parallel-build-use-processorcount.patch"
+
+  patch --binary -p1 -i "${srcdir}/opus_check.patch"
+
+  patch -p1 -i "${srcdir}/build-x264-x265-status-message-add-empty-lines.patch"
 }
 
 build() {
@@ -80,18 +95,16 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DFAKEROOT="${srcdir}/fakeroot" \
     -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
-  make -j1
+  make
   make DESTDIR="${srcdir}/fakeroot" install
 
-  msg2 "Build Common Plugins"
+  msg2 "Build Core Plugins"
   cd "${srcdir}/build_core_plugins"
   cmake ../avidemux/avidemux_plugins \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPLUGIN_UI=COMMON \
-    -DQTSCRIPT=OFF \
-    -DFAKEROOT="${srcdir}/fakeroot" \
-    -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
+    -DFAKEROOT="${srcdir}/fakeroot"
   make
   make DESTDIR="${srcdir}/fakeroot" install
 
@@ -112,8 +125,7 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DENABLE_QT5=ON \
     -DPLUGIN_UI=QT4 \
-    -DFAKEROOT="${srcdir}/fakeroot" \
-    -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
+    -DFAKEROOT="${srcdir}/fakeroot"
   make
   make DESTDIR="${srcdir}/fakeroot" install
 
@@ -132,8 +144,7 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPLUGIN_UI=CLI \
-    -DFAKEROOT="${srcdir}/fakeroot" \
-    -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
+    -DFAKEROOT="${srcdir}/fakeroot"
   make
   make DESTDIR="${srcdir}/fakeroot" install
 
@@ -143,8 +154,7 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr  \
     -DPLUGIN_UI=SETTINGS \
-    -DFAKEROOT="${srcdir}/fakeroot" \
-    -DAVIDEMUX_SOURCE_DIR="${srcdir}/avidemux"
+    -DFAKEROOT="${srcdir}/fakeroot"
   make
   make DESTDIR="${srcdir}/fakeroot" install
 }
@@ -219,5 +229,5 @@ package_avidemux-cli-git() {
   make -C build_cli DESTDIR="${pkgdir}" install
   make -C build_cli_plugins DESTDIR="${pkgdir}" install
 
-  rm -fr "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/"
+  rm -fr "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders"
 }
diff --git a/add_settings_pluginui_message_error.patch b/add_settings_pluginui_message_error.patch
index 5fe56981882b..8230d0bc4b3d 100644
--- a/add_settings_pluginui_message_error.patch
+++ b/add_settings_pluginui_message_error.patch
@@ -2,7 +2,7 @@ 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)
+@@ -88,7 +88,7 @@ SET(DO_CLI    0)
  SET(DO_SETTINGS    0)
  
  IF (NOT PLUGIN_UI)
diff --git a/build-x264-x265-status-message-add-empty-lines.patch b/build-x264-x265-status-message-add-empty-lines.patch
new file mode 100644
index 000000000000..6e2e4a962a7f
--- /dev/null
+++ b/build-x264-x265-status-message-add-empty-lines.patch
@@ -0,0 +1,67 @@
+diff --git a/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt b/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt
+index d5ab816..2532eee 100644
+--- a/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt
++++ b/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt
+@@ -12,6 +12,7 @@ include(admCheckX264)
+ checkX264()
+ IF(USE_X264)
+   MESSAGE(STATUS "x264 plugin activated.")
++  MESSAGE("")
+   INCLUDE_DIRECTORIES(${X264_INCLUDE_DIR})
+ 
+   #-----------------------QT4 VERSION---------------------
+diff --git a/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt b/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt
+index 6ff2a8f..eddcd2f 100644
+--- a/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt
++++ b/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt
+@@ -12,6 +12,7 @@ include(admCheckX265)
+ checkX265()
+ IF(USE_X265)
+   MESSAGE(STATUS "x265 plugin activated.")
++  MESSAGE("")
+   INCLUDE_DIRECTORIES(${X265_INCLUDE_DIR})
+ 
+   #-----------------------QT4 VERSION---------------------
+@@ -44,5 +45,6 @@ IF(USE_X265)
+   endif(DO_SETTINGS)
+ ELSE(USE_X265)
+   MESSAGE(STATUS "x265 disabled.")
++  MESSAGE("")
+ ENDIF(USE_X265)
+ 
+diff --git a/cmake/admCheckX264.cmake b/cmake/admCheckX264.cmake
+index 10b7333..09a46f1 100644
+--- a/cmake/admCheckX264.cmake
++++ b/cmake/admCheckX264.cmake
+@@ -38,7 +38,6 @@ MACRO(checkX264)
+ 

+ 		SET(X264_CHECKED 1)

+ 

+-		MESSAGE("")

+ 	ENDIF (NOT X264_CHECKED)

+ 

+ 	APPEND_SUMMARY_LIST("Video Encoder" "x264" "${USE_X264}")

+diff --git a/cmake/admCheckX265.cmake b/cmake/admCheckX265.cmake
+index 06c0314..5346f4b 100644
+--- a/cmake/admCheckX265.cmake
++++ b/cmake/admCheckX265.cmake
+@@ -40,7 +40,6 @@ MACRO(checkX265)
+ 
+ 		SET(X265_CHECKED 1)
+ 
+-		MESSAGE("")
+ 	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
diff --git a/ffmpeg-parallel-build-use-processorcount.patch b/ffmpeg-parallel-build-use-processorcount.patch
new file mode 100644
index 000000000000..64717ed09119
--- /dev/null
+++ b/ffmpeg-parallel-build-use-processorcount.patch
@@ -0,0 +1,21 @@
+diff --git a/cmake/admFFmpegBuild.cmake b/cmake/admFFmpegBuild.cmake
+index 317c7dc..32cf4b8 100644
+--- a/cmake/admFFmpegBuild.cmake
++++ b/cmake/admFFmpegBuild.cmake
+@@ -305,9 +305,15 @@ convertPathToUnix(ffmpeg_gnumake_executable ${BASH_EXECUTABLE})
+ configure_file("${AVIDEMUX_TOP_SOURCE_DIR}/cmake/ffmpeg_make.sh.cmake" "${FFMPEG_BINARY_DIR}/ffmpeg_make.sh")

+ registerFFmpeg("${FFMPEG_SOURCE_DIR}" "${FFMPEG_BINARY_DIR}" 0)

+ 

++include(ProcessorCount)

++ProcessorCount(N)

++if(NOT N EQUAL 0)

++  set(JOBS_IN_PARALLEL -j${N})

++endif(NOT N EQUAL 0)

++

+ if(CMAKE_HOST_UNIX)

+         add_custom_target(         libavutil_dummy

+-                                   COMMAND ${CMAKE_BUILD_TOOL}  -j 4 # We assume make or gnumake when host is unix

++                                   COMMAND ${CMAKE_MAKE_PROGRAM} ${JOBS_IN_PARALLEL} # We assume make or gnumake when host is unix

+                                    WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")

+ else(CMAKE_HOST_UNIX)

+         add_custom_target(         libavutil_dummy

diff --git a/opus_check.patch b/opus_check.patch
new file mode 100644
index 000000000000..60ec88b7d85c
--- /dev/null
+++ b/opus_check.patch
@@ -0,0 +1,17 @@
+diff --git a/cmake/admCheckOpus.cmake b/cmake/admCheckOpus.cmake

+index 8fd8051..a425072 100644

+--- a/cmake/admCheckOpus.cmake

++++ b/cmake/admCheckOpus.cmake

+@@ -18,6 +18,12 @@ MACRO(checkOpusDec)

+                 ELSE (OPUS)

+                   MESSAGE("${MSG_DISABLE_OPTION}")

+                 ENDIF (OPUS)

++

++		SET(OPUS_CHECKED 1)

++

++		MESSAGE("")

++

+ 	ENDIF (NOT OPUS_CHECKED)

++

+ 	APPEND_SUMMARY_LIST("Audio Decoder" "Opus" "${LIBOPUS_FOUND}")

+ ENDMACRO(checkOpusDec)