diff options
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 6 | ||||
-rw-r--r-- | build-x264-x265-status-message-add-empty-lines.patch | 55 |
3 files changed, 6 insertions, 67 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sun May 7 12:09:53 UTC 2017 +# Sat Jul 8 10:45:00 UTC 2017 pkgbase = avidemux-git pkgdesc = A graphical/cli tool to edit video (filter/re-encode/split). (GIT version) - pkgver = 2.7.0.170507.509571b14 + pkgver = 2.7.0.170708.d80f2168f pkgrel = 1 url = http://www.avidemux.org arch = i686 @@ -43,13 +43,11 @@ pkgbase = avidemux-git 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 sha256sums = SKIP sha256sums = 4f751cbb3a65f904f7c0ad68473880e2a9edcda332a293e20ad238280ec52884 sha256sums = c5b5d3d7bcdf4c588a780c12fdac7791ddb0527db438c85b4c1c078507da2f0b sha256sums = 0b66d6813c0ae190239d62eb2440bf479e0603c4c0f36433dafe6e7e9a325de8 sha256sums = ae6d2c93163b7b760591688c7811dfdd4a952ed9074d8cbdf4953b701f0fa7db - sha256sums = eb911280ef2d0c9f27e6464512933b43f57242a8c09168e273367f2a4e6ea32c pkgname = avidemux-core-git pkgdesc = Core libs for Avidemux. (GIT version) @@ -78,13 +76,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.7.0.170507.509571b14 + provides = avidemux-core-git=2.7.0.170708.d80f2168f provides = avidemux-core conflicts = avidemux-core pkgname = avidemux-qt-git pkgdesc = Qt GUI for Avidemux. (GIT version) - depends = avidemux-core-git=2.7.0.170507.509571b14 + depends = avidemux-core-git=2.7.0.170708.d80f2168f depends = qt5-script depends = libxv depends = glu @@ -96,7 +94,7 @@ pkgname = avidemux-qt-git pkgname = avidemux-cli-git pkgdesc = CLI frontend for Avidemux. (GIT version) - depends = avidemux-core-git=2.7.0.170507.509571b14 + depends = avidemux-core-git=2.7.0.170708.d80f2168f provides = avidemux-cli conflicts = avidemux-cli @@ -5,7 +5,7 @@ pkgname=('avidemux-core-git' 'avidemux-qt-git' 'avidemux-cli-git' ) -pkgver=2.7.0.170507.509571b14 +pkgver=2.7.0.170708.d80f2168f pkgrel=1 pkgdesc="A graphical/cli tool to edit video (filter/re-encode/split). (GIT version)" arch=('i686' 'x86_64') @@ -47,14 +47,12 @@ source=('avidemux::git+https://github.com/mean00/avidemux2.git' 'add_settings_pluginui_message_error.patch' 'ffmpeg-parallel-build-use-processorcount.patch' 'opus_check.patch' - 'build-x264-x265-status-message-add-empty-lines.patch' ) sha256sums=('SKIP' '4f751cbb3a65f904f7c0ad68473880e2a9edcda332a293e20ad238280ec52884' 'c5b5d3d7bcdf4c588a780c12fdac7791ddb0527db438c85b4c1c078507da2f0b' '0b66d6813c0ae190239d62eb2440bf479e0603c4c0f36433dafe6e7e9a325de8' 'ae6d2c93163b7b760591688c7811dfdd4a952ed9074d8cbdf4953b701f0fa7db' - 'eb911280ef2d0c9f27e6464512933b43f57242a8c09168e273367f2a4e6ea32c' ) pkgver() { @@ -81,8 +79,6 @@ prepare() { patch --binary -p1 -i "${srcdir}/ffmpeg-parallel-build-use-processorcount.patch" patch --binary -p1 -i "${srcdir}/opus_check.patch" - - patch --binary -p1 -i "${srcdir}/build-x264-x265-status-message-add-empty-lines.patch" } build() { diff --git a/build-x264-x265-status-message-add-empty-lines.patch b/build-x264-x265-status-message-add-empty-lines.patch deleted file mode 100644 index 5c2e18cb77ae..000000000000 --- a/build-x264-x265-status-message-add-empty-lines.patch +++ /dev/null @@ -1,55 +0,0 @@ -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}") |