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

kodi: 18.6 -> 18.8 #94915

Merged
merged 1 commit into from Aug 8, 2020
Merged

kodi: 18.6 -> 18.8 #94915

merged 1 commit into from Aug 8, 2020

Conversation

austinbutler
Copy link
Member

@austinbutler austinbutler commented Aug 8, 2020 •
edited

Motivation for this change

Version upgrade, but also I was getting a build error with the current version and from some searching it looked like a fix had been implemented in 18.8. 18.8 builds for me without issue.

[ 37%] Linking CXX static library music_tags.a
[ 37%] Built target music_tags
/build/source/xbmc/network/WebServer.cpp: In member function 'void CWebServer::SetupPostDataProcessing(const HTTPRequest&, CWebServer::ConnectionHandler*, std::shared_ptr<IHTTPRequestHandler>, void**) const':
/build/source/xbmc/network/WebServer.cpp:503:106: error: invalid conversion from 'int (*)(void*, MHD_ValueKind, const char*, const char*, const char*, const char*, const char*, uint64_t, size_t)' {aka 'int (*)(void*, MHD_ValueKind, const char*, const char*, const char*, const char*, const char*, long unsigned int, long unsigned int)'} to 'MHD_PostDataIterator' {aka 'MHD_Result (*)(void*, MHD_ValueKind, const char*, const char*, const char*, const char*, const char*, long unsigned int, long unsigned int)'} [-fpermissive]
  503 |   connectionHandler->postprocessor = MHD_create_post_processor(request.connection, MAX_POST_BUFFER_SIZE, &CWebServer::HandlePostField, static_cast<void*>(connectionHandler));
      |                                                                                                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                                                                                                          |
      |                                                                                                          int (*)(void*, MHD_ValueKind, const char*, const char*, const char*, const char*, const char*, uint64_t, size_t) {aka int (*)(void*, MHD_ValueKind, const char*, const char*, const char*, const char*, const char*, long unsigned int, long unsigned int)}
In file included from /build/source/xbmc/network/httprequesthandler/IHTTPRequestHandler.h:21,
                 from /build/source/xbmc/network/WebServer.h:14,
                 from /build/source/xbmc/network/WebServer.cpp:9:
/nix/store/c5mbgq649szrf1wl409n13c7wdrba3q9-libmicrohttpd-0.9.71-dev/include/microhttpd.h:3465:49: note:   initializing argument 3 of 'MHD_PostProcessor* MHD_create_post_processor(MHD_Connection*, size_t, MHD_PostDataIterator, void*)'
 3465 |                            MHD_PostDataIterator iter, void *iter_cls);
      |                            ~~~~~~~~~~~~~~~~~~~~~^~~~
/build/source/xbmc/network/WebServer.cpp: In member function 'MHD_Daemon* CWebServer::StartMHD(unsigned int, int)':
/build/source/xbmc/network/WebServer.cpp:1127:27: error: invalid conversion from 'int (*)(void*, MHD_Connection*, const char*, const char*, const char*, const char*, size_t*, void**)' {aka 'int (*)(void*, MHD_Connection*, const char*, const char*, const char*, const char*, long unsigned int*, void**)'} to 'MHD_AccessHandlerCallback' {aka 'MHD_Result (*)(void*, MHD_Connection*, const char*, const char*, const char*, const char*, long unsigned int*, void**)'} [-fpermissive]
 1127 |                           &CWebServer::AnswerToConnection,
      |                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                           |
      |                           int (*)(void*, MHD_Connection*, const char*, const char*, const char*, const char*, size_t*, void**) {aka int (*)(void*, MHD_Connection*, const char*, const char*, const char*, const char*, long unsigned int*, void**)}
In file included from /build/source/xbmc/network/httprequesthandler/IHTTPRequestHandler.h:21,
                 from /build/source/xbmc/network/WebServer.h:14,
                 from /build/source/xbmc/network/WebServer.cpp:9:
/nix/store/c5mbgq649szrf1wl409n13c7wdrba3q9-libmicrohttpd-0.9.71-dev/include/microhttpd.h:2428:45: note:   initializing argument 5 of 'MHD_Daemon* MHD_start_daemon(unsigned int, uint16_t, MHD_AcceptPolicyCallback, void*, MHD_AccessHandlerCallback, void*, ...)'
 2428 |                   MHD_AccessHandlerCallback dh, void *dh_cls,
      |                   ~~~~~~~~~~~~~~~~~~~~~~~~~~^~
/build/source/xbmc/network/WebServer.cpp:1154:27: error: invalid conversion from 'int (*)(void*, MHD_Connection*, const char*, const char*, const char*, const char*, size_t*, void**)' {aka 'int (*)(void*, MHD_Connection*, const char*, const char*, const char*, const char*, long unsigned int*, void**)'} to 'MHD_AccessHandlerCallback' {aka 'MHD_Result (*)(void*, MHD_Connection*, const char*, const char*, const char*, const char*, long unsigned int*, void**)'} [-fpermissive]
 1154 |                           &CWebServer::AnswerToConnection,
      |                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                           |
      |                           int (*)(void*, MHD_Connection*, const char*, const char*, const char*, const char*, size_t*, void**) {aka int (*)(void*, MHD_Connection*, const char*, const char*, const char*, const char*, long unsigned int*, void**)}
In file included from /build/source/xbmc/network/httprequesthandler/IHTTPRequestHandler.h:21,
                 from /build/source/xbmc/network/WebServer.h:14,
                 from /build/source/xbmc/network/WebServer.cpp:9:
/nix/store/c5mbgq649szrf1wl409n13c7wdrba3q9-libmicrohttpd-0.9.71-dev/include/microhttpd.h:2428:45: note:   initializing argument 5 of 'MHD_Daemon* MHD_start_daemon(unsigned int, uint16_t, MHD_AcceptPolicyCallback, void*, MHD_AccessHandlerCallback, void*, ...)'
 2428 |                   MHD_AccessHandlerCallback dh, void *dh_cls,
      |                   ~~~~~~~~~~~~~~~~~~~~~~~~~~^~
make[2]: *** [build/network/CMakeFiles/network.dir/build.make:290: build/network/CMakeFiles/network.dir/WebServer.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:6602: build/network/CMakeFiles/network.dir/all] Error 2
make: *** [Makefile:160: all] Error 2
builder for '/nix/store/r537vv7im02k1r0722cxqm26i5lypknj-kodi-wayland-18.6.drv' failed with exit code 2
cannot build derivation '/nix/store/v5wv7wlbnwncib8qh6qxpkx5nmlzilzv-kodi-wayland-with-plugins-18.6.drv': 1 dependencies couldn't be built
building '/nix/store/xx41b9s8qj80q8zg4fxlvdwpv573q1xg-rambox-0.7.5.drv'...
building '/nix/store/fiiiqj9phkm75b90wqmmxw2kjhjfzxvm-reload-container.drv'...
cannot build derivation '/nix/store/v06wda9z2a7s3r9wc38brr16i6kf5z2r-system-path.drv': 1 dependencies couldn't be built
building '/nix/store/69ys8183njsvkwj1308vj80x59sbslmq-teamviewer_15.2.2756_amd64.deb.drv'...
cannot build derivation '/nix/store/khfspvkx0br9pc313lg2mx0hh7lcy92f-nixos-system-austin-laptop-20.09pre237279.8e2b14aceb1.drv': 1 dependencies couldn't be built
error: build of '/nix/store/khfspvkx0br9pc313lg2mx0hh7lcy92f-nixos-system-austin-laptop-20.09pre237279.8e2b14aceb1.drv' failed
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@peterhoeg
Copy link
Member

Small thing - can you clean up the whitespace error (refer to the failed check) please?

@austinbutler
Copy link
Member Author

@peterhoeg fixed the trailing whitespace.

@ofborg ofborg bot requested a review from titanous August 8, 2020 06:36
@peterhoeg peterhoeg merged commit e0f5a28 into NixOS:master Aug 8, 2020
@austinbutler austinbutler deleted the kodi-18.8 branch May 24, 2021 02:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@domenkozar domenkozar Awaiting requested review from domenkozar

@edwtjo edwtjo Awaiting requested review from edwtjo

@sephalon sephalon Awaiting requested review from sephalon

@peterhoeg peterhoeg Awaiting requested review from peterhoeg

@titanous titanous Awaiting requested review from titanous

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@austinbutler @peterhoeg @titanous