[avidemux] Bump for rebuild in new infra.

Richard Shaw hobbes1069 at rpmfusion.org
Thu Jul 7 17:08:39 CEST 2016


commit 52a92e702c83a6ecf39466ecc8109b1d9a8e486a
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Thu Jul 7 10:08:29 2016 -0500

    Bump for rebuild in new infra.
    
    - Add patch for GCC 6 narrowing conversion error.

 avidemux-2.6.12-narrowing.patch | 23 +++++++++++++++++++++++
 avidemux.spec                   |  3 +++
 2 files changed, 26 insertions(+)
---
diff --git a/avidemux-2.6.12-narrowing.patch b/avidemux-2.6.12-narrowing.patch
new file mode 100644
index 0000000..a40d947
--- /dev/null
+++ b/avidemux-2.6.12-narrowing.patch
@@ -0,0 +1,23 @@
+commit b54303bc9b9310e288a1dde9c923f48e854bd55f
+Author: mean <fixounet at free.fr>
+Date:   Tue Jul 5 18:43:58 2016 +0200
+
+    [Prefs/couple] Add std::string in addition to char *, safer
+
+diff --git a/avidemux_core/ADM_coreUtils/src/prefs.cpp b/avidemux_core/ADM_coreUtils/src/prefs.cpp
+index 79f69c1..7c1b419 100644
+--- a/avidemux_core/ADM_coreUtils/src/prefs.cpp
++++ b/avidemux_core/ADM_coreUtils/src/prefs.cpp
+@@ -44,8 +44,8 @@ typedef struct
+    const char *name2;
+    ADM_paramType  type;
+    const char *defaultValue;
+-   float    min;
+-   float    max;
++   double    min;
++   double    max;
+ }optionDesc;
+
+ #include "prefs2_pref.h"
+
+
diff --git a/avidemux.spec b/avidemux.spec
index 2675ef4..7a04424 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -13,6 +13,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
 
 # Don't try to build on arm
 ExcludeArch: %{arm}
@@ -138,6 +139,7 @@ This package contains translation files for %{name}.
 %setup -q -n %{name}_%{version}
 %patch0 -p1
 %patch1 -p1 -b .bund_libs
+%patch2 -p1
 
 # Remove sources of bundled libraries.
 rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
@@ -368,6 +370,7 @@ fi
 %changelog
 * Sat Jun 25 2016 Richard Shaw <hobbes1069 at gmail.com> - 2.6.12-2
 - Bump for rebuild in new infra.
+- Add patch for GCC 6 narrowing conversion error.
 
 * Mon Apr  4 2016 Richard Shaw <hobbes1069 at gmail.com> - 2.6.12-1
 - Fix library file permissions, BZ#3923.


More information about the rpmfusion-commits mailing list