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

Jump to bottom

[faad2] Update to 2.10.1 #29319

Merged
merged 2 commits into from
Feb 2, 2023
Merged

[faad2] Update to 2.10.1 #29319

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4625ce
[faad2] Update to 2.10.1
Cheney-W Jan 31, 2023
614b124
Fix tools uninstalled
Cheney-W Feb 1, 2023
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
13 changes: 0 additions & 13 deletions ports/faad2/0001-Fix-non-x86-msvc.patch
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions ports/faad2/0002-Fix-unary-minus.patch
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions ports/faad2/0003-Initialize-pointers.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ports/faad2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.7.2)
project (faad VERSION 2.9.1)
project (faad VERSION 2.10.1)

option(FAAD_BUILD_BINARIES "Build faad2 binaries" OFF)

Expand Down
10 changes: 3 additions & 7 deletions ports/faad2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO knik0/faad2
REF 043d37b60cdded2abed7c4054f954e # 2_9_1
SHA512 8658256bbcb3ce641eef67c4f5d22d54b348805a06b2954718a44910861a9882371c887feb085060c524f955993ae26c211c6bb4fb8d95f9e9d1d0b5dca0ebe4
REF "${VERSION}"
SHA512 8df69278350c68dd770c4bc482e42bc95eb04cd784eeea3f3fc58d615833c8b07dc3c72029bb7e5bfed612b7c1b8daefc9cb57be9789befb587120ef115e55b3
HEAD_REF master
PATCHES
0001-Fix-non-x86-msvc.patch # https://github.com/knik0/faad2/pull/42
0002-Fix-unary-minus.patch # https://github.com/knik0/faad2/pull/43
0003-Initialize-pointers.patch # https://github.com/knik0/faad2/pull/44
)

file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
Expand All @@ -28,4 +24,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_copy_pdbs()

file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}")
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
4 changes: 2 additions & 2 deletions ports/faad2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "faad2",
"version": "2.9.1",
"port-version": 5,
"version": "2.10.1",
"description": "Freeware Advanced Audio (AAC) Decoder",
"homepage": "https://sourceforge.net/projects/faac/",
"license": "GPL-2.0-or-later",
"supports": "windows",
"dependencies": [
{
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2257,8 +2257,8 @@
"port-version": 0
},
"faad2": {
"baseline": "2.9.1",
"port-version": 5
"baseline": "2.10.1",
"port-version": 0
},
"fadbad": {
"baseline": "2.1.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/faad2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "554ceb378aedd7166831ff6fc1e6e22d30a74721",
"version": "2.10.1",
"port-version": 0
},
{
"git-tree": "67b420585d5f99b7dec259912abd2d7edcfb9492",
"version": "2.9.1",
Expand Down