Skip to content

Commit

Permalink
Verifying versioned libs (#1116)
Browse files Browse the repository at this point in the history
* make versioned shared libraries

* Minor syntax fix

.. is required for fetching files from parent dir ... without .. it throws error

* Fix typo in readme

* add free missing (#746)

Co-authored-by: David D <david.desbiens@tentaq.com>

* Update readme (#744)

* Fix typo in readme

* Update Readme

Debug section: add solution to cmake error "could not find JNI"

Co-authored-by: Hassan Sahibzada <hsahibza@amazon.com>

* Add instruction to set offline mode (#741)

Co-authored-by: Hassan Sahibzada <hsahibza@amazon.com>

* Update README and travis.yml to acknowledge develop (#739)

Co-authored-by: Hassan Sahibzada <hsahibza@amazon.com>

* Gstreamer RTSP Docs Update (#712)

Hoping this help others avoid hours of frustration.

As noted in the helpful but well hidden issue comment #193 (comment), the Gstreamer examples for RTSP do not run at all.  I'm no Gstreamer expert but using `h264parse` works perfectly, while `video/x-h264, format=avc,alignment=au` just causes the pipeline to hang.

* Resolving merge conflicts

* Update version #

* Update the version string property with the version

* Remove duplicate definitions

---------

Co-authored-by: Tom spot Callaway <spot@fedoraproject.org>
Co-authored-by: Ketul shah <ketulshah1993@gmail.com>
Co-authored-by: Jeremy Gunawan <jggunawa@amazon.com>
Co-authored-by: waikup83 <waikup@hotmail.com>
Co-authored-by: David D <david.desbiens@tentaq.com>
Co-authored-by: Hassan Sahibzada <hsahibza@amazon.com>
Co-authored-by: Divya Sampath Kumar <disa6302@colorado.edu>
Co-authored-by: Anton Vattay <3martini@gmail.com>
  • Loading branch information
9 people committed Dec 6, 2023
1 parent 86d1ef7 commit 9f28a4c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
13 changes: 12 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ project(KinesisVideoProducerCpp VERSION 3.4.0)
set(CMAKE_CXX_STANDARD 11)
include(GNUInstallDirs)

set(KINESIS_VIDEO_PRODUCER_CPP_MAJOR_VERSION 3)
set(KINESIS_VIDEO_PRODUCER_CPP_MINOR_VERSION 4)
set(KINESIS_VIDEO_PRODUCER_CPP_PATCH_VERSION 1)
set(KINESIS_VIDEO_PRODUCER_CPP_VERSION ${KINESIS_VIDEO_PRODUCER_CPP_MAJOR_VERSION}.${KINESIS_VIDEO_PRODUCER_CPP_MINOR_VERSION}.${KINESIS_VIDEO_PRODUCER_CPP_PATCH_VERSION})

# User Flags
option(BUILD_GSTREAMER_PLUGIN "Build kvssink GStreamer plugin" OFF)
option(BUILD_JNI "Build C++ wrapper for JNI to expose the functionality to Java/Android" OFF)
Expand All @@ -27,7 +32,7 @@ option(MEMORY_SANITIZER "Build with MemorySanitizer" OFF)
option(THREAD_SANITIZER "Build with ThreadSanitizer" OFF)
option(UNDEFINED_BEHAVIOR_SANITIZER "Build with UndefinedBehaviorSanitizer" OFF)

add_definitions(-DCPP_VERSION_STRING=\"${PROJECT_VERSION}\")
add_definitions(-DCPP_VERSION_STRING=\"${KINESIS_VIDEO_PRODUCER_CPP_VERSION}\")

set(CMAKE_MACOSX_RPATH TRUE)
get_filename_component(ROOT "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
Expand Down Expand Up @@ -194,6 +199,9 @@ install(
DESTINATION .)

add_library(KinesisVideoProducer ${LINKAGE} ${PRODUCER_CPP_SOURCE_FILES})
if(NOT BUILD_STATIC)
set_target_properties(KinesisVideoProducer PROPERTIES VERSION ${KINESIS_VIDEO_PRODUCER_CPP_VERSION} SOVERSION ${KINESIS_VIDEO_PRODUCER_CPP_MAJOR_VERSION})
endif()
target_link_libraries(
KinesisVideoProducer
PUBLIC kvsCommonCurl
Expand Down Expand Up @@ -221,6 +229,9 @@ if(BUILD_JNI)
DIRECTORY ${KINESIS_VIDEO_PRODUCER_CPP_SRC}/src/JNI/include
DESTINATION .)
add_library(KinesisVideoProducerJNI SHARED ${JNI_HEADERS} ${JNI_SOURCE_FILES})
if(NOT BUILD_STATIC)
set_target_properties(KinesisVideoProducerJNI PROPERTIES VERSION ${KINESIS_VIDEO_PRODUCER_CPP_VERSION} SOVERSION ${KINESIS_VIDEO_PRODUCER_CPP_MAJOR_VERSION})
endif()
target_link_libraries(KinesisVideoProducerJNI kvspic)

install(
Expand Down
2 changes: 1 addition & 1 deletion src/gstreamer/gstkvssink.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1665,4 +1665,4 @@ GST_PLUGIN_DEFINE (
"Proprietary",
"GStreamer",
"http://gstreamer.net/"
)
)

0 comments on commit 9f28a4c

Please sign in to comment.