diff options
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | cmake-boost.patch | 16 |
3 files changed, 7 insertions, 27 deletions
@@ -1,6 +1,6 @@ pkgbase = kms-core pkgdesc = Kurento media server core library - pkgver = 6.13.0 + pkgver = 6.17.0 pkgrel = 4 url = https://github.com/Kurento/kms-core arch = x86_64 @@ -19,14 +19,11 @@ pkgbase = kms-core backup = etc/kurento/modules/kurento/MediaElement.conf.ini backup = etc/kurento/modules/kurento/SdpEndpoint.conf.json backup = etc/kurento/modules/kurento/UriEndpoint.conf.ini - source = git://github.com/Kurento/kms-core.git#tag=6.13.0 - source = cmake-boost.patch + source = git+https://github.com/Kurento/kms-core.git#tag=6.17.0 source = kmscore.c.patch source = register-parent-string.patch sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = SKIP pkgname = kms-core - @@ -1,5 +1,5 @@ pkgname=kms-core -pkgver=6.13.0 +pkgver=6.17.0 pkgrel=4 pkgdesc="Kurento media server core library" arch=(x86_64) @@ -8,12 +8,11 @@ license=(apache) depends=(boost libsigc++ glibmm gstreamer gst-plugins-base kms-jsoncpp kms-jsonrpc) makedepends=(kms-cmake-utils kurento-module-creator libvpx) source=( - "git://github.com/Kurento/$pkgname.git#tag=$pkgver" - cmake-boost.patch + "git+https://github.com/Kurento/$pkgname.git#tag=$pkgver" kmscore.c.patch register-parent-string.patch ) -sha256sums=(SKIP SKIP SKIP SKIP) +sha256sums=(SKIP SKIP SKIP) backup=( etc/kurento/modules/kurento/BaseRtpEndpoint.conf.ini etc/kurento/modules/kurento/MediaElement.conf.ini @@ -23,7 +22,6 @@ backup=( prepare() { cd "$srcdir/$pkgname" - patch -p0 <"$srcdir/cmake-boost.patch" patch -p1 <"$srcdir/kmscore.c.patch" patch -p0 <"$srcdir/register-parent-string.patch" sed -ri -e 's#gstreamer((-[-a-z]+)?)-1\.5#gstreamer\1-1.0#g' {,*/,*/*/,*/*/*/,*/*/*/*/}CMakeLists.txt @@ -34,7 +32,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_MODULES_INSTALL_DIR=/usr/share/cmake/Modules -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=Release .. make } @@ -43,3 +41,4 @@ package() { cd "$builddir" make install DESTDIR="$pkgdir" } + diff --git a/cmake-boost.patch b/cmake-boost.patch deleted file mode 100644 index 22c11c26b255..000000000000 --- a/cmake-boost.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- CMakeLists.txt.orig 2020-04-20 17:10:19.486449763 +0200 -+++ CMakeLists.txt 2020-04-20 17:11:51.007697213 +0200 -@@ -76,11 +76,9 @@ - include(GenericFind) - - if(${HAS_STD_REGEX_REPLACE}) -- set(BOOST_REQUIRED_COMPONENTS "filesystem system") -- generic_find(LIBNAME Boost REQUIRED COMPONENTS filesystem system unit_test_framework) -+ find_package(Boost REQUIRED COMPONENTS filesystem system unit_test_framework) - else() -- set(BOOST_REQUIRED_COMPONENTS "filesystem system regex") -- generic_find(LIBNAME Boost REQUIRED COMPONENTS filesystem system regex unit_test_framework) -+ find_package(Boost REQUIRED COMPONENTS filesystem system regex unit_test_framework) - endif() - - generic_find(LIBNAME gstreamer-1.5 VERSION ${GST_REQUIRED} REQUIRED) |