summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Serafin2020-06-08 22:06:19 +0200
committerPiotr Serafin2020-06-08 23:37:29 +0200
commit91b91fb02ea643f7691e026dfcf1523682326553 (patch)
tree093aa0c0b797a00d03f0e3b279b13ad370a9c1f3
parent6b7a9e267c310f88b8b9cc79d41d200646ab743c (diff)
downloadaur-91b91fb02ea643f7691e026dfcf1523682326553.tar.gz
Updated to 3.21_1819. Fixed dir structure
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD35
2 files changed, 28 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 588f5442ef9..a2034cdc56c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = tsduck
pkgdesc = An extensible toolkit for MPEG/DVB transport streams
- pkgver = 3.20_1689
+ pkgver = 3.21_1819
pkgrel = 1
url = https://tsduck.io/
install = tsduck.install
@@ -10,8 +10,8 @@ pkgbase = tsduck
depends = curl
depends = srt
depends = jq
- source = tsduck-3.20-1689.tar.gz::https://github.com/tsduck/tsduck/archive/v3.20-1689.tar.gz
- md5sums = 3578a9bf9a61a26de3bdbabf9276409a
+ source = tsduck-3.21-1819.tar.gz::https://github.com/tsduck/tsduck/archive/v3.21-1819.tar.gz
+ md5sums = 887e678fd86b8916335e8a48ac037560
pkgname = tsduck
diff --git a/PKGBUILD b/PKGBUILD
index 33cd9f1d55a..faed7267920 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,7 @@
-# Maintainer: Mihai Bi┼čog <mihai.bisog@gmail.com>
# Maintainer: Piotr Serafin <piotr.serafin.71@gmail.com>
pkgname=tsduck
-_pkgver=3.20-1689
+_pkgver=3.21-1819
pkgver=${_pkgver/-/_}
pkgrel=1
pkgdesc="An extensible toolkit for MPEG/DVB transport streams"
@@ -11,7 +10,7 @@ url="https://tsduck.io/"
license=('BSD')
depends=(pcsclite curl srt jq)
source=("$pkgname-${_pkgver}.tar.gz::https://github.com/tsduck/tsduck/archive/v${_pkgver}.tar.gz")
-md5sums=('3578a9bf9a61a26de3bdbabf9276409a')
+md5sums=('887e678fd86b8916335e8a48ac037560')
install=$pkgname.install
build() {
@@ -22,14 +21,30 @@ build() {
package() {
cd "$pkgname-${_pkgver}"
- make SYSROOT="$pkgdir" install install-devel
- install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib"
+ make SYSROOT="$pkgdir" install
+ install -D -m644 LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- local TSPLUGINS_PATH="/usr/lib/tsduck/plugins"
- mkdir -p "$pkgdir/$TSPLUGINS_PATH"
- find "$pkgdir/usr/bin" -type f -name 'tsplugin_*.so' -exec mv -t "$pkgdir/$TSPLUGINS_PATH" {} +
+ mkdir -p "$pkgdir/usr/lib"
+ find "$pkgdir/usr/bin" -type f -name 'tsduck.so' -exec mv -t "$pkgdir/usr/lib" {} +
+
+ # If pacman sees a /lib directory in a package, it will detect a conflict
+ # with the symlink on the filesystem. This uses /usr/lib directly.
+ mkdir -p "$pkgdir/usr/lib/udev/rules.d"
+ cp "$pkgdir/lib/udev/rules.d/80-tsduck.rules" "$pkgdir/usr/lib/udev/rules.d"
+ rm -rf "$pkgdir/lib"
+
+ mkdir -p "$pkgdir/usr/lib/$pkgname"
+ find "$pkgdir/usr/bin" -type f -name 'tsplugin_*.so' -exec mv -t "$pkgdir/usr/lib/$pkgname" {} +
+ find "$pkgdir/usr/bin" -type f -name 'tsduck.*.xml' -exec mv -t "$pkgdir/usr/lib/$pkgname" {} +
+ find "$pkgdir/usr/bin" -type f -name 'tsduck.names' -exec mv -t "$pkgdir/usr/lib/$pkgname" {} +
+ find "$pkgdir/usr/bin" -type f -name 'tsduck.oui.names' -exec mv -t "$pkgdir/usr/lib/$pkgname" {} +
+
+ # When 3.22 will be released all above static resources will be installed in /usr/share/tsduck
+ # mkdir -p "$pkgdir/usr/share/$pkgname"
+ # find "$pkgdir/usr/bin" -type f -name 'tsduck.*.xml' -exec mv -t "$pkgdir/usr/share/$pkgname" {} +
+ # find "$pkgdir/usr/bin" -type f -name 'tsduck.names' -exec mv -t "$pkgdir/usr/share/$pkgname" {} +
+ # find "$pkgdir/usr/bin" -type f -name 'tsduck.oui.names' -exec mv -t "$pkgdir/usr/share/$pkgname" {} +
mkdir -p "$pkgdir/etc/profile.d/"
- echo "export TSPLUGINS_PATH=/${TSPLUGINS_PATH}" > "$pkgdir/etc/profile.d/tsduck.sh"
+ echo "export TSPLUGINS_PATH=/usr/lib/tsduck" > "$pkgdir/etc/profile.d/tsduck.sh"
}