build: start working on statically linking libmpv

Author: silenium-dev

native/CMakeLists.txt

@@ -23,12 +23,16 @@ project(${PROJECT_NAME} LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-option(USE_SYSTEM_FFMPEG "Link dynamically against system ffmpeg instead of using static prebuilt libraries" ON)
+option(USE_SYSTEM_FFMPEG "Link dynamically against system ffmpeg instead of using static prebuilt libraries" OFF)
+option(USE_SYSTEM_MPV "Link dynamically against system mpv instead of using static prebuilt libraries" OFF)
 
 include(ExternalProject)
 if (NOT USE_SYSTEM_FFMPEG)
     include(thirdparty/ffmpeg.cmake)
 endif ()
+if (NOT USE_SYSTEM_MPV)
+    include(thirdparty/mpv.cmake)
+endif ()
 
 set(SOURCES
         src/cpp/util/Errors.cpp
@@ -51,22 +55,30 @@ target_include_directories(${PROJECT_NAME} PRIVATE "src/cpp/")
 
 message(STATUS "JAVA_HOME: ${JAVA_HOME}")
 target_include_directories(${PROJECT_NAME} PUBLIC "${JAVA_HOME}/include")
-#if (NOT USE_SYSTEM_FFMPEG)
-#    target_link_libraries(${PROJECT_NAME} PUBLIC -Wl,--push-state,--whole-archive,--allow-multiple-definition ffmpeg -Wl,--pop-state)
-#    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND objcopy --localize-hidden --strip-all --strip-unneeded $<TARGET_FILE:${PROJECT_NAME}>)
-#endif ()
+if (NOT USE_SYSTEM_FFMPEG)
+    target_link_libraries(${PROJECT_NAME} PUBLIC -Wl,--push-state,--whole-archive,--allow-multiple-definition ffmpeg -Wl,--pop-state)
+endif ()
+if (NOT USE_SYSTEM_MPV)
+    target_link_libraries(${PROJECT_NAME} PUBLIC -Wl,--push-state,--whole-archive,--allow-multiple-definition mpv -Wl,--pop-state)
+endif ()
+add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND objcopy --localize-hidden --strip-all --strip-unneeded $<TARGET_FILE:${PROJECT_NAME}>)
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     target_compile_definitions(${PROJECT_NAME} PRIVATE -D_LINUX)
     find_package(PkgConfig REQUIRED)
-    pkg_check_modules(GL REQUIRED IMPORTED_TARGET gl egl libva libva-drm libdrm glx libva-glx)
-    pkg_check_modules(MPV REQUIRED IMPORTED_TARGET mpv)
-    target_link_libraries(${PROJECT_NAME} PUBLIC PkgConfig::GL PkgConfig::MPV)
+    pkg_check_modules(GL REQUIRED IMPORTED_TARGET egl glx)
+    target_link_libraries(${PROJECT_NAME} PUBLIC PkgConfig::GL)
     target_include_directories(${PROJECT_NAME} PUBLIC "${JAVA_HOME}/include/linux")
-#    if (USE_SYSTEM_FFMPEG)
-#        pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET libavcodec libavformat libavutil libswscale libavfilter)
-#        target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::FFMPEG)
-#    endif ()
+    add_compile_options(-static -static-libstdc++ -static-libgcc)
+    add_link_options(-static -static-libstdc++ -static-libgcc)
+    if (USE_SYSTEM_FFMPEG)
+        pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET libavcodec libavformat libavutil libswscale libavfilter)
+        target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::FFMPEG)
+    endif ()
+    if (USE_SYSTEM_MPV)
+        pkg_check_modules(MPV REQUIRED IMPORTED_TARGET mpv)
+        target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::MPV)
+    endif ()
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     target_compile_definitions(${PROJECT_NAME} PRIVATE -D_WINDOWS)
     target_link_libraries(${PROJECT_NAME} PUBLIC opengl32 dxgi d3d11 d3dcompiler)

native/src/cpp/mpv/MPV.cpp

@@ -590,7 +590,6 @@ JNIEXPORT jobject JNICALL Java_dev_silenium_multimedia_core_mpv_MPVKt_createRend
                     return nullptr;
                 }
 
-                // TODO: Fix crash here during renderer disposal
                 const auto glProcMethod = jni_env->GetMethodID(jni_env->GetObjectClass(javaRender), "getGlProc", "(Ljava/lang/String;)J");
                 if (glProcMethod == nullptr) {
                     std::cerr << "Method not found: getGlProc" << std::endl;
@@ -601,7 +600,6 @@ JNIEXPORT jobject JNICALL Java_dev_silenium_multimedia_core_mpv_MPVKt_createRend
                 const auto ret = jni_env->CallLongMethod(javaRender, glProcMethod, nameStr);
                 jni_env->DeleteLocalRef(nameStr);
                 jvm->DetachCurrentThread();
-                // const auto ret = glXGetProcAddress(reinterpret_cast<const GLubyte *>(name));
                 return reinterpret_cast<void *>(ret);
             }),
             .get_proc_address_ctx = object,

native/thirdparty/mpv.cmake

@@ -0,0 +1,21 @@
+add_library(mpv STATIC IMPORTED)
+if (NOT DEFINED MPV_A_LOCATION)
+    set(MPV_URL "https://reposilite.silenium.dev/releases/dev/silenium/libs/mpv/mpv-natives-${MPV_PLATFORM}${MPV_PLATFORM_EXTENSION}/${MPV_VERSION}/mpv-natives-${MPV_PLATFORM}${MPV_PLATFORM_EXTENSION}-${MPV_VERSION}.zip")
+    set(MPV_URL_SHA256 "https://reposilite.silenium.dev/releases/dev/silenium/libs/mpv/mpv-natives-${MPV_PLATFORM}${MPV_PLATFORM_EXTENSION}/${MPV_VERSION}/mpv-natives-${MPV_PLATFORM}${MPV_PLATFORM_EXTENSION}-${MPV_VERSION}.zip.sha256")
+    set(MPV_PREFIX "${CMAKE_BINARY_DIR}/mpv")
+    message(STATUS "Downloading mpv from ${MPV_URL}")
+
+    file(DOWNLOAD "${MPV_URL_SHA256}" "${CMAKE_BINARY_DIR}/mpv.zip.sha256")
+    file(READ "${CMAKE_BINARY_DIR}/mpv.zip.sha256" MPV_SHA256)
+    file(DOWNLOAD "${MPV_URL}" "${CMAKE_BINARY_DIR}/mpv.zip" EXPECTED_HASH SHA256=${MPV_SHA256} SHOW_PROGRESS)
+    file(ARCHIVE_EXTRACT INPUT "${CMAKE_BINARY_DIR}/mpv.zip" DESTINATION "${MPV_PREFIX}")
+
+    set(MPV_INCLUDE_DIR "${MPV_PREFIX}/include")
+    set(MPV_LIB_DIR "${MPV_PREFIX}/lib")
+    set_target_properties(mpv PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/libmpv.a")
+    target_include_directories(mpv INTERFACE "${MPV_INCLUDE_DIR}")
+else ()
+    set_target_properties(mpv PROPERTIES IMPORTED_LOCATION "${MPV_A_LOCATION}")
+endif ()
+
+target_link_options(mpv INTERFACE "-Wl,-Bsymbolic")