[avidemux] Update to latest upstream release, 2.6.19.
by Richard Shaw
commit 398862972f97eefa2f131af0e7efc58dd4562086
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sat Apr 22 09:07:39 2017 -0500
Update to latest upstream release, 2.6.19.
avidemux-2.6.15-disable-vpx-decoder-plugin.patch | 7 -
avidemux-2.6.16-filter-preview.patch | 379 -----------------------
avidemux-2.6.16-mp4muxer-eac3.patch | 25 --
avidemux-2.6.16-unbundle-libmp4v2.patch | 102 ------
avidemux-2.6.19-i18n-ru-fix-crop-filter.patch | 118 +++++++
avidemux-2.6.19-version-string-generation.patch | 220 +++++++++++++
avidemux-2.6.19-vpx-decoder.patch | 101 ++++++
avidemux.spec | 9 +-
8 files changed, 443 insertions(+), 518 deletions(-)
---
diff --git a/avidemux-2.6.19-i18n-ru-fix-crop-filter.patch b/avidemux-2.6.19-i18n-ru-fix-crop-filter.patch
new file mode 100644
index 0000000..66e1266
--- /dev/null
+++ b/avidemux-2.6.19-i18n-ru-fix-crop-filter.patch
@@ -0,0 +1,118 @@
+commit 2cf56812d9fe69a14145bc9265b6590834b9e1eb
+Author: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Thu Mar 30 23:23:37 2017 +0200
+
+ [i18n/ru] Fix crop filter translations, remove the last leftovers from broken heuristics
+---
+ avidemux/qt4/i18n/avidemux_ru.ts | 31 ++++++++++++++-----------------
+ 1 file changed, 14 insertions(+), 17 deletions(-)
+
+diff --git a/avidemux/qt4/i18n/avidemux_ru.ts b/avidemux/qt4/i18n/avidemux_ru.ts
+index 32e2b66..7ed65c1 100644
+--- a/avidemux/qt4/i18n/avidemux_ru.ts
++++ b/avidemux/qt4/i18n/avidemux_ru.ts
+@@ -3149,8 +3149,7 @@ Drop timing informations ?</source>
+ <message>
+ <location line="+7"/>
+ <source>1/1</source>
+- <translation type="unfinished">
+- {1/1?}</translation>
++ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+@@ -5415,8 +5414,7 @@ Is it running ?</source>
+ <message>
+ <location line="+2"/>
+ <source>5.1</source>
+- <translation type="unfinished">
+- {5.1?}</translation>
++ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+@@ -6698,8 +6696,7 @@ Do you want to continue anyway ?</source>
+ <message>
+ <location line="+1"/>
+ <source>1:1</source>
+- <translation type="unfinished">
+- {1:1?}</translation>
++ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../../avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h" line="+157"/>
+@@ -7599,25 +7596,25 @@ Do you want to load it ?
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp" line="+56"/>
+ <source>Crop</source>
+- <translation type="unfinished">Обрезка</translation>
++ <translation>Кадрирование</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Crop filter</source>
+- <translation type="unfinished">Фильтр обрезки</translation>
++ <translation>Фильтр кадрирования</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Warning Cropping too much width ! Width reseted !
+ </source>
+- <translation type="unfinished">Предупреждение: ширина слишком сильно обрезана! Ее значение восстановлено!
++ <translation>Предупреждение: ширина слишком сильно обрезана! Ее значение восстановлено!
+ </translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Warning Cropping too much height ! Height reseted !
+ </source>
+- <translation type="unfinished">Предупреждение: высота слишком сильно обрезана! Ее значение восстановлено!
++ <translation>Предупреждение: высота слишком сильно обрезана! Ее значение восстановлено!
+ </translation>
+ </message>
+ </context>
+@@ -7626,37 +7623,37 @@ Do you want to load it ?
+ <message>
+ <location filename="../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/crop.ui" line="+14"/>
+ <source>Crop</source>
+- <translation type="unfinished">Обрезка </translation>
++ <translation>Кадрирование</translation>
+ </message>
+ <message>
+ <location line="+88"/>
+ <source>Reset</source>
+- <translation type="unfinished">Сброс</translation>
++ <translation>Сброс</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Auto Crop</source>
+- <translation type="unfinished">Авто обрезка</translation>
++ <translation>Автокадрирование</translation>
+ </message>
+ <message>
+ <location line="-108"/>
+ <source>Right:</source>
+- <translation type="unfinished">Справа:</translation>
++ <translation>Справа:</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Top:</source>
+- <translation type="unfinished">Сверху:</translation>
++ <translation>Сверху:</translation>
+ </message>
+ <message>
+ <location line="+64"/>
+ <source>Bottom:</source>
+- <translation type="unfinished">Слева:</translation>
++ <translation>Снизу:</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Left:</source>
+- <translation type="unfinished">Снизу:</translation>
++ <translation>Слева:</translation>
+ </message>
+ </context>
+ <context>
diff --git a/avidemux-2.6.19-version-string-generation.patch b/avidemux-2.6.19-version-string-generation.patch
new file mode 100644
index 0000000..9ebf1f0
--- /dev/null
+++ b/avidemux-2.6.19-version-string-generation.patch
@@ -0,0 +1,220 @@
+commit 706f1c9c11cbf77593f6ae19b3763855a0b67e44
+Author: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Wed Mar 29 10:22:39 2017 +0200
+
+ [main] Fix version string generation
+---
+ avidemux/common/main.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/avidemux/common/main.cpp b/avidemux/common/main.cpp
+index 3b5b44b..99bc8be 100755
+--- a/avidemux/common/main.cpp
++++ b/avidemux/common/main.cpp
+@@ -177,7 +177,8 @@ static bool admDummyHwCleanup()
+ int startAvidemux(int argc, char *argv[])
+ {
+
+-#define MKSTRING(x) #x
++#define STR(x) #x
++#define MKSTRING(x) STR(x)
+ printf("*************************\n");
+ printf(" Avidemux v%s", MKSTRING(ADM_VERSION));
+
+commit a17cf88b53a248a50d93831aab92206aad177c9b
+Author: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Thu Mar 30 13:22:15 2017 +0200
+
+ [cmake/qt/cli] Unset ADM_SUBVERSION for releases, fix version string generation for jobs
+---
+ avidemux/cli/CMakeLists.txt | 4 +++-
+ avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp | 7 ++++---
+ avidemux/qt4/ADM_jobs/src/CMakeLists.txt | 5 ++++-
+ avidemux/qt4/ADM_userInterfaces/ADM_dialog/CMakeLists.txt | 5 ++++-
+ avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp | 11 +++--------
+ avidemux/qt4/CMakeLists.txt | 4 +++-
+ cmake/admCPackRpm.cmake | 6 +++++-
+ cmake/admMainChecks.cmake | 2 +-
+ 8 files changed, 27 insertions(+), 17 deletions(-)
+
+diff --git a/avidemux/cli/CMakeLists.txt b/avidemux/cli/CMakeLists.txt
+index ad9c9b7..4f62c85 100644
+--- a/avidemux/cli/CMakeLists.txt
++++ b/avidemux/cli/CMakeLists.txt
+@@ -62,7 +62,9 @@ ADD_SUBDIRECTORY(ADM_UIs ./ADM_UIsCli)
+ ADD_SUBDIRECTORY(ADM_userInterfaces ./ADM_userInterfacesCli)
+
+ SDLify(../common/main.cpp)
+-ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
++if (ADM_SUBVERSION)
++ ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
++endif (ADM_SUBVERSION)
+ ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION='\"${AVIDEMUX_VERSION}\"'")
+
+ ###########################################
+diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
+index 3ad51af..85cec5f 100644
+--- a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
++++ b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
+@@ -46,11 +46,12 @@ int main(int argc, char *argv[])
+
+ installSigHandler();
+
+-
++#define STR(x) #x
++#define MKSTRING(x) STR(x)
++
+ printf("*************************\n");
+- printf(" Avidemux v" VERSION);
++ printf(" Avidemux v%s", MKSTRING(ADM_VERSION));
+ #if defined(ADM_SUBVERSION)
+-#define MKSTRING(x) #x
+ printf(" (%s)", MKSTRING(ADM_SUBVERSION));
+ #endif
+ printf("\n*************************\n");
+diff --git a/avidemux/qt4/ADM_jobs/src/CMakeLists.txt b/avidemux/qt4/ADM_jobs/src/CMakeLists.txt
+index 6d4fddf..77afc92 100644
+--- a/avidemux/qt4/ADM_jobs/src/CMakeLists.txt
++++ b/avidemux/qt4/ADM_jobs/src/CMakeLists.txt
+@@ -45,7 +45,10 @@ endif (WIN32)
+ include(admCoreIncludes)
+ include_directories("${PTHREAD_INCLUDE_DIR}")
+ ADD_EXECUTABLE(avidemux3_jobs_${QT_EXTENSION} ${ADM_JOB_SRCS})
+-ADD_SOURCE_CFLAGS(ADM_jobs.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
++ADD_SOURCE_CFLAGS(ADM_jobs.cpp "-DADM_VERSION=\"${AVIDEMUX_VERSION}\"")
++if (ADM_SUBVERSION)
++ ADD_SOURCE_CFLAGS(ADM_jobs.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
++endif (ADM_SUBVERSION)
+
+ ###########################################
+ TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreSocket6)
+diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_dialog/CMakeLists.txt b/avidemux/qt4/ADM_userInterfaces/ADM_dialog/CMakeLists.txt
+index 080bcc1..d99d0dd 100644
+--- a/avidemux/qt4/ADM_userInterfaces/ADM_dialog/CMakeLists.txt
++++ b/avidemux/qt4/ADM_userInterfaces/ADM_dialog/CMakeLists.txt
+@@ -40,7 +40,10 @@ SET(${ADM_LIB}_SRCS ${${ADM_LIB}_SRCS}
+ Q_audioTracks.cpp
+ )
+
+-ADD_DEFINITIONS(-DADM_SUBVERSION=\"${ADM_SUBVERSION}\" -DADM_VERSION=\"${AVIDEMUX_VERSION}\")
++if (ADM_SUBVERSION)
++ ADD_DEFINITIONS(-DADM_SUBVERSION=\"${ADM_SUBVERSION}\")
++endif (ADM_SUBVERSION)
++ADD_DEFINITIONS(-DADM_VERSION=\"${AVIDEMUX_VERSION}\")
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/avidemux/ADM_UIs/ADM_QT4/include")
+ include_directories("${CMAKE_SOURCE_DIR}/../common/ADM_script2/include")
+diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp b/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp
+index 142e531..b9cfa62 100644
+--- a/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp
++++ b/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp
+@@ -32,14 +32,9 @@ Ui_aboutWindow::Ui_aboutWindow(QWidget* parent) : QDialog(parent)
+
+ char subversion[128]={0};
+ #if defined(ADM_SUBVERSION)
+- int l=strlen(ADM_SUBVERSION);
+- if(l>1)
+- {
+- sprintf(subversion,"%s <br><small>(%s-fflibs %s)</small>", ADM_VERSION, ADM_SUBVERSION,ADM_FFMPEG_VERSION);
+- }else
+- {
+- sprintf(subversion,"%s - Release",ADM_VERSION);
+- }
++ sprintf(subversion,"%s <br><small>(%s-fflibs %s)</small>", ADM_VERSION, ADM_SUBVERSION, ADM_FFMPEG_VERSION);
++#else
++ sprintf(subversion,"%s - Release",ADM_VERSION);
+ #endif
+ QString sv(subversion);
+ ui.versionLabel->setTextFormat(Qt::RichText);
+diff --git a/avidemux/qt4/CMakeLists.txt b/avidemux/qt4/CMakeLists.txt
+index 2b3b921..20390a7 100755
+--- a/avidemux/qt4/CMakeLists.txt
++++ b/avidemux/qt4/CMakeLists.txt
+@@ -133,7 +133,9 @@ ADD_SUBDIRECTORY(ADM_UIs ./ADM_UIsQt4)
+ ADD_SUBDIRECTORY(ADM_userInterfaces ./ADM_userInterfaces${QT_LIBRARY_EXTENSION})
+
+ SDLify(../common/main.cpp)
+-ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
++if (ADM_SUBVERSION)
++ ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
++endif (ADM_SUBVERSION)
+ ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION=\"${AVIDEMUX_VERSION}\"")
+ ADD_SOURCE_CFLAGS(../common/main.cpp "-DQT_FLAVOR=\"${QT_EXTENSION}\"")
+
+diff --git a/cmake/admCPackRpm.cmake b/cmake/admCPackRpm.cmake
+index 5b15af6..dce2ca9 100644
+--- a/cmake/admCPackRpm.cmake
++++ b/cmake/admCPackRpm.cmake
+@@ -11,7 +11,11 @@ SET(CPACK_RPM_PACKAGE_ARCHITECTURE "i386")
+ ENDIF (X86_64_SUPPORTED)
+ # Mandatory
+ SET(CPACK_RPM_PACKAGE_VERSION "${AVIDEMUX_VERSION}")
+-SET(CPACK_RPM_PACKAGE_RELEASE "1.r${ADM_SUBVERSION}.bootstrap")
++IF (ADM_SUBVERSION)
++ SET(CPACK_RPM_PACKAGE_RELEASE "1.r${ADM_SUBVERSION}.bootstrap")
++ELSE (ADM_SUBVERSION)
++ SET(CPACK_RPM_PACKAGE_RELEASE "1.bootstrap")
++ENDIF (ADM_SUBVERSION)
+
+ SET(CPACK_RPM_PACKAGE_LICENSE "GPLv2+")
+ SET(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
+diff --git a/cmake/admMainChecks.cmake b/cmake/admMainChecks.cmake
+index 984ac81..38edf01 100644
+--- a/cmake/admMainChecks.cmake
++++ b/cmake/admMainChecks.cmake
+@@ -147,7 +147,7 @@ MESSAGE("")
+ MESSAGE(STATUS "Checking for SCM")
+ MESSAGE(STATUS "****************")
+ IF(RELEASE OR AVIDEMUX_EXTERNAL_BUILD)
+- SET( ADM_SUBVERSION 0)
++ UNSET( ADM_SUBVERSION )
+ ELSE()
+ admGetRevision( ${CMAKE_SOURCE_DIR} ADM_SUBVERSION)
+ ENDIF()
+commit a9bd97951955f6498cf7e7ac55f2984934b6c2c3
+Author: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Fri Mar 31 08:40:30 2017 +0200
+
+ [cmake] Revert unsetting ADM_SUBVERSION
+
+ Oops, setting ADM_SUBVERSION to 0 for releases was just as fine.
+ Reverting the unnecessary change made to admMainChecks.cmake.
+---
+ cmake/admMainChecks.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/admMainChecks.cmake b/cmake/admMainChecks.cmake
+index 38edf01..984ac81 100644
+--- a/cmake/admMainChecks.cmake
++++ b/cmake/admMainChecks.cmake
+@@ -147,7 +147,7 @@ MESSAGE("")
+ MESSAGE(STATUS "Checking for SCM")
+ MESSAGE(STATUS "****************")
+ IF(RELEASE OR AVIDEMUX_EXTERNAL_BUILD)
+- UNSET( ADM_SUBVERSION )
++ SET( ADM_SUBVERSION 0)
+ ELSE()
+ admGetRevision( ${CMAKE_SOURCE_DIR} ADM_SUBVERSION)
+ ENDIF()
+commit 53e50137ae03854fe94e902de4ba14a18c9a34a9
+Author: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Sat Apr 1 14:42:01 2017 +0200
+
+ [build/cli] Fix the version string
+---
+ avidemux/cli/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avidemux/cli/CMakeLists.txt b/avidemux/cli/CMakeLists.txt
+index 4f62c85..da9202e 100644
+--- a/avidemux/cli/CMakeLists.txt
++++ b/avidemux/cli/CMakeLists.txt
+@@ -65,7 +65,7 @@ SDLify(../common/main.cpp)
+ if (ADM_SUBVERSION)
+ ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")
+ endif (ADM_SUBVERSION)
+-ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION='\"${AVIDEMUX_VERSION}\"'")
++ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION=\"${AVIDEMUX_VERSION}\"")
+
+ ###########################################
+ # Version Info
diff --git a/avidemux-2.6.19-vpx-decoder.patch b/avidemux-2.6.19-vpx-decoder.patch
new file mode 100644
index 0000000..93bc506
--- /dev/null
+++ b/avidemux-2.6.19-vpx-decoder.patch
@@ -0,0 +1,101 @@
+commit cf5932741795a7212149c85c3dc2e933147fa98d
+Author: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Sun Apr 2 03:16:57 2017 +0200
+
+ [plugins/vpx] Fix swapped UV, menu name
+---
+ avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp | 8 ++++----
+ avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp b/avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp
+index a686dae..cd57bf4 100644
+--- a/avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp
++++ b/avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp
+@@ -93,11 +93,11 @@ bool decoderVPX::uncompress (ADMCompressedImage * in, ADMImage * out)
+ if(r)
+ {
+ r->_planes[0]=img->planes[0];
+- r->_planes[1]=img->planes[1];
+- r->_planes[2]=img->planes[2];
++ r->_planes[1]=img->planes[2];
++ r->_planes[2]=img->planes[1];
+ r->_planeStride[0]=img->stride[0];
+- r->_planeStride[1]=img->stride[1];
+- r->_planeStride[2]=img->stride[2];
++ r->_planeStride[1]=img->stride[2];
++ r->_planeStride[2]=img->stride[1];
+ r->_colorspace=ADM_COLOR_YV12;
+ r->Pts=in->demuxerPts;
+ r->flags=in->flags;
+diff --git a/avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp b/avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp
+index c5e625d..f59ada7 100644
+--- a/avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp
++++ b/avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp
+@@ -17,9 +17,9 @@
+ static uint32_t fccs[]={MKFCC('V','P','8',' '),0};
+ ADM_DECLARE_VIDEO_DECODER_PREAMBLE(decoderVPX);
+ ADM_DECLARE_VIDEO_DECODER_MAIN("vpx",
+- "VP8/WebmM",
++ "VP8/WebM",
+ "Decoder using libvpx (c) mean 2010",
+ fccs, // No configuration
+ NULL,
+ 1,0,0
+-);
+\ No newline at end of file
++);
+commit 630df97bbd875f810f7b103393bdfcaa7eb9a6e3
+Author: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Sun Apr 2 23:28:18 2017 +0200
+
+ [plugins/vpx] Add VP9 decoding support
+---
+ avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp | 16 ++++++++++++++--
+ avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp | 4 ++--
+ 2 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp b/avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp
+index cd57bf4..8841b58 100644
+--- a/avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp
++++ b/avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.cpp
+@@ -37,8 +37,20 @@ decoderVPX::decoderVPX (uint32_t w, uint32_t h,uint32_t fcc, uint32_t extraDataL
+ vpx_codec_dec_cfg_t cfg;
+ vpx_codec_flags_t flags=0; //VPX_CODEC_USE_POSTPROC
+ vpx_codec_ctx_t *instance=new vpx_codec_ctx_t;
+- const struct vpx_codec_iface *iface = &vpx_codec_vp8_dx_algo;
+-
++ const struct vpx_codec_iface *iface;
++ if(fcc==MKFCC('V','P','8',' '))
++ {
++ iface = &vpx_codec_vp8_dx_algo;
++ }else if(fcc==MKFCC('V','P','9',' '))
++ {
++ iface = &vpx_codec_vp9_dx_algo;
++ }else
++ {
++ ADM_warning("Unsupported FCC\n");
++ delete instance;
++ return;
++ }
++
+ memset(instance,0,sizeof(*instance));
+ memset(&cfg,0,sizeof(cfg));
+ cfg.threads=1;
+diff --git a/avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp b/avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp
+index f59ada7..df01971 100644
+--- a/avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp
++++ b/avidemux_plugins/ADM_videoDecoder/vpx/vpxPlugin.cpp
+@@ -14,10 +14,10 @@
+ #include "ADM_default.h"
+ #include "ADM_coreVideoDecoderInternal.h"
+ #include "ADM_vpx.h"
+-static uint32_t fccs[]={MKFCC('V','P','8',' '),0};
++static uint32_t fccs[]={MKFCC('V','P','8',' '),MKFCC('V','P','9',' '),0};
+ ADM_DECLARE_VIDEO_DECODER_PREAMBLE(decoderVPX);
+ ADM_DECLARE_VIDEO_DECODER_MAIN("vpx",
+- "VP8/WebM",
++ "VP8/VP9/WebM",
+ "Decoder using libvpx (c) mean 2010",
+ fccs, // No configuration
+ NULL,
diff --git a/avidemux.spec b/avidemux.spec
index c90d208..e7985d2 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -5,7 +5,7 @@
Name: avidemux
Version: 2.6.19
-Release: 5%{?dist}
+Release: 1%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -13,10 +13,9 @@ URL: http://www.avidemux.org
Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
Source1: avidemux-qt.desktop
-Patch0: avidemux-2.6.15-disable-vpx-decoder-plugin.patch
-#Patch1: avidemux-2.6.16-filter-preview.patch
-#Patch2: avidemux-2.6.16-unbundle-libmp4v2.patch
-#Patch3: avidemux-2.6.16-mp4muxer-eac3.patch
+Patch0: avidemux-2.6.19-vpx-decoder.patch
+Patch1: avidemux-2.6.19-version-string-generation.patch
+Patch2: avidemux-2.6.19-i18n-ru-fix-crop-filter.patch
# Don't try to build on arm, aarch64 or ppc
ExclusiveArch: i686 x86_64
7 years
[avidemux] Update to latest upstream release, 2.6.19.
by Richard Shaw
commit 6421ee8a06c3f93c7d0a13c0b3b23eb15fd56376
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sat Apr 22 08:40:41 2017 -0500
Update to latest upstream release, 2.6.19.
.gitignore | 1 +
avidemux.spec | 17 ++++++++---------
sources | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 080bce9..b7bcd15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ avidemux_2.6.10.tar.gz
/avidemux_2.6.12.tar.gz
/avidemux_2.6.15.tar.gz
/avidemux_2.6.16.tar.gz
+/avidemux_2.6.19.tar.gz
diff --git a/avidemux.spec b/avidemux.spec
index 59f2278..c90d208 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -4,7 +4,7 @@
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
Name: avidemux
-Version: 2.6.16
+Version: 2.6.19
Release: 5%{?dist}
Summary: Graphical video editing and transcoding tool
@@ -14,9 +14,9 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.
Source1: avidemux-qt.desktop
Patch0: avidemux-2.6.15-disable-vpx-decoder-plugin.patch
-Patch1: avidemux-2.6.16-filter-preview.patch
-Patch2: avidemux-2.6.16-unbundle-libmp4v2.patch
-Patch3: avidemux-2.6.16-mp4muxer-eac3.patch
+#Patch1: avidemux-2.6.16-filter-preview.patch
+#Patch2: avidemux-2.6.16-unbundle-libmp4v2.patch
+#Patch3: avidemux-2.6.16-mp4muxer-eac3.patch
# Don't try to build on arm, aarch64 or ppc
ExclusiveArch: i686 x86_64
@@ -121,11 +121,7 @@ This package contains translation files for %{name}.
%prep
-%setup -q -n %{name}_%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%autosetup -p1 -n %{name}_%{version}
# Remove sources of bundled libraries.
rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
@@ -306,6 +302,9 @@ fi
%changelog
+* Sat Apr 22 2017 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.19-1
+- Update to latest upstream release, 2.6.19.
+
* Wed Mar 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.16-5
- Build for x86 only
diff --git a/sources b/sources
index dd75077..7e3bb85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d0df96cc9f165b4ebcd7bc7fe1d09ba avidemux_2.6.16.tar.gz
+06beb020357f30877986fb87074f19b0 avidemux_2.6.19.tar.gz
7 years
[qmplay2/f24] Update to 17.04.21
by Martin Gansser
Summary of changes:
ace3e34... Update to 17.04.21 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years
[qmplay2/f25] Update to 17.04.21
by Martin Gansser
Summary of changes:
ace3e34... Update to 17.04.21 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years
[qmplay2/f26] Update to 17.04.21
by Martin Gansser
Summary of changes:
ace3e34... Update to 17.04.21 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years
[qmplay2] Update to 17.04.21
by Martin Gansser
commit ace3e344701106819b8e621a04cae3829245df53
Author: Martin Gansser <mgansser(a)alice.de>
Date: Sat Apr 22 14:41:25 2017 +0200
Update to 17.04.21
.gitignore | 1 +
qmplay2.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3123b21..fd0fe60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/QMPlay2-src-17.02.12.tar.xz
/QMPlay2-src-17.03.17.tar.xz
/QMPlay2-src-17.04.02.tar.xz
+/QMPlay2-src-17.04.21.tar.xz
diff --git a/qmplay2.spec b/qmplay2.spec
index d8c5f04..08cb3f6 100644
--- a/qmplay2.spec
+++ b/qmplay2.spec
@@ -1,7 +1,7 @@
%global pname QMPlay2
Name: qmplay2
-Version: 17.04.02
+Version: 17.04.21
Release: 1%{?dist}
Summary: A Qt based media player, streamer and downloader
License: LGPLv3+
@@ -135,6 +135,9 @@ fi
%{_includedir}/%{pname}
%changelog
+* Sat Apr 22 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 17.04.21-1
+- Update to 17.04.21
+
* Mon Apr 03 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 17.04.02-1
- Update to 17.04.02
- Dropped appdata.xml file
diff --git a/sources b/sources
index 28181ad..cd9a372 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ecc16e0cc1162c12c61fae8dfd7c3fd QMPlay2-src-17.04.02.tar.xz
+13e3f72cf6272dee48d8d1e21de93beb QMPlay2-src-17.04.21.tar.xz
7 years
