From a8fabef2a9b87414bdfde82d7f44304620ae8ea1 Mon Sep 17 00:00:00 2001 From: koron393 Date: Sat, 13 Apr 2024 11:20:10 +0900 Subject: [PATCH 1/2] Fix VLC aribb25 compile error * See https://code.videolan.org/videolan/aribb25/-/blob/master/src/arib_std_b25.h?ref_type=heads#L70 Change-Id: Ia8a7a6e13a39755b23224dda4f7389638eb44f3e --- aribb25/arib_std_b25.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aribb25/arib_std_b25.h b/aribb25/arib_std_b25.h index 922aec9..317edcb 100644 --- a/aribb25/arib_std_b25.h +++ b/aribb25/arib_std_b25.h @@ -52,6 +52,8 @@ typedef struct { } ARIB_STD_B25; +#define ARIB_STD_B25_TS_PROBING_MIN_DATA (320 * 9 - 1) + #ifdef __cplusplus extern "C" { #endif From 0b8de6117d1dd733c4e8321fb2d782d764d6327c Mon Sep 17 00:00:00 2001 From: koron393 Date: Sat, 13 Apr 2024 11:22:06 +0900 Subject: [PATCH 2/2] Add 'Fake' aribb25.pc for VLC aribb25 module build Change-Id: I0f1ba7b2a0be1aaf84fa52ae6988cf80736ed167 --- CMakeLists.txt | 3 +++ aribb25/aribb25.pc.in | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 aribb25/aribb25.pc.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ea28af..0f29c37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -269,6 +269,9 @@ if(UNIX AND NOT CYGWIN) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/symlink-${ARIBB25_LIB_NAME} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} RENAME arib25) install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -DLDCONFIG_EXECUTABLE=${LDCONFIG_EXECUTABLE} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/PostInstall.cmake)") + configure_file(aribb25/${ARIBB25_LIB_NAME}.pc.in ${ARIBB25_LIB_NAME}.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ARIBB25_LIB_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + add_custom_target(uninstall ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Uninstall.cmake) # ---------- install (Windows) ---------- diff --git a/aribb25/aribb25.pc.in b/aribb25/aribb25.pc.in new file mode 100644 index 0000000..e536876 --- /dev/null +++ b/aribb25/aribb25.pc.in @@ -0,0 +1,11 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=${prefix}/include + +Name: @ARIBB25_LIB_NAME@ +Description: @ARIBB25_DESCRIPTION@ +URL: @ARIBB25_URL@ +Version: @ARIBB25_VERSION_STRING@ +Libs: -L${libdir} -l@ARIBB25_LIB_NAME@ +Cflags: -I${includedir}