- recreate from scratch

- update to version 6.13.0

4 files changed, 55 insertions, 105 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33d4017dd8ee..4c2b769c7b9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,40 +1,20 @@
 pkgbase = kurento-media-server
-	pkgdesc = Kurento Media Server
-	pkgver = 6.7.1
+	pkgdesc = Kurento WebRTC media server
+	pkgver = 6.13.0
 	pkgrel = 1
-	url = http://www.kurento.org/
+	url = https://github.com/Kurento/kurento-media-server
 	arch = any
-	license = LGPL v2.1
-	makedepends = cmake
-	makedepends = gstreamer
-	makedepends = gst-plugins-base
-	makedepends = gst-plugins-good
-	makedepends = gst-plugins-bad
-	makedepends = gst-plugins-ugly
-	makedepends = gst-libav
-	makedepends = libsigc++
-	makedepends = glibmm
-	makedepends = kms-core>=6.7.0
-	makedepends = kms-elements>=6.7.0
-	makedepends = kms-filters>=6.7.0
-	depends = boost-libs
-	depends = gstreamer
-	depends = gst-plugins-base
-	depends = gst-plugins-good
-	depends = gst-plugins-bad
-	depends = gst-plugins-ugly
-	depends = gst-libav
-	depends = libsigc++
-	depends = glibmm
-	depends = kms-core>=6.7.0
-	depends = kms-elements>=6.7.0
-	depends = kms-filters>=6.7.0
-	provides = kurento-media-server
-	conflicts = kurento-media-server
-	source = https://github.com/Kurento/kurento-media-server/archive/6.7.1.tar.gz
-	source = kurento.conf.json.patch
-	sha256sums = 3c8880d9071cc650e7c0a8404fb8a90282bd95eff3fa83fe95c8ff943b2cbef3
-	sha256sums = db711ae29c104d2b28744cc695c2f8bc4c185668a681c2972a9a07701796e7f2
+	license = apache
+	makedepends = kms-cmake-utils
+	makedepends = websocketpp
+	depends = kms-core
+	depends = boost
+	optdepends = kms-elements
+	optdepends = kms-filters
+	source = git://github.com/Kurento/kurento-media-server.git#tag=6.13.0
+	source = cmake-boost.patch
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = kurento-media-server
 
diff --git a/PKGBUILD b/PKGBUILD
index 2aeb3952ba6a..fede7ba3f902 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,39 @@
-# Maintainer: Alexander Susha <isushik94@gmail.com>
 pkgname=kurento-media-server
-pkgver=6.7.1
+pkgver=6.13.0
 pkgrel=1
-pkgdesc='Kurento Media Server'
-arch=('any')
-url='http://www.kurento.org/'
-license=('LGPL v2.1')
-depends=('boost-libs' 'gstreamer' 'gst-plugins-base' 'gst-plugins-good' 'gst-plugins-bad' 'gst-plugins-ugly' 'gst-libav' 'libsigc++' 'glibmm' 'kms-core>=6.7.0' 'kms-elements>=6.7.0' 'kms-filters>=6.7.0')
-makedepends=('cmake' 'gstreamer' 'gst-plugins-base' 'gst-plugins-good' 'gst-plugins-bad' 'gst-plugins-ugly' 'gst-libav' 'libsigc++' 'glibmm' 'kms-core>=6.7.0' 'kms-elements>=6.7.0' 'kms-filters>=6.7.0')
-provides=(${pkgname})
-conflicts=(${pkgname})
-source=("https://github.com/Kurento/${pkgname}/archive/${pkgver}.tar.gz"
-        'kurento.conf.json.patch')
-sha256sums=('3c8880d9071cc650e7c0a8404fb8a90282bd95eff3fa83fe95c8ff943b2cbef3'
-            'db711ae29c104d2b28744cc695c2f8bc4c185668a681c2972a9a07701796e7f2')
+pkgdesc="Kurento WebRTC media server"
+arch=(any)
+url="https://github.com/Kurento/kurento-media-server"
+license=('apache')
+depends=(kms-core boost)
+optdepends=(kms-elements kms-filters)
+makedepends=(kms-cmake-utils websocketpp)
+source=(
+    'git://github.com/Kurento/kurento-media-server.git#tag=6.13.0'
+    cmake-boost.patch
+)
 
-prepare(){
-    cd ${srcdir}/${pkgname}-${pkgver}
+sha256sums=(SKIP SKIP)
 
-    patch -Nu < ../kurento.conf.json.patch
-
-    for FILE in $(find . -type f)
-    do
-        sed -i -E "s/gstreamer\-((\w|\d)+\-)?1\.5/gstreamer-\11.0/g" $FILE
-        sed -i -E "s/SSL_R_SHORT_READ/boost::asio::ssl::error::stream_truncated/g" $FILE
-    done
+prepare() {
+    cd "$srcdir/$pkgname"
+    patch -p0 <"$srcdir/cmake-boost.patch"
+    sed -ri -e 's#gstreamer((-[-a-z]+)?)-1\.5#gstreamer\1-1.0#g' CMakeLists.txt
+    rm -r server/transport/websocket/websocketpp
+    ln -s /usr/include/websocketpp server/transport/websocket/websocketpp
 }
-build() {
-    mkdir -p "build"
-    cd "build"
 
-    cmake ${srcdir}/${pkgname}-${pkgver}/. -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations -Wno-catch-value"
+build() {
+    local builddir=$srcdir/$pkgname/build
+    rm -rf "$builddir"
+    mkdir "$builddir"
+    cd "$builddir"
+    cmake -DCMAKE_MODULE_PATH=/usr/share/cmake/Modules -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=Release ..
+    make
 }
+
 package() {
-    make -C build DESTDIR="${pkgdir}" install
-    mv ${pkgdir}/usr/etc ${pkgdir}/
+    local builddir=$srcdir/$pkgname/build
+    cd "$builddir"
+    make install DESTDIR="$pkgdir"
 }
diff --git a/cmake-boost.patch b/cmake-boost.patch
new file mode 100644
index 000000000000..ae074b7470df
--- /dev/null
+++ b/cmake-boost.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2020-04-22 13:19:20.692253724 +0200
++++ CMakeLists.txt	2020-04-22 13:19:16.602213194 +0200
+@@ -62,7 +62,7 @@
+ set(CMAKE_THREAD_PREFER_PTHREAD ON)
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads REQUIRED)
+-generic_find(LIBNAME Boost COMPONENTS system filesystem program_options unit_test_framework thread log REQUIRED)
++find_package(Boost REQUIRED COMPONENTS system filesystem program_options unit_test_framework thread log)
+ 
+ find_package(OpenSSL REQUIRED)
+ 
diff --git a/kurento.conf.json.patch b/kurento.conf.json.patch
deleted file mode 100644
index 7ea20a7e5f9f..000000000000
--- a/kurento.conf.json.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- kurento.conf.json	2018-02-06 10:19:47.246319048 +0300
-+++ kurento.conf.json	2018-02-06 10:38:24.913381988 +0300
-@@ -1,25 +1,25 @@
- {
-   "mediaServer" : {
-     "resources": {
--    //  //Resources usage limit for raising an exception when an object creation is attempted
--    //  "exceptionLimit": "0.8",
--    //  // Resources usage limit for restarting the server when no objects are alive
--    //  "killLimit": "0.7",
--        // Garbage collector period in seconds
-+        "_comment01": "//  //Resources usage limit for raising an exception when an object creation is attempted",
-+        "_comment02": "//  \"exceptionLimit\": \"0.8\"",
-+        "_comment03": "//  // Resources usage limit for restarting the server when no objects are alive",
-+        "_comment04": "//  \"killLimit\": \"0.7\"",
-+        "_comment05": "// Garbage collector period in seconds",
-         "garbageCollectorPeriod": 240
-     },
-     "net" : {
-       "websocket": {
-         "port": 8888,
--        //"secure": {
--        //  "port": 8433,
--        //  "certificate": "defaultCertificate.pem",
--        //  "password": ""
--        //},
--        //"registrar": {
--        //  "address": "ws://localhost:9090",
--        //  "localAddress": "localhost"
--        //},
-+        "_comment01": "//\"secure\": {",
-+        "_comment02": "//  \"port\": 8433,",
-+        "_comment03": "//  \"certificate\": \"defaultCertificate.pem\",",
-+        "_comment04": "//  \"password\": \"\"",
-+        "_comment05": "//},",
-+        "_comment06": "//\"registrar\": {",
-+        "_comment07": "//  \"address\": \"ws://localhost:9090\"",
-+        "_comment08": "//  \"localAddress\": \"localhost\"",
-+        "_comment09": "//}",
-         "path": "kurento",
-         "threads": 10
-       }