[avidemux] Add GCC 6 operator patch.
commit df6f9cc67e5e030e4208bfad4ee55e66d631154c
Author: Richard M. Shaw <hobbes1069(a)gmail.com>
Date: Thu Jul 7 11:24:07 2016 -0500
Add GCC 6 operator patch.
avidemux-2.6.12-gcc6.patch | 11 +++++++++++
avidemux.spec | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/avidemux-2.6.12-gcc6.patch b/avidemux-2.6.12-gcc6.patch
new file mode 100644
index 0000000..8a1e2d2
--- /dev/null
+++ b/avidemux-2.6.12-gcc6.patch
@@ -0,0 +1,11 @@
+--- a/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h
++++ b/avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h
+@@ -213,7 +213,7 @@ if(!codec) {GUI_Error_HIG("Codec",QT_TR_
+ if (avcodec_open2(_context, codec, NULL) < 0) \
+ { \
+ printf("[lavc] Decoder init:
"display" video decoder failed!\n"); \
+- GUI_Error_HIG("Codec","Internal
error opening "display); \
++ GUI_Error_HIG("Codec","Internal
error opening " display); \
+ ADM_assert(0); \
+ } \
+ else \
diff --git a/avidemux.spec b/avidemux.spec
index 7a04424..d5c2ac0 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -14,6 +14,7 @@ Source1: avidemux-qt.desktop
Patch0: avidemux-2.6.10-bundled_libs.patch
Patch1: avidemux-2.6.10-qt5_lrelease.patch
Patch2: avidemux-2.6.12-narrowing.patch
+Patch3: avidemux-2.6.12-gcc6.patch
# Don't try to build on arm
ExcludeArch: %{arm}
@@ -140,6 +141,7 @@ This package contains translation files for %{name}.
%patch0 -p1
%patch1 -p1 -b .bund_libs
%patch2 -p1
+%patch3 -p1
# Remove sources of bundled libraries.
rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
@@ -370,7 +372,7 @@ fi
%changelog
* Sat Jun 25 2016 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.12-2
- Bump for rebuild in new infra.
-- Add patch for GCC 6 narrowing conversion error.
+- Add patch for GCC 6 narrowing conversion and other GCC 6 errors.
* Mon Apr 4 2016 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.12-1
- Fix library file permissions, BZ#3923.