diff options
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | PKGBUILD | 19 | ||||
-rw-r--r-- | cmake-boost.patch | 11 |
3 files changed, 16 insertions, 23 deletions
@@ -1,6 +1,6 @@ pkgbase = kurento-media-server pkgdesc = Kurento WebRTC media server - pkgver = 6.13.0 + pkgver = 6.17.0 pkgrel = 3 url = https://github.com/Kurento/kurento-media-server arch = x86_64 @@ -14,10 +14,11 @@ pkgbase = kurento-media-server optdepends = kms-filters backup = etc/kurento/kurento.conf.json backup = etc/kurento/sdp_pattern.txt - source = git://github.com/Kurento/kurento-media-server.git#tag=6.13.0 - source = cmake-boost.patch + source = git+https://github.com/Kurento/kurento-media-server.git#tag=6.17.0 + source = https://raw.githubusercontent.com/vmarkovtsev/DeathHandler/911e4df429a89309b10111d76d232d4a7c2b5485/death_handler.cc + source = https://raw.githubusercontent.com/vmarkovtsev/DeathHandler/911e4df429a89309b10111d76d232d4a7c2b5485/death_handler.h + sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP pkgname = kurento-media-server - @@ -1,5 +1,5 @@ pkgname=kurento-media-server -pkgver=6.13.0 +pkgver=6.17.0 pkgrel=3 pkgdesc="Kurento WebRTC media server" arch=(x86_64) @@ -9,10 +9,11 @@ depends=(kms-core boost) optdepends=(kms-elements kms-filters) makedepends=(kms-cmake-utils libevent websocketpp) source=( - "git://github.com/Kurento/kurento-media-server.git#tag=$pkgver" - cmake-boost.patch + "git+https://github.com/Kurento/kurento-media-server.git#tag=$pkgver" + 'https://raw.githubusercontent.com/vmarkovtsev/DeathHandler/911e4df429a89309b10111d76d232d4a7c2b5485/death_handler.cc' + 'https://raw.githubusercontent.com/vmarkovtsev/DeathHandler/911e4df429a89309b10111d76d232d4a7c2b5485/death_handler.h' ) -sha256sums=(SKIP SKIP) +sha256sums=(SKIP SKIP SKIP) backup=( etc/kurento/kurento.conf.json etc/kurento/sdp_pattern.txt @@ -20,10 +21,11 @@ backup=( 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 + sed -i 's/ 0.7.0//' server/transport/websocket/CMakeLists.txt + cp ../death_handler.cc server/death_handler.cpp + cp ../death_handler.h server/death_handler.hpp + ln -s death_handler.hpp server/death_handler.h } build() { @@ -31,7 +33,7 @@ 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 .. + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=Release .. make } @@ -40,3 +42,4 @@ package() { cd "$builddir" make install DESTDIR="$pkgdir" } + diff --git a/cmake-boost.patch b/cmake-boost.patch deleted file mode 100644 index ae074b7470df..000000000000 --- a/cmake-boost.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) - |