Received: by mail.netbsd.org (Postfix, from userid 605) id 7339584D79; Thu, 2 Jan 2020 19:47:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EFFF484D77 for ; Thu, 2 Jan 2020 19:47:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id iqd1bDaCxrZy for ; Thu, 2 Jan 2020 19:47:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id F331684D2C for ; Thu, 2 Jan 2020 19:47:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id ED2BBFA97; Thu, 2 Jan 2020 19:47:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1577994424126750" MIME-Version: 1.0 Date: Thu, 2 Jan 2020 19:47:04 +0000 From: "Olaf Seibert" Subject: CVS commit: pkgsrc/multimedia/avidemux To: pkgsrc-changes@NetBSD.org Reply-To: rhialto@netbsd.org X-Mailer: log_accum Message-Id: <20200102194704.ED2BBFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1577994424126750 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rhialto Date: Thu Jan 2 19:47:04 UTC 2020 Modified Files: pkgsrc/multimedia/avidemux: Makefile distinfo Added Files: pkgsrc/multimedia/avidemux/patches: patch-avidemux_ADM__inputs_ADM__h263_ADM__h263.cpp patch-avidemux_ADM__inputs_ADM__ogm_ADM__ogmAudio.cpp patch-avidemux_ADM__outputs_oplug__ogm_op__ogsave.cpp patch-avidemux_ADM__userInterfaces_ADM__commonUI_DIA__bitrateHisto.cpp patch-avidemux_gtk__gui.cpp patch-avidemux_gui__navigate.cpp Log Message: multimedia/avidemux: more patches for gcc 7 which is pickier than older gcc. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 pkgsrc/multimedia/avidemux/Makefile cvs rdiff -u -r1.24 -r1.25 pkgsrc/multimedia/avidemux/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/multimedia/avidemux/patches/patch-avidemux_ADM__inputs_ADM__h263_ADM__h263.cpp \ pkgsrc/multimedia/avidemux/patches/patch-avidemux_ADM__inputs_ADM__ogm_ADM__ogmAudio.cpp \ pkgsrc/multimedia/avidemux/patches/patch-avidemux_ADM__outputs_oplug__ogm_op__ogsave.cpp \ pkgsrc/multimedia/avidemux/patches/patch-avidemux_ADM__userInterfaces_ADM__commonUI_DIA__bitrateHisto.cpp \ pkgsrc/multimedia/avidemux/patches/patch-avidemux_gtk__gui.cpp \ pkgsrc/multimedia/avidemux/patches/patch-avidemux_gui__navigate.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1577994424126750 Content-Disposition: inline Content-Length: 8948 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/avidemux/Makefile diff -u pkgsrc/multimedia/avidemux/Makefile:1.111 pkgsrc/multimedia/avidemux/Makefile:1.112 --- pkgsrc/multimedia/avidemux/Makefile:1.111 Wed Sep 18 14:17:12 2019 +++ pkgsrc/multimedia/avidemux/Makefile Thu Jan 2 19:47:04 2020 @@ -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/ Index: pkgsrc/multimedia/avidemux/distinfo diff -u pkgsrc/multimedia/avidemux/distinfo:1.24 pkgsrc/multimedia/avidemux/distinfo:1.25 --- pkgsrc/multimedia/avidemux/distinfo:1.24 Tue Nov 3 23:54:22 2015 +++ pkgsrc/multimedia/avidemux/distinfo Thu Jan 2 19:47:04 2020 @@ -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__coreImage_src_ 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 Added files: Index: pkgsrc/multimedia/avidemux/patches/patch-avidemux_ADM__inputs_ADM__h263_ADM__h263.cpp diff -u /dev/null pkgsrc/multimedia/avidemux/patches/patch-avidemux_ADM__inputs_ADM__h263_ADM__h263.cpp:1.1 --- /dev/null Thu Jan 2 19:47:04 2020 +++ pkgsrc/multimedia/avidemux/patches/patch-avidemux_ADM__inputs_ADM__h263_ADM__h263.cpp Thu Jan 2 19:47:04 2020 @@ -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) value + while(_demuxer->readHeaderOfType(_currentTrack->audioTrack,&cursize,&flags,&f)) + { +- if(f>val || abs(f-val)val || (val-f)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 ; Index: pkgsrc/multimedia/avidemux/patches/patch-avidemux_gtk__gui.cpp diff -u /dev/null pkgsrc/multimedia/avidemux/patches/patch-avidemux_gtk__gui.cpp:1.1 --- /dev/null Thu Jan 2 19:47:04 2020 +++ pkgsrc/multimedia/avidemux/patches/patch-avidemux_gtk__gui.cpp Thu Jan 2 19:47:04 2020 @@ -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 Index: pkgsrc/multimedia/avidemux/patches/patch-avidemux_gui__navigate.cpp diff -u /dev/null pkgsrc/multimedia/avidemux/patches/patch-avidemux_gui__navigate.cpp:1.1 --- /dev/null Thu Jan 2 19:47:04 2020 +++ pkgsrc/multimedia/avidemux/patches/patch-avidemux_gui__navigate.cpp Thu Jan 2 19:47:04 2020 @@ -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; + --_----------=_1577994424126750--