Skip to content

Commit

Permalink
Update project to KMS 6.0
Browse files Browse the repository at this point in the history
Change-Id: I79673ec764b50cbed431e294fddeb2895195209c
  • Loading branch information
dfernandezlop committed Mar 11, 2016
1 parent 6f3e4cc commit c6a43e6
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ endif ()

find_package(PkgConfig)

set (GST_REQUIRED 1.3.3)
set (GST_REQUIRED 1.5.0)
set (GLIB_REQUIRED 2.38)
set (OPENCV_REQUIRED 2.0.0)

#gst-plugins dependencies
pkg_check_modules(GSTREAMER REQUIRED gstreamer-1.0>=${GST_REQUIRED})
pkg_check_modules(GSTREAMER_BASE REQUIRED gstreamer-base-1.0>=${GST_REQUIRED})
pkg_check_modules(GSTREAMER_VIDEO REQUIRED gstreamer-video-1.0>=${GST_REQUIRED})
pkg_check_modules(GSTREAMER_CHECK REQUIRED gstreamer-check-1.0>=${GST_REQUIRED})
pkg_check_modules(GSTREAMER REQUIRED gstreamer-1.5>=${GST_REQUIRED})
pkg_check_modules(GSTREAMER_BASE REQUIRED gstreamer-base-1.5>=${GST_REQUIRED})
pkg_check_modules(GSTREAMER_VIDEO REQUIRED gstreamer-video-1.5>=${GST_REQUIRED})
pkg_check_modules(GSTREAMER_CHECK REQUIRED gstreamer-check-1.5>=${GST_REQUIRED})
pkg_check_modules(KMSCORE REQUIRED kmscore)
pkg_check_modules(OPENCV REQUIRED opencv>=${OPENCV_REQUIRED})

Expand All @@ -48,7 +48,7 @@ set (GETTEXT_PACKAGE "plugin-sample")

include(GNUInstallDirs)

set (CMAKE_INSTALL_GST_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/gstreamer-1.0)
set (CMAKE_INSTALL_GST_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/gstreamer-1.5)
set (KURENTO_MODULES_SO_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${KURENTO_MODULES_DIR_INSTALL_PREFIX})

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
Expand Down
12 changes: 6 additions & 6 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ Maintainer: Kurento Maintenance Team <[email protected]>
Build-Depends: debhelper (>= 8.0.0),
cmake,
pkg-config,
kms-core-dev,
kms-elements-dev,
kms-filters-dev,
kms-core-6.0-dev (>= 6.0.0),
kms-elements-6.0-dev (>= 6.0.0),
kms-filters-6.0-dev (>= 6.0.0),
libopencv-dev
Standards-Version: 3.9.4
Homepage: http://kurento.org
Expand All @@ -22,9 +22,9 @@ Description: Kurento Plugin Sample
Package: kms-plugin-sample-dev
Architecture: any
Depends: kms-plugin-sample (= ${binary:Version}),
kms-core-dev,
kms-elements-dev,
kms-filters-dev
kms-core-6.0-dev (>= 6.0.0),
kms-elements-6.0-dev (>= 6.0.0),
kms-filters-6.0-dev (>= 6.0.0),
Description: Kurento Plugin Sample development files

Package: kms-plugin-sample-dbg
Expand Down
2 changes: 1 addition & 1 deletion debian/kms-plugin-sample.install
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
usr/lib/*/lib*.so.*
usr/lib/*/gstreamer-1.0/lib*.so
usr/lib/*/gstreamer-1.5/lib*.so
usr/lib/*/kurento/*/*.so
2 changes: 1 addition & 1 deletion src/server/interface/sampleplugin.kmd.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sampleplugin",
"version": "0.0.1-dev",
"kurentoVersion": "^5.0.0",
"kurentoVersion": "^6.0.0",
"code": {
"api": {
"js": {
Expand Down

0 comments on commit c6a43e6

Please sign in to comment.