Date: Saturday, January 22, 2022 @ 18:51:30 Author: dvzrv Revision: 1113475
upgpkg: rtosc 0.3.1-1: Upgrade to 0.3.1. Split out documentation into rtosc-docs. Use upstream provided cmake option to only build shared library. Simplify quoting in file. Do not break long lines. Modified: rtosc/trunk/PKGBUILD Deleted: rtosc/trunk/rtosc-fix-pkg-config-file.patch rtosc/trunk/rtosc-include-missing-headers.patch -------------------------------------+ PKGBUILD | 69 +++++++++++++--------------------- rtosc-fix-pkg-config-file.patch | 15 ------- rtosc-include-missing-headers.patch | 32 --------------- 3 files changed, 28 insertions(+), 88 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-22 18:42:14 UTC (rev 1113474) +++ PKGBUILD 2022-01-22 18:51:30 UTC (rev 1113475) @@ -1,62 +1,49 @@ # Maintainer: David Runge <dv...@archlinux.org> -pkgname=rtosc -pkgver=0.2.0 -pkgrel=3 +pkgbase=rtosc +pkgname=(rtosc rtosc-docs) +pkgver=0.3.1 +pkgrel=1 pkgdesc="Realtime safe OSC Messaging" -arch=('x86_64') +arch=(x86_64) url="https://github.com/fundamental/rtosc" -license=('MIT') -depends=('gcc-libs' 'glibc') -makedepends=('cmake' 'doxygen') -provides=('librtosc.so' 'librtosc-cpp.so') -source=("$pkgname-$pkgver.tar.gz::https://github.com/fundamental/${pkgname}/archive/v${pkgver}.tar.gz" - "${pkgname}-fix-pkg-config-file.patch" - "${pkgname}-include-missing-headers.patch") -sha512sums=('f19aed587c752f33a063849fce2b4f531b734d8ae68d9f3b623da2872260b258b92c24b6160734a01f091ba821a4bd72cae98a138570ef6c741b03e1353d835a' - '65f6ada68c74b4c7f5e1bf3939dce3f04fbc704a8fd5386e003951201c927dc6776327c520de0b6cca2c9b09445072f931fd9cc08ed4a50c94a500f06cce4244' - '25db71244ce931919c6c95ca3b90fe3d4f21537a913b1c1056559b28fe59abbe6643113d46d5fda02ff3c11de4c4e51ac0f03b1a9b550176f3d547f698dccfe4') -b2sums=('723f4876c21b1e5ca1196bf726ad21d68083b11d56d19ca32c4b68325d59026055b1cb5a2eb3f4eeffab99f74230947e560ac2c12a4c2123f84629ae9b68a6d1' - '48013cf03a906a5311b816185da1195690e772c867d4bdaf962ff4d8c0a81de9af421bd0ed73e89fe3ab38de42987677777e643c345771d1d8fb638068655652' - '615ec60d8bc6abb3af4df32b02be57c7948308f269dbb78aac6af9019f7b12763e6fae186c13b0aff563ac2a53612630c9bf84ab257391c463300053346ec812') +license=(MIT) +makedepends=(asciidoctor cmake doxygen) +source=("$pkgname-$pkgver.tar.gz::https://github.com/fundamental/${pkgname}/archive/v${pkgver}.tar.gz") +sha512sums=('55bb8282bdefaee2c8c2187f523bba889d66d6ba051bc6ff2c443ef171e0ae5f12048c95014cf127076234d4d59b4052ac0dfcae4ade7d7d4a8cf14057cf2a0a') +b2sums=('01744e56daf492579352008b830b8d7bb1cac755573bdc0d7a7788dcd869dc4ecbd65d2bf62829dfdb804e9e6131b76c6744e6a944364908c4313956d05dd9ed') -prepare() { - cd "$pkgname-$pkgver" - # add missing headers: https://github.com/fundamental/rtosc/issues/41 - patch -Np1 -i ../"${pkgname}-include-missing-headers.patch" - # fix libdir in pkg-config file: - # https://github.com/fundamental/rtosc/issues/42 - patch -Np1 -i ../"${pkgname}-fix-pkg-config-file.patch" - sed -e 's/STATIC/SHARED/g' -i CMakeLists.txt -} - build() { - cd "$pkgname-$pkgver" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_LIBDIR=lib \ -DPERF_TEST=ON \ + -DRTOSC_BUILD_SHARED_LIBS=ON \ -W no-dev \ -B build \ - -S . + -S "$pkgbase-$pkgver" make VERBOSE=1 -C build - doxygen build/Doxyfile + make rtosc-doc -C build } check() { - cd "$pkgname-$pkgver" make -k test -C build } -package() { - cd "$pkgname-$pkgver" +package_rtosc() { + depends=(gcc-libs glibc) + optdepends=('rtosc-docs: for developer documentation') + provides=(librtosc.so librtosc-cpp.so) + make DESTDIR="$pkgdir/" install -C build - install -vDm 644 html/search/*.{js,png,html} \ - -t "${pkgdir}/usr/share/doc/${pkgname}/html/search" - install -vDm 644 html/*.{css,js,png,html} \ - -t "${pkgdir}/usr/share/doc/${pkgname}/html" - install -vDm 644 README.adoc \ - -t "${pkgdir}/usr/share/doc/${pkgname}" - install -vDm 644 LICENSE \ - -t "${pkgdir}/usr/share/licenses/${pkgname}" + install -vDm 644 "$pkgbase-$pkgver/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgbase}" + install -vDm 644 "$pkgbase-$pkgver/"{README,doc/Guide}.adoc -t "${pkgdir}/usr/share/doc/${pkgbase}" } + +package_rtosc-docs() { + pkgdesc+=" - documentation" + + install -vDm 644 build/html/search/*.{js,png,html} -t "${pkgdir}/usr/share/doc/${pkgbase}/html/search" + install -vDm 644 build/html/*.{css,js,png,html} -t "${pkgdir}/usr/share/doc/${pkgbase}/html" + install -vDm 644 "$pkgbase-$pkgver/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}" +} Deleted: rtosc-fix-pkg-config-file.patch =================================================================== --- rtosc-fix-pkg-config-file.patch 2022-01-22 18:42:14 UTC (rev 1113474) +++ rtosc-fix-pkg-config-file.patch 2022-01-22 18:51:30 UTC (rev 1113475) @@ -1,15 +0,0 @@ -diff -ruN a/librtosc.pc.cmake c/librtosc.pc.cmake ---- a/librtosc.pc.cmake 2019-04-16 01:18:21.000000000 +0200 -+++ c/librtosc.pc.cmake 2019-04-18 23:43:41.030168614 +0200 -@@ -3,9 +3,8 @@ - # - - prefix=@CMAKE_INSTALL_PREFIX@ --exec_prefix=${prefix} --libdir=${exec_prefix} --includedir=${prefix}/include -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - - Name: rtosc - Description: rtosc - a realtime safe open sound control serialization and dispatch system Deleted: rtosc-include-missing-headers.patch =================================================================== --- rtosc-include-missing-headers.patch 2022-01-22 18:42:14 UTC (rev 1113474) +++ rtosc-include-missing-headers.patch 2022-01-22 18:51:30 UTC (rev 1113475) @@ -1,32 +0,0 @@ -diff -ruN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2019-04-16 01:18:21.000000000 +0200 -+++ b/CMakeLists.txt 2019-04-16 21:10:10.934681045 +0200 -@@ -251,14 +251,24 @@ - DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") - endif() - install(FILES include/rtosc/rtosc.h -- include/rtosc/thread-link.h -- include/rtosc/ports.h -+ include/rtosc/arg-val-cmp.h -+ include/rtosc/arg-val-math.h -+ include/rtosc/automations.h -+ include/rtosc/bundle-foreach.h -+ include/rtosc/default-value.h - include/rtosc/miditable.h - include/rtosc/port-sugar.h -- include/rtosc/undo-history.h -+ include/rtosc/ports-runtime.h -+ include/rtosc/ports.h -+ include/rtosc/pretty-format.h -+ include/rtosc/rtosc-time.h -+ include/rtosc/rtosc-version.h -+ include/rtosc/savefile.h - include/rtosc/subtree-serialize.h -+ include/rtosc/thread-link.h - include/rtosc/typed-message.h -- include/rtosc/rtosc-version.h -+ include/rtosc/typestring.hh -+ include/rtosc/undo-history.h - DESTINATION include/rtosc) - install(TARGETS rtosc rtosc-cpp - DESTINATION ${CMAKE_INSTALL_LIBDIR})