diff options
Diffstat (limited to 'pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch')
| -rw-r--r-- | pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch b/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch new file mode 100644 index 000000000000..3348146e3ddc --- /dev/null +++ b/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch @@ -0,0 +1,59 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6a85063..73dbd39 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -50,13 +50,12 @@ include(GetGitRevisionDescription) + include(InstallRequiredSystemLibraries) + include(FindPkgConfig) + include(ExternalProject) +-include(BuildLibMPEG2) + + use_cxx11( ) + + PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2) + PKG_SEARCH_MODULE(SDL2_TTF REQUIRED SDL2_ttf) +-build_libmpeg2( ) ++PKG_SEARCH_MODULE(MPEG2 REQUIRED libmpeg2) + + message(STATUS "Target: ${CMAKE_SYSTEM_NAME} ${CMAKE_TARGET_ARCHITECTURES}") + +@@ -110,7 +109,6 @@ add_subdirectory(timer) + add_subdirectory(video) + add_subdirectory(vldp) + +-add_dependencies( vldp libmpeg2 ) + add_dependencies( ldp-out vldp ) + add_dependencies( game vldp ) + add_dependencies( sound vldp ) +diff --git a/src/vldp/vldp_internal.cpp b/src/vldp/vldp_internal.cpp +index 16a74cb..2605011 100644 +--- a/src/vldp/vldp_internal.cpp ++++ b/src/vldp/vldp_internal.cpp +@@ -40,9 +40,9 @@ + #include <plog/Log.h> + + #include <inttypes.h> +- ++extern "C" { + #include <mpeg2.h> +- ++} + #ifdef VLDP_DEBUG + #define FRAMELOG "frame_report.txt" + #endif +diff --git a/src/vldp/vldp_internal.h b/src/vldp/vldp_internal.h +index 88450e9..1ea83ef 100644 +--- a/src/vldp/vldp_internal.h ++++ b/src/vldp/vldp_internal.h +@@ -26,9 +26,9 @@ + #define VLDP_INTERNAL_H + + #include "vldp.h" // for the VLDP_BOOL definition and SDL.h +- ++extern "C" { + #include <mpeg2.h> +- ++} + // this is which version of the .dat file format we are using + #define DAT_VERSION 3 + |
