head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.32 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.30 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.28 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.26 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.24 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.22 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.20 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.18 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.16 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.14 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.12 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.10 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.8 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.6 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.4 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.2 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.1.0.10 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.8 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.6 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.4 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.2 pkgsrc-2021Q1-base:1.1; locks; strict; comment @# @; 1.2 date 2022.05.15.11.50.53; author tnn; state Exp; branches; next 1.1; commitid 6hP0AY9Vj18E79ED; 1.1 date 2021.01.24.19.03.47; author maya; state Exp; branches; next ; commitid 95rghECs5zqJO0FC; desc @@ 1.2 log @fna3d: update to 22.05 to fix build with current graphics/mojoshader @ text @$NetBSD: patch-CMakeLists.txt,v 1.1 2021/01/24 19:03:47 maya Exp $ set correct library version disable bundled mojoshader in favor of the one from pkgsrc --- CMakeLists.txt.orig 2022-05-01 15:39:21.000000000 +0000 +++ CMakeLists.txt @@@@ -3,6 +3,9 @@@@ cmake_minimum_required(VERSION 2.8.12) project(FNA3D C) +include_directories("${PREFIX}/include" + "${X11BASE}/include") + # Options option(BUILD_SHARED_LIBS "Build shared library" ON) option(TRACING_SUPPORT "Build with tracing enabled" OFF) @@@@ -100,18 +103,7 @@@@ add_library(FNA3D src/FNA3D_PipelineCache.c src/FNA3D_Tracing.c ) -add_library(mojoshader STATIC - MojoShader/mojoshader.c - MojoShader/mojoshader_effects.c - MojoShader/mojoshader_common.c - MojoShader/mojoshader_d3d11.c - MojoShader/mojoshader_opengl.c - MojoShader/mojoshader_vulkan.c - MojoShader/profiles/mojoshader_profile_common.c - MojoShader/profiles/mojoshader_profile_glsl.c - MojoShader/profiles/mojoshader_profile_hlsl.c - MojoShader/profiles/mojoshader_profile_spirv.c -) + if(TRACING_SUPPORT) add_executable(fna3d_replay replay/replay.c) target_link_libraries(fna3d_replay FNA3D) @@@@ -124,9 +116,6 @@@@ endif() if(NOT MSVC) set_property(TARGET FNA3D PROPERTY COMPILE_FLAGS "-std=gnu99 -Wall -Wno-strict-aliasing -pedantic") endif() -if(BUILD_SHARED_LIBS) - set_property(TARGET mojoshader PROPERTY POSITION_INDEPENDENT_CODE ON) -endif() # FNA3D folders as includes, for other targets to consume target_include_directories(FNA3D PUBLIC @@@@ -147,10 +136,6 @@@@ if(BUILD_DXVK_NATIVE) $ ) endif() -target_include_directories(mojoshader PUBLIC - $ - $ -) # MinGW builds should statically link libgcc if(MINGW) @@@@ -178,7 +163,6 @@@@ else() if (TARGET SDL2::SDL2) message(STATUS "using TARGET SDL2::SDL2") target_link_libraries(FNA3D PUBLIC SDL2::SDL2) - target_link_libraries(mojoshader PUBLIC SDL2::SDL2) elseif (TARGET SDL2) message(STATUS "using TARGET SDL2") target_link_libraries(FNA3D PUBLIC SDL2) @ 1.1 log @Add fna3d version 21.01 This is FNA3D, the 3D graphics library for FNA. FNA3D was written to be used for FNA's Graphics namespace. It carries the same API design as XNA 4.0, with various implementations available at runtime (including Vulkan, OpenGL, Metal, and Direct3D). For shaders, we support Direct3D 9 Effect Framework binaries via MojoShader. Note that while FNA is the main consumer of FNA3D, we do NOT provide separate C# bindings. If you want to use FNA3D in C#, simply use FNA instead; it's the same API and can be used entirely by itself without dragging in other dependencies. @ text @d1 1 a1 1 $NetBSD$ d6 1 a6 1 --- CMakeLists.txt.orig 2021-01-01 16:22:56.000000000 +0000 d17 2 a18 3 option(DISABLE_D3D11 "Disable D3D11 backend") @@@@ -105,28 +108,11 @@@@ add_library(FNA3D src/FNA3D_Image.c d20 1 a27 1 - MojoShader/mojoshader_metal.c a31 1 - MojoShader/profiles/mojoshader_profile_metal.c d34 5 a38 2 # Build flags d48 4 a51 4 @@@@ -134,10 +120,6 @@@@ target_include_directories(FNA3D PUBLIC $ $ ) d59 1 a59 1 @@@@ -165,7 +147,6 @@@@ else() @