main/pjproject: upgrade to 2.2.1

2 files changed, 21 insertions, 4 deletions

diff --git a/main/pjproject/APKBUILD b/main/pjproject/APKBUILD
index 24f017275c..795c667f20 100644
--- a/main/pjproject/APKBUILD
+++ b/main/pjproject/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pjproject
-pkgver=2.2
+pkgver=2.2.1
 pkgrel=0
 pkgdesc="CLI Softphone"
 url="http://www.pjsip.org/pjsua.htm"
@@ -13,6 +13,7 @@ makedepends="$depends_dev"
 install=
 subpackages="$pkgname-dev pjsua"
 source="http://www.pjsip.org/release/$pkgver/$pkgname-$pkgver.tar.bz2
+        fix-bb-cp-uniqueness.patch
         musl-fixes.patch"
 
 _builddir="$srcdir/$pkgname-$pkgver"
@@ -70,6 +71,7 @@ build() {
 
 package() {
         cd "$_builddir"
+        install -d "$pkgdir"/usr/lib
         make -j1 DESTDIR="$pkgdir" prefix=/usr install
 }
 
@@ -79,9 +81,12 @@ pjsua() {
         install -D -m755 pjsua "$subpkgdir"/usr/bin/pjsua
 }
 
-md5sums="0172c649ce68a150dee04011133cfd09  pjproject-2.2.tar.bz2
+md5sums="6ed4bb7750c827dc1d881e209a3b62db  pjproject-2.2.1.tar.bz2
+1f152ad611b5fb0e44676e2701b53a15  fix-bb-cp-uniqueness.patch
 e92287afb144883546e39c382bd75cdd  musl-fixes.patch"
-sha256sums="d926e7a9b76ccfcff493cf3cbc003ed6cd183d2bb29d96061b3fd38f70753014  pjproject-2.2.tar.bz2
+sha256sums="da1933336b38b65ff2254bed05ea1076531b16915777a252ea999cf7f3284cb3  pjproject-2.2.1.tar.bz2
+cae0255ddb8b6b6e07f6da5b448ec669b0727dc6d6c795e0d1cd8ce9ae504d40  fix-bb-cp-uniqueness.patch
 a9768e1ddc6e519048a5acc084ed1e9d2007bd0cd6291dde0828ea7efc837266  musl-fixes.patch"
-sha512sums="08d75d23c83a54deebcad4a980cb60e47a0ecaaebf8ae552296b088fbda8b69299763ae0b41a062e9b2e0f5c467fe91efd3b5d22855578a1d16ba20cbefde458  pjproject-2.2.tar.bz2
+sha512sums="ead780282a1b3df8ca326992d30b83236c3fdb9dbafb134b33d3f59484ce7253ca8014f2d7d8b98968a696b75e8a29a545b3aa34a66acdf55a21942ca9b30370  pjproject-2.2.1.tar.bz2
+cc4077c9999d4eb28cfc34080ea2cdfdc905726565afdca96d26979d734a1d70522c5e6307ec33c0d4f5f1a5b26699787cbd31fecb73b860b6b417eda50f37a1  fix-bb-cp-uniqueness.patch
 1dd0d8dabe0c27f8d314a776b8873700755ae59346223a5bb5ec816ab42d4fa4c8d9281ed33ced9cba87177cdf6249e458c404c8fd0ac9ec0be8607b4a4e8a73  musl-fixes.patch"
diff --git a/main/pjproject/fix-bb-cp-uniqueness.patch b/main/pjproject/fix-bb-cp-uniqueness.patch
new file mode 100644
index 0000000000..c6846cd569
--- /dev/null
+++ b/main/pjproject/fix-bb-cp-uniqueness.patch
@@ -0,0 +1,12 @@
+diff -ru pjproject-2.2.1.orig/Makefile pjproject-2.2.1/Makefile
+--- pjproject-2.2.1.orig/Makefile       2014-04-15 08:14:35.075716775 -0300
++++ pjproject-2.2.1/Makefile    2014-04-15 08:21:39.683417350 -0300
+@@ -108,7 +108,7 @@
+ install:
+        mkdir -p $(DESTDIR)$(libdir)/
+ #      cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/
+-       cp -af $(APP_LIBXX_FILES) $(DESTDIR)$(libdir)/
++       cp -af $(sort $(APP_LIBXX_FILES)) $(DESTDIR)$(libdir)/
+        mkdir -p $(DESTDIR)$(includedir)/
+        for d in pjlib pjlib-util pjnath pjmedia pjsip; do \
+                cp -RLf $$d/include/* $(DESTDIR)$(includedir)/; \