Ticket #69342: shaderc-newport2.diff

File shaderc-newport2.diff, 3.1 KB (added by DanielO (Daniel O'Connor), 7 months ago)

Updated port diff.

  • graphics/shaderc/Portfile

    diff -Nur /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/graphics/shaderc/Portfile graphics/shaderc/Portfile
    old new  
     1# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
     2
     3PortSystem          1.0
     4PortGroup           github 1.0
     5PortGroup           cmake 1.1
     6
     7github.setup        google shaderc 2023.8 v
     8github.tarball_from archive
     9
     10categories          graphics devel
     11license             Apache-2
     12maintainers         {dons.net.au:darius @DanielO} openmaintainer
     13
     14description         Shader compilations
     15long_description    A collection of tools, libraries and tests for shader compilation. At \n\
     16                    the moment it includes: \n\
     17                      - glslc, a command line compiler for GLSL/HLSL to SPIR-V, and \n\
     18                      - libshaderc, a library API for accessing glslc functionality.
     19homepage            https://github.com/google/shaderc
     20
     21depends_run-append \
     22                    port:glslang \
     23                    port:spirv-tools
     24
     25checksums           sha256  dfec5045f30d8f6d3d3914ab5b3cc2695947f266d41261b1459177cd789308d1 \
     26                    rmd160  7d180ceeb4c3af8717733afb3153b7e5036c90cd \
     27                    size    227238
     28
     29compiler.cxx_standard 2017
     30
     31patchfiles-append     patch-CMakeLists.diff
     32
     33configure.args-append \
     34                    -DSHADERC_SKIP_TESTS=yes
     35 
     36configure.cppflags-append \
     37                    -I${prefix}/include/spirv-tools \
     38                    -I${prefix}/include/glslang
     39
  • graphics/shaderc/files/patch-CMakeLists.diff

    diff -Nur /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/graphics/shaderc/files/patch-CMakeLists.diff graphics/shaderc/files/patch-CMakeLists.diff
    old new  
     1The repository as-is wants to build spirv-tools and glslang and link to that, we
     2use the other ports instead.
     3Discussed in https://github.com/google/shaderc/issues/1199
     4--- CMakeLists.txt.orig 2024-01-04 04:15:00
     5+++ CMakeLists.txt      2024-02-15 20:01:55
     6@@ -124,8 +124,6 @@
     7 
     8 # Configure subdirectories.
     9 # We depend on these for later projects, so they should come first.
     10-add_subdirectory(third_party)
     11-
     12 add_subdirectory(libshaderc_util)
     13 add_subdirectory(libshaderc)
     14 add_subdirectory(glslc)
     15@@ -136,7 +134,7 @@
     16 add_custom_target(build-version
     17   ${PYTHON_EXECUTABLE}
     18   ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
     19-  ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
     20+  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
     21   COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
     22 
     23 function(define_pkg_config_file NAME LIBS)