head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.24
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.22
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.20
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.18
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.16
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.14
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.12
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.10
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.8
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.6
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.4
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.2
	pkgsrc-2023Q2-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2023.05.05.14.55.18;	author nikita;	state Exp;
branches;
next	1.1;
commitid	16ZoIqGLo6dVIMnE;

1.1
date	2023.05.05.00.08.13;	author nikita;	state Exp;
branches;
next	;
commitid	H9AjDBU0ChUDOHnE;


desc
@@


1.2
log
@0ad: fix part of the rpath issues + use pkgconfig for miniupnpc
@
text
@$NetBSD$


--- libraries/source/nvtt/src/CMakeLists.txt.orig	2022-09-23 22:36:55.000000000 +0200
+++ libraries/source/nvtt/src/CMakeLists.txt	2023-05-05 13:29:14.769485899 +0200
@@@@ -42,11 +42,10 @@@@
 	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_SKIP_BUILD_RPATH FALSE)
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+SET(CMAKE_BUILD_RPATH "${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib/0ad")
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-SET(CMAKE_INSTALL_NAME_DIR "@@executable_path")
 
 ADD_SUBDIRECTORY(extern)
 
@


1.1
log
@0ad: move do-build into standard build.
add 2 patches to revert upstream (build system) changes to nvtt.
@
text
@a2 1
Revert patch by upstream.
d4 3
a6 3
--- 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 @@@@
d13 4
a16 1
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
d18 1
a18 1
-
a20 1
 ADD_SUBDIRECTORY(src)
@