From owner-svn-ports-all@freebsd.org Fri Nov 25 08:45:55 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29346C528D1; Fri, 25 Nov 2016 08:45:55 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 03C3E8BC; Fri, 25 Nov 2016 08:45:54 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAP8jsYf019817; Fri, 25 Nov 2016 08:45:54 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAP8jss1019815; Fri, 25 Nov 2016 08:45:54 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611250845.uAP8jss1019815@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 25 Nov 2016 08:45:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427085 - in head/x11/leechcraft: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Nov 2016 08:45:55 -0000 Author: jbeich Date: Fri Nov 25 08:45:53 2016 New Revision: 427085 URL: https://svnweb.freebsd.org/changeset/ports/427085 Log: x11/leechcraft: unbreak with ffmpeg 3.x src/plugins/musiczombie/chroma.cpp:41:10: fatal error: 'libavutil/audioconvert.h' file not found #include ^ src/plugins/musiczombie/chroma.cpp:125:35: error: use of undeclared identifier 'avcodec_alloc_frame' std::shared_ptr frame (avcodec_alloc_frame (), ^ src/plugins/musiczombie/chroma.cpp:126:27: error: use of undeclared identifier 'avcodec_free_frame'; did you mean 'avcodec_get_name'? [] (AVFrame *frame) { avcodec_free_frame (&frame); }); ^~~~~~~~~~~~~~~~~~ avcodec_get_name /usr/local/include/libavcodec/avcodec.h:6187:13: note: 'avcodec_get_name' declared here const char *avcodec_get_name(enum AVCodecID id); ^ src/plugins/musiczombie/chroma.cpp:126:47: error: cannot initialize a parameter of type 'enum AVCodecID' with an rvalue of type 'AVFrame **' [] (AVFrame *frame) { avcodec_free_frame (&frame); }); ^~~~~~ /usr/local/include/libavcodec/avcodec.h:6187:45: note: passing argument to parameter 'id' here const char *avcodec_get_name(enum AVCodecID id); ^ PR: 207547 Obtained from: upstream Approved by: portmgr blanket Added: head/x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp (contents, props changed) Modified: head/x11/leechcraft/Makefile (contents, props changed) Modified: head/x11/leechcraft/Makefile ============================================================================== --- head/x11/leechcraft/Makefile Fri Nov 25 08:19:42 2016 (r427084) +++ head/x11/leechcraft/Makefile Fri Nov 25 08:45:53 2016 (r427085) @@ -3,7 +3,7 @@ PORTNAME= leechcraft PORTVERSION= 0.6.70 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= x11 MASTER_SITES= http://dist.leechcraft.org/LeechCraft/0.6.70/ Added: head/x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp Fri Nov 25 08:45:53 2016 (r427085) @@ -0,0 +1,34 @@ +https://github.com/0xd34df00d/leechcraft/commit/307be1dd37059e49eca37f77ddc4806125a8f843 +https://github.com/0xd34df00d/leechcraft/commit/53d56cafd3a1d299601d9f3bfd4ee051ae9121ba +https://github.com/0xd34df00d/leechcraft/commit/875e3b43b7a91656f61180b2b2179137f18e6d71 + +--- plugins/musiczombie/chroma.cpp.orig 2014-07-28 18:35:44 UTC ++++ plugins/musiczombie/chroma.cpp +@@ -38,7 +38,6 @@ extern "C" + { + #include + #include +-#include + #include + #include + #include +@@ -122,8 +121,8 @@ namespace MusicZombie + auto remaining = maxLength * codecCtx->channels * codecCtx->sample_rate; + chromaprint_start (Ctx_, codecCtx->sample_rate, codecCtx->channels); + +- std::shared_ptr frame (avcodec_alloc_frame (), +- [] (AVFrame *frame) { avcodec_free_frame (&frame); }); ++ std::shared_ptr frame (av_frame_alloc (), ++ [] (AVFrame *frame) { av_frame_free (&frame); }); + auto maxDstNbSamples = 0; + + uint8_t *dstData [1] = { nullptr }; +@@ -140,7 +139,7 @@ namespace MusicZombie + if (packet.stream_index != streamIndex) + continue; + +- avcodec_get_frame_defaults (frame.get ()); ++ av_frame_unref (frame.get ()); + int gotFrame = false; + auto consumed = avcodec_decode_audio4 (codecCtx.get (), frame.get (), &gotFrame, &packet); +