From 1d6e1be7ac3b4535f178d24d53e6eeee6ba674e1 Mon Sep 17 00:00:00 2001
From: "Matthias C. M. Troffaes" <matthias.troffaes@gmail.com>
Date: Wed, 9 Jun 2021 23:25:20 +0100
Subject: [ffmpeg] use pkgconfig to get system dependencies for cmake (#17985)

* [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
---
 ports/avcpp/0002-av_init_packet_deprecation.patch | 16 ++++++++++++++++
 ports/avcpp/portfile.cmake                        |  1 +
 ports/avcpp/vcpkg.json                            |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 ports/avcpp/0002-av_init_packet_deprecation.patch

(limited to 'ports/avcpp')

diff --git a/ports/avcpp/0002-av_init_packet_deprecation.patch b/ports/avcpp/0002-av_init_packet_deprecation.patch
new file mode 100644
index 000000000..a243b0dfe
--- /dev/null
+++ b/ports/avcpp/0002-av_init_packet_deprecation.patch
@@ -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)
diff --git a/ports/avcpp/portfile.cmake b/ports/avcpp/portfile.cmake
index d6412fce8..c472590ee 100644
--- a/ports/avcpp/portfile.cmake
+++ b/ports/avcpp/portfile.cmake
@@ -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)
diff --git a/ports/avcpp/vcpkg.json b/ports/avcpp/vcpkg.json
index afb9a18a4..8a2495d98 100644
--- a/ports/avcpp/vcpkg.json
+++ b/ports/avcpp/vcpkg.json
@@ -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": [
-- 
cgit v1.2.3