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.

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

kodi: update to 21.0 #51373

Merged
merged 2 commits into from
Jul 26, 2024
Merged

kodi: update to 21.0 #51373

merged 2 commits into from
Jul 26, 2024

Conversation

zlice
Copy link
Contributor

@zlice zlice commented Jul 22, 2024

Testing the changes

  • I tested the changes in this PR: NO

Local build testing

  • I built this PR locally for my native architecture, x86_64
  • I built this PR locally for these architectures (if supported. mark crossbuilds):
    • x86_64-musl

Comments

Previous kodi does not build on ffmpeg 4 or 6. Compiles but I have not actually used it.

There is a ps3 remote related tool that ends up in /kodi that seems more appropriate for /usr/share/kodi or /opt even.

Copy link
Member

@classabbyamp classabbyamp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why skip ci?

srcpkgs/libwaylandpp/template Show resolved Hide resolved
srcpkgs/libwaylandpp/template Outdated Show resolved Hide resolved
srcpkgs/kodi/template Outdated Show resolved Hide resolved
srcpkgs/kodi/template Outdated Show resolved Hide resolved
srcpkgs/kodi/template Outdated Show resolved Hide resolved
@zlice
Copy link
Contributor Author

zlice commented Jul 22, 2024

why skip ci?

The /kodi file will bomb out and I'm not sure it will build in time. Advice on that file? previouis ffmpeg6 pr comment #43761 (comment)

@zlice zlice force-pushed the kodi_21.0 branch 2 times, most recently from 9f15f7e to a803c1a Compare July 22, 2024 04:16
@classabbyamp
Copy link
Member

seeing how it fails is important, it means i don't have to go through checking out your branch, building it myself, etc.

@classabbyamp
Copy link
Member

i can't reproduce the /kodi thing

@zlice
Copy link
Contributor Author

zlice commented Jul 22, 2024

didn't happen for me either this time. i did a git cherry-pick so i'm not sure what happened

@zlice zlice changed the title kodi: update to 21.0 [ci skip] kodi: update to 21.0 Jul 22, 2024
@zlice
Copy link
Contributor Author

zlice commented Jul 22, 2024

aarch64 seems to crossbuild for me locally

@classabbyamp classabbyamp force-pushed the kodi_21.0 branch 3 times, most recently from 89bcad8 to 48db73e Compare July 22, 2024 22:32
@classabbyamp
Copy link
Member

still trying to bash the vendored deps into submission on cross, maybe it would be better to break them out into proper packages

@zlice
Copy link
Contributor Author

zlice commented Jul 23, 2024

the errors look similar to what is happening with deadbeef. i swore i built these both fine before. though that may have been with ffmpeg as 6 and everything in 1 PR

2024-07-23T05:49:29.8485954Z /usr/bin/ld: aarch64 architecture of input file `lib/.libs/version_print.o' is incompatible with i386:x86-64 output
2024-07-23T05:49:29.8487145Z /usr/bin/ld: final link failed: file in wrong format
2024-07-23T05:49:29.8487818Z collect2: error: ld returned 1 exit status
2024-07-23T05:49:29.8488477Z make: *** [Makefile:509: lib/libfstrcmp.la] Error 1

@classabbyamp
Copy link
Member

well basically it's using the host linker instead of the target linker and I'm not sure how to massage it into using the right one

@zlice
Copy link
Contributor Author

zlice commented Jul 23, 2024

me either honestly. i've been wacking my head at it for a while now. https://forum.kodi.tv/showthread.php?tid=371204 says to make depends/tools/native still, though i just want the 2 json/texture that were there. ive put --host (and other --build/--target combinations that make no difference) in udfread and fstrcmp which doesn't actually help. build.ninja is full of --host=aarch64. but again trying to mix host/build/target doesn't make a difference. pretty sure the depends/tools/native needs built

note: udfread seems to build. fstrcmp however has libtool complaints about this is aarch64 and x86-64, 'incompatible' errors

@zlice
Copy link
Contributor Author

zlice commented Jul 23, 2024

where this is currently failing cross compilation. fstrcmp

libtool --mode=compile --tag=CC aarch64-linux-gnu-gcc  -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a   -I/usr/aarch64-linux-gnu/usr/include -ffile-prefix-map=/builddir/kodi-21.0/build=. -Wall -Wextra -Wshadow -I. -c \
	lib/version_print.c -o lib/version_print.lo
libtool: compile:  aarch64-linux-gnu-gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a -I/usr/aarch64-linux-gnu/usr/include -ffile-prefix-map=/builddir/kodi-21.0/build=. -Wall -Wextra -Wshadow -I. -c lib/version_print.c  -fPIC -DPIC -o lib/.libs/version_print.o
libtool: compile:  aarch64-linux-gnu-gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a -I/usr/aarch64-linux-gnu/usr/include -ffile-prefix-map=/builddir/kodi-21.0/build=. -Wall -Wextra -Wshadow -I. -c lib/version_print.c -o lib/version_print.o >/dev/null 2>&1
rm -f lib/libfstrcmp.la
libtool --mode=link --tag=CC aarch64-linux-gnu-gcc  -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a   -I/usr/aarch64-linux-gnu/usr/include -ffile-prefix-map=/builddir/kodi-21.0/build=. -Wall -Wextra -Wshadow -Wl,-z,relro -Wl,-z,now -Wl,--as-needed   -Wl,-z,stack-size=1048576 -L/usr/aarch64-linux-gnu/usr/lib \
	-o lib/libfstrcmp.la lib/ac/string.lo lib/downcase.lo lib/fmemcmp.lo lib/fmemcmpi.lo lib/fstrcasecmp.lo lib/fstrcasecmpi.lo lib/fstrcmp.lo lib/fstrcmpi.lo lib/fstrcoll.lo lib/fstrcolli.lo lib/fwcscmp.lo lib/fwcscmpi.lo lib/mbs_to_wcs.lo lib/nmalloc.lo lib/program_name.lo lib/version.lo lib/version_print.lo  -rpath /builddir/kodi-21.0/build/build/lib -version-info 6:0:6
libtool: link: cc -shared  -fPIC -DPIC  lib/ac/.libs/string.o lib/.libs/downcase.o lib/.libs/fmemcmp.o lib/.libs/fmemcmpi.o lib/.libs/fstrcasecmp.o lib/.libs/fstrcasecmpi.o lib/.libs/fstrcmp.o lib/.libs/fstrcmpi.o lib/.libs/fstrcoll.o lib/.libs/fstrcolli.o lib/.libs/fwcscmp.o lib/.libs/fwcscmpi.o lib/.libs/mbs_to_wcs.o lib/.libs/nmalloc.o lib/.libs/program_name.o lib/.libs/version.o lib/.libs/version_print.o   -L/usr/aarch64-linux-gnu/usr/lib  -O2 -march=armv8-a -Wl,-z -Wl,relro -Wl,-z -Wl,now -Wl,--as-needed -Wl,-z -Wl,stack-size=1048576   -Wl,-soname -Wl,libfstrcmp.so.0 -o lib/.libs/libfstrcmp.so.0.6.0
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libc.so when searching for -lc
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libc.a when searching for -lc
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
/usr/bin/ld: aarch64 architecture of input file `lib/ac/.libs/string.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/downcase.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/fmemcmp.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/fmemcmpi.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/fstrcasecmp.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/fstrcasecmpi.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/fstrcmp.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/fstrcmpi.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/fstrcoll.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/fstrcolli.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/fwcscmp.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/fwcscmpi.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/mbs_to_wcs.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/nmalloc.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/program_name.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/version.o' is incompatible with i386:x86-64 output
/usr/bin/ld: aarch64 architecture of input file `lib/.libs/version_print.o' is incompatible with i386:x86-64 output
/usr/bin/ld: final link failed: file in wrong format
collect2: error: ld returned 1 exit status
make: *** [Makefile:509: lib/libfstrcmp.la] Error 1

@zlice zlice changed the title kodi: update to 21.0 WIP kodi: update to 21.0 Jul 23, 2024
@zlice zlice force-pushed the kodi_21.0 branch 3 times, most recently from 5824815 to 2480a8c Compare July 24, 2024 16:07
@zlice zlice changed the title WIP kodi: update to 21.0 kodi: update to 21.0 Jul 24, 2024
@zlice
Copy link
Contributor Author

zlice commented Jul 24, 2024

similar to deadbeef with some of the host/build/target stuff. udfread works fine. made an issue for fstrcmp as it doesn't cross build. luckily the old builds from probably 6 years ago are still there and work, which is the only reason this can crossbuild.

srcpkgs/kodi/template Outdated Show resolved Hide resolved
@classabbyamp classabbyamp merged commit 371cf1a into void-linux:master Jul 26, 2024
8 checks passed
@zlice zlice deleted the kodi_21.0 branch July 29, 2024 01:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants