| 1 |
commit: 0b9deda9488d7ea978a43f5cf3d49c4319468af6 |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon May 29 03:38:43 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 23 05:35:34 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b9deda9 |
| 7 |
|
| 8 |
media-libs/avidemux-core: Fix building with GCC-6 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=594902 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 12 |
|
| 13 |
.../avidemux-core/avidemux-core-2.6.8.ebuild | 3 +- |
| 14 |
.../files/avidemux-core-2.6.8-gcc6.patch | 50 ++++++++++++++++++++++ |
| 15 |
2 files changed, 52 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild |
| 18 |
index 713066eac7f..f7dde42a475 100644 |
| 19 |
--- a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild |
| 20 |
+++ b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2015 Gentoo Foundation |
| 23 |
+# Copyright 1999-2017 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI="5" |
| 27 |
@@ -53,6 +53,7 @@ DEPEND=" |
| 28 |
S="${WORKDIR}/${MY_P}" |
| 29 |
BUILD_DIR="${S}/buildCore" |
| 30 |
|
| 31 |
+PATCHES=( "${FILESDIR}"/${P}-gcc6.patch ) |
| 32 |
DOCS=( AUTHORS README ) |
| 33 |
|
| 34 |
src_prepare() { |
| 35 |
|
| 36 |
diff --git a/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch b/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch |
| 37 |
new file mode 100644 |
| 38 |
index 00000000000..dbdf8ff93a8 |
| 39 |
--- /dev/null |
| 40 |
+++ b/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch |
| 41 |
@@ -0,0 +1,50 @@ |
| 42 |
+--- a/avidemux_core/ADM_coreUtils/src/prefs.cpp |
| 43 |
++++ b/avidemux_core/ADM_coreUtils/src/prefs.cpp |
| 44 |
+@@ -44,8 +44,8 @@ |
| 45 |
+ const char *name2; |
| 46 |
+ ADM_paramType type; |
| 47 |
+ const char *defaultValue; |
| 48 |
+- float min; |
| 49 |
+- float max; |
| 50 |
++ double min; |
| 51 |
++ double max; |
| 52 |
+ }optionDesc; |
| 53 |
+ |
| 54 |
+ #include "prefs2_pref.h" |
| 55 |
+--- a/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp |
| 56 |
++++ b/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp |
| 57 |
+@@ -46,7 +46,7 @@ |
| 58 |
+ // By construction, the error should be minimal |
| 59 |
+ if(newDts!=ADM_AUDIO_NO_DTS) |
| 60 |
+ { |
| 61 |
+- if( abs(newDts-lastDts)>ADM_MAX_SKEW) |
| 62 |
++ if( labs((int64_t)newDts-lastDts)>ADM_MAX_SKEW) |
| 63 |
+ { |
| 64 |
+ printf("[AudioStream] Warning skew in dts =%"PRId64", \n",(int64_t)newDts-(uint64_t)lastDts); |
| 65 |
+ printf("[AudioStream] Warning skew lastDts=%s \n",ADM_us2plain(lastDts)); |
| 66 |
+--- a/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp |
| 67 |
++++ b/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp |
| 68 |
+@@ -30,19 +30,19 @@ |
| 69 |
+ #define WRAP_Open_Template(funcz,argz,display,codecid) \ |
| 70 |
+ {\ |
| 71 |
+ AVCodec *codec=funcz(argz);\ |
| 72 |
+-if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec"display));ADM_assert(0);} \ |
| 73 |
++if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec" display));ADM_assert(0);} \ |
| 74 |
+ codecId=codecid; \ |
| 75 |
+ _context->workaround_bugs=1*FF_BUG_AUTODETECT +0*FF_BUG_NO_PADDING; \ |
| 76 |
+ _context->error_concealment=3; \ |
| 77 |
+ if (avcodec_open(_context, codec) < 0) \ |
| 78 |
+ { \ |
| 79 |
+- printf("[lavc] Decoder init: "display" video decoder failed!\n"); \ |
| 80 |
+- GUI_Error_HIG("Codec","Internal error opening "display); \ |
| 81 |
++ printf("[lavc] Decoder init: " display " video decoder failed!\n"); \ |
| 82 |
++ GUI_Error_HIG("Codec","Internal error opening " display); \ |
| 83 |
+ ADM_assert(0); \ |
| 84 |
+ } \ |
| 85 |
+ else \ |
| 86 |
+ { \ |
| 87 |
+- printf("[lavc] Decoder init: "display" video decoder initialized! (%s)\n",codec->long_name); \ |
| 88 |
++ printf("[lavc] Decoder init: " display " video decoder initialized! (%s)\n",codec->long_name); \ |
| 89 |
+ } \ |
| 90 |
+ } |
| 91 |
+ |
Archives