Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[tools/depends] Bump swig 4.2.0 #24552

Merged
merged 5 commits into from
Jan 29, 2024
Merged

[tools/depends] Bump swig 4.2.0 #24552

merged 5 commits into from
Jan 29, 2024

Commits on Jan 28, 2024

  1. [tools/depends][native] Add bison 

    Bison 3.5 is a dependency of swig 4.2.0 cmake builds. macos ships bison 2.3.
so add as a general native dep
    fuzzard committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    79659ef View commit details
    Browse the repository at this point in the history

  2. [tools/depends][native] Add pcre2 

    pcre2 is a dependency of swig 4.2.0+
    fuzzard committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    f1cda56 View commit details
    Browse the repository at this point in the history

  3. [swig] Fix building with Swig 4.2.0 

    swig 4.2.0 introduced a change that adds a constructor to the generated AddonModuleXbmcaddon.i.cpp
file. This causes failures such as

build/swig/AddonModuleXbmcaddon.i.cpp: In function 'PyObject* PythonBindings::xbmcaddon_XBMCAddon_xbmcaddon_Settings_New(PyTypeObject*, PyObject*, PyObject*)':
build/swig/AddonModuleXbmcaddon.i.cpp:1751:52: error: no matching function for call to 'XBMCAddon::xbmcaddon::Settings::Settings()'
 1751 |     apiResult = new XBMCAddon::xbmcaddon::Settings();
      |                                                    ^
In file included from ../xbmc/interfaces/legacy/Addon.h:14,
                 from build/swig/AddonModuleXbmcaddon.i.cpp:30:
../xbmc/interfaces/legacy/Settings.h:58:3: note: candidate: 'XBMCAddon::xbmcaddon::Settings::Settings(std::shared_ptr<CSettingsBase>)'
   58 |   Settings(std::shared_ptr<CSettingsBase> settings);
      |   ^~~~~~~~
../xbmc/interfaces/legacy/Settings.h:58:3: note:   candidate expects 1 argument, 0 provided

If we disable the contructor for Settings, we get the same generated output as swig <=4.1.1
    fuzzard committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    f6b1efb View commit details
    Browse the repository at this point in the history

  4. [tools/depends][native] Bump Swig 4.2.0

    fuzzard committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    1f7b45f View commit details
    Browse the repository at this point in the history

  5. [tools/depends][native] Remove PCRE

    fuzzard committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    4891243 View commit details
    Browse the repository at this point in the history