pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/avidemux multimedia/avidemux: more patches ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/15194bcdb006
branches: trunk
changeset: 346718:15194bcdb006
user: rhialto <rhialto%pkgsrc.org@localhost>
date: Thu Jan 02 19:47:04 2020 +0000
description:
multimedia/avidemux: more patches for gcc 7 which is pickier than older gcc.
diffstat:
multimedia/avidemux/Makefile | 4 +-
multimedia/avidemux/distinfo | 8 ++++-
multimedia/avidemux/patches/patch-avidemux_ADM__inputs_ADM__h263_ADM__h263.cpp | 16 ++++++++++
multimedia/avidemux/patches/patch-avidemux_ADM__inputs_ADM__ogm_ADM__ogmAudio.cpp | 16 ++++++++++
multimedia/avidemux/patches/patch-avidemux_ADM__outputs_oplug__ogm_op__ogsave.cpp | 16 ++++++++++
multimedia/avidemux/patches/patch-avidemux_ADM__userInterfaces_ADM__commonUI_DIA__bitrateHisto.cpp | 16 ++++++++++
multimedia/avidemux/patches/patch-avidemux_gtk__gui.cpp | 15 +++++++++
multimedia/avidemux/patches/patch-avidemux_gui__navigate.cpp | 15 +++++++++
8 files changed, 103 insertions(+), 3 deletions(-)
diffs (160 lines):
diff -r ac4ef19895cf -r 15194bcdb006 multimedia/avidemux/Makefile
--- a/multimedia/avidemux/Makefile Thu Jan 02 19:34:46 2020 +0000
+++ b/multimedia/avidemux/Makefile Thu Jan 02 19:47:04 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.111 2019/09/18 14:17:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.112 2020/01/02 19:47:04 rhialto Exp $
#
DISTNAME= avidemux_2.5.4
PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 44
+PKGREVISION= 45
CATEGORIES= multimedia
MASTER_SITES= http://download.berlios.de/avidemux/
diff -r ac4ef19895cf -r 15194bcdb006 multimedia/avidemux/distinfo
--- a/multimedia/avidemux/distinfo Thu Jan 02 19:34:46 2020 +0000
+++ b/multimedia/avidemux/distinfo Thu Jan 02 19:47:04 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2015/11/03 23:54:22 agc Exp $
+$NetBSD: distinfo,v 1.25 2020/01/02 19:47:04 rhialto Exp $
SHA1 (avidemux_2.5.4.tar.gz) = 83d6f6d87442ce4fc4e4806735ec27ef5e90364c
RMD160 (avidemux_2.5.4.tar.gz) = e20454a558210d5f7ab1418ae4013b618d1001d9
@@ -13,11 +13,17 @@
SHA1 (patch-avidemux_ADM__coreUI_include_DIA__factory.h) = 1aa53bdb0519122e63ac8fbcb76ca389cc97d6ba
SHA1 (patch-avidemux_ADM__core_include_ADM__assert.h) = ff039fcb901aa78a01c1fda07295ae170a5aaee4
SHA1 (patch-avidemux_ADM__core_include_ADM__mangle.h) = 54d580839fb5c1007379692e5e33979f72eedcbf
+SHA1 (patch-avidemux_ADM__inputs_ADM__h263_ADM__h263.cpp) = 1740fb04b5aa2a6ffa33827f336442ecdcf91e34
+SHA1 (patch-avidemux_ADM__inputs_ADM__ogm_ADM__ogmAudio.cpp) = 639802f8e4d9031706fdf88f4a545959e967d54e
+SHA1 (patch-avidemux_ADM__outputs_oplug__ogm_op__ogsave.cpp) = 8e3d0d0d824e5afb0450a5edf9c41f20e13c777e
SHA1 (patch-avidemux_ADM__userInterfaces_ADM__GTK_ADM__toolkit__gtk_jogshuttle.c) = d9fb28f3db0978cff3e90746aa9efcef0084daa3
+SHA1 (patch-avidemux_ADM__userInterfaces_ADM__commonUI_DIA__bitrateHisto.cpp) = adddbcfe6c0e1893afc91e38266b5924b2af83ba
SHA1 (patch-avidemux_ADM_core_src_ADM_cpuCap.cpp) = c344cf9707c2e8dc9f03b6379f749997bf01b22b
SHA1 (patch-avidemux_ADM_core_src_ADM_crashdump.cpp) = cdbd0419a100601b0c8f125228b2e3bf1c42fd14
SHA1 (patch-avidemux_ADM_userInterfaces_ADM_render_GUI_sdlRender.cpp) = 334fb6c2195b0e9e294ea461aa88ab9bd4828c53
SHA1 (patch-avidemux_CMakeLists.txt) = 00b6e92b77af1d575e801a824664921dae067db0
+SHA1 (patch-avidemux_gtk__gui.cpp) = b822944f236ff7e9fedab89ec1523cdcf28f0a3a
+SHA1 (patch-avidemux_gui__navigate.cpp) = f57df69cbf571f22e239af2db499debe8aac1a24
SHA1 (patch-ax) = 09d676d910dfcccb30b4f73d1a935647492c259a
SHA1 (patch-cmake_admCheckMiscLibs.cmake) = 2ece918805b2561f2ec47510265aed6352433c42
SHA1 (patch-cmake_admFFmpegPrepareTar.cmake) = 690039fb2a74f628c905200a5e767da2904f2df3
diff -r ac4ef19895cf -r 15194bcdb006 multimedia/avidemux/patches/patch-avidemux_ADM__inputs_ADM__h263_ADM__h263.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/avidemux/patches/patch-avidemux_ADM__inputs_ADM__h263_ADM__h263.cpp Thu Jan 02 19:47:04 2020 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-avidemux_ADM__inputs_ADM__h263_ADM__h263.cpp,v 1.1 2020/01/02 19:47:04 rhialto Exp $
+
+gcc7: ambiguous call to abs(uint32_t) but can't be negative
+(even if maybe that might have been intended).
+
+--- avidemux/ADM_inputs/ADM_h263/ADM_h263.cpp.orig 2008-06-24 19:46:05.000000000 +0000
++++ avidemux/ADM_inputs/ADM_h263/ADM_h263.cpp
+@@ -169,7 +169,7 @@ uint8_t h263Header::open(const char *
+ delta &=0xff;
+ if(!nbImg) delta=0;
+ //++++++++++++++PTYPE++++++++++++
+- if(((word&0xc0)==0x80) && ( abs(delta)<MAX_DELTA))
++ if(((word&0xc0)==0x80) && ( delta<MAX_DELTA))
+ {
+ last_pts=pts;
+ nbImg++;
diff -r ac4ef19895cf -r 15194bcdb006 multimedia/avidemux/patches/patch-avidemux_ADM__inputs_ADM__ogm_ADM__ogmAudio.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/avidemux/patches/patch-avidemux_ADM__inputs_ADM__ogm_ADM__ogmAudio.cpp Thu Jan 02 19:47:04 2020 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-avidemux_ADM__inputs_ADM__ogm_ADM__ogmAudio.cpp,v 1.1 2020/01/02 19:47:04 rhialto Exp $
+
+gcc7: error: call of overloaded 'abs(__uint64_t)' is ambiguous
+Fortunately since f<=val, val-f will be positive.
+
+--- avidemux/ADM_inputs/ADM_ogm/ADM_ogmAudio.cpp.orig 2008-06-24 19:46:05.000000000 +0000
++++ avidemux/ADM_inputs/ADM_ogm/ADM_ogmAudio.cpp
+@@ -402,7 +402,7 @@ static WAVHeader hdr;
+ // Now we forward till the next header is > value
+ while(_demuxer->readHeaderOfType(_currentTrack->audioTrack,&cursize,&flags,&f))
+ {
+- if(f>val || abs(f-val)<CLOSE_ENOUGH)
++ if(f>val || (val-f)<CLOSE_ENOUGH)
+ {
+ aprintf("Wanted %llu",val);
+ aprintf(" got %llu\n",f);
diff -r ac4ef19895cf -r 15194bcdb006 multimedia/avidemux/patches/patch-avidemux_ADM__outputs_oplug__ogm_op__ogsave.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/avidemux/patches/patch-avidemux_ADM__outputs_oplug__ogm_op__ogsave.cpp Thu Jan 02 19:47:04 2020 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-avidemux_ADM__outputs_oplug__ogm_op__ogsave.cpp,v 1.1 2020/01/02 19:47:04 rhialto Exp $
+
+gcc7: error: call of overloaded 'abs(__uint32_t)' is ambiguous
+so make the values signed so that a difference can properly be determined.
+
+--- avidemux/ADM_outputs/oplug_ogm/op_ogsave.cpp.orig 2008-09-20 18:04:35.000000000 +0000
++++ avidemux/ADM_outputs/oplug_ogm/op_ogsave.cpp
+@@ -163,7 +163,7 @@ uint8_t error=0;
+ }
+ }
+
+- if(abs(j-_togo)<3 && error) error=0; // might be caused by late B frame
++ if(abs((int64_t)j-(int64_t)_togo)<3 && error) error=0; // might be caused by late B frame
+ delete encoding_gui;
+ encoding_gui=NULL;
+ //________________ Flush______________________
diff -r ac4ef19895cf -r 15194bcdb006 multimedia/avidemux/patches/patch-avidemux_ADM__userInterfaces_ADM__commonUI_DIA__bitrateHisto.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/avidemux/patches/patch-avidemux_ADM__userInterfaces_ADM__commonUI_DIA__bitrateHisto.cpp Thu Jan 02 19:47:04 2020 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-avidemux_ADM__userInterfaces_ADM__commonUI_DIA__bitrateHisto.cpp,v 1.1 2020/01/02 19:47:04 rhialto Exp $
+
+gcc7: error: call of overloaded 'abs(__uint32_t)' is ambiguous
+so make the values signed so that a difference can properly be determined.
+
+--- avidemux/ADM_userInterfaces/ADM_commonUI/DIA_bitrateHisto.cpp.orig 2008-04-03 18:19:06.000000000 +0000
++++ avidemux/ADM_userInterfaces/ADM_commonUI/DIA_bitrateHisto.cpp
+@@ -50,7 +50,7 @@ uint32_t maxBFrame=0;
+ // 1st compute the total
+
+ max=0;
+- if(!(frameEnd>frameStart) || abs(frameStart-frameEnd)<5)
++ if(!(frameEnd>frameStart) || abs((int64_t)frameStart-(int64_t)frameEnd)<5)
+ {
+ GUI_Error_HIG(QT_TR_NOOP("No data"), NULL);
+ return ;
diff -r ac4ef19895cf -r 15194bcdb006 multimedia/avidemux/patches/patch-avidemux_gtk__gui.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/avidemux/patches/patch-avidemux_gtk__gui.cpp Thu Jan 02 19:47:04 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-avidemux_gtk__gui.cpp,v 1.1 2020/01/02 19:47:04 rhialto Exp $
+
+gcc7: error: call of overloaded 'abs(__uint32_t)' is ambiguous
+
+--- avidemux/gtk_gui.cpp.orig 2010-06-22 06:30:27.000000000 +0000
++++ avidemux/gtk_gui.cpp
+@@ -1795,7 +1795,7 @@ uint8_t ADM_saveRaw (const char *name)
+ }
+ if (!found)
+ {
+- if(abs(i-frameEnd)>2)
++ if(abs((int64_t)i-(int64_t)frameEnd)>2)
+ ret=0;
+ else
+ ret=1; // Good enough
diff -r ac4ef19895cf -r 15194bcdb006 multimedia/avidemux/patches/patch-avidemux_gui__navigate.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/avidemux/patches/patch-avidemux_gui__navigate.cpp Thu Jan 02 19:47:04 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-avidemux_gui__navigate.cpp,v 1.1 2020/01/02 19:47:04 rhialto Exp $
+
+gcc7: error: call of overloaded 'abs(__uint32_t)' is ambiguous
+
+--- avidemux/gui_navigate.cpp.orig 2008-09-13 17:47:05.000000000 +0000
++++ avidemux/gui_navigate.cpp
+@@ -243,7 +243,7 @@ void GUI_NextPrevBlackFrame(int dir)
+ else total=curframe+1;
+ while(1)
+ {
+- int current=abs(curframe-orgFrame);
++ int current=abs((int64_t)curframe-(int64_t)orgFrame);
+ f=curframe+dir;
+ if(work->update(current,total)) break;
+
Home |
Main Index |
Thread Index |
Old Index