fix build

3 files changed, 36 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b001582bf5e5..0fd47869773f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,17 @@
 pkgbase = linphone-plugin-msamr
 	pkgdesc = Mediastreamer2 plugin for AMR codec
 	pkgver = 1.1.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.linphone.org/
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
+	depends = mediastreamer2
 	depends = opencore-amr
+	depends = ortp
 	source = https://gitlab.linphone.org/BC/public/msamr/-/archive/1.1.3/msamr-1.1.3.tar.gz
+	source = cmake.patch
 	sha256sums = 08e67986389a03246d0891715e354778986275c675012947526e8029e7454b32
+	sha256sums = 14b422b1400a63184760ce1c3039863594e96a24607d499aeb23688adfd18e84
 
 pkgname = linphone-plugin-msamr
-
diff --git a/PKGBUILD b/PKGBUILD
index ecc11551eb7a..fab76be66487 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,34 @@
 pkgname=linphone-plugin-msamr
 _pkgname=msamr
 pkgver=1.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Mediastreamer2 plugin for AMR codec"
 arch=('x86_64')
 url="http://www.linphone.org/"
 license=('GPL3')
-depends=('opencore-amr')
+depends=('mediastreamer2'
+    'opencore-amr'
+    'ortp')
 makedepends=('cmake')
-source=("https://gitlab.linphone.org/BC/public/msamr/-/archive/$pkgver/msamr-$pkgver.tar.gz")
-sha256sums=('08e67986389a03246d0891715e354778986275c675012947526e8029e7454b32')
+source=("https://gitlab.linphone.org/BC/public/msamr/-/archive/$pkgver/msamr-$pkgver.tar.gz"
+    cmake.patch)
+sha256sums=('08e67986389a03246d0891715e354778986275c675012947526e8029e7454b32'
+            '14b422b1400a63184760ce1c3039863594e96a24607d499aeb23688adfd18e84')
+
+prepare() {
+    cd "$_pkgname-$pkgver"
+    patch -p1 -i ../cmake.patch
+}
 
 build() {
-    cd "${srcdir}"
-    mkdir -p build
-    cd build
-    cmake -DCMAKE_PREFIX_PATH="/usr" \
+    cmake -B build "$_pkgname-$pkgver" \
+        -DCMAKE_PREFIX_PATH="/usr" \
         -DCMAKE_INSTALL_PREFIX="/usr" \
-        -DENABLE_STATIC="NO" "../$_pkgname-$pkgver"
-    make
+        -DENABLE_STATIC="NO" \
+        -Wno-dev
+    make -C build
 }
 
 package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" -C build install
 }
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 000000000000..a217b7e92051
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,12 @@
+diff -urN msamr-1.1.3-orig/CMakeLists.txt msamr-1.1.3/CMakeLists.txt
+--- msamr-1.1.3-orig/CMakeLists.txt	2022-01-14 15:09:22.495180947 -0500
++++ msamr-1.1.3/CMakeLists.txt	2022-01-14 15:09:33.788521185 -0500
+@@ -52,7 +52,7 @@
+ 	include("${EP_ortp_CONFIG_DIR}/ORTPConfig.cmake")
+ 	include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake")
+ else()
+-	find_package(ORTP REQUIRED)
++	find_package(ortp REQUIRED)
+ 	find_package(Mediastreamer2 REQUIRED)
+ endif()
+ if(ENABLE_NARROWBAND)