mirror of
https://git.freebsd.org/ports.git
synced 2025-07-16 16:59:17 -04:00
eca93dbd6d
* Fix build with system miniupnpc
* Properly use ${LOCALBASE} instead of hardcoding /usr/local
for multimedia/ffmpeg3 build dependency
* Misc cleanup (missing USES= flag for desktop-file-utils, correct typo
in rapidjson external module commit tag)
Changelog: https://www.ppsspp.org/news/release-1.19/
36 lines
967 B
CMake
36 lines
967 B
CMake
--- cmake/Modules/FindFFmpeg.cmake.orig 2024-02-04 13:08:02 UTC
|
|
+++ cmake/Modules/FindFFmpeg.cmake
|
|
@@ -56,9 +56,7 @@ function(find_ffmpeg LIBNAME)
|
|
set(_FFmpeg_HEADER_swscale swscale)
|
|
|
|
function(find_ffmpeg LIBNAME)
|
|
- if(DEFINED ENV{FFMPEG_DIR})
|
|
- set(FFMPEG_DIR $ENV{FFMPEG_DIR})
|
|
- endif()
|
|
+ set(FFMPEG_DIR %%LOCALBASE%%/ffmpeg3)
|
|
|
|
if(FFMPEG_DIR)
|
|
list(APPEND INCLUDE_PATHS
|
|
@@ -79,17 +77,13 @@ function(find_ffmpeg LIBNAME)
|
|
NO_CMAKE_FIND_ROOT_PATH
|
|
)
|
|
else()
|
|
- list(APPEND INCLUDE_PATHS
|
|
- /usr/local/include/ffmpeg
|
|
- /usr/local/include/lib${LIBNAME}
|
|
- /usr/include/ffmpeg
|
|
- /usr/include/lib${LIBNAME}
|
|
- /usr/include/ffmpeg/lib${LIBNAME}
|
|
+ list(SET INCLUDE_PATHS
|
|
+ %%LOCALBASE%%/ffmpeg3/include/ffmpeg
|
|
+ %%LOCALBASE%%/ffmpeg3/include/lib${LIBNAME}
|
|
)
|
|
|
|
- list(APPEND LIB_PATHS
|
|
- /usr/local/lib
|
|
- /usr/lib
|
|
+ list(SET LIB_PATHS
|
|
+ %%LOCALBASE%%/ffmpeg3/lib
|
|
)
|
|
endif()
|
|
|