-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Create proper debug configuration #6193
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.
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
Open
icegood
wants to merge
40
commits into
SynoCommunity:master
Choose a base branch
from
icegood:fix/ffmpeg6_debug_builds
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+635
−680
Open
Changes from all commits
Commits
Show all changes
40 commits
Select commit
Hold shift + click to select a range
2e7248b
Create proper debug configuration
icegood 481a285
Update mk files to fix a few corner cases for GCC_DEBUG_INFO
th0ma7 fabffc3
berkeleydb: Fix for using GCC_DEBUG_INFO
th0ma7 81919ed
curl: Fix for using GCC_DEBUG_INFO
th0ma7 314a8bb
libpng: Fix for using GCC_DEBUG_INFO
th0ma7 8112a8a
ffmpeg7: Port ffmpeg6 changes from #6193
th0ma7 366e604
glibc-2.28: Revert change related to ADDITIONAL_CFLAGS = -O2
th0ma7 c7229a0
libtheora: Remove unrelated CMAKE option
th0ma7 6e0784b
libvorbis: Revert unrelated CMAKE option
th0ma7 289529c
nettle: Revert change related to ADDITIONAL_CFLAGS = -O2
th0ma7 f99672a
x264: Revert removal of --prefix=$(INSTALL_PREFIX)
th0ma7 f79e336
libtheora: Rever removal of ADDITIONAL_CFLAGS = -Os
th0ma7 8b95642
libvorbis: Revert removal of ADDITIONAL_CFLAGS = -Os
th0ma7 3768cc7
ffmpeg7: Fix typo in ifeq for alpine
th0ma7 cb4101c
Further enhance CMake and meson related Debug builds
th0ma7 d53b3cb
ffmpeg67: Further sync changes between the two versions
th0ma7 52d0ddb
cross-env.mk: Make GCC_DEBUG_INFO and GCC_NO_DEBUG_INFO exclusive
th0ma7 e224a27
cross-cmake.mk: *_FLAGS_DEBUG are for extra debug flags only
th0ma7 5911f59
intel-gpu-tools: Requires assert() to be on even in debug mode
th0ma7 4e77596
ICG: Fix path based on CMAKE_BUILD_TYPE rather than default Release
th0ma7 93e46a9
mk/cmake*: Sync with meson and enforce env variable cleanup
th0ma7 0cc5165
meson.mk: Use a $(RUN_MESON) similar to $(RUN_CMAKE) for a clean env
th0ma7 674f601
cmake.mk: Use CMAKE_SHARED_LINKER_FLAGS instead of invalid CMAKE_LDSH…
th0ma7 41cc2b0
x265: Use updated CMAKE_TOOLCHAIN_FILE_PKG and RUN_CMAKE as needed
th0ma7 c5f46f6
meson+cmake: Allow echoing of the configure & compile env call string
th0ma7 6985928
common.mk: Migrate common environment cleanup definitions
th0ma7 14f0dc8
ninja.mk: Adopt RUN_CMAKE|MESON as needed to use a clean environment
th0ma7 7743dd3
lame: Add patch to disable FPU on non-x86 archs as enabled in debug
th0ma7 cf11dca
ffmpeg7: Update version from 7.0.2 to 7.0.3
th0ma7 063f001
libzmq: Update from 4.3.4 to 4.3.5 and disable perf tools build
th0ma7 164cb99
libaom: Update from version 3.8.3 to 3.13.1 and fix debug build
th0ma7 d449ac5
svt-av1: Update to version 2.3.0 + fix pkgconfig prefix and math lib
th0ma7 df6f948
cross-debug: Multiple fixes for proper building in debug mode
th0ma7 def15b5
codec2: Version 1.2.0 update + fix crosscompiling using *_FOR_BUILD
th0ma7 889e10f
codec2: Remove unecessary test patch file
th0ma7 83dbb6c
ffmpeg7: Re-enable code2 now that crosscompiling is fixed
th0ma7 d564c91
copy.mk: Ensure it exists with error if files are missing
th0ma7 35bcf19
svt-av1: Update plist to match version
th0ma7 250e7ab
libaom: Re-introduce support for DSM-6
th0ma7 fe5e50d
libaom-latest: Clean-up pre-DSM-7 remaining artifacts
th0ma7 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
lnk:lib/libcodec2.so | ||
lib:lib/libcodec2.so.1.1 | ||
lib:lib/libcodec2.so.1.2 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
codec2-1.1.1.tar.gz SHA1 91442ccf51e2dbb4d5b9da1bb71c622d16bb0173 | ||
codec2-1.1.1.tar.gz SHA256 e3f287314a0cd125c42db9a7dc7f2e8cf4589bcc0e8def3e7188b45cb0f8e2fc | ||
codec2-1.1.1.tar.gz MD5 bcb5b40673f5f47ec357d83ada44d835 | ||
codec2-1.2.0.tar.gz SHA1 ff3d34e19ff40aee9b1c5fdcecc545a3bd69b7bf | ||
codec2-1.2.0.tar.gz SHA256 cbccae52b2c2ecc5d2757e407da567eb681241ff8dadce39d779a7219dbcf449 | ||
codec2-1.2.0.tar.gz MD5 8186452c6d3cfc89cc6c880a6a7130d0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,138 @@ | ||
--- src/CMakeLists.txt-orig 2023-07-19 23:29:48.000000000 +0000 | ||
+++ src/CMakeLists.txt 2025-09-29 20:58:59.099005682 +0000 | ||
@@ -63,25 +63,39 @@ set(CODEBOOKSNEWAMP2_ENERGY | ||
|
||
# when crosscompiling we need a native executable | ||
if(CMAKE_CROSSCOMPILING) | ||
- set(CMAKE_DISABLE_SOURCE_CHANGES OFF) | ||
- include(ExternalProject) | ||
- ExternalProject_Add(codec2_native | ||
- SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/.. | ||
- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/codec2_native | ||
- BUILD_COMMAND ${CMAKE_COMMAND} --build . --target generate_codebook | ||
- INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/codec2_native/src/generate_codebook ${CMAKE_CURRENT_BINARY_DIR} | ||
- BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/generate_codebook | ||
+ # Use native tools for build machine | ||
+ if(NOT DEFINED CMAKE_C_COMPILER_FOR_BUILD) | ||
+ find_program(CMAKE_C_COMPILER_FOR_BUILD NAMES gcc cc clang REQUIRED) | ||
+ endif() | ||
+ | ||
+ # Set the path for the native executable | ||
+ set(GENERATE_CODEBOOK_BIN ${CMAKE_CURRENT_BINARY_DIR}/generate_codebook_native) | ||
+ | ||
+ # Build native generate_codebook using host compiler as a custom target | ||
+ add_custom_command( | ||
+ OUTPUT ${GENERATE_CODEBOOK_BIN} | ||
+ COMMAND ${CMAKE_C_COMPILER_FOR_BUILD} | ||
+ ${CMAKE_CURRENT_SOURCE_DIR}/generate_codebook.c | ||
+ -o ${GENERATE_CODEBOOK_BIN} | ||
+ -lm | ||
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/generate_codebook.c | ||
+ COMMENT "Building native generate_codebook for build machine" | ||
+ VERBATIM | ||
) | ||
- add_executable(generate_codebook IMPORTED) | ||
- set_target_properties(generate_codebook PROPERTIES | ||
- IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/generate_codebook) | ||
- add_dependencies(generate_codebook codec2_native) | ||
- set(CMAKE_DISABLE_SOURCE_CHANGES ON) | ||
+ | ||
+ add_custom_target(generate_codebook_target ALL | ||
+ DEPENDS ${GENERATE_CODEBOOK_BIN} | ||
+ ) | ||
+ | ||
else(CMAKE_CROSSCOMPILING) | ||
-# Build code generator binaries. These do not get installed. | ||
+ # Build code generator binaries. These do not get installed. | ||
# generate_codebook | ||
add_executable(generate_codebook generate_codebook.c) | ||
target_link_libraries(generate_codebook m) | ||
+ | ||
+ # Set the path for the native executable | ||
+ set(GENERATE_CODEBOOK_BIN $<TARGET_FILE:generate_codebook>) | ||
+ | ||
# Make native builds available for cross-compiling. | ||
export(TARGETS generate_codebook | ||
FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake) | ||
@@ -91,57 +105,65 @@ endif(CMAKE_CROSSCOMPILING) | ||
# codebook.c | ||
add_custom_command( | ||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebook.c | ||
- COMMAND generate_codebook lsp_cb ${CODEBOOKS} > ${CMAKE_CURRENT_BINARY_DIR}/codebook.c | ||
- DEPENDS generate_codebook ${CODEBOOKS} | ||
+ COMMAND ${GENERATE_CODEBOOK_BIN} lsp_cb ${CODEBOOKS} > ${CMAKE_CURRENT_BINARY_DIR}/codebook.c | ||
+ DEPENDS ${GENERATE_CODEBOOK_BIN} ${CODEBOOKS} | ||
+ VERBATIM | ||
) | ||
|
||
# codebookd.c | ||
add_custom_command( | ||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebookd.c | ||
- COMMAND generate_codebook lsp_cbd ${CODEBOOKSD} > ${CMAKE_CURRENT_BINARY_DIR}/codebookd.c | ||
- DEPENDS generate_codebook ${CODEBOOKSD} | ||
+ COMMAND ${GENERATE_CODEBOOK_BIN} lsp_cbd ${CODEBOOKSD} > ${CMAKE_CURRENT_BINARY_DIR}/codebookd.c | ||
+ DEPENDS ${GENERATE_CODEBOOK_BIN} ${CODEBOOKSD} | ||
+ VERBATIM | ||
) | ||
|
||
# codebookjmv.c | ||
add_custom_command( | ||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebookjmv.c | ||
- COMMAND generate_codebook lsp_cbjmv ${CODEBOOKSJMV} > ${CMAKE_CURRENT_BINARY_DIR}/codebookjmv.c | ||
- DEPENDS generate_codebook ${CODEBOOKSJMV} | ||
+ COMMAND ${GENERATE_CODEBOOK_BIN} lsp_cbjmv ${CODEBOOKSJMV} > ${CMAKE_CURRENT_BINARY_DIR}/codebookjmv.c | ||
+ DEPENDS ${GENERATE_CODEBOOK_BIN} ${CODEBOOKSJMV} | ||
+ VERBATIM | ||
) | ||
|
||
# codebookge.c | ||
add_custom_command( | ||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebookge.c | ||
- COMMAND generate_codebook ge_cb ${CODEBOOKSGE} > ${CMAKE_CURRENT_BINARY_DIR}/codebookge.c | ||
- DEPENDS generate_codebook ${CODEBOOKSGE} | ||
+ COMMAND ${GENERATE_CODEBOOK_BIN} ge_cb ${CODEBOOKSGE} > ${CMAKE_CURRENT_BINARY_DIR}/codebookge.c | ||
+ DEPENDS ${GENERATE_CODEBOOK_BIN} ${CODEBOOKSGE} | ||
+ VERBATIM | ||
) | ||
|
||
# codebooknewamp1.c | ||
add_custom_command( | ||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp1.c | ||
- COMMAND generate_codebook newamp1vq_cb ${CODEBOOKSNEWAMP1} > ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp1.c | ||
- DEPENDS generate_codebook ${CODEBOOKSNEWAMP1} | ||
+ COMMAND ${GENERATE_CODEBOOK_BIN} newamp1vq_cb ${CODEBOOKSNEWAMP1} > ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp1.c | ||
+ DEPENDS ${GENERATE_CODEBOOK_BIN} ${CODEBOOKSNEWAMP1} | ||
+ VERBATIM | ||
) | ||
|
||
# codebooknewamp1_energy.c | ||
add_custom_command( | ||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp1_energy.c | ||
- COMMAND generate_codebook newamp1_energy_cb ${CODEBOOKSNEWAMP1_ENERGY} > ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp1_energy.c | ||
- DEPENDS generate_codebook ${CODEBOOKSNEWAMP1_ENERGY} | ||
+ COMMAND ${GENERATE_CODEBOOK_BIN} newamp1_energy_cb ${CODEBOOKSNEWAMP1_ENERGY} > ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp1_energy.c | ||
+ DEPENDS ${GENERATE_CODEBOOK_BIN} ${CODEBOOKSNEWAMP1_ENERGY} | ||
+ VERBATIM | ||
) | ||
|
||
# codebooknewamp2.c | ||
add_custom_command( | ||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp2.c | ||
- COMMAND generate_codebook newamp2vq_cb ${CODEBOOKSNEWAMP2} > ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp2.c | ||
- DEPENDS generate_codebook ${CODEBOOKSNEWAMP2} | ||
+ COMMAND ${GENERATE_CODEBOOK_BIN} newamp2vq_cb ${CODEBOOKSNEWAMP2} > ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp2.c | ||
+ DEPENDS ${GENERATE_CODEBOOK_BIN} ${CODEBOOKSNEWAMP2} | ||
+ VERBATIM | ||
) | ||
|
||
# codebooknewamp2_energy.c | ||
add_custom_command( | ||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp2_energy.c | ||
- COMMAND generate_codebook newamp2_energy_cb ${CODEBOOKSNEWAMP2_ENERGY} > ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp2_energy.c | ||
- DEPENDS generate_codebook ${CODEBOOKSNEWAMP2_ENERGY} | ||
+ COMMAND ${GENERATE_CODEBOOK_BIN} newamp2_energy_cb ${CODEBOOKSNEWAMP2_ENERGY} > ${CMAKE_CURRENT_BINARY_DIR}/codebooknewamp2_energy.c | ||
+ DEPENDS ${GENERATE_CODEBOOK_BIN} ${CODEBOOKSNEWAMP2_ENERGY} | ||
+ VERBATIM | ||
) | ||
|
||
# |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
ffmpeg-7.0.2.tar.bz2 SHA1 ea4652903adfd69541ba1eb5b793296c5103ff0d | ||
ffmpeg-7.0.2.tar.bz2 SHA256 1ed250407ea8f955cca2f1139da3229fbc13032a0802e4b744be195865ff1541 | ||
ffmpeg-7.0.2.tar.bz2 MD5 6a0d7d8c3f1f22c894381b48e358f2f3 | ||
ffmpeg-7.0.3.tar.bz2 SHA1 0b2628a6f3088454af733fafbe84e5d167817943 | ||
ffmpeg-7.0.3.tar.bz2 SHA256 7f883369a494623127aaf408ad05b71a7168536564b67ba8762e9b1c76057a3f | ||
ffmpeg-7.0.3.tar.bz2 MD5 7e5b0fa0903b62afd4a46b5816397dd8 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.