From nobody Thu Jul 27 06:24:26 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RBLMb3gynz4p4HD; Thu, 27 Jul 2023 06:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RBLMb2T6Bz3mXF; Thu, 27 Jul 2023 06:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690439067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AGjv//lwi7IdASSJ/8NwdmC57TVkI7wK+oRYf/61HEQ=; b=HGMyz9QIRBPAuJkbNdrfluqRPbDr8KiCmbSIERsoiJ3iBHv1udH8XW3OAm3jDVGf9RFXye AsdZ2JnGmIXJIXDdUfROaqqIKbRsueNr1preVjfvBOik39SMLgZFL83dgsSIQ0dMmdPq++ wPIMNg1rZ8cdidCQNHNQq63rd3y+6PKRVROE5RxnlRxcmxc9pRu2Ka2chqTc0aVOz5FFv2 YfGyFH9PMAnlMM6MQfOb+pieMobSa601xGqOgFtLNBvkL4C5CGje5sRpCvYHuRSUwhIdzO QgKghzONVZvLwbgAih7YQdBZOdutthfN0cqnS1UWE9Fuav0S9ydDn9sPxmEVvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690439067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AGjv//lwi7IdASSJ/8NwdmC57TVkI7wK+oRYf/61HEQ=; b=nFr/6qRksKstDWXynCMBq3vAWWm8tJGFzxU1sCnZ/EK5tD+6IdoaXcX/H+PrXqusDWLqng MsG4vM6Xn+glIkcEhjCDLA3Qp/s5AoJbCK9MUMi+XJDGUd/n3wXd8qwO18z/o7Eu4NMWMg fPDS76FHHwyhBA2XmxEoBezPOglaZRhTr3cwSJ+lK6aeVmM2k5EXk/Vf6KfHSDcz6ISINw Z7fTpDqJksOQ76stYpZiYm4cr/oJGWeDZMzvcvzLR4lj+RMTorDWayGaCIaoPYzqScQVvg byZRZ5j529MJT/i2k9ZQOoMxB7vQVK/SoPgD+35rd+9GrzHzTsdVuDnc45xI+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690439067; a=rsa-sha256; cv=none; b=r7P5hj/cp1eAXGjTZz7zBwz7LCiFTljThxRv9UrhYpv8KiPp6+3DhkoqVQ63BwhhjwCZ3b PmgDJUkf5+/ZPSr+dQV7o0PVO0lhJ1IKio57zYiw6pIOZfqXKaFXn/2U69LrtX7KJ/9Ukr WcPqil87/8pB6NLd/D4WNUrnBN1JyU+gNT9xawU7HoYrkGbxiHCu3veKXjd6RFl4IgJHTA Sh0EKf9E+9boNTzHxGL/Vyn9YAMXGWYSs9Zqk9bq/M/oSphMumz424qc028mMexRWXra1F 5DYLDV/PaadOxq3HtH+m+vReo3dyQb1EAmSVKLh790NkSTpzySrx+fEBkLWm/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RBLMZ6JGSz1DJN; Thu, 27 Jul 2023 06:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36R6OQHV012621; Thu, 27 Jul 2023 06:24:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36R6OQJI012620; Thu, 27 Jul 2023 06:24:26 GMT (envelope-from git) Date: Thu, 27 Jul 2023 06:24:26 GMT Message-Id: <202307270624.36R6OQJI012620@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: f252b3a865d3 - main - multimedia/dvdstyler: Fix build on FreeBSD 14 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f252b3a865d3476360ee429e0297d589fd94b4fb Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=f252b3a865d3476360ee429e0297d589fd94b4fb commit f252b3a865d3476360ee429e0297d589fd94b4fb Author: Alan Hicks AuthorDate: 2023-07-26 07:23:49 +0000 Commit: Fernando Apesteguía CommitDate: 2023-07-27 06:24:01 +0000 multimedia/dvdstyler: Fix build on FreeBSD 14 Update to C++17. PR: 272680 Reported by: ahicks@p-o.co.uk (maintainer) --- multimedia/dvdstyler/Makefile | 4 +++- .../dvdstyler/files/patch-wxVillaLib_ThumbnailFactory.cpp | 11 +++++++++++ multimedia/dvdstyler/files/patch-wxVillaLib_imagjpg.cpp | 10 ++++++++++ multimedia/dvdstyler/files/patch-wxVillaLib_thumb_md5.cpp | 11 +++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile index 1b8fd0f79391..7e8cd9289c21 100644 --- a/multimedia/dvdstyler/Makefile +++ b/multimedia/dvdstyler/Makefile @@ -1,6 +1,6 @@ PORTNAME= dvdstyler DISTVERSION= 3.3b3 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 2 CATEGORIES= multimedia #MASTER_SITES= SF @@ -43,6 +43,8 @@ WX_CONF_ARGS= absolute GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_AVCONV_PATH="" OBJCXX="${CXX}" +CFLAGS+= -std=c17 +CPPFLAGS+= -std=c++17 OPTIONS_DEFINE= DOCS diff --git a/multimedia/dvdstyler/files/patch-wxVillaLib_ThumbnailFactory.cpp b/multimedia/dvdstyler/files/patch-wxVillaLib_ThumbnailFactory.cpp new file mode 100644 index 000000000000..d1b28b3d4159 --- /dev/null +++ b/multimedia/dvdstyler/files/patch-wxVillaLib_ThumbnailFactory.cpp @@ -0,0 +1,11 @@ +--- wxVillaLib/ThumbnailFactory.cpp 2023-07-24 10:21:13.152544000 +0100 ++++ wxVillaLib/ThumbnailFactory.cpp 2023-07-24 10:18:45.440168000 +0100 +@@ -363,7 +363,7 @@ + img = decoder.GetNextFrame(); + } + if (img.Ok() && decoder.GetFrameAspectRatio() > 0 +- && labs(decoder.GetFrameAspectRatio()*100 - img.GetWidth()*100/img.GetHeight()) >= 5) { ++ && std::abs(decoder.GetFrameAspectRatio()*100 - img.GetWidth()*100/img.GetHeight()) >= 5) { + if (lround(img.GetWidth() / decoder.GetFrameAspectRatio()) > img.GetHeight()) + img.Rescale(img.GetWidth(), lround(img.GetWidth() / decoder.GetFrameAspectRatio())); + else diff --git a/multimedia/dvdstyler/files/patch-wxVillaLib_imagjpg.cpp b/multimedia/dvdstyler/files/patch-wxVillaLib_imagjpg.cpp new file mode 100644 index 000000000000..feb4c16aa200 --- /dev/null +++ b/multimedia/dvdstyler/files/patch-wxVillaLib_imagjpg.cpp @@ -0,0 +1,10 @@ +--- wxVillaLib/imagjpg.cpp 2023-07-24 10:38:58.609790000 +0100 ++++ wxVillaLib/imagjpg.cpp 2023-07-24 10:41:28.358164000 +0100 +@@ -1,7 +1,3 @@ +-#ifdef __GNUG__ +-#pragma implementation "imagjpg.h" +-#endif +- + // For compilers that support precompilation, includes "wx.h". + #include "wx/wxprec.h" + diff --git a/multimedia/dvdstyler/files/patch-wxVillaLib_thumb_md5.cpp b/multimedia/dvdstyler/files/patch-wxVillaLib_thumb_md5.cpp new file mode 100644 index 000000000000..6b18f2f1c11a --- /dev/null +++ b/multimedia/dvdstyler/files/patch-wxVillaLib_thumb_md5.cpp @@ -0,0 +1,11 @@ +--- wxVillaLib/thumb_md5.cpp 2023-07-24 10:20:48.138290000 +0100 ++++ wxVillaLib/thumb_md5.cpp 2023-07-24 10:02:20.011636000 +0100 +@@ -199,7 +199,7 @@ + static void + thumb_md5_transform (wxUint32 buf[4], wxUint32 const in[16]) + { +- register wxUint32 a, b, c, d; ++ wxUint32 a, b, c, d; + + a = buf[0]; + b = buf[1];