From fdcb4f7ef445d80c9670f8a7af2846126b11df06 Mon Sep 17 00:00:00 2001 From: nikita Date: Fri, 5 May 2023 00:08:13 +0000 Subject: [PATCH] 0ad: move do-build into standard build. add 2 patches to revert upstream (build system) changes to nvtt. --- games/0ad/Makefile | 17 ++++++++--------- games/0ad/distinfo | 4 +++- games/0ad/options.mk | 4 ++-- ...h-libraries_source_nvtt_src_CMakeLists.txt | 19 +++++++++++++++++++ ...es_source_nvtt_src_src_nvtt_CMakeLists.txt | 17 +++++++++++++++++ 5 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 games/0ad/patches/patch-libraries_source_nvtt_src_CMakeLists.txt create mode 100644 games/0ad/patches/patch-libraries_source_nvtt_src_src_nvtt_CMakeLists.txt diff --git a/games/0ad/Makefile b/games/0ad/Makefile index 07d3cb41ea72..d894999cb4df 100644 --- a/games/0ad/Makefile +++ b/games/0ad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2023/05/04 17:29:33 nikita Exp $ +# $NetBSD: Makefile,v 1.4 2023/05/05 00:08:13 nikita Exp $ .include "Makefile.common" @@ -59,14 +59,18 @@ INSTALLATION_DIRS+= share/pixmaps CFLAGS+= -msse .endif +MAKE_FLAGS+= config=release +MAKE_FLAGS+= verbose=1 +MAKE_FLAGS+= -j ${_MAKE_JOBS_N:U1} +MAKE_ENV+= JOBS=${_MAKE_JOBS_N:U1} +BUILD_DIRS= build/workspaces/gcc + .include "options.mk" # nvtt, notes from gentoo: # Build bundled NVTT # nvtt is abandoned upstream and 0ad has forked it and added fixes. # Use their copy. bug #768930 -# --with-system-nvtt - do-configure: ${RUN} cd ${WRKSRC}/build/workspaces && ./clean-workspaces.sh ${RUN} cd ${WRKSRC}/build/workspaces && ./update-workspaces.sh \ @@ -78,11 +82,6 @@ do-configure: --without-pch \ ${CONFIGURE_EDITOR} ${CONFIGURE_TESTS} -do-build: - ${RUN} cd ${WRKSRC} && \ - ${GMAKE} config=release verbose=1 -j ${_MAKE_JOBS_N:U1} \ - -C build/workspaces/gcc - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/pyrogenesis ${DESTDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/build/resources/0ad.sh ${DESTDIR}${PREFIX}/bin/0ad @@ -106,7 +105,7 @@ do-install: libsimulation2.a libtinygettext.a libCollada.so \ libnvcore.so libnvimage.so libnvmath.so libnvtt.so \ ${DESTDIR}${PREFIX}/lib/${PKGBASE} - # hack. figure out where to set the rpath in the cmake build of the bundled nvtt. + # TODO: second part of rpath is missing after build .for f in libnvcore libnvimage libnvmath libnvtt ${PREFIX}/bin/patchelf \ --force-rpath \ diff --git a/games/0ad/distinfo b/games/0ad/distinfo index 849909e3cb34..71cc2e8a9608 100644 --- a/games/0ad/distinfo +++ b/games/0ad/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2023/05/04 15:20:52 nikita Exp $ +$NetBSD: distinfo,v 1.2 2023/05/05 00:08:13 nikita Exp $ BLAKE2s (0ad-0.0.26-alpha-unix-build.tar.xz) = c731d26db0269bc9de34bf75705eb2031a105b676217a1da916c79c2d2237015 SHA512 (0ad-0.0.26-alpha-unix-build.tar.xz) = aaf647d5d8454c244015d2a198beeaaebc571a5bc96446f3acff8dbd05f9843029c500bf4162651a5e1fcdb42bd5fb5b4f5c512c78372479fbd8565dd093f272 @@ -13,6 +13,8 @@ SHA1 (patch-libraries_source_fcollada_src_FCollada_FCDocument_FCDocument.h) = ae SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_FUCriticalSection.h) = fd181f746bba33ceb917a5de4794296c229213fc SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_FUStringBuilder.hpp) = f71f1f361601b2ce561c00a811d33bce6735a06d SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_Platforms.h) = 6887cca8e6ff1765a6b666bd595f8bcb41c2a90f +SHA1 (patch-libraries_source_nvtt_src_CMakeLists.txt) = 2d956e3ae9f6ec5fc2db8a33f99d3ffc066a2e40 +SHA1 (patch-libraries_source_nvtt_src_src_nvtt_CMakeLists.txt) = f42c1f4c57a3ef23a793a216f858b909dcf01e98 SHA1 (patch-libraries_source_spidermonkey_build.sh) = 34225c82659cc236bff076301dd52adca9888f92 SHA1 (patch-source_lib_allocators_page__aligned.cpp) = c25054afd543a1a90530964a63b2b692b1687765 SHA1 (patch-source_maths_tests_test__Bound.h) = 8d6b79199d86dabdddf3dca68eed2d252ef9a649 diff --git a/games/0ad/options.mk b/games/0ad/options.mk index 1453a77bcab2..4967ac87ef2f 100644 --- a/games/0ad/options.mk +++ b/games/0ad/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2023/05/04 17:29:33 nikita Exp $ +# $NetBSD: options.mk,v 1.3 2023/05/05 00:08:13 nikita Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.0ad PKG_SUPPORTED_OPTIONS+= tests editor @@ -18,7 +18,7 @@ CONFIGURE_TESTS?= --without-tests # TODO: not entirely working binary (loads, complains about files not found), # something is missing. .if ${PKG_OPTIONS:Meditor} -CONFIGURE_EDITOR?= +CONFIGURE_EDITOR?= --enable-atlas .include "../../x11/wxGTK32/buildlink3.mk" PLIST.editor= yes .else diff --git a/games/0ad/patches/patch-libraries_source_nvtt_src_CMakeLists.txt b/games/0ad/patches/patch-libraries_source_nvtt_src_CMakeLists.txt new file mode 100644 index 000000000000..0683d0ec7a22 --- /dev/null +++ b/games/0ad/patches/patch-libraries_source_nvtt_src_CMakeLists.txt @@ -0,0 +1,19 @@ +$NetBSD: patch-libraries_source_nvtt_src_CMakeLists.txt,v 1.1 2023/05/05 00:08:13 nikita Exp $ + +Revert patch by upstream. + +--- libraries/source/nvtt/src/CMakeLists.txt.orig 2023-05-05 00:58:46.017561096 +0200 ++++ libraries/source/nvtt/src/CMakeLists.txt 2023-05-05 01:01:04.794683803 +0200 +@@ -42,12 +42,6 @@ + SET(NVIMAGE_SHARED TRUE) + ENDIF(NVTT_SHARED) + +-SET(CMAKE_SKIP_BUILD_RPATH TRUE) +-SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) +-SET(CMAKE_INSTALL_RPATH "$ORIGIN") +-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +-SET(CMAKE_INSTALL_NAME_DIR "@executable_path") +- + ADD_SUBDIRECTORY(extern) + + ADD_SUBDIRECTORY(src) diff --git a/games/0ad/patches/patch-libraries_source_nvtt_src_src_nvtt_CMakeLists.txt b/games/0ad/patches/patch-libraries_source_nvtt_src_src_nvtt_CMakeLists.txt new file mode 100644 index 000000000000..ba97a041e71e --- /dev/null +++ b/games/0ad/patches/patch-libraries_source_nvtt_src_src_nvtt_CMakeLists.txt @@ -0,0 +1,17 @@ +$NetBSD: patch-libraries_source_nvtt_src_src_nvtt_CMakeLists.txt,v 1.1 2023/05/05 00:08:13 nikita Exp $ + +Revert patch by upstream. + +--- libraries/source/nvtt/src/src/nvtt/CMakeLists.txt.orig 2023-05-05 01:17:21.236120624 +0200 ++++ libraries/source/nvtt/src/src/nvtt/CMakeLists.txt 2023-05-05 01:17:49.911281699 +0200 +@@ -42,10 +42,6 @@ + ADD_DEFINITIONS(-DNVTT_EXPORTS) + + IF(NVTT_SHARED) +- IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +- SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,origin") +- ENDIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +- + ADD_DEFINITIONS(-DNVTT_SHARED=1) + ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS}) + ELSE(NVTT_SHARED)