Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 918989
Collapse All | Expand All

(-)a/configure (-2 / +21 lines)
Lines 2626-2631 CMDLINE_SET=" Link Here
2626
    ignore_tests
2626
    ignore_tests
2627
    install
2627
    install
2628
    ld
2628
    ld
2629
    libglslang_ldflags
2629
    ln_s
2630
    ln_s
2630
    logfile
2631
    logfile
2631
    malloc_prefix
2632
    malloc_prefix
Lines 6652-6657 if enabled_all libglslang libshaderc; then Link Here
6652
    die "ERROR: libshaderc and libglslang are mutually exclusive, if in doubt, disable libglslang"
6653
    die "ERROR: libshaderc and libglslang are mutually exclusive, if in doubt, disable libglslang"
6653
fi
6654
fi
6654
6655
6656
if enabled libglslang; then
6657
    if [ -x "$(command -v glslang)" ]; then
6658
        # https://github.com/KhronosGroup/glslang
6659
        # commit 6be56e45e574b375d759b89dad35f780bbd4792f: Remove `OGLCompiler` and `HLSL` stub libraries from build
6660
        # StandAlone/StandAlone.cpp: "SpirvGeneratorVersion:GLSLANG_VERSION_MAJOR.GLSLANG_VERSION_MINOR.GLSLANG_VERSION_PATCH GLSLANG_VERSION_FLAVOR"
6661
        glslang_version="$(glslang -dumpversion)"
6662
        glslang_major="${glslang_version%%.*}"
6663
        glslang_major="${glslang_major#*:}"
6664
        if test ${glslang_major} -le 13; then
6665
            libglslang_ldflags=" -lOSDependent -lHLSL -lOGLCompiler"
6666
        elif ! [[ ${glslang_major} =~ ^[0-9]+$ ]]; then
6667
            die "ERROR: glslang's computed major version isn't a number: '${glslang_major}'"
6668
        fi
6669
    else
6670
        die "ERROR: glslang binary not found, impossible to determine installed glslang's version"
6671
    fi
6672
fi
6673
6655
check_cpp_condition winrt windows.h "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)"
6674
check_cpp_condition winrt windows.h "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)"
6656
6675
6657
if ! disabled w32threads && ! enabled pthreads; then
6676
if ! disabled w32threads && ! enabled pthreads; then
Lines 6771-6780 enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build. Link Here
6771
enabled libfribidi        && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
6790
enabled libfribidi        && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
6772
enabled libharfbuzz       && require_pkg_config libharfbuzz harfbuzz hb.h hb_buffer_create
6791
enabled libharfbuzz       && require_pkg_config libharfbuzz harfbuzz hb.h hb_buffer_create
6773
enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
6792
enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
6774
                            -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \
6793
                            -lglslang -lMachineIndependent "${libglslang_ldflags}" -lGenericCodeGen \
6775
                            -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ||
6794
                            -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ||
6776
                        require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
6795
                        require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
6777
                            -lglslang -lOSDependent -lHLSL -lOGLCompiler \
6796
                            -lglslang "${libglslang_ldflags}" \
6778
                            -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; }
6797
                            -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; }
6779
enabled libgme            && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
6798
enabled libgme            && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
6780
                               require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
6799
                               require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }

Return to bug 918989