From nobody Tue Jul 30 22:25:07 2024 X-Original-To: dev-commits-ports-main@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 4WYVCl3PXmz5S6hH; Tue, 30 Jul 2024 22:25:07 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WYVCl2txxz421S; Tue, 30 Jul 2024 22:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722378307; 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=9fks3kcd1SI2lc2lMOrqR4LZQPefTM6fnR7UhjOrXjQ=; b=aaseUMtJQ/0pqvv5RObVNxkyS4jGydZ8KtnHxwtKXKKpMM6l8q+jyTLsqwJTCLo8bMHA14 Kaahbla3qUVEtNm6YuLhS5sVuf4HPZWG13gfVX8Qm3faO7ljXScTJ0haXL2+5fdhxYDAyO ++8L9qN5k2PBBOXEMO9d9OROhEkX4CNyxwFi3QC4eobZ08Ckcv9dbP6JMdsQ49ZQBQkQ0T DERr2j8UDRrJIUTYuSSwMckyf34kHF0DfpeeIwzG9ZBGoyph5I+/nFnJBLNip7Y45aUKSK YBcIXxy549unw2b0F3yjp6muA3rQqy9ZziRcVFtOt7ia39DwpST/nYnNceO8/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722378307; a=rsa-sha256; cv=none; b=j0au9OZW568smN1gM/3Ii3PU7+3k6OB+9AoC1JLf5aa6ZaE8eFdOCizoTZNLAm5Jc5iT2q f7ny8jjSZB4n6L7Pzf6dHXxiPrvFnAvTw5P/akgtxQ/175vPkSVPevpf6NteveO0tyy2AA 9BU/W95pIuTyT95kKyDQboTNpUQuMqMfr+ZN59oM1W54OqajdHFFS81FPAKixzZeFirWws +xvWohXgZJTemeGT4lkk2mo/8nzgARWSnpzXCIUY0Efw78rHxBVK24jsYpPdGNdWdTg0PL D1Bsajn9JzEj1BK7hzUeCXPs9L3v6XbFhFHbwmxquO8i1Ju5H6eoiu+zsjgeag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722378307; 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=9fks3kcd1SI2lc2lMOrqR4LZQPefTM6fnR7UhjOrXjQ=; b=Xx9XkbI12qyOqhTHn6BNwbsF3op3taHoqL5Ughzu4l1C7jbMWAd0Qw2yHtcjLmiFJQcaJO vknp3yslpVnL8yrB7T2X2Ljove84k9MIL62z29JlwKUwBVBGCjDvQyHeU7xSviEukNeSLf 6sf5feyqNNlsL6ahYGwibKiX7cp7OqFw54/PxpV74N1Agvg7YlkJXZ0YABjj8guxxNTsCu Rw/LLJOnSbyLuswTjUCa6BL29g6tIjXIN6qGJTf4NuQfy3XdnZGacIooZfL422htDzQAdY HgZy3F/Ibt47HuCVHmon66IKUeBy1UY07cuPhG+Fh/6gpdyiftvFoKmLnEakbA== 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 4WYVCl2N3hzbKc; Tue, 30 Jul 2024 22:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46UMP7k1043669; Tue, 30 Jul 2024 22:25:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46UMP7gD043666; Tue, 30 Jul 2024 22:25:07 GMT (envelope-from git) Date: Tue, 30 Jul 2024 22:25:07 GMT Message-Id: <202407302225.46UMP7gD043666@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Torsten Zuehlsdorff Subject: git: 09bbcc173a47 - main - emulators/zsnes: Ignore on FreeBSD 14.0 and use older C++ Standard for compilation List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09bbcc173a47febddd0e82f14f43c971a90c5008 Auto-Submitted: auto-generated The branch main has been updated by tz: URL: https://cgit.FreeBSD.org/ports/commit/?id=09bbcc173a47febddd0e82f14f43c971a90c5008 commit 09bbcc173a47febddd0e82f14f43c971a90c5008 Author: Torsten Zuehlsdorff AuthorDate: 2024-07-30 22:19:10 +0000 Commit: Torsten Zuehlsdorff CommitDate: 2024-07-30 22:24:29 +0000 emulators/zsnes: Ignore on FreeBSD 14.0 and use older C++ Standard for compilation Since ZSNES is not in active development, with the last release being in 2007, the code is not designed to be compiled with more recent C++ standards. Thus, this patch makes it use an older standard to make it compile. - Updated Makefile (cleaned up through portclippy and portfmt), adding a CONFIGURE_ENV to set the C++ standard through CXXFLAGS. - Updated files/patch-configure as the above CXXFLAGS were being ignored due to one line using CFLAGS instead of CXXFLAGS. - Add IGNORE for FreeBSD 14.0, because of build failures on this plattform. Since it builds fine on 14.1 and 14.0 is EOL soon, we decided to IGNORE it for this version. The error is: checking for zlib - version >= 1.2.3... 1.3, bad version string given by zlib, sometimes due to very old zlibs that didnt correctly define their version. Please upgrade if you are running an old zlib... no configure: error: zlib >= 1.2.3 is required PR: 280195 Approved by: Naram Qashat (maintainer) --- emulators/zsnes/Makefile | 50 ++++++++++++++++++++--------------- emulators/zsnes/files/patch-configure | 24 ++++++++++++----- 2 files changed, 47 insertions(+), 27 deletions(-) diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile index fcf091b9dc40..2ddf7b91cc57 100644 --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -23,40 +23,48 @@ USES= gmake localbase sdl tar:bzip2 USE_SDL= sdl GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-cpucheck +CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -std=gnu++03" WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/}/src -PLIST_FILES= bin/zsnes share/man/man1/zsnes.1.gz +PLIST_FILES= bin/zsnes \ + share/man/man1/zsnes.1.gz -NO_OPTIONS_SORT=yes -OPTIONS_DEFINE= X11 OPENGL DEBUGGER JMA AO -OPTIONS_DEFAULT=X11 JMA -DEBUGGER_DESC= ZSNES Debugger -JMA_DESC= JMA support +OPTIONS_DEFINE= AO DEBUGGER JMA OPENGL X11 +OPTIONS_DEFAULT= JMA X11 +DEBUGGER_DESC= ZSNES Debugger +JMA_DESC= JMA support +AO_LIB_DEPENDS= libao.so:audio/libao +AO_CONFIGURE_ENABLE= libao DEBUGGER_CONFIGURE_ENABLE= debugger -JMA_CONFIGURE_ENABLE= jma -X11_CONFIGURE_WITH= x +JMA_CONFIGURE_ENABLE= jma OPENGL_CONFIGURE_ENABLE= opengl +X11_CONFIGURE_WITH= x -AO_LIB_DEPENDS= libao.so:audio/libao -AO_CONFIGURE_ENABLE= libao +.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400000 && ${OSVERSION} < 1401000 ) +IGNORE= Does not build on FreeBSD 14.0 - zlib is too old +.endif post-patch: - @${REINPLACE_CMD} -e \ - 's|@CXX@ @CFLAGS@ -o|@CXX@ @CXXFLAGS@ @CPPFLAGS@ -o|g ; \ - s|@CC@ @CFLAGS@ -o|@CC@ @CFLAGS@ @CPPFLAGS@ -o|g' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -i "" -e \ - 's|-O3||g' ${WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} -e 's|@CXX@ @CFLAGS@ -o|@CXX@ @CXXFLAGS@ @CPPFLAGS@ -o|g ; s|@CC@ @CFLAGS@ -o|@CC@ @CFLAGS@ @CPPFLAGS@ -o|g' \ + ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -i "" \ + -e 's|-O3||g' \ + ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|size_t argc|int argc|g' \ - ${WRKSRC}/parsegen.cpp ${WRKSRC}/tools/depbuild.cpp \ - ${WRKSRC}/tools/extraext.cpp ${WRKSRC}/tools/macroll.cpp \ - ${WRKSRC}/tools/minwhite.cpp ${WRKSRC}/tools/nreplace.cpp \ + ${WRKSRC}/parsegen.cpp \ + ${WRKSRC}/tools/depbuild.cpp \ + ${WRKSRC}/tools/extraext.cpp \ + ${WRKSRC}/tools/macroll.cpp \ + ${WRKSRC}/tools/minwhite.cpp \ + ${WRKSRC}/tools/nreplace.cpp \ ${WRKSRC}/tools/varrep.cpp do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/zsnes ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/linux/zsnes.1 ${STAGEDIR}${PREFIX}/share/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/zsnes \ + ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/linux/zsnes.1 \ + ${STAGEDIR}${PREFIX}/share/man/man1 .include diff --git a/emulators/zsnes/files/patch-configure b/emulators/zsnes/files/patch-configure index bfb9a54abebd..e0d94f34a551 100644 --- a/emulators/zsnes/files/patch-configure +++ b/emulators/zsnes/files/patch-configure @@ -1,9 +1,11 @@ ---- configure.orig Thu Jan 25 23:44:43 2007 -+++ configure Thu Jan 25 23:48:32 2007 -@@ -5130,89 +5130,6 @@ +--- configure.orig 2007-01-25 00:51:21 UTC ++++ configure +@@ -5128,92 +5128,6 @@ else - { echo "$as_me:$LINENO: checking which cpu architecture to optimize for" >&5 - echo $ECHO_N "checking which cpu architecture to optimize for... $ECHO_C" >&6; } + CFLAGSBAK="$CFLAGS" + +- { echo "$as_me:$LINENO: checking which cpu architecture to optimize for" >&5 +-echo $ECHO_N "checking which cpu architecture to optimize for... $ECHO_C" >&6; } - if test x$force_arch != x; then - CFLAGS="$CFLAGS -march=$force_arch" - cat >conftest.$ac_ext <<_ACEOF @@ -87,6 +89,16 @@ - CFLAGS="$CFLAGS -march=$ARCH_INFO" - fi - fi - +- # Check whether --enable-release was given. if test "${enable_release+set}" = set; then + enableval=$enable_release; release=$enableval +@@ -5237,7 +5151,7 @@ fi + NFLAGS="$NFLAGS -O1" + fi + fi +-CXXFLAGS="$CFLAGS -fno-rtti" ++CXXFLAGS="$CXXFLAGS -fno-rtti" + + if test x$enable_jma != xno; then + JMA_FILES="\$(JMA_D)/7zlzma.o \$(JMA_D)/crc32.o \$(JMA_D)/iiostrm.o\