Skip to content
Snippets Groups Projects

Draft: Yaml parsing

Closed Draft: Yaml parsing
yaml_parsing into master
5 unresolved threads
Closed Gijs Peskens requested to merge yaml_parsing into master
5 unresolved threads

Rebased MR !54 (closed)

Edited by Gijs Peskens

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
meson.build
52 52 builtin_cjson = true
53 53 builtin_lz4 = true
54 54 else
55 add_project_arguments(['-Wshadow', '-pedantic-errors'], language: 'c')
55 add_project_arguments(['-Wshadow', '-pedantic-errors','-Werror'], language: 'c')
  • Gijs Peskens
    Gijs Peskens @gpeskens started a thread on the diff
    • meson.build
    52 52 builtin_cjson = true
    53 53 builtin_lz4 = true
    54 54 else
    55 add_project_arguments(['-Wshadow', '-pedantic-errors'], language: 'c')
    55 add_project_arguments(['-Wshadow', '-pedantic-errors','-Werror'], language: 'c')
    56 56 add_project_arguments(cc.get_supported_arguments([
    57 57 '-Wundef',
    58 '-Werror=vla',
    • Gijs Peskens
      Gijs Peskens @gpeskens ·
      Author Developer

      This should not be removed, if this breaks LIBYAML itself consider adding flags to it's compilation/adding #pragmas to disable warning on specific files

    • Please register or sign in to reply
  • Gijs Peskens
    Gijs Peskens @gpeskens started a thread on the diff
    • meson.build
    76 75 test_args = []
    77 76 threads = []
    78 77 if host_machine.system() == 'linux'
    78 add_project_arguments(['-DLIBYAML'], language: 'c')
  • Gijs Peskens
    Gijs Peskens @gpeskens started a thread on the diff
    • tools/ristreceiver.c
    37 38 enum rist_profile profile = RIST_PROFILE_MAIN;
    38 39
    39 40 static struct option long_options[] = {
    41 { "file", required_argument, NULL, 'f' },
  • Gijs Peskens
    Gijs Peskens @gpeskens started a thread on the diff
    • tools/meson.build
    31 cmake = import('cmake')
    32 toolchainfile = ''
    33 if meson.is_cross_build()
    34 if meson.get_cross_property('mingw_toolchainfile')
    35 toolchainfile = '-DCMAKE_TOOLCHAIN_FILE='+meson.current_source_dir() + '/common/ci/x86_64-w64-mingw32.cmake'
    36 endif
    37 endif
    38 libyaml_proj = cmake.subproject('libyaml', cmake_options: ['-DENABLE_TESTING=OFF', '-DENABLE_PROGRAMS=OFF', '-DCMAKE_POSITION_INDEPENDENT_CODE=ON', toolchainfile], default_options: ['werror=false'])
    39 libyaml = libyaml_proj.dependency('yaml')
    40 endif
    41 tools_dependencies += [libyaml]
    42 endif
    19 43
    20 44 executable('ristsender',
    21 ['ristsender.c',srp_shared, tools_deps, rev_target],
    45 ['ristsender.c', 'yamlparse.c', srp_shared, tools_deps, rev_target],
  • Gijs Peskens added 14 commits

    added 14 commits

    Compare with previous version

    Toggle commit list
  • Sergio Ammirata
    Sergio Ammirata @sammirata ·
    Maintainer

    This feature is now in the file_config branch and will be merged soon

    Edited by Sergio Ammirata
  • Sergio Ammirata closed

    closed

    • Please register or sign in to reply

    VideoLAN code repository instance