Update patches

5 files changed, 38 insertions, 77 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7878fae84ea9..cf1f75906db5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Sep  1 17:55:35 UTC 2016
+# Sun Dec 25 03:19:03 UTC 2016
 pkgbase = avidemux-git
 	pkgdesc = A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)
-	pkgver = 2.6.13.160901.811311c
+	pkgver = 2.6.15.161225.5c8664c5
 	pkgrel = 1
 	url = http://www.avidemux.org
 	arch = i686
@@ -36,18 +36,16 @@ pkgbase = avidemux-git
 	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 = 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 = 7f249fef96f44c235c62b7d5d86a6421d87251a1
-	sha1sums = 66da0d2f30e03c5b06df694a96fe82c0b47d1871
-	sha1sums = 3ed60a05b2900c90dfa4f8e4d230aedfec4e2d02
-	sha1sums = 15c343c81139ab84354effd60bda534082a8855b
+	sha256sums = SKIP
+	sha256sums = 4f751cbb3a65f904f7c0ad68473880e2a9edcda332a293e20ad238280ec52884
+	sha256sums = c5b5d3d7bcdf4c588a780c12fdac7791ddb0527db438c85b4c1c078507da2f0b
+	sha256sums = c400cb7980dc469abc8f09b33196ef3e0968e31826d7feb3ba3e0bc75f83be13
+	sha256sums = ae6d2c93163b7b760591688c7811dfdd4a952ed9074d8cbdf4953b701f0fa7db
+	sha256sums = a6541c04d693b8a42c4b8c6371eebb79cf2ba36a37d6558b80f5e27d2c1d93fc
 
 pkgname = avidemux-core-git
 	pkgdesc = Core libs for Avidemux. (GIT version)
@@ -72,13 +70,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.13.160901.811311c
+	provides = avidemux-core-git=2.6.15.161225.5c8664c5
 	provides = avidemux-core
 	conflicts = avidemux-core
 
 pkgname = avidemux-qt-git
 	pkgdesc = Qt GUI for Avidemux. (GIT version)
-	depends = avidemux-core-git=2.6.13.160901.811311c
+	depends = avidemux-core-git=2.6.15.161225.5c8664c5
 	depends = qt5-script
 	depends = libxv
 	depends = glu
@@ -90,7 +88,7 @@ pkgname = avidemux-qt-git
 
 pkgname = avidemux-cli-git
 	pkgdesc = CLI frontend for Avidemux. (GIT version)
-	depends = avidemux-core-git=2.6.13.160901.811311c
+	depends = avidemux-core-git=2.6.15.161225.5c8664c5
 	provides = avidemux-cli
 	conflicts = avidemux-cli
 
diff --git a/PKGBUILD b/PKGBUILD
index 47cd732ae1c1..84856679ba2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=('avidemux-core-git'
          'avidemux-qt-git'
          'avidemux-cli-git'
          )
-pkgver=2.6.13.160901.811311c
+pkgver=2.6.15.161225.5c8664c5
 pkgrel=1
 pkgdesc="A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)"
 arch=('i686' 'x86_64')
@@ -40,21 +40,18 @@ makedepends=('git'
              )
 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'
-          '7f249fef96f44c235c62b7d5d86a6421d87251a1'
-          '66da0d2f30e03c5b06df694a96fe82c0b47d1871'
-          '3ed60a05b2900c90dfa4f8e4d230aedfec4e2d02'
-          '15c343c81139ab84354effd60bda534082a8855b'
-          )
-
+sha256sums=('SKIP'
+            '4f751cbb3a65f904f7c0ad68473880e2a9edcda332a293e20ad238280ec52884'
+            'c5b5d3d7bcdf4c588a780c12fdac7791ddb0527db438c85b4c1c078507da2f0b'
+            'c400cb7980dc469abc8f09b33196ef3e0968e31826d7feb3ba3e0bc75f83be13'
+            'ae6d2c93163b7b760591688c7811dfdd4a952ed9074d8cbdf4953b701f0fa7db'
+            'a6541c04d693b8a42c4b8c6371eebb79cf2ba36a37d6558b80f5e27d2c1d93fc'
+            )
 
 pkgver() {
   cd avidemux
@@ -73,14 +70,11 @@ prepare() {
   # 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"
 
   # 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}/ffmpeg-parallel-build-use-processorcount.patch"
 
   patch --binary -p1 -i "${srcdir}/opus_check.patch"
 
diff --git a/ffmpeg-parallel-build-use-processorcount.patch b/ffmpeg-parallel-build-use-processorcount.patch
index 64717ed09119..ef2db8a46faf 100644
--- a/ffmpeg-parallel-build-use-processorcount.patch
+++ b/ffmpeg-parallel-build-use-processorcount.patch
@@ -1,21 +1,17 @@
-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/cmake/admFFmpegBuild_helpers.cmake b/cmake/admFFmpegBuild_helpers.cmake

+index 0d8cd846..131b278b 100644

+--- a/cmake/admFFmpegBuild_helpers.cmake

++++ b/cmake/admFFmpegBuild_helpers.cmake

+@@ -297,7 +297,11 @@ MACRO(ADM_FF_BUILD_UNIX_STYLE)

+ #

+ MACRO(ADM_FF_ADD_DUMMY_TARGET)

+     if(NOT MSVC)

+-       SET(PARRALLEL "-j4") 

++        include(ProcessorCount)^M

++        ProcessorCount(N)^M

++        if(NOT N EQUAL 0)^M

++           SET(PARRALLEL -j${N})^M

++        endif(NOT N EQUAL 0)^M

+     endif(NOT MSVC)

+     add_custom_target(         libavutil_dummy ALL

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

diff --git a/fix_nvenc_check.patch b/fix_nvenc_check.patch
deleted file mode 100644
index ffd8bae6b0b4..000000000000
--- a/fix_nvenc_check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/opus_check.patch b/opus_check.patch
index 60ec88b7d85c..3ae0565660b5 100644
--- a/opus_check.patch
+++ b/opus_check.patch
@@ -1,5 +1,5 @@
 diff --git a/cmake/admCheckOpus.cmake b/cmake/admCheckOpus.cmake

-index 8fd8051..a425072 100644

+index 8fd8051b..a425072c 100644

 --- a/cmake/admCheckOpus.cmake

 +++ b/cmake/admCheckOpus.cmake

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