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

[Jan Steffens]

    Date: Friday, September 25, 2020 @ 13:01:42
  Author: heftig
Revision: 396555

archrelease: copy trunk to extra-x86_64

Added:
  srt/repos/extra-x86_64/PKGBUILD
    (from rev 396554, srt/trunk/PKGBUILD)
Deleted:
  srt/repos/extra-x86_64/PKGBUILD
  srt/repos/extra-x86_64/no-rpath.diff

---------------+
 PKGBUILD      |   97 +++++++++++++++++++++++++++-----------------------------
 no-rpath.diff |   12 ------
 2 files changed, 48 insertions(+), 61 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-25 13:00:56 UTC (rev 396554)
+++ PKGBUILD	2020-09-25 13:01:42 UTC (rev 396555)
@@ -1,49 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=srt
-pkgver=1.4.1
-pkgrel=2
-pkgdesc="Secure Reliable Transport library"
-url="https://www.srtalliance.org/"
-arch=(x86_64)
-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')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  patch -Np1 -i ../no-rpath.diff
-}
-
-build() {
-  cmake -Hsrt -Bbuild \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_BINDIR=bin \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCMAKE_INSTALL_INCLUDEDIR=include \
-    -DENABLE_TESTING=True
-  cmake --build build
-}
-
-check() {
-  cd build
-  ./uriparser-test
-  ./utility-test
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --build build --target install
-  rm "$pkgdir"/usr/bin/{uriparser,utility}-test
-}
-
-# vim:set ts=2 sw=2:

Copied: srt/repos/extra-x86_64/PKGBUILD (from rev 396554, srt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-09-25 13:01:42 UTC (rev 396555)
@@ -0,0 +1,48 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgname=srt
+pkgver=1.4.2
+pkgrel=1
+pkgdesc="Secure Reliable Transport library"
+url="https://www.srtalliance.org/"
+arch=(x86_64)
+license=(MPL2)
+depends=(openssl)
+makedepends=(git cmake)
+_commit=50b7af06f3a0a456c172b4cb3aceafa8a5cc0036  # tags/v1.4.2
+source=("git+https://github.com/Haivision/srt#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+}
+
+build() {
+  cmake -S srt -B build \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_BINDIR=bin \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_INSTALL_INCLUDEDIR=include \
+    -DCMAKE_BUILD_TYPE=None \
+    -DENABLE_STATIC=ON \
+    -DENABLE_TESTING=ON
+  cmake --build build
+}
+
+check() {
+  cd build
+  ./uriparser-test
+  ./utility-test
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+  rm "$pkgdir"/usr/bin/{uriparser,utility}-test
+}
+
+# vim:set ts=2 sw=2:

Deleted: no-rpath.diff
===================================================================
--- no-rpath.diff	2020-09-25 13:00:56 UTC (rev 396554)
+++ no-rpath.diff	2020-09-25 13:01:42 UTC (rev 396555)
@@ -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.