c7b1925252
3.11.2 has issues along these lines: cmQtAutoGeneratorMocUic.cxx:(.text+0x8e8b): undefined reference to `operator new(unsigned long, std::align_val_t)' cmQtAutoGeneratorMocUic.cxx:(.text+0x8ebf): undefined reference to `operator delete(void*, std::align_val_t)'
35 lines
1.1 KiB
Plaintext
35 lines
1.1 KiB
Plaintext
$OpenBSD: patch-Modules_FindMPEG_cmake,v 1.11 2018/06/14 17:04:45 sthen Exp $
|
|
Index: Modules/FindMPEG.cmake
|
|
--- Modules/FindMPEG.cmake.orig
|
|
+++ Modules/FindMPEG.cmake
|
|
@@ -22,23 +22,19 @@
|
|
# MPEG_mpeg2_LIBRARY, where to find the MPEG library.
|
|
# MPEG_vo_LIBRARY, where to find the vo library.
|
|
|
|
-find_path(MPEG_INCLUDE_DIR mpeg2dec/include/video_out.h
|
|
- /usr/local/livid
|
|
+find_path(MPEG_INCLUDE_DIR mpeg2dec/mpeg2.h
|
|
+ ${LOCALBASE}/include
|
|
)
|
|
|
|
find_library(MPEG_mpeg2_LIBRARY mpeg2
|
|
- /usr/local/livid/mpeg2dec/libmpeg2/.libs
|
|
+ ${LOCALBASE}/lib
|
|
)
|
|
|
|
-find_library( MPEG_vo_LIBRARY vo
|
|
- /usr/local/livid/mpeg2dec/libvo/.libs
|
|
-)
|
|
-
|
|
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
|
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
|
|
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY)
|
|
|
|
if(MPEG_FOUND)
|
|
- set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ${MPEG_vo_LIBRARY} )
|
|
+ set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} )
|
|
endif()
|
|
|
|
-mark_as_advanced(MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
|
|
+mark_as_advanced(MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY)
|