Skip to content

Commit

Permalink
[ffmpeg] use pkgconfig to get system dependencies for cmake (#17985)
Browse files Browse the repository at this point in the history
* [ffmpeg] use ffbuild/config.mak to get dependencies

* [ffmpeg] bump port version

* [ffmpeg] x-add-version

* [ffmpeg] fix dependency issue on x64-linux

* [ffmpeg] x-add-version

* [ffmpeg] link order fix on linux

* [ffmpeg] x-add-version

* [ffmpeg] bump port version

* [ffmpeg] x-add-version

* [ffmpeg] exclude -lgcc and -lgcc_s (causes issues on azure for unknown reasons)

* [ffmpeg] x-add-version

* [ffmpeg] handle -lgcc and -lgcc_s appropriately

* [ffmpeg] x-add-version

* [ffmpeg] use x_vcpkg_pkgconfig_get_modules to get info, added some more fixes to generated for pkgconfig files

* [ffmpeg] report dependencies (for now, helps debugging)

* [vcpkg-pkgconfig-get-modules] bump port version

* [ffmpeg] [vcpkg-pkgconfig-get-modules] x-add-version

* [ffmpeg] fix variant issue

* [ffmpeg] x-add-version

* [ffmpeg] reformat manifest

* [ffmpeg] x-add-version

* [ffmpeg] remove duplicate avfilter library from dependencies

* [ffmpeg] fix -pthread / -pthreads on linux

* [ffmpeg] x-add-version

* [ffmpeg] fix dynamic builds when no libraries need to be linked

* [ffmpeg] x-add-version

* [ffmpeg] disable openh264 on uwp when building all

* [ffmpeg] x-add-version

* [avcpp] fix uwp build failure due to deprecations treated as errors

* [avcpp] bump port version

* [avcpp] x-add-version

* [avcpp] smaller patch

* [avcpp] x-add-version

* [ffmpeg] x-add-version
  • Loading branch information
mcmtroffaes authored Jun 9, 2021
1 parent 17378cf commit 1d6e1be
Show file tree
Hide file tree
Showing 12 changed files with 178 additions and 427 deletions.
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

0 comments on commit 1d6e1be

Please sign in to comment.