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

Update to latest FAAD2 Commit #354

Merged
merged 5 commits into from
Mar 7, 2025
Merged

Update to latest FAAD2 Commit #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e846a83
Update to latest FAAD2 branch commit
TheDaChicken Jan 1, 2025
191ac10
Ensure to pass `CMAKE_C_FLAGS` and `-O2 -fPIC` to faad2
TheDaChicken Jan 1, 2025
7a33a92
Properly format the patch
TheDaChicken Jan 1, 2025
9c5cc28
Update to FAAD2 2.11.2
argilo Mar 6, 2025
879d0ee
Update patch to align with upstream change
argilo Mar 7, 2025
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: 9 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ option (USE_SYSTEM_LIBUSB "Use system provided libusb" ON)
option (USE_SYSTEM_LIBAO "Use system provided libao" ON)
option (BUILD_DOC "Build API documentation" OFF)

set (FAAD2_CONFIGURE_ARGS "" CACHE STRING "Extra arguments for FAAD2 configure command")
set (FAAD2_CMAKE_ARGS "" CACHE STRING "Extra arguments for FAAD2 cmake command")
set (LIBRARY_DEBUG_LEVEL "5" CACHE STRING "Debug logging level for libnrsc5: 1=debug, 2=info, 3=warn, 4=error, 5=none")
set (HOST_TRIPLE "${HOST_TRIPLE_DEFAULT}" CACHE STRING "Override default host triple")
if (HOST_TRIPLE)
Expand Down Expand Up @@ -219,14 +219,19 @@ if (USE_FAAD2)
faad2_external
TIMEOUT 120
GIT_REPOSITORY "https://github.com/knik0/faad2.git"
GIT_TAG df42c6fc018552519d140e3d8ffe7046ed48b0cf
GIT_TAG 2.11.2
PREFIX ${FAAD2_PREFIX}

UPDATE_COMMAND ""
PATCH_COMMAND patch -p1 -Ni "${CMAKE_SOURCE_DIR}/support/faad2-hdc-support.patch" || exit 0
COMMAND sh ./bootstrap

CONFIGURE_COMMAND ${FAAD2_PREFIX}/src/faad2_external/configure ${HOST_TRIPLE_ARG} ${FAAD2_CONFIGURE_ARGS} --prefix=${FAAD2_PREFIX} --libdir=${FAAD2_PREFIX}/lib "CFLAGS=-O2 -fPIC ${CMAKE_C_FLAGS}"
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=OFF
-DCMAKE_INSTALL_PREFIX:STRING=${FAAD2_PREFIX}
-DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
-DCMAKE_SYSTEM_NAME:STRING=${CMAKE_SYSTEM_NAME}
"-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -O2 -fPIC"
${FAAD2_CMAKE_ARGS}
)

add_library (faad2 STATIC IMPORTED)
Expand Down
Loading
Loading