upgpkg: pjproject 2.11-5

2 files changed, 43 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 008cef318606..130a51fdeed2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pjproject
 	pkgdesc = Open source SIP stack and media stack
 	pkgver = 2.11
-	pkgrel = 4
+	pkgrel = 5
 	url = https://www.pjsip.org/
 	arch = x86_64
 	arch = aarch64
@@ -9,7 +9,6 @@ pkgbase = pjproject
 	arch = i686
 	license = GPL
 	makedepends = alsa-lib
-	makedepends = e2fsprogs
 	makedepends = ffmpeg
 	makedepends = libsamplerate
 	makedepends = libsrtp
@@ -18,10 +17,11 @@ pkgbase = pjproject
 	makedepends = opus
 	makedepends = portaudio
 	makedepends = speex
-	makedepends = swig
 	makedepends = util-linux
 	makedepends = python
+	makedepends = e2fsprogs
 	makedepends = python-setuptools
+	makedepends = swig
 	source = pjproject-2.11.tar.gz::https://github.com/pjsip/pjproject/archive/2.11.tar.gz
 	source = 0001-Don-t-build-Java-bindings.patch
 	source = 0002-Fix-installation-of-libpjsua2-shared-libraries-2670.patch::https://github.com/pjsip/pjproject/commit/742f7dc252ded778a8b677937791c02e2fbc0dde.patch
@@ -32,20 +32,19 @@ pkgbase = pjproject
 	sha256sums = 61fa2a76d069aa5c95b6e2c539f7b20e2ccf0b126fc60c18117762541d0a7472
 
 pkgname = pjproject
-	depends = openssl
-	depends = portaudio
-	depends = speex
 	depends = alsa-lib
-	depends = libsamplerate
-	depends = util-linux
 	depends = ffmpeg
+	depends = libsamplerate
 	depends = libsrtp
-	depends = opus
 	depends = libyuv
+	depends = openssl
+	depends = opus
+	depends = portaudio
+	depends = speex
+	depends = util-linux
 	optdepends = e2fsprogs
 	optdepends = python-pjproject: Python bindings
 
 pkgname = python-pjproject
 	depends = pjproject
 	depends = python
-
diff --git a/PKGBUILD b/PKGBUILD
index 1550ba9077b3..197db03d8b9b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,14 +7,27 @@
 pkgbase=pjproject
 pkgname=("$pkgbase" "python-$pkgbase")
 pkgver=2.11
-pkgrel=4
+pkgrel=5
 pkgdesc='Open source SIP stack and media stack'
-arch=('x86_64' 'aarch64' 'armv7h' 'i686')
+arch=(x86_64 aarch64 armv7h i686)
 url='https://www.pjsip.org/'
-license=('GPL')
-makedepends=('alsa-lib' 'e2fsprogs' 'ffmpeg' 'libsamplerate' 'libsrtp' 'libyuv'
-             'openssl' 'opus' 'portaudio' 'speex' 'swig' 'util-linux'
-             'python' 'python-setuptools')
+license=(GPL)
+_pkgdepends=(alsa-lib
+             ffmpeg
+             libsamplerate
+             libsrtp
+             libyuv
+             openssl
+             opus
+             portaudio
+             speex
+             util-linux)
+_libdepends=(python)
+makedepends=("${_pkgdepends[@]}"
+             "${_libdepends[@]}"
+             e2fsprogs
+             python-setuptools
+             swig)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/pjsip/$pkgbase/archive/$pkgver.tar.gz"
         '0001-Don-t-build-Java-bindings.patch'
         '0002-Fix-installation-of-libpjsua2-shared-libraries-2670.patch::https://github.com/pjsip/pjproject/commit/742f7dc252ded778a8b677937791c02e2fbc0dde.patch'
@@ -25,19 +38,19 @@ sha256sums=('c89b155a38daef6e92c8e1ae5c6895357fe5c5406dfdee2f3717962e21565f1c'
             '61fa2a76d069aa5c95b6e2c539f7b20e2ccf0b126fc60c18117762541d0a7472')
 
 prepare() {
-  cd "$pkgbase-$pkgver"
-  patch -Np1 < "../${source[1]}"
-  patch -Np1 < "../${source[2]%%::*}"
-  cp "../${source[3]}" 'pjlib/include/pj/config_site.h'
+	cd "$pkgbase-$pkgver"
+	patch -Np1 < "../${source[1]}"
+	patch -Np1 < "../${source[2]%%::*}"
+	install -Dm644 -t "pjlib/include/pj/" "../${source[3]}"
 }
 
 build() {
   cd "$pkgbase-$pkgver"
   export CXXFLAGS="$CXXFLAGS -fPIC"
-  if [ "$CARCH" = "aarch64" ]; then
+  if [ "$CARCH" = 'aarch64' ]; then
     arch_opts=(--disable-libwebrtc)
   fi
-  if [ "$CARCH" = "i686" ]; then
+  if [ "$CARCH" = 'i686' ]; then
     export CXXFLAGS="$CXXFLAGS -march=i686"
     arch_opts=(--disable-libwebrtc)
   fi
@@ -52,27 +65,23 @@ build() {
     --enable-shared \
     --disable-opencore-amr \
     "${arch_opts[@]}"
-
   make dep
   make
-
   make -C pjsip-apps/src/swig
-
-  cd 'pjsip-apps/src/swig/python'
+  pushd 'pjsip-apps/src/swig/python'
   python setup.py build
 }
 
 package_pjproject() {
-  depends=('openssl' 'portaudio' 'speex' 'alsa-lib' 'libsamplerate' 'util-linux'
-           'ffmpeg' 'libsrtp' 'opus' 'libyuv')
-  optdepends=('e2fsprogs' 'python-pjproject: Python bindings')
-  cd "$pkgbase-$pkgver"
-  make -j1 DESTDIR="$pkgdir" install
-  install -D -m755 pjsip-apps/bin/pjsua-*gnu* "$pkgdir/usr/bin/pjsua"
+	depends=("${_pkgdepends[@]}")
+	optdepends=(e2fsprogs "python-$pkgbase: Python bindings")
+	cd "$pkgbase-$pkgver"
+	make -j1 DESTDIR="$pkgdir" install
+	install -Dm755 pjsip-apps/bin/pjsua-*gnu* "$pkgdir/usr/bin/pjsua"
 }
 
 package_python-pjproject() {
-  depends=('pjproject' 'python')
-  cd "$pkgbase-$pkgver/pjsip-apps/src/swig/python"
-  python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+	depends=("$pkgbase" "${_libdepends[@]}")
+	pushd "$pkgbase-$pkgver/pjsip-apps/src/swig/python"
+	python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }