baresip: update to 2.0.0

Signed-off-by: Gustavo Heinz <gustavo@gsthnz.com>

3 files changed, 5 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1af7246626b1..695adf609736 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -47,9 +47,7 @@ pkgbase = baresip
 	optdepends = speexdsp: (speex_aec, speex_pp modules)
 	optdepends = v4l-utils: (v4l2 module)
 	source = baresip-1.1.0.tar.gz::https://github.com/baresip/baresip/archive/v1.1.0.tar.gz
-	source = baresip-flags.patch
-	sha256sums = f9230b27c4a62f31223847bc485c51f3d960f8a09f36998dedb73358e1784b4e
-	sha256sums = 43835240d0cffd2754b7dc36f62340b2fccf5966a3e4b81f0a179428f607b914
+	sha256sums = 6feaa431b52b81a28238420bfc4efe3550ddef624fc6c1601ac144ef406d9b32
 
 pkgname = baresip
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ab5c7e17591..beebcf8cb488 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Dmitrij D. Czarkoff <czarkoff at gmail dot com>
 
 pkgname=baresip
-pkgver=1.1.0
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="portable and modular SIP User-Agent with audio and video support"
 arch=('i686' 'x86_64' 'armv6h')
@@ -30,19 +30,12 @@ optdepends=('alsa-lib: (alsa module)'
             'speexdsp: (speex_aec, speex_pp modules)'
             'v4l-utils: (v4l2 module)')
 makedepends=(${optdepends[@]/%:*/})
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/baresip/baresip/archive/v${pkgver}.tar.gz"
-        "baresip-flags.patch")
-sha256sums=('f9230b27c4a62f31223847bc485c51f3d960f8a09f36998dedb73358e1784b4e'
-            '43835240d0cffd2754b7dc36f62340b2fccf5966a3e4b81f0a179428f607b914')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/baresip-flags.patch
-}
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/baresip/baresip/archive/v${pkgver}.tar.gz")
+sha256sums=("6feaa431b52b81a28238420bfc4efe3550ddef624fc6c1601ac144ef406d9b32")
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make V=1 USE_GST= USE_GST_VIDEO= PREFIX="/usr"
+  make V=1 USE_GST= USE_GST_VIDEO= DESTDIR="/usr" PREFIX="/usr"
 }
 
 package() {
diff --git a/baresip-flags.patch b/baresip-flags.patch
deleted file mode 100644
index 5542d149f429..000000000000
--- a/baresip-flags.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0a14121e..b2e4491c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -230,7 +230,7 @@ Makefile:	mk/*.mk $(MOD_MK) $(LIBRE_MK)
- 
- $(SHARED): $(LIB_OBJS)
- 	@echo "  LD      $@"
--	$(HIDE)$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
-+	$(HIDE)$(LD) $(LDFLAGS) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
- 
- $(STATICLIB): $(LIB_OBJS)
- 	@echo "  AR      $@"
-@@ -255,7 +255,7 @@ libbaresip.pc:
- 
- $(BIN):	$(APP_OBJS)
- 	@echo "  LD      $@"
--	$(HIDE)$(LD) $(LFLAGS) $(APP_LFLAGS) $^ \
-+	$(HIDE)$(LD) $(LDFLAGS) $(LFLAGS) $(APP_LFLAGS) $^ \
- 		-L$(LIBRE_SO) -lre $(LIBS) -o $@
- 
- 
-@@ -274,7 +274,7 @@ test:	$(TEST_BIN)
- 
- $(TEST_BIN):	$(STATICLIB) $(TEST_OBJS) $(TEST_MODULES)
- 	@echo "  LD      $@"
--	$(HIDE)$(LD) $(LFLAGS) $(APP_LFLAGS) $(TEST_OBJS) \
-+	$(HIDE)$(LD) $(LDFLAGS) $(LFLAGS) $(APP_LFLAGS) $(TEST_OBJS) \
- 		-L$(LIBRE_SO) -L. \
- 		-l$(PROJECT) -lre $(LIBS) $(TEST_LIBS) -o $@
- 
-diff --git a/mk/mod.mk b/mk/mod.mk
-index 5408031b..f85fd23b 100644
---- a/mk/mod.mk
-+++ b/mk/mod.mk
-@@ -38,7 +38,7 @@ ifeq ($(STATIC),)
- 
- $(MOD)$(MOD_SUFFIX): $($(MOD)_OBJS)
- 	@echo "  LD [M]  $@"
--	$(HIDE)$(LD) $(LFLAGS) $(SH_LFLAGS) $(MOD_LFLAGS) \
-+	$(HIDE)$(LD) $(LDFLAGS) $(LFLAGS) $(SH_LFLAGS) $(MOD_LFLAGS) \
- 		$($(basename $@)_OBJS) \
- 		$($(basename $@)_LFLAGS) -L$(LIBRE_SO) -lre -o $@
-