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

[cmake] fix libdvd depends build #11440

Closed
wants to merge 1 commit into from
Closed

Conversation

lrusak
Copy link
Contributor

@lrusak lrusak commented Jan 13, 2017

Description

libdvd{read,css,nav} should be built when KODI_DEPENDSBUILD is set, not the other way around.

Instead of the NOT I can flop the logic around instead if desired.

Motivation and Context

libdvd{read,css,nav} should not be downloaded/built when not doing a depends build

How Has This Been Tested?

build tested in LibreELEC

With this it now finds and links the correct libraries

DVDREAD_LIBRARY:FILEPATH=/home/lukas/libreelec/build.LibreELEC-RPi2.arm-8.0-devel/toolchain/armv7ve-libreelec-linux-gnueabi/sysroot/usr/lib/libdvdread.a
DVDCSS_LIBRARY:FILEPATH=/home/lukas/libreelec/build.LibreELEC-RPi2.arm-8.0-devel/toolchain/armv7ve-libreelec-linux-gnueabi/sysroot/usr/lib/libdvdcss.a
DVDNAV_LIBRARY:FILEPATH=/home/lukas/libreelec/build.LibreELEC-RPi2.arm-8.0-devel/toolchain/armv7ve-libreelec-linux-gnueabi/sysroot/usr/lib/libdvdnav.a

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the Code guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the CONTRIBUTING document
  • I have added tests to cover my change
  • All new and existing tests passed

@hudokkow
Copy link
Member

travis doesn't like it.

@lrusak
Copy link
Contributor Author

lrusak commented Jan 13, 2017

Do we not include libdvd* on the system for Linux builds?

@wsnipex
Copy link
Member

wsnipex commented Jan 14, 2017

This is wrong!

@lrusak
Copy link
Contributor Author

lrusak commented Jan 14, 2017

So if it's a depends build it doesn't build libdvd*???

And if it's not a depends build it builds libdvd*??

How does that make sense?

@wsnipex
Copy link
Member

wsnipex commented Jan 14, 2017

KODI_DEPENDSBUILD is true when unified depends are used. that means all depends have been built before kodi

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CMake Component: Depends Type: Fix non-breaking change which fixes an issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants