mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-22 17:51:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

android: Stop including ca-certificates as compulsory

Browse source 
See gstreamer/cerbero#402

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7838>
This commit is contained in:
L. E. Segovia 2024-11-06 01:06:05 +00:00 committed by GStreamer Marge Bot
parent 37ce358952
commit a4de777982
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/jni/CMakeLists.txt
View file

@ -25,7 +25,7 @@ list(APPEND CMAKE_MODULE_PATH "${GSTREAMER_ROOT}/share/cmake")
set(GSTREAMER_NDK_BUILD_PATH "${GSTREAMER_ROOT}/share/gst-android/ndk-build/") set(GSTREAMER_NDK_BUILD_PATH "${GSTREAMER_ROOT}/share/gst-android/ndk-build/")
set(GSTREAMER_PLUGINS coreelements) set(GSTREAMER_PLUGINS coreelements)
find_library(LOG_LIB log REQUIRED) find_library(LOG_LIB log REQUIRED)
find_package(GStreamerMobile COMPONENTS ${GSTREAMER_PLUGINS} fonts ca_certificates REQUIRED) find_package(GStreamerMobile COMPONENTS ${GSTREAMER_PLUGINS} fonts REQUIRED)
add_library(tutorial-1 SHARED tutorial-1.c dummy.cpp) add_library(tutorial-1 SHARED tutorial-1.c dummy.cpp)
target_link_libraries(tutorial-1 target_link_libraries(tutorial-1

2
subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/jni/CMakeLists.txt
View file

@ -26,7 +26,7 @@ set(GSTREAMER_NDK_BUILD_PATH "${GSTREAMER_ROOT}/share/gst-android/ndk-build/")
include("${GSTREAMER_NDK_BUILD_PATH}/plugins.cmake") include("${GSTREAMER_NDK_BUILD_PATH}/plugins.cmake")
set(GSTREAMER_PLUGINS ${GSTREAMER_PLUGINS_CORE} ${GSTREAMER_PLUGINS_SYS}) set(GSTREAMER_PLUGINS ${GSTREAMER_PLUGINS_CORE} ${GSTREAMER_PLUGINS_SYS})
find_library(LOG_LIB log REQUIRED) find_library(LOG_LIB log REQUIRED)
find_package(GStreamerMobile COMPONENTS ${GSTREAMER_PLUGINS} fonts ca_certificates REQUIRED) find_package(GStreamerMobile COMPONENTS ${GSTREAMER_PLUGINS} fonts REQUIRED)
add_library(tutorial-2 SHARED tutorial-2.c dummy.cpp) add_library(tutorial-2 SHARED tutorial-2.c dummy.cpp)
target_link_libraries(tutorial-2 target_link_libraries(tutorial-2

2
subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/jni/CMakeLists.txt
View file

@ -28,7 +28,7 @@ set(GSTREAMER_PLUGINS ${GSTREAMER_PLUGINS_CORE} ${GSTREAMER_PLUGINS_SYS}
set(GStreamer_EXTRA_DEPS gstreamer-video-1.0 gobject-2.0) set(GStreamer_EXTRA_DEPS gstreamer-video-1.0 gobject-2.0)
find_library(ANDROID_LIB android REQUIRED) find_library(ANDROID_LIB android REQUIRED)
find_library(LOG_LIB log REQUIRED) find_library(LOG_LIB log REQUIRED)
find_package(GStreamerMobile COMPONENTS ${GSTREAMER_PLUGINS} fonts ca_certificates REQUIRED) find_package(GStreamerMobile COMPONENTS ${GSTREAMER_PLUGINS} fonts REQUIRED)
add_library(tutorial-3 SHARED tutorial-3.c dummy.cpp) add_library(tutorial-3 SHARED tutorial-3.c dummy.cpp)
target_link_libraries(tutorial-3 target_link_libraries(tutorial-3