[arch-commits] Commit in srt/trunk (PKGBUILD no-rpath.diff)

[Jan Steffens]

    Date: Friday, September 25, 2020 @ 13:00:56
  Author: heftig
Revision: 396554

1.4.2-1

Modified:
  srt/trunk/PKGBUILD
Deleted:
  srt/trunk/no-rpath.diff

---------------+
 PKGBUILD      |   23 +++++++++++------------
 no-rpath.diff |   12 ------------
 2 files changed, 11 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-25 11:15:12 UTC (rev 396553)
+++ PKGBUILD	2020-09-25 13:00:56 UTC (rev 396554)
@@ -1,8 +1,8 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 
 pkgname=srt
-pkgver=1.4.1
-pkgrel=2
+pkgver=1.4.2
+pkgrel=1
 pkgdesc="Secure Reliable Transport library"
 url="https://www.srtalliance.org/"
 arch=(x86_64)
@@ -9,11 +9,9 @@
 license=(MPL2)
 depends=(openssl)
 makedepends=(git cmake)
-_commit=9e52606fae3b32818b5b734d45d3358f4a95cf3f  # tags/v1.4.1
-source=("git+https://github.com/Haivision/srt#commit=$_commit"
-        no-rpath.diff)
-sha256sums=('SKIP'
-            'ce9a97d661d796da85a7e4faf9c70c27368d00eb505f85c03a31bba8f22e6847')
+_commit=50b7af06f3a0a456c172b4cb3aceafa8a5cc0036  # tags/v1.4.2
+source=("git+https://github.com/Haivision/srt#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -22,16 +20,17 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../no-rpath.diff
 }
 
 build() {
-  cmake -Hsrt -Bbuild \
+  cmake -S srt -B build \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_BINDIR=bin \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_INSTALL_INCLUDEDIR=include \
-    -DENABLE_TESTING=True
+    -DCMAKE_BUILD_TYPE=None \
+    -DENABLE_STATIC=ON \
+    -DENABLE_TESTING=ON
   cmake --build build
 }
 
@@ -42,7 +41,7 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" cmake --build build --target install
+  DESTDIR="$pkgdir" cmake --install build
   rm "$pkgdir"/usr/bin/{uriparser,utility}-test
 }
 

Deleted: no-rpath.diff
===================================================================
--- no-rpath.diff	2020-09-25 11:15:12 UTC (rev 396553)
+++ no-rpath.diff	2020-09-25 13:00:56 UTC (rev 396554)
@@ -1,12 +0,0 @@
-diff --git i/CMakeLists.txt w/CMakeLists.txt
-index e913122..2cc3c3d 100644
---- i/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -634,7 +634,6 @@ macro(srt_make_application name)
- 		# be placed into the binrary directory anyway.
- 		# XXX not sure about Mac.
- 		# See this name used already in install(${TARGET_srt} LIBRARY DESTINATION...).
--		set(FORCE_RPATH LINK_FLAGS -Wl,-rpath,.,-rpath,../${CMAKE_INSTALL_LIBDIR} BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE)
- 	endif()
- 
- 	# We state that Darwin always uses CLANG compiler, which honors this flag the same way.