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

inputstream.ffmpegdirect: new addon #4109

Merged
merged 2 commits into from
Mar 3, 2020
Merged

inputstream.ffmpegdirect: new addon #4109

merged 2 commits into from
Mar 3, 2020

Conversation

MilhouseVH
Copy link
Contributor

packages/multimedia/zvbi/package.mk Outdated Show resolved Hide resolved
packages/multimedia/zvbi/package.mk Outdated Show resolved Hide resolved
packages/multimedia/zvbi/package.mk Outdated Show resolved Hide resolved
@MilhouseVH
Copy link
Contributor Author

Squashed changes. I'll bring the github mirror to the attention of phunkyfish to see if he wants to use those changes, or stick with the version he's using/testing.

@MilhouseVH
Copy link
Contributor Author

Not sure what's wrong with this now, it's gone through a lot of changes since xbmc/inputstream.ffmpegdirect@72a12ac although that original rev isn't building any longer, either. I've pushed 3 extra commits to bring this up to date, but it still fails to build for RPi2: http://ix.io/28OH

If anyone has any ideas, or can suggest a fix, or wants to take this over (please do!) :)

@vpeter4
Copy link
Contributor

vpeter4 commented Feb 3, 2020

One way.

Always convert list to string because otherwise
cmake thinks link options are libraries

--- a/CMakeLists.txt	2020-01-30 23:10:02.000000000 +0100
+++ b/CMakeLists.txt	2020-02-03 06:05:03.421006628 +0100
@@ -122,6 +122,9 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin"
   # and along with the ';''s and allow CMake to add them back
   string(REGEX REPLACE "-framework;([A-Za-z0-9_]+);?" "" FFMPEG_LDFLAGS "${FFMPEG_LDFLAGS}")
   string(REGEX REPLACE ";" " " FFMPEG_LDFLAGS "${FFMPEG_LDFLAGS}")
+else()
+  # Convert list to string because otherwise cmake thinks link options are libraries
+  string(REGEX REPLACE ";" " " FFMPEG_LDFLAGS "${FFMPEG_LDFLAGS}")
 endif()
 set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS "${FFMPEG_LDFLAGS}")
 

@vpeter4
Copy link
Contributor

vpeter4 commented Feb 11, 2020

Fixed here: xbmc/inputstream.ffmpegdirect@0e6f7da

@MilhouseVH
Copy link
Contributor Author

Aha! Thanks @vpeter4. Will get back on this in the next few days once my workload permits.

@vpeter4
Copy link
Contributor

vpeter4 commented Feb 11, 2020

Btw: I think pvr.iptvsimple should also be bumped.

@MilhouseVH
Copy link
Contributor Author

Thanks @vpeter, the cmake fix works and the add-on now builds. commits updated and squashed.

pvr.iptvsimple will be updated next time we sync kodi - there's been a lot of cmake-related changes in Kodi recently, and the necessary changes to add-ons are still be worked through (for instance the imagedecoder raw & mpo addons remain broken and yet to be fixed).

@vpeter4
Copy link
Contributor

vpeter4 commented Mar 1, 2020

Seems this now could be merged?

@MilhouseVH MilhouseVH marked this pull request as ready for review March 2, 2020 19:28
@chewitt chewitt merged commit 547b6d9 into LibreELEC:master Mar 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants