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

Fixed issues with Win64 build failing to build ffmpeg #12781

Merged
merged 1 commit into from Sep 27, 2017
Merged

Fixed issues with Win64 build failing to build ffmpeg #12781

merged 1 commit into from Sep 27, 2017

Conversation

nicklauslittle
Copy link
Contributor

Description

buildmpeg.sh was changed to match the value assigned to ARCH in other scripts/batch files (x86_64). It looks like it was just typoed initially.

The ffmpeg patch fixes an issue where the zlib includes (zconf.h:477) were trying to #include <unistd.h> when compiled with Visual Studio. I tracked this down to the ffmpeg configure script creating #define HAVE_UNISTD_H 0 in config.h. This works fine for ffmpeg, since all its checks use #if HAVE_UNISTD_H, but does not work on zlib which uses #ifdef HAVE_UNISTD_H (zconf.h:436). The patch simply #undef HAVE_UNISTD_H if HAVE_UNISTD_H is set to 0. This will cause HAVE_UNISTD_H checks to work with both zlib and ffmpeg.

Motivation and Context

I wanted to check out the latest Kodi Alpha, and my build environment is Win64 using Visual Studio 2015. I followed the build instructions, but ended up running into errors. I tracked down the source of the different errors and came up with my best attempt at fixing them that worked with the existing build system.

How Has This Been Tested?

I ran the build from a clean state (git clean -xdf) with only my additional commit and was able to build, run tests, and use Kodi.

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves existing functionality)
  • 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

@Rechi Rechi added Type: Fix non-breaking change which fixes an issue v18 Leia Platform: Windows labels Sep 8, 2017
@Rechi Rechi added this to the L 18.0-alpha1 milestone Sep 8, 2017
@Rechi Rechi requested a review from afedchin September 8, 2017 07:53
@Rechi
Copy link
Member

Rechi commented Sep 27, 2017

jenkins build and merge

@jenkins4kodi jenkins4kodi merged commit dff8c2c into xbmc:master Sep 27, 2017
@nicklauslittle nicklauslittle deleted the ffmpeg_Win64 branch October 3, 2017 23:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Platform: Windows Type: Fix non-breaking change which fixes an issue v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants