[arch-commits] Commit in srt/repos/extra-x86_64 (4 files)

Jan Steffens heftig at archlinux.org
Sun Mar 10 17:53:36 UTC 2019


    Date: Sunday, March 10, 2019 @ 17:53:35
  Author: heftig
Revision: 347591

archrelease: copy trunk to extra-x86_64

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

---------------+
 PKGBUILD      |  102 ++++++++++++++++++++++++++------------------------------
 no-rpath.diff |   24 ++++++-------
 2 files changed, 60 insertions(+), 66 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-10 17:53:21 UTC (rev 347590)
+++ PKGBUILD	2019-03-10 17:53:35 UTC (rev 347591)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=srt
-pkgver=1.3.1
-pkgrel=1
-pkgdesc="Secure Reliable Transport library"
-url="https://www.srtalliance.org/"
-arch=(x86_64)
-license=(MPL2)
-depends=(openssl)
-makedepends=(git cmake ninja)
-_commit=d6499ca374fe1bff5ccfd959786309b18a8e7388  # tags/v1.3.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() {
-  mkdir build
-  cd $pkgname
-  patch -Np1 -i ../no-rpath.diff
-}
-
-build() {
-  cd build
-  cmake -G Ninja ../srt \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_BINDIR=bin \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCMAKE_INSTALL_INCLUDEDIR=include \
-    -DENABLE_TESTING=True
-  cmake --build .
-}
-
-check() {
-  cd build
-  ./utility-test
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --build build --target install
-  rm "$pkgdir"/usr/bin/*-test
-
-  # Build tries this but fails when DESTDIR is set
-  ln -s srt-live-transmit "$pkgdir/usr/bin/stransmit"
-}
-
-# vim:set ts=2 sw=2:

Copied: srt/repos/extra-x86_64/PKGBUILD (from rev 347590, srt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-03-10 17:53:35 UTC (rev 347591)
@@ -0,0 +1,48 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=srt
+pkgver=1.3.2
+pkgrel=1
+pkgdesc="Secure Reliable Transport library"
+url="https://www.srtalliance.org/"
+arch=(x86_64)
+license=(MPL2)
+depends=(openssl)
+makedepends=(git cmake ninja)
+_commit=89cb4786a444038461725c9044c31ae9405c2ba9  # tags/v1.3.2
+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 -GNinja \
+    -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
+  ./utility-test
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --build build --target install
+  rm "$pkgdir"/usr/bin/*-test
+}
+
+# vim:set ts=2 sw=2:

Deleted: no-rpath.diff
===================================================================
--- no-rpath.diff	2019-03-10 17:53:21 UTC (rev 347590)
+++ no-rpath.diff	2019-03-10 17:53:35 UTC (rev 347591)
@@ -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.

Copied: srt/repos/extra-x86_64/no-rpath.diff (from rev 347590, srt/trunk/no-rpath.diff)
===================================================================
--- no-rpath.diff	                        (rev 0)
+++ no-rpath.diff	2019-03-10 17:53:35 UTC (rev 347591)
@@ -0,0 +1,12 @@
+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.


More information about the arch-commits mailing list