summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Maclennan2020-02-22 05:22:40 +0000
committerCaleb Maclennan2020-02-22 05:24:52 +0000
commite8b9e22e56ab18b8e594958546e88b4c7943bf1b (patch)
tree2fb4a514bab3e0a57d5c4136bfc9a30888b73be5
parent944a089150a2f59c599ffc030730d882d00ab683 (diff)
downloadaur-e8b9e22e56ab18b8e594958546e88b4c7943bf1b.tar.gz
Update to 2.10
-rw-r--r--.SRCINFO19
-rw-r--r--.gitignore2
-rw-r--r--0001-Don-t-build-Java-bindings.patch19
-rw-r--r--0002-Query-python-executable-for-actual-version-in-use.patch35
-rw-r--r--PKGBUILD55
-rw-r--r--config_site.h3
6 files changed, 53 insertions, 80 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8c79954d03d..ad85a880cc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
pkgbase = pjproject
pkgdesc = Open source SIP stack and media stack
- pkgver = 2.9
- pkgrel = 2
+ pkgver = 2.10
+ pkgrel = 1
url = https://www.pjsip.org/
- arch = i686
arch = x86_64
arch = armv7h
+ arch = i686
license = GPL
makedepends = alsa-lib
makedepends = e2fsprogs
@@ -15,16 +15,17 @@ pkgbase = pjproject
makedepends = openssl
makedepends = opus
makedepends = portaudio
- makedepends = python
makedepends = speex
makedepends = swig
makedepends = util-linux
- source = https://www.pjsip.org/release/2.9/pjproject-2.9.tar.bz2
+ makedepends = python
+ makedepends = python-setuptools
+ source = pjproject-2.10.tar.gz::https://github.com/pjsip/pjproject/archive/2.10.tar.gz
source = 0001-Don-t-build-Java-bindings.patch
- source = 0002-Query-python-executable-for-actual-version-in-use.patch
- md5sums = 66757078e7bd7cf316acb0425c2fdd6f
- md5sums = 84f243ca0469ee9079e01622b622d65f
- md5sums = feabd9629dd9ab619fbb56894e2e43f4
+ source = config_site.h
+ sha256sums = 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de
+ sha256sums = c6673d97185c2383140b6d915aeaa7e525c9cfb5f51c097472cf4773b4f87ab4
+ sha256sums = 61fa2a76d069aa5c95b6e2c539f7b20e2ccf0b126fc60c18117762541d0a7472
pkgname = pjproject
depends = openssl
diff --git a/.gitignore b/.gitignore
index abac961c6da..c252b19c149 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
!./.SRCINFO
!./.gitignore
!./0001-Don-t-build-Java-bindings.patch
-!./0002-Query-python-executable-for-actual-version-in-use.patch
!./PKGBUILD
+!./config_site.h
diff --git a/0001-Don-t-build-Java-bindings.patch b/0001-Don-t-build-Java-bindings.patch
index 20470f7a58a..a4b1be45619 100644
--- a/0001-Don-t-build-Java-bindings.patch
+++ b/0001-Don-t-build-Java-bindings.patch
@@ -1,25 +1,26 @@
-From 2a528772c79a6575bef2dfcd0699945409ef9dd1 Mon Sep 17 00:00:00 2001
-From: Nobody <nobody@nowhere.net>
-Date: Mon, 17 Sep 2001 00:00:00 +0000
-Subject: [PATCH 1/2] Don't build Java bindings
+From c80630d6923f50b29fc136e75a8bed5de4ae50dd Mon Sep 17 00:00:00 2001
+From: Caleb Maclennan <caleb@alerque.com>
+Date: Sat, 22 Feb 2020 04:54:58 +0000
+Subject: [PATCH] Don't build Java bindings
+Signed-off-by: Caleb Maclennan <caleb@alerque.com>
---
pjsip-apps/src/swig/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pjsip-apps/src/swig/Makefile b/pjsip-apps/src/swig/Makefile
-index ef8d0c9..e6d2580 100644
+index abb317b..1f4759f 100644
--- a/pjsip-apps/src/swig/Makefile
+++ b/pjsip-apps/src/swig/Makefile
@@ -7,7 +7,7 @@ else
ifneq ($(findstring ios,$(TARGET_NAME)),)
- DIRS = csharp
+ LANG = csharp
else
-- DIRS = python java
-+ DIRS = python
+- LANG = python java
++ LANG = python
endif
endif
--
-2.20.1
+2.25.1
diff --git a/0002-Query-python-executable-for-actual-version-in-use.patch b/0002-Query-python-executable-for-actual-version-in-use.patch
deleted file mode 100644
index 2752e54526a..00000000000
--- a/0002-Query-python-executable-for-actual-version-in-use.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 69b94c9d9ee6a525022c40dae70fd0d839db5537 Mon Sep 17 00:00:00 2001
-From: Nobody <nobody@nowhere.net>
-Date: Mon, 17 Sep 2001 00:00:00 +0000
-Subject: [PATCH 2/2] Query python executable for actual version in use
-
----
- pjsip-apps/src/swig/python/Makefile | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/pjsip-apps/src/swig/python/Makefile b/pjsip-apps/src/swig/python/Makefile
-index 5addbb9..0e1d194 100644
---- a/pjsip-apps/src/swig/python/Makefile
-+++ b/pjsip-apps/src/swig/python/Makefile
-@@ -3,13 +3,14 @@ PYTHON_SO=_pjsua2.so
- USE_PYTHON3?=1
-
- ifeq ($(USE_PYTHON3),1)
-- PYTHON_EXE=python3.6
-- PYTHON_PKG_DIR=$(HOME)/.local/lib/python3.6/site-packages
-+ PYTHON_EXE=python3
- else
-- PYTHON_EXE=python2.7
-- PYTHON_PKG_DIR=$(HOME)/.local/lib/python2.7/site-packages
-+ PYTHON_EXE=python2
- endif
-
-+PYTHON_VERSION := $(shell $(PYTHON_EXE) -c 'import sys; print(".".join(str(v) for v in sys.version_info[0:2]))')
-+PYTHON_PKG_DIR := $(HOME)/.local/lib/python$(PYTHON_VERSION)/site-packages
-+
- #PYTHON_SETUP_FLAGS = --inplace
- ifeq ($(OS),Windows_NT)
- PYTHON_SETUP_FLAGS += --compiler=mingw32
---
-2.20.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 9bce948cfa6..771ebebd53b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,30 +4,31 @@
# Contributor: Travis Hegner <travis.hegner@gmail.com>
pkgbase=pjproject
-pkgname=(pjproject python-pjproject)
-pkgver=2.9
-pkgrel=2
+pkgname=("$pkgbase" "python-$pkgbase")
+pkgver=2.10
+pkgrel=1
pkgdesc='Open source SIP stack and media stack'
-arch=('i686' 'x86_64' 'armv7h')
+arch=('x86_64' 'armv7h' 'i686')
url='https://www.pjsip.org/'
license=('GPL')
-makedepends=('alsa-lib' 'e2fsprogs' 'ffmpeg' 'libsamplerate' 'libsrtp' 'openssl' 'opus' 'portaudio' 'python' 'speex' 'swig' 'util-linux')
-source=("https://www.pjsip.org/release/$pkgver/$pkgname-$pkgver.tar.bz2"
- 0001-Don-t-build-Java-bindings.patch
- 0002-Query-python-executable-for-actual-version-in-use.patch)
-md5sums=('66757078e7bd7cf316acb0425c2fdd6f'
- '84f243ca0469ee9079e01622b622d65f'
- 'feabd9629dd9ab619fbb56894e2e43f4')
+makedepends=('alsa-lib' 'e2fsprogs' 'ffmpeg' 'libsamplerate' 'libsrtp'
+ 'openssl' 'opus' 'portaudio' 'speex' 'swig' 'util-linux'
+ 'python' 'python-setuptools')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/pjsip/$pkgbase/archive/$pkgver.tar.gz"
+ '0001-Don-t-build-Java-bindings.patch'
+ 'config_site.h')
+sha256sums=('936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de'
+ 'c6673d97185c2383140b6d915aeaa7e525c9cfb5f51c097472cf4773b4f87ab4'
+ '61fa2a76d069aa5c95b6e2c539f7b20e2ccf0b126fc60c18117762541d0a7472')
prepare() {
- cd "$srcdir/$pkgbase-$pkgver"
- patch -Np1 < "$srcdir/0001-Don-t-build-Java-bindings.patch"
- patch -Np1 < "$srcdir/0002-Query-python-executable-for-actual-version-in-use.patch"
- echo "#define PJ_HAS_IPV6 1" >> "pjlib/include/pj/config_site.h"
+ cd "$pkgbase-$pkgver"
+ patch -Np1 < "../${source[1]}"
+ cp "../${source[2]}" 'pjlib/include/pj/config_site.h'
}
build() {
- cd "$srcdir/$pkgbase-$pkgver"
+ cd "$pkgbase-$pkgver"
export CXXFLAGS="$CXXFLAGS -fPIC"
if [ "$CARCH" = "i686" ]; then
export CXXFLAGS="$CXXFLAGS -march=i686"
@@ -44,24 +45,26 @@ build() {
--disable-opencore-amr \
"${arch_opts[@]}"
- echo "#define PJ_HAS_IPV6 1" >> "$srcdir/$pkgname-$pkgver/pjlib/include/pj/config_site.h"
- make -j1 dep
- make -j1
+ make dep
+ make
- make -C pjsip-apps/src/swig -j1
+ make -C pjsip-apps/src/swig
+
+ cd 'pjsip-apps/src/swig/python'
+ python setup.py build
}
package_pjproject() {
- depends=('openssl' 'portaudio' 'speex' 'alsa-lib' 'libsamplerate' 'util-linux' 'ffmpeg' 'libsrtp' 'opus')
+ depends=('openssl' 'portaudio' 'speex' 'alsa-lib' 'libsamplerate' 'util-linux'
+ 'ffmpeg' 'libsrtp' 'opus')
optdepends=('e2fsprogs' 'python-pjproject: Python bindings')
- cd "$srcdir/$pkgbase-$pkgver"
+ cd "$pkgbase-$pkgver"
make -j1 DESTDIR="$pkgdir" install
- install -D -m755 pjsip-apps/bin/pjsua-*gnu* "$pkgdir"/usr/bin/pjsua
+ install -D -m755 pjsip-apps/bin/pjsua-*gnu* "$pkgdir/usr/bin/pjsua"
}
package_python-pjproject() {
depends=('pjproject' 'python')
- cd "$srcdir/$pkgbase-$pkgver/pjsip-apps/src/swig/python"
-
- python setup.py install --root="$pkgdir/" --optimize=1
+ cd "$pkgbase-$pkgver/pjsip-apps/src/swig/python"
+ python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
}
diff --git a/config_site.h b/config_site.h
new file mode 100644
index 00000000000..bb11dd9142c
--- /dev/null
+++ b/config_site.h
@@ -0,0 +1,3 @@
+#define PJ_DEBUG 0
+#define PJ_TIMER_DEBUG 0
+#define PJ_HAS_IPV6 1