Volker Schlecht wrote (2023-11-30 17:53 CET):
> Ping, just rebuilt and tested on amd64 with -current from yesterday.
>
> On 2023-11-06 22:58, Volker Schlecht wrote:
> > Here's an update for games/widelands to version 1.1
> > It doesn't seem to require boost anymore, a few patches can be dropped, others
> > modified - otherwise a pretty straightforward update which builds (and plays)
> > nicely on amd64.
> >
> > The large PLIST makes the diff a little unwieldy, though :-)
> >
> > ok?
Ah, now I remember I tested the previous diff and wondered why you use
the embedded minizip instead of rchivers/minizip. I tried to build it
with our minizip and failed... so, I guess that's the answer.
Assuming the diff below is the same that you initially sent,
OK sdk@
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/widelands/Makefile,v
> retrieving revision 1.39
> diff -u -p -r1.39 Makefile
> --- Makefile 30 Sep 2023 05:29:00 -0000 1.39
> +++ Makefile 30 Nov 2023 16:45:35 -0000
> @@ -2,8 +2,7 @@ COMMENT = economic and military simulati
>
> GH_ACCOUNT = widelands
> GH_PROJECT = widelands
> -GH_TAGNAME = v1.0
> -REVISION = 3
> +GH_TAGNAME = v1.1
>
> CATEGORIES = games
>
> @@ -13,22 +12,23 @@ HOMEPAGE = https://www.widelands.org/
> PERMIT_PACKAGE = Yes
>
> WANTLIB += ${COMPILER_LIBCXX} GL GLEW SDL2 SDL2_image SDL2_mixer
> -WANTLIB += SDL2_ttf boost_unit_test_framework-mt boost_system-mt
> -WANTLIB += c curl execinfo iconv icudata icuuc intl m png z
> +WANTLIB += SDL2_ttf c execinfo iconv icudata icuuc intl m png z atomic
>
> # c++11
> COMPILER = base-clang ports-gcc
>
> -BUILD_DEPENDS = devel/gettext,-tools
> -LIB_DEPENDS = devel/boost \
> +BUILD_DEPENDS = devel/asio \
> + devel/gettext,-tools
> +
> +LIB_DEPENDS = lang/gcc/8,-libs \
> devel/gettext,-runtime \
> devel/sdl2-image \
> devel/sdl2-mixer \
> devel/sdl2-ttf \
> graphics/png \
> graphics/glew \
> - net/curl \
> textproc/icu4c
> +
> RUN_DEPENDS = devel/desktop-file-utils \
> x11/gtk+4,-guic
>
> @@ -40,12 +40,15 @@ MODPY_RUNDEP= No
>
> CONFIGURE_ARGS = -DWL_INSTALL_DATADIR=${PREFIX}/share/widelands \
> -DWL_INSTALL_BASEDIR=${PREFIX}/share/widelands \
> + -DWL_INSTALL_BINDIR=${PREFIX}/bin \
> -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \
> -DGTK_UPDATE_ICON_CACHE=False \
> + -DOPTION_FORCE_EMBEDDED_MINIZIP=ON \
> -Wno-dev
>
> CONFIGURE_ENV = LDFLAGS="${LDFLAGS} -lGL -lexecinfo -lintl -liconv \
> -L${LOCALBASE}/lib -L${X11BASE}/lib"
> +
>
> DEBUG_PACKAGES = ${BUILD_PACKAGES}
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/widelands/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo 26 Jun 2021 05:31:16 -0000 1.6
> +++ distinfo 30 Nov 2023 16:45:35 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (widelands-1.0.tar.gz) = HasMQGKHPMcsXgVY+eliCw7xhfGniSOnfEzlue12Axo=
> -SIZE (widelands-1.0.tar.gz) = 792124780
> +SHA256 (widelands-1.1.tar.gz) = aFP889rsm2YAVpHlvLADJmNLrwmFrYmn5lEVAmEvZBI=
> +SIZE (widelands-1.1.tar.gz) = 416104611
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/games/widelands/patches/patch-CMakeLists_txt,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 11 Mar 2022 19:05:11 -0000 1.7
> +++ patches/patch-CMakeLists_txt 30 Nov 2023 16:45:36 -0000
> @@ -1,53 +1,30 @@
> - Don't set -O3.
> - Don't install source docs.
> -- Unbreak build with cmake 3.15
>
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -192,21 +192,9 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
> - endif()
> - option(OPTION_ASAN "Build with AddressSanitizer" ON)
> - elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
> -- if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
> -- message(STATUS "GCC >6.2.0 breaks -03, setting -02")
> -- set(WL_OPTIMIZE_FLAGS "-O2")
> -- else()
> +@@ -228,7 +228,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
> + elseif(MSVC)
> + set(WL_OPTIMIZE_FLAGS "/O2")
> + else()
> - set(WL_OPTIMIZE_FLAGS "-O3")
> -- endif ()
> - set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
> - option(OPTION_ASAN "Build with AddressSanitizer" OFF)
> - elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
> -- if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
> -- message(STATUS "GCC >6.2.0 breaks -03, setting -02")
> -- set(WL_OPTIMIZE_FLAGS "-O2")
> -- else()
> ++ set(WL_OPTIMIZE_FLAGS "-O2")
> + endif ()
> + if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0))
> + message(WARNING "GCC <7.0.0 is known to cause segfaults in release builds. Please consider upgrading to GCC version 7 or newer or using Clang. Adding selected overrides to suppress reporting of known bugs.")
> +@@ -243,7 +243,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
> + elseif(MSVC)
> + set(WL_OPTIMIZE_FLAGS "/O2")
> + else()
> - set(WL_OPTIMIZE_FLAGS "-O3")
> -- endif ()
> ++ set(WL_OPTIMIZE_FLAGS "-O2")
> + endif ()
> set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
> - option(OPTION_ASAN "Build with AddressSanitizer" ON)
> - else()
> -@@ -255,7 +243,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
> - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-unreachable-code")
> - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-documentation")
> -
> -- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=deprecated")
> -+ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=deprecated")
> - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=non-pod-varargs")
> -
> - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Qunused-arguments")
> -@@ -313,7 +301,7 @@ if(NOT MSVC)
> - # Turn some warnings into errors.
> - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=format-security")
> - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type")
> -- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow")
> -+# wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow")
> - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")
> -
> - wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
> -@@ -469,15 +457,6 @@ install(
> + if(NOT OPTION_TSAN)
> +@@ -562,15 +562,6 @@ install(
> DESTINATION ${WL_INSTALL_BASEDIR}
> - CONFIGURATIONS Debug;Release
> + CONFIGURATIONS Debug;Release;None
> COMPONENT CoreLicenseFiles
> -)
> -
> @@ -60,4 +37,4 @@ Index: CMakeLists.txt
> - PATTERN "CMakeLists.txt" EXCLUDE
> )
>
> - set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${WL_INSTALL_DATADIR}/locale)
> + if(OPTION_BUILD_TRANSLATIONS)
> Index: patches/patch-cmake_WlFunctions_cmake
> ===================================================================
> RCS file: patches/patch-cmake_WlFunctions_cmake
> diff -N patches/patch-cmake_WlFunctions_cmake
> --- patches/patch-cmake_WlFunctions_cmake 11 Mar 2022 19:05:11 -0000 1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,10 +0,0 @@
> -Index: cmake/WlFunctions.cmake
> ---- cmake/WlFunctions.cmake.orig
> -+++ cmake/WlFunctions.cmake
> -@@ -325,5 +325,5 @@ function(wl_binary NAME)
> -
> - #Quoting the CMake documentation on DESTINATION:
> - #"If a relative path is given it is interpreted relative to the value of CMAKE_INSTALL_PREFIX"
> -- install(TARGETS ${NAME} DESTINATION "." COMPONENT ExecutableFiles)
> -+ install(TARGETS ${NAME} DESTINATION "bin" COMPONENT ExecutableFiles)
> - endfunction()
> Index: patches/patch-src_base_macros_h
> ===================================================================
> RCS file: patches/patch-src_base_macros_h
> diff -N patches/patch-src_base_macros_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_base_macros_h 30 Nov 2023 16:45:36 -0000
> @@ -0,0 +1,17 @@
> +Index: src/base/macros.h
> +--- src/base/macros.h.orig
> ++++ src/base/macros.h
> +@@ -21,6 +21,13 @@
> +
> + #include <cinttypes>
> +
> ++// Define __WORDSIZE
> ++#if defined(_LP64)
> ++# define __WORDSIZE 64
> ++#else
> ++# define __WORDSIZE 32
> ++
No comments:
Post a Comment