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.

Sign up for GitHub

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

[avcpp] Update to 2.4.0 #38590

Merged
merged 10 commits into from
May 23, 2024
Merged

[avcpp] Update to 2.4.0 #38590

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5267eb7
find_package(Threads)
May 6, 2024
d0a3661
update version
May 6, 2024
6f9d287
remove newline
May 7, 2024
aa9d8bd
update git-tree
May 7, 2024
22efa69
add patch
May 7, 2024
ba1dc0b
update git-tree
May 7, 2024
668770a
update to 2.4.0
May 20, 2024
c537176
update version
May 20, 2024
f983c11
Merge branch 'master' into Dev/Monica/fix_avcpp
MonicaLiu0311 May 20, 2024
7513b8f
format
May 20, 2024
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
10 changes: 10 additions & 0 deletions ports/avcpp/fix-dependencies.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
diff --git a/src/Config.cmake.in b/src/Config.cmake.in
index 0704fad..e8abd66 100644
--- a/src/Config.cmake.in
+++ b/src/Config.cmake.in
@@ -1,2 +1,5 @@
+include(CMakeFindDependencyMacro)
+find_dependency(Threads)
+
@PACKAGE_INIT@
include("${CMAKE_CURRENT_LIST_DIR}/avcpp-targets.cmake")
1 change: 1 addition & 0 deletions ports/avcpp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ vcpkg_from_github(
PATCHES
0002-av_init_packet_deprecation.patch
fix-pkgconfig-location.patch
fix-dependencies.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AVCPP_ENABLE_STATIC)
Expand Down
1 change: 1 addition & 0 deletions ports/avcpp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "avcpp",
"version": "2.3.0",
"port-version": 1,
"description": "Wrapper for the FFmpeg that simplify usage it from C++ projects.",
"homepage": "https://github.com/h4tr3d/avcpp",
"license": "LGPL-2.1-only OR BSD-3-Clause",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/avcpp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b1b22cb051a97e7e7594ff3b3e3d637a8251d34b",
"version": "2.3.0",
"port-version": 1
},
{
"git-tree": "0536c50812252994282f92dc60c6be989da16ed3",
"version": "2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@
},
"avcpp": {
"baseline": "2.3.0",
"port-version": 0
"port-version": 1
},
"avisynthplus": {
"baseline": "3.7.3",
Expand Down