Merge pull request #64366 from JohnAZoidberg/pjsip-29

pjsip: 2.8 -> 2.9
2019-07-14 23:02:57 -05:00 · 2019-07-14 23:02:57 -05:00 · eadc851051
commit eadc851051
parent 5bcc6cecb3 53506d9c15
2 changed files with 17 additions and 2 deletions
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@ -2,13 +2,15 @@

 stdenv.mkDerivation rec {
  name = "pjsip-${version}";
-  version = "2.8";
+  version = "2.9";

  src = fetchurl {
    url = "https://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2";
-    sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah";
+    sha256 = "0dm6l8fypkimmzvld35zyykbg957cm5zb4ny3lchgv68amwfz1fi";
  };

+  patches = [ ./fix-aarch64.patch ];
+
  buildInputs = [ openssl libsamplerate alsaLib ];

  preConfigure = ''
--- a/pkgs/applications/networking/pjsip/fix-aarch64.patch
+++ b/pkgs/applications/networking/pjsip/fix-aarch64.patch
@ -0,0 +1,13 @@
+--- a/aconfigure
+++ b/aconfigure
+@@ -8945,6 +8945,10 @@
+                                  ac_webrtc_instset=neon
+                                  ac_webrtc_cflags="-DWEBRTC_ARCH_ARMV7 -mfloat-abi=hard -mfpu=neon"
+                                  ;;
+                             arm64*|aarch64*)
+                                 ac_webrtc_instset=neon
+                                 ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64"
+                                 ;;
+                              *)
+                                  ac_webrtc_instset=sse2
+                                  ;;