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

[ffmpeg] enable opengl feature on osx #18624

Merged
merged 10 commits into from
Jul 16, 2021

Conversation

mcmtroffaes
Copy link
Contributor

  • What does your PR fix?

    The opengl feature was disabled on osx when compiling ffmpeg[all], however ffmpeg supports it perfectly on osx and it compiles with no problems (see for instance https://github.com/mcmtroffaes/ffmpeg-msvc-build/runs/2903919175).

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    No changes besides adding an extra feature for osx.

  • Does your PR follow the maintainer guide?

    Yes.

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    Yes.

@NancyLi1013 NancyLi1013 added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Jun 25, 2021
@NancyLi1013
Copy link
Contributor

Hi @mcmtroffaes

Thanks again for your PR.

Building package ffmpeg[all,all-gpl,all-nonfree,ass,avcodec,avdevice,avfilter,avformat,avresample,bzip2,core,fdk-aac,fontconfig,freetype,fribidi,gpl,iconv,ilbc,lzma,modplug,mp3lame,nonfree,opencl,opengl,openh264,openjpeg,openssl,opus,postproc,snappy,soxr,speex,swresample,swscale,theora,vorbis,vpx,webp,x264,x265,zlib]:x64-osx...
CMake Error at ports/ffmpeg/portfile.cmake:76 (message):
  Feature 'opengl' does not support 'uwp | (windows & arm) | osx'
Call Stack (most recent call first):
  scripts/ports.cmake:139 (include)

Seems this is still needed to update.

if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX)
message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm) | osx'")

@mcmtroffaes
Copy link
Contributor Author

Oh yes, I missed it as I removed these checks in my CI to allow testing the more experimental features. Fixed now.

ports/ffmpeg/portfile.cmake Outdated Show resolved Hide resolved
mcmtroffaes and others added 2 commits June 25, 2021 10:17
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
@NancyLi1013
Copy link
Contributor

You should have tested this feature opengl on osx, right?

@mcmtroffaes
Copy link
Contributor Author

You should have tested this feature opengl on osx, right?

Well, I don't have a mac myself for in-depth testing, however I've run a simple test application on CI https://github.com/mcmtroffaes/ffmpeg-msvc-build/runs/2903919175#step:14:1122 which shows that the opengl device can be opened on osx.

@NancyLi1013
Copy link
Contributor

The feature opengl has passed on x64-osx on my local machine.

Building package ffmpeg[avcodec,avdevice,avfilter,avformat,core,gpl,opengl,postproc,swresample,swscale]:x64-osx... done
Installing package ffmpeg[avcodec,avdevice,avfilter,avformat,core,gpl,opengl,postproc,swresample,swscale]:x64-osx...
Installing package ffmpeg[avcodec,avdevice,avfilter,avformat,core,gpl,opengl,postproc,swresample,swscale]:x64-osx... done
Elapsed time for package ffmpeg:x64-osx: 5.426 min

Thanks again for your efforts @mcmtroffaes.

@NancyLi1013 NancyLi1013 added the info:reviewed Pull Request changes follow basic guidelines label Jun 28, 2021
@mcmtroffaes
Copy link
Contributor Author

You're welcome, and thanks for running an extra local test. I'm pretty confident that if it works on CI it should also work for users but better be safe than sorry!

@mcmtroffaes
Copy link
Contributor Author

Merged master & bumped port version again.

# Conflicts:
#	ports/ffmpeg/vcpkg.json
#	versions/baseline.json
#	versions/f-/ffmpeg.json
@BillyONeal BillyONeal merged commit 30d8b36 into microsoft:master Jul 16, 2021
@BillyONeal
Copy link
Member

Thanks for your contribution!

@mcmtroffaes mcmtroffaes deleted the feature/ffmpeg-opengl-osx branch July 16, 2021 07:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants