update to 2.2.0-1

3 files changed, 7 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 904c476fb364..69aa37ebcc7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Feb  3 18:00:25 UTC 2018
+# Sat Jun 23 22:52:13 UTC 2018
 pkgbase = mingw-w64-libsrtp
 	pkgdesc = Library for SRTP (Secure Realtime Transport Protocol) (mingw-w64)
-	pkgver = 1.6.0
+	pkgver = 2.2.0
 	pkgrel = 1
 	url = https://github.com/cisco/libsrtp
 	arch = any
@@ -12,10 +12,8 @@ pkgbase = mingw-w64-libsrtp
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = mingw-w64-libsrtp-1.6.0.tar.gz::https://github.com/cisco/libsrtp/archive/v1.6.0.tar.gz
-	source = 0001-Don-t-create-a-symlink-if-there-is-no-SHAREDLIBVERSI.patch
-	sha256sums = 1a3e7904354d55e45b3c5c024ec0eab1b8fa76fdbf4dd2ea2625dad2b3c6edde
-	sha256sums = 27c399254f21e3155b1e4e4fb3772e4a6bce85b40eddefafeffaa37c9d2ef222
+	source = mingw-w64-libsrtp-2.2.0.tar.gz::https://github.com/cisco/libsrtp/archive/v2.2.0.tar.gz
+	sha256sums = 44fd7497bce78767e96b54a11bca520adb2ad32effd515f04bce602b60a1a50b
 
 pkgname = mingw-w64-libsrtp
 
diff --git a/0001-Don-t-create-a-symlink-if-there-is-no-SHAREDLIBVERSI.patch b/0001-Don-t-create-a-symlink-if-there-is-no-SHAREDLIBVERSI.patch
deleted file mode 100644
index 78645e48b223..000000000000
--- a/0001-Don-t-create-a-symlink-if-there-is-no-SHAREDLIBVERSI.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fa772c2e3d41de4cdd587700f567b5aff59452bb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Wed, 24 Feb 2016 11:23:28 +0200
-Subject: [PATCH] Don't create a symlink if there is no $(SHAREDLIBVERSION)
-
-Otherwise we create a symlink with the same name as the target, which will
-create a symlink pointing to itself.
----
- Makefile.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index d9b2c4f..c0a67be 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -273,7 +273,9 @@ install:
- 	if [ -f libsrtp.$(SHAREDLIBSUFFIX) ]; then \
- 		$(INSTALL) -d $(DESTDIR)$(SHAREDLIB_DIR); \
- 		cp libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/; \
--		ln -sfn libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp.$(SHAREDLIBSUFFIXNOVER); \
-+		if [ -n "$(SHAREDLIBVERSION)" ]; then \
-+			ln -sfn libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp.$(SHAREDLIBSUFFIXNOVER); \
-+		fi; \
- 	fi
- 	if [ "$(pkgconfig_DATA)" != "" ]; then \
- 		$(INSTALL) -d $(DESTDIR)$(pkgconfigdir); \
--- 
-2.7.0
-
diff --git a/PKGBUILD b/PKGBUILD
index f295dc73ff3d..a0f94b24b082 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: drakkan <nicola.murino at gmail dot com>
 pkgname=mingw-w64-libsrtp
-pkgver=1.6.0
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="Library for SRTP (Secure Realtime Transport Protocol) (mingw-w64)"
 arch=('any')
@@ -9,18 +9,11 @@ license=('BSD')
 makedepends=('mingw-w64-configure')
 depends=('mingw-w64-crt')
 options=('!strip' '!buildflags' 'staticlibs')
-source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
-  "0001-Don-t-create-a-symlink-if-there-is-no-SHAREDLIBVERSI.patch")
-sha256sums=('1a3e7904354d55e45b3c5c024ec0eab1b8fa76fdbf4dd2ea2625dad2b3c6edde'
-  '27c399254f21e3155b1e4e4fb3772e4a6bce85b40eddefafeffaa37c9d2ef222')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
+sha256sums=('44fd7497bce78767e96b54a11bca520adb2ad32effd515f04bce602b60a1a50b')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
-prepare() {
-  cd "${srcdir}/libsrtp-${pkgver}"
-  patch -p1 -i ${srcdir}/0001-Don-t-create-a-symlink-if-there-is-no-SHAREDLIBVERSI.patch
-}
-
 build() {
   export ac_cv_lib_pcap_pcap_create=no
   cd "${srcdir}/libsrtp-$pkgver/"