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] use pkgconfig to get system dependencies for cmake #17985

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
6828d80
[ffmpeg] use ffbuild/config.mak to get dependencies
mcmtroffaes May 8, 2021
af8ae0a
[ffmpeg] bump port version
mcmtroffaes May 18, 2021
b05930b
[ffmpeg] x-add-version
mcmtroffaes May 18, 2021
4d68c69
[ffmpeg] fix dependency issue on x64-linux
mcmtroffaes May 20, 2021
552789c
[ffmpeg] x-add-version
mcmtroffaes May 20, 2021
2049bd6
[ffmpeg] link order fix on linux
mcmtroffaes May 20, 2021
d0f77d8
[ffmpeg] x-add-version
mcmtroffaes May 20, 2021
1a109f4
Merge remote-tracking branch 'upstream/master' into feature/use-ffbui…
mcmtroffaes May 20, 2021
8431dbd
Merge remote-tracking branch 'upstream/master' into feature/use-ffbui…
mcmtroffaes May 21, 2021
1009d3d
[ffmpeg] bump port version
mcmtroffaes May 21, 2021
21bcf55
[ffmpeg] x-add-version
mcmtroffaes May 21, 2021
fbb6fef
[ffmpeg] exclude -lgcc and -lgcc_s (causes issues on azure for unknow…
mcmtroffaes May 21, 2021
79f509e
[ffmpeg] x-add-version
mcmtroffaes May 21, 2021
6432fdf
[ffmpeg] handle -lgcc and -lgcc_s appropriately
mcmtroffaes May 21, 2021
f2ab46d
[ffmpeg] x-add-version
mcmtroffaes May 21, 2021
c1f03cd
[ffmpeg] use x_vcpkg_pkgconfig_get_modules to get info, added some mo…
mcmtroffaes May 23, 2021
c735eca
[ffmpeg] report dependencies (for now, helps debugging)
mcmtroffaes May 23, 2021
bdac304
[vcpkg-pkgconfig-get-modules] bump port version
mcmtroffaes May 23, 2021
89483ce
[ffmpeg] [vcpkg-pkgconfig-get-modules] x-add-version
mcmtroffaes May 23, 2021
23535b2
[ffmpeg] fix variant issue
mcmtroffaes May 23, 2021
b1c9d0a
[ffmpeg] x-add-version
mcmtroffaes May 23, 2021
9f5dd9d
[ffmpeg] reformat manifest
mcmtroffaes May 23, 2021
5b427c5
[ffmpeg] x-add-version
mcmtroffaes May 23, 2021
facd2b3
[ffmpeg] remove duplicate avfilter library from dependencies
mcmtroffaes May 23, 2021
5b424c7
[ffmpeg] fix -pthread / -pthreads on linux
mcmtroffaes May 23, 2021
7ab836b
[ffmpeg] x-add-version
mcmtroffaes May 23, 2021
99d04ae
[ffmpeg] fix dynamic builds when no libraries need to be linked
mcmtroffaes May 23, 2021
2307861
[ffmpeg] x-add-version
mcmtroffaes May 23, 2021
b473dd9
[ffmpeg] disable openh264 on uwp when building all
mcmtroffaes May 25, 2021
a5fee83
[ffmpeg] x-add-version
mcmtroffaes May 25, 2021
377c4c9
[avcpp] fix uwp build failure due to deprecations treated as errors
mcmtroffaes May 25, 2021
7a3154d
[avcpp] bump port version
mcmtroffaes May 25, 2021
a4cf8f2
[avcpp] x-add-version
mcmtroffaes May 25, 2021
9a8d0ad
[avcpp] smaller patch
mcmtroffaes May 25, 2021
d6b8901
[avcpp] x-add-version
mcmtroffaes May 25, 2021
115ff68
Merge remote-tracking branch 'upstream/master' into feature/use-ffbui…
mcmtroffaes Jun 4, 2021
0713274
[ffmpeg] x-add-version
mcmtroffaes Jun 4, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ports/avcpp/0002-av_init_packet_deprecation.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5fed05..7875b91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,11 @@ set (AVCPP_WARNING_OPTIONS
$<$<CXX_COMPILER_ID:MSVC>:
/W4>)

+# fixes vcpkg uwp failures due to /sdl
+if(MSVC)
+ add_compile_options(/wd4996)
+endif()
+
# -pthread sets also some useful compile-time flags
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads)
1 change: 1 addition & 0 deletions ports/avcpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
0001-remove-problematic-compound-literal.patch
0002-av_init_packet_deprecation.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AVCPP_ENABLE_STATIC)
Expand Down
1 change: 1 addition & 0 deletions ports/avcpp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "avcpp",
"version-date": "2021-05-06",
"port-version": 1,
"description": "Wrapper for the FFmpeg that simplify usage it from C++ projects.",
"homepage": "https://github.com/h4tr3d/avcpp",
"dependencies": [
Expand Down
Loading