summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO10
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD7
-rw-r--r--ffmpeg-parallel-build-use-processorcount.patch17
4 files changed, 5 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index be5a49e85758..088b0f746591 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Oct 21 17:39:46 UTC 2017
+# Sat Dec 16 20:07:57 UTC 2017
pkgbase = avidemux-git
pkgdesc = A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)
- pkgver = 2.7.0.171021.896fea92d
+ pkgver = 2.7.0.171216.f75d3a20a
pkgrel = 1
url = http://www.avidemux.org
arch = i686
@@ -44,12 +44,10 @@ pkgbase = avidemux-git
source = avidemux::git+https://github.com/mean00/avidemux2.git
source = fix_verbose.patch
source = add_settings_pluginui_message_error.patch
- source = ffmpeg-parallel-build-use-processorcount.patch
source = opus_check.patch
sha256sums = SKIP
sha256sums = 4f751cbb3a65f904f7c0ad68473880e2a9edcda332a293e20ad238280ec52884
sha256sums = c5b5d3d7bcdf4c588a780c12fdac7791ddb0527db438c85b4c1c078507da2f0b
- sha256sums = 0b66d6813c0ae190239d62eb2440bf479e0603c4c0f36433dafe6e7e9a325de8
sha256sums = ae6d2c93163b7b760591688c7811dfdd4a952ed9074d8cbdf4953b701f0fa7db
pkgname = avidemux-core-git
@@ -85,7 +83,7 @@ pkgname = avidemux-core-git
pkgname = avidemux-qt-git
pkgdesc = Qt GUI for Avidemux. (GIT version)
- depends = avidemux-core-git>=2.7.0.171021.896fea92d
+ depends = avidemux-core-git>=2.7.0.171216.f75d3a20a
depends = qt5-script
depends = libxv
depends = glu
@@ -97,7 +95,7 @@ pkgname = avidemux-qt-git
pkgname = avidemux-cli-git
pkgdesc = CLI frontend for Avidemux. (GIT version)
- depends = avidemux-core-git>=2.7.0.171021.896fea92d
+ depends = avidemux-core-git>=2.7.0.171216.f75d3a20a
provides = avidemux-cli
conflicts = avidemux-cli
diff --git a/.gitignore b/.gitignore
index 0aa9138c7792..3bf1dcd72a99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
!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 7c91597b6f96..0e63f8d1761e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=('avidemux-core-git'
'avidemux-qt-git'
'avidemux-cli-git'
)
-pkgver=2.7.0.171021.896fea92d
+pkgver=2.7.0.171216.f75d3a20a
pkgrel=1
pkgdesc="A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)"
arch=('i686' 'x86_64')
@@ -48,13 +48,11 @@ makedepends=('git'
source=('avidemux::git+https://github.com/mean00/avidemux2.git'
'fix_verbose.patch'
'add_settings_pluginui_message_error.patch'
- 'ffmpeg-parallel-build-use-processorcount.patch'
'opus_check.patch'
)
sha256sums=('SKIP'
'4f751cbb3a65f904f7c0ad68473880e2a9edcda332a293e20ad238280ec52884'
'c5b5d3d7bcdf4c588a780c12fdac7791ddb0527db438c85b4c1c078507da2f0b'
- '0b66d6813c0ae190239d62eb2440bf479e0603c4c0f36433dafe6e7e9a325de8'
'ae6d2c93163b7b760591688c7811dfdd4a952ed9074d8cbdf4953b701f0fa7db'
)
@@ -78,9 +76,6 @@ 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 --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
deleted file mode 100644
index 2ddbd373808d..000000000000
--- a/ffmpeg-parallel-build-use-processorcount.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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)
-+ ProcessorCount(N)
-+ if(NOT N EQUAL 0)
-+ SET(PARRALLEL -j${N})
-+ endif(NOT N EQUAL 0)
- endif(NOT MSVC)
- add_custom_target( libavutil_dummy ALL
- COMMAND ${CMAKE_BUILD_TOOL} ${PARRALLEL} # We assume make or gnumake when host is unix