From nobody Thu Feb 22 11:10:58 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 4TgVnH0mH2z5CQGD; Thu, 22 Feb 2024 11:10:59 +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 4TgVnH0J24z4rcW; Thu, 22 Feb 2024 11:10:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708600259; 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=ecV8Q4e4t2YfadY/Bv/vT+p44Aiqf36f+NMq4d4ks4s=; b=rULuOfzm6mkoNDDTw5ugjet5m83euR1OFhZTK46L+AqLcVMk2+cuDGdba1O+h70mJxo83i CvZ0fGteDG35JaANgf/obcyrY65wtXrzUblIBGBeoSO4rNm9kcveF2T5cyGfOF7uLx8sQE iwaQ0/baKHT5YuWLEXp4Gj6cnX0FL43Hv86qZyhVKFsOlCFIOGFCcDrurtWob4t+d56j69 KreIjTGelLCqIBEvwqWck3F+vOJrv/vtpmyULSDU+nDBnzLO6WFhgkYvWlkqnJyOUGqI8U UhGX8AgpnFKSL7zczbxWDuW7gJAGxiLRJXdNuvPIuZbN8a0NpWupAO+9BT9KfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708600259; 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=ecV8Q4e4t2YfadY/Bv/vT+p44Aiqf36f+NMq4d4ks4s=; b=RgVznwYCY9HyZq9h27eDSLMzplHOUoWryPmOSWbAXvSHyz22mMKeeGoCVUSGx4u9K52L/4 BqOzw0EUYyXNs+FUjspo4AD92eWX+sbiFsNxjVcNC6VZqoJ6CiKqggO+LMbUDJ3J1eY4cc LAUZTCfmOcvD5vlq26+ZSBiQi9rDXqTywFhSjwVKaxIdVHqm9ZtWiDqSfKMI4gw/SCv9Oo 9uuSAc9UxWxFwF69dub/vMCpSYh2Udt6x3rDnunB7Aj5f/1yQp+UbI7TM5lC0J/4Jbq6eZ KHfiTO37xsQs8YPTpq4L4VyXl6FNGZ1gpaFscMKt34adqobLrz98nOsKu9mcxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708600259; a=rsa-sha256; cv=none; b=IdcfY2uYI94DLDHiGWyCV3v6rcybratbnmtVzBP19/Z54zo4fM4Hf8ix8BOwI+TiuPj48K SGPG7uRocFKYhma5HrmUf7qR7tk9KfVnEav0P2BPlNxYRW/nQd9P5UTVtFHEFDZ2SV42ma w9n8aG6HcKs/cdU31BPC5ifMOnBZcmhOUzMg0BaPi/0+cuHMK4pS+CgEAkZIVRxH2EaWrn Y5dZs/nMOaVI6lxyA5bLX+SW/EJ+8Ebuuwr0/HnJEfks7B3z9rYg813sOSFzgorNFSn14f qmqP89AbZt8FksO6G3kYiDfOVIbn9S+V2+HDUeVnFRiU+Gg/I3zsN0sVKmonFw== 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 4TgVnG6T07zTxd; Thu, 22 Feb 2024 11:10:58 +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 41MBAwkq085047; Thu, 22 Feb 2024 11:10:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MBAwIX085044; Thu, 22 Feb 2024 11:10:58 GMT (envelope-from git) Date: Thu, 22 Feb 2024 11:10:58 GMT Message-Id: <202402221110.41MBAwIX085044@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: b274c8918b4f - main - games/openttd: update OpenTTD to the latest version 13.4 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b274c8918b4f9bda160326dc0233524975acd031 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=b274c8918b4f9bda160326dc0233524975acd031 commit b274c8918b4f9bda160326dc0233524975acd031 Author: Alexey Dokuchaev AuthorDate: 2024-02-22 11:09:56 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-02-22 11:09:56 +0000 games/openttd: update OpenTTD to the latest version 13.4 - By popular demand, prefer SDL 2.x by default but leave the option to use the previous stable version - Drop incomplete work-around for strange Clang bug added in commit f2488f960dc8: the problem is not specific to PowerPC but versions 13.1 and later no longer trigger it (pending investigation) PR: 272428, 272623 Reported by: portscout, pkg-fallout Clang bug: https://github.com/llvm/llvm-project/issues/49093 --- games/openttd/Makefile | 30 +++++++++--------------------- games/openttd/distinfo | 6 +++--- games/openttd/files/patch-CMakeLists.txt | 14 ++++++++++---- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/games/openttd/Makefile b/games/openttd/Makefile index 4c78f3a2bb26..2c8767d76450 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -1,8 +1,7 @@ PORTNAME= openttd -DISTVERSION= 13.0 -PORTREVISION= 2 +DISTVERSION= 13.4 CATEGORIES= games -MASTER_SITES= https://proxy.binaries.openttd.org/openttd-releases/${DISTVERSION}/ +MASTER_SITES= https://cdn.openttd.org/openttd-releases/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-source MAINTAINER= danfe@FreeBSD.org @@ -14,13 +13,13 @@ LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png \ liblzo2.so:archivers/lzo2 -USES= cmake cpe pkgconfig tar:xz +USES= cmake compiler:c++17-lang cpe pkgconfig tar:xz CMAKE_ARGS= -DCMAKE_INSTALL_BINDIR:PATH=bin \ -DCMAKE_INSTALL_DATADIR:PATH=share WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} -OPTIONS_DEFINE= DOCS FLUIDSYNTH SAVE_PASSWORDS SERVER +OPTIONS_DEFINE= DOCS FLUIDSYNTH SAVE_PASSWORDS SDL1 SERVER SERVER_PREVENTS= FLUIDSYNTH FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth @@ -29,6 +28,11 @@ FLUIDSYNTH_CMAKE_ON= -DWITH_FLUIDSYNTH:BOOL=ON SAVE_PASSWORDS_DESC= Save passwords between server restarts SAVE_PASSWORDS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-save-passwords +SDL1_DESC= Use SDL v1.2 instead of v2 for GUI +SDL1_VARS= _SDL_VERSION=sdl +SDL1_CMAKE_OFF= -DWITH_SDL2:BOOL=ON +SDL1_VARS_OFF= _SDL_VERSION=sdl2 + SERVER_DESC= Build dedicated server only (no GUI) SERVER_USES_OFF= gnome sdl SERVER_USE_OFF= SDL=${_SDL_VERSION} @@ -40,22 +44,6 @@ SERVER_LIB_DEPENDS_OFF= libfontconfig.so:x11-fonts/fontconfig \ libiculx.so:devel/icu-lx SERVER_VARS= USE_RC_SUBR=${PORTNAME} -.include - -.if ${ARCH:Mpowerpc*} && ${OSVERSION} > 1400078 -USES+= llvm:min=16 -CC= clang${LLVM_VERSION} -CXX= clang++${LLVM_VERSION} -.else -USES+= compiler:c++17-lang -.endif - -.if exists(${LOCALBASE}/lib/libSDL2.so) -_SDL_VERSION= sdl2 -.else -_SDL_VERSION= sdl -.endif - post-install-SERVER-on: @${REINPLACE_CMD} -E '/\.desktop|icons|pixmaps/d' ${TMPPLIST} diff --git a/games/openttd/distinfo b/games/openttd/distinfo index 2b588f925aa5..c3828606cb3b 100644 --- a/games/openttd/distinfo +++ b/games/openttd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1675619840 -SHA256 (openttd-13.0-source.tar.xz) = 339df8e0e0827087c83afe78f8efc6a73b0a3d8a950a0b53137ce6e8aad7ab67 -SIZE (openttd-13.0-source.tar.xz) = 7422316 +TIMESTAMP = 1708509717 +SHA256 (openttd-13.4-source.tar.xz) = 2a1deba01bfe58e2188879f450c3fa4f3819271ab49bf348dd66545f040d146f +SIZE (openttd-13.4-source.tar.xz) = 7428012 diff --git a/games/openttd/files/patch-CMakeLists.txt b/games/openttd/files/patch-CMakeLists.txt index 24881ccc445a..d6e569721c72 100644 --- a/games/openttd/files/patch-CMakeLists.txt +++ b/games/openttd/files/patch-CMakeLists.txt @@ -1,7 +1,13 @@ ---- CMakeLists.txt.orig 2022-04-02 10:38:20 UTC +--- CMakeLists.txt.orig 2023-07-29 23:01:44 UTC +++ CMakeLists.txt -@@ -133,7 +133,9 @@ if(NOT OPTION_DEDICATED) - if(NOT SDL2_FOUND) +@@ -129,11 +129,14 @@ if(NOT OPTION_DEDICATED) + find_package(Allegro) + if(NOT APPLE) + find_package(Freetype) ++if(WITH_SDL2) + find_package(SDL2) +- if(NOT SDL2_FOUND) ++else() find_package(SDL) endif() +if(WITH_FLUIDSYNTH) @@ -10,7 +16,7 @@ find_package(Fontconfig) find_package(ICU OPTIONAL_COMPONENTS i18n lx) endif() -@@ -260,7 +262,9 @@ link_package(LIBLZMA TARGET LibLZMA::LibLZMA ENCOURAGE +@@ -260,7 +263,9 @@ link_package(LIBLZMA TARGET LibLZMA::LibLZMA ENCOURAGE link_package(LZO) if(NOT OPTION_DEDICATED)