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 17.0 #4500

Closed
wants to merge 12 commits into from

Conversation

@lrusak
Copy link
Contributor

lrusak commented Dec 16, 2015

As far as I know nothing else needs to be added/dropped. I will update as things change.

This can stay as a placeholder until openelec-7.0 is branched

@lrusak lrusak added this to the 8.0.0 milestone Dec 16, 2015
@fritsch

This comment has been minimized.

Copy link
Contributor

fritsch commented Dec 16, 2015

That means OE will skip v16 alltogether?

Edit: Nevermind 8.0.0 you said

@lrusak

This comment has been minimized.

Copy link
Contributor Author

lrusak commented Dec 16, 2015

Just trying to get the ball rolling 👍

@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Jan 6, 2016

@lrusak

This comment has been minimized.

Copy link
Contributor Author

lrusak commented Jan 6, 2016

@MilhouseVH Thanks, I have picked them.

The libmpeg2 commit has been merged in xbmc/xbmc#8686 and xbmc/xbmc#8687

@stefansaraev I have picked the relevant aml/wetek commits. Hopefully these are safe ;)

I have updated to kodi-17.0-alpha1-7ca3fea

@lrusak lrusak changed the title kodi: update to 17.0-alpha1-e6144a3 kodi: update to 17.0 Jan 6, 2016
@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Jan 6, 2016

wetek patches replace those in projects/

@lrusak

This comment has been minimized.

Copy link
Contributor Author

lrusak commented Jan 6, 2016

I knew that ;)

@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Jan 6, 2016

0020-aml-Add-support-for-4k-resolutions.patch <= not needed for WP.

@codesnake to ack removal of:
0011-aml-Use-fpsrate-and-fpsscale-instead-of-rfpsrate-and.patch
0012-Fix-incorrect-frame-rate-detection-of-some-videos-wi.patch
^ I did not find a visual difference so I dropped those after 20th rebase.

you dont need 0019-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch if you keep 0017-enable-IEC958.patch (I think)

you may also update SIGTERM and others from my git if you want, that's why I keep the branch up to date.

@codesnake

This comment has been minimized.

Copy link
Contributor

codesnake commented Jan 6, 2016

I think 0011-aml-Use-fpsrate-and-fpsscale-instead-of-rfpsrate-and.patch may be safely removed, it does only cosmetic things.
If I recall correctly 0012-Fix-incorrect-frame-rate-detection-of-some-videos-wi.patch was added to fix playback problems of some videos with variable framerate. Need to recheck if it is still needed.
0019-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch and 0017-enable-IEC958.patch do the same thing, but in little different ways.

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

MilhouseVH commented Jan 7, 2016

Removing the tiff package might have been a little premature... a clean build of master with #4500 has failed while building Pillow:

  BUILD    Pillow (target)
...
/home/neil/projects/scratch/alternates/OpenELEC.tv.test/build.OpenELEC-RPi.arm-7.0-devel/toolchain/bin/armv6zk-openelec-linux-gnueabi-gcc -DNDEBUG -O2 -Wall -pipe -I/home/neil/projects/scratch/alternates/OpenELEC.tv.test/build.OpenELEC-RPi.arm-7.0-devel/toolchain/include -Wno-format-security -march=armv6zk -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated -mcpu=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -fomit-frame-pointer -Wall -pipe -Os -fexcess-precision=fast -flto -ffat-lto-objects -fPIC -DHAVE_LIBJPEG -DHAVE_LIBZ -DHAVE_LIBTIFF -I/home/neil/projects/scratch/alternates/OpenELEC.tv.test/build.OpenELEC-RPi.arm-7.0-devel/toolchain/armv6zk-openelec-linux-gnueabi/sysroot/usr/include/freetype2 -I/home/neil/projects/scratch/alternates/OpenELEC.tv.test/build.OpenELEC-RPi.arm-7.0-devel/Pillow-3.0.0/libImaging -I/home/neil/projects/scratch/alternates/OpenELEC.tv.test/build.OpenELEC-RPi.arm-7.0-devel/toolchain/armv6zk-openelec-linux-gnueabi/sysroot/usr/include -I/home/neil/projects/scratch/alternates/OpenELEC.tv.test/build.OpenELEC-RPi.arm-7.0-devel/toolchain/armv6zk-openelec-linux-gnueabi/sysroot/usr/include/python2.7 -c libImaging/Unpack.c -o build/temp.linux-x86_64-2.7/libImaging/Unpack.o
In file included from libImaging/TiffDecode.c:21:0:
libImaging/TiffDecode.h:10:20: fatal error: tiffio.h: No such file or directory
compilation terminated.

Any suggestions? I already have libtiff5-dev installed on my Ubuntu build machine, but that hasn't helped...

@lrusak

This comment has been minimized.

Copy link
Contributor Author

lrusak commented Jan 7, 2016

not sure but it might be possible to disable tiff via --disable-tiff in Pillow

otherwise I'll have to drop the tiff commit.

@lrusak

This comment has been minimized.

Copy link
Contributor Author

lrusak commented Jan 7, 2016

@MilhouseVH please test with that last commit

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

MilhouseVH commented Jan 7, 2016

It sort of worked... Pillow has now failed with a different error: http://pastebin.com/raw/bbCv3eWU

Failed on both RPi and RPi2, x86 still building (not got as far as Pillow)

@sraue

This comment has been minimized.

Copy link
Contributor

sraue commented Jan 7, 2016

please readd tiff if pillow uses this...

@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Jan 7, 2016

something borked with your buildsystem. look at your build log..

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

MilhouseVH commented Jan 7, 2016

something borked with your buildsystem. look at your build log..

Possibly, but I've just repeated the build with tiff disabled and both RPi and RPi2 have failed again, same error, so for some reason RPi & RPi2 (maybe ARM in general) don't like building Pillow with tiff disabled.

With tiff reinstated it of course builds OK.

@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Jan 7, 2016

works fine here.

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

MilhouseVH commented Jan 7, 2016

On RPi/ARM? This post (first reply) suggests adding -m32, though why it would suddenly be required once tiff is disabled is above my pay grade.

@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Jan 7, 2016

I do build only for wetek play / wetek core.
however, keep tiff if you need it. but also note that tiff was removed from kodi unified depends and there is no build issue here as well. not even had to force disable it, like you do.

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

MilhouseVH commented Jan 7, 2016

On a totally clean build without the tiff package you won't (shouldn't?) have tiffio.h, unless it's being pulled in from elsewhere... tis odd, but I think this is how it's going to remain, keeping tiff. At least it works. :)

@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Jan 8, 2016

you need http://sprunge.us/HIEK for next bump or kodi will be linked against libbluetooth.

@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Jan 9, 2016

this python cross build stuff is semi broken, as always, here's your new packages/python/graphics/Pillow/patches/Pillow-2.7.0-crosscompiling-0.1.patch because Pillow picks tiff headers from host:

http://sprunge.us/FNjD

@lrusak

This comment has been minimized.

Copy link
Contributor Author

lrusak commented Jan 10, 2016

thanks @stefansaraev, you da man

@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Jan 10, 2016

you still have to drop the dep.

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

MilhouseVH commented Jan 10, 2016

If the tiff package and associated Pillow dependency are dropped the build fails while building Pillow due to a missing tiffio.h:

In file included from decode.c:440:0:
/home/neil/projects/OpenELEC.tv/build.OpenELEC-RPi2.arm-7.0-devel/Pillow-3.0.0/libImaging/TiffDecode.h:10:20: fatal error: tiffio.h: No such file or directory
compilation terminated.

Where else is this file supposed to come from without the tiff package that currently supplies it?

@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Jan 10, 2016

you did not read above, @MilhouseVH did you ?

also, you should not trust your own builds because of little breakages like this (yes, it's openeled buildsystem fault , but still, you should be building with MINIMAL set of dev packages installed on your host. kernel / libc / stdc++ dev). I said tiff is gone upstream (kodi depends) too, and no issues. I said what exactly was broken in OE. sorry, I wont repeat myself again :)

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

MilhouseVH commented Jan 10, 2016

I try to keep my build system as minimal as possible. I'm afraid you're being too cryptic for me (or I'm too stupid) - I've built with all the patches in this PR, plus now the removal of tiff, and all I can say is what I've been saying all along - it won't build. I'm happy to hear from others if they can or can't build, as clearly there's a difference between your system and mine (I can build for Generic, but not for RPi/RPi2).

@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Jan 10, 2016

then @lrusak drop the Pillow patch change and we are done with it ;)

@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Jan 16, 2016

glew can be removed from depends, as well.

@lrusak

This comment has been minimized.

Copy link
Contributor Author

lrusak commented Jan 18, 2016

done

@lrusak

This comment has been minimized.

Copy link
Contributor Author

lrusak commented Jan 27, 2016

updated to include:

  • platform changes
  • soil
  • screensaver.asterwave
  • screensaver.cpblobs

Will update to latest kodi and binary add-on version when this is closer to merging to avoid flooding the ftp with useless packages.

@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Jan 27, 2016

kodi-platform and p8-platform mkpkg should be part of mkpkg_binary-addons. you should never use their master branches, but what's referenced in kodi. see my git.

@lrusak

This comment has been minimized.

Copy link
Contributor Author

lrusak commented Jan 27, 2016

Done.

I also moved the following to packages/mediacenter/kodi-binary-addons/addon-deps

libopenmpt
tinyxml2
fluidsynth
libprojectM
jsoncpp
sidplay-libs
soil
asplib

as they are only needed by binary addons, if we don't want this I can drop it, but I'll have to remember to adjust mkpkg_binary-addons

@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Feb 1, 2016

boost can be removed next bump

@lrusak

This comment has been minimized.

Copy link
Contributor Author

lrusak commented Feb 2, 2016

bye bye boost

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

MilhouseVH commented Feb 2, 2016

mkpkg_binary-addons no longer applies on top of master, and why are we no longer removing jasper and libmpeg2 packages, or have these been dropped from the PR by mistake?

@lrusak

This comment has been minimized.

Copy link
Contributor Author

lrusak commented Feb 2, 2016

Some people don't want packages to be removed. So most likely they will be moved some where else in the tree packages/unused maybe.

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

MilhouseVH commented Feb 2, 2016

Dumb if they're not used, and it's why we have git, but OK. Can you rebase this on top of master as I see you've already merged the mkpkg_binary-addons commit.

@sraue sraue mentioned this pull request Feb 11, 2016
@stefansaraev

This comment has been minimized.

Copy link
Contributor

stefansaraev commented Feb 14, 2016

libsquish can be removed next bump

@mhueske

This comment has been minimized.

Copy link

mhueske commented Feb 14, 2016

When updating to the latest kodi master, OE won't compile for IMX any longer because of PR xbmc/xbmc#7633 in combination with the old official SolidRun kernel. So that kernel needs to be patched (or updated), too.

@vpeter4

This comment has been minimized.

Copy link
Contributor

vpeter4 commented Feb 14, 2016

Kernel needs to be updated to newer 3.14 from solidrun. Or 4.4 from Xbian.
Also vivante libraries must be updated to v5 for kernel from sr.

@@ -229,14 +229,13 @@ export CXXFLAGS_FOR_BUILD="$HOST_CXXFLAGS"
export CFLAGS_FOR_BUILD="$HOST_CFLAGS"
export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"

export PYTHON_VERSION="2.7"

This comment has been minimized.

Copy link
@ghost

ghost Mar 5, 2016

GitHub doesn't let me comment on random lines, but lines 374-375 still reference $PYTHON_VERSION.
kodi-send is currently broken in Milhouse builds ("No module named xbmcclient") as its imports get installed in
/usr/lib/python/site-packages/kodi (vs python2.7)

This comment has been minimized.

Copy link
@MilhouseVH

MilhouseVH Mar 5, 2016

Contributor

Yes, we need to reinstate export PYTHON_VERSION="2.7" - thanks @anaconda.

Seems odd to have removed it then hard-code 2.7 in multiple places. @lrusak can we change this back so that wherever there is a reference to 2.7 it uses $PYTHON_VERSION instead?

@lrusak lrusak closed this Mar 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
9 participants
You can’t perform that action at this time.