From owner-svn-ports-head@freebsd.org Thu Jan 11 21:42:22 2018 Return-Path: Delivered-To: svn-ports-head@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 09D3EE7E2D4; Thu, 11 Jan 2018 21:42:22 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DA15763674; Thu, 11 Jan 2018 21:42:21 +0000 (UTC) (envelope-from marius@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 400511AB61; Thu, 11 Jan 2018 21:42:21 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0BLgLsl047924; Thu, 11 Jan 2018 21:42:21 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0BLgL1c047895; Thu, 11 Jan 2018 21:42:21 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201801112142.w0BLgL1c047895@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 11 Jan 2018 21:42:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458797 - head/sysutils/cdrdao/files X-SVN-Group: ports-head X-SVN-Commit-Author: marius X-SVN-Commit-Paths: head/sysutils/cdrdao/files X-SVN-Commit-Revision: 458797 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jan 2018 21:42:22 -0000 Author: marius Date: Thu Jan 11 21:42:20 2018 New Revision: 458797 URL: https://svnweb.freebsd.org/changeset/ports/458797 Log: Fix build of toc2mp3 after update of audio/lame to version 3.100. PR: 225038 Added: head/sysutils/cdrdao/files/patch-utils_toc2mp3.cc (contents, props changed) Added: head/sysutils/cdrdao/files/patch-utils_toc2mp3.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrdao/files/patch-utils_toc2mp3.cc Thu Jan 11 21:42:20 2018 (r458797) @@ -0,0 +1,24 @@ +--- utils/toc2mp3.cc.orig 2003-02-22 10:16:56 UTC ++++ utils/toc2mp3.cc +@@ -143,8 +143,8 @@ static void printUsage() + + message(0, "LAME encoder version: %s", get_lame_version()); + message(0, "Supported bit rates: "); +- for (int i = 0; i < 16 && bitrate_table[1][i] >= 0; i++) { +- message(0, "%d ", bitrate_table[1][i]); ++ for (int br, i = 0; (br = lame_get_bitrate(1, i)) >= 0; i++) { ++ message(0, "%d ", br); + } + message(0, ""); + } +@@ -238,8 +238,8 @@ lame_global_flags *init_encoder(int bitr + lame_global_flags *lf; + int bitrateOk = 0; + +- for (int i = 0; bitrate_table[1][i] >= 0 && !bitrateOk; i++) { +- if (bitrate == bitrate_table[1][i]) ++ for (int br, i = 0; (br = lame_get_bitrate(1, i)) >= 0 && !bitrateOk; i++) { ++ if (br == bitrate) + bitrateOk = 1; + } +