[bug#38984] [PATCH 01/22] gnu: jami: Bump to 20191128.1.4c44bb7.

[bug#38984] [PATCH 01/22] gnu: jami: Bump to 20191128.1.4c44bb7.

[Jan Wielkiewicz]

This is my first patch ever, hope I won't break anything :P
My changes: Updating Jami and it's dependencies, moving Jami and modified deps to jami.scm, improving quality of packages by applying patches and configure flags to dependencies modified by Jami developers, fixing formatting.


Jan Wielkiewicz

---
 gnu/packages/telephony.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 0c9de8bd0c..d923882e6b 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -657,7 +657,7 @@ calls and messages")
 Initiation Protocol (SIP) and a multimedia framework.")
     (license license:gpl2+)))
 
-(define %jami-version "20191101.3.67671e7")
+(define %jami-version "20191128.1.4c44bb7")
 
 (define* (jami-source #:key without-daemon)
   (origin
@@ -673,7 +673,7 @@ Initiation Protocol (SIP) and a multimedia framework.")
        #f))
     (sha256
      (base32
-      "0kw172w2ccyz438kf5xqw14nhfm4xk6a2libnzib9j2wvhlpf4q0"))))
+      "1d1rvvb1qx8h464s2650zd9c1nhpwymvq6h058a8fzp4pzxxb64v"))))
 
 (define-public pjproject-jami
   (package
-- 
2.24.1

[bug#38984] [PATCH 02/22] gnu: jami: fix downloading by changing the prefix to jami_

[Jan Wielkiewicz]

---
 gnu/packages/telephony.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index d923882e6b..e6660c00e1 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -662,7 +662,7 @@ Initiation Protocol (SIP) and a multimedia framework.")
 (define* (jami-source #:key without-daemon)
   (origin
     (method url-fetch)
-    (uri (string-append "https://dl.jami.net/ring-release/tarballs/ring_"
+    (uri (string-append "https://dl.jami.net/ring-release/tarballs/jami_"
                         %jami-version
                         ".tar.gz"))
     (modules '((guix build utils)))
-- 
2.24.1

[bug#38969] [PATCH 03/22] gnu: Add libnatpmp

[Jan Wielkiewicz]

---
 gnu/packages/networking.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 482305de35..76a36111f1 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -367,6 +367,32 @@ between different versions of ØMQ.")
 files contain direct mappings of the abstractions provided by the ØMQ C API.")
       (license license:expat))))
 
+(define-public libnatpmp
+  (package
+    (name "libnatpmp")
+    (version "20150609")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+		    "http://miniupnp.free.fr/files/"
+		    name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+		      (delete 'configure)
+		      (delete 'check))
+       #:make-flags
+       (list (string-append "PREFIX=" (assoc-ref %outputs "out")))))
+    (home-page "http://miniupnp.free.fr/libnatpmp.html")
+    (synopsis "C Library implementing NAT-PMP")
+    (description
+     "libnatpmp is a portable and asynchronous implementaiton of the NAT Port Mapping Protocol (NAT-PMP) written in C.")
+    (license license:bsd-3)))
+
 (define-public librdkafka
   (package
     (name "librdkafka")
-- 
2.24.1

bug#38969: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38975] [PATCH 04/22] gnu: libupnp: Bump to 1.8.3; change fetch-method; add missing dependencies.

[Jan Wielkiewicz]

---
 gnu/packages/upnp.scm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
index 390a3387ab..4ba696e8ba 100644
--- a/gnu/packages/upnp.scm
+++ b/gnu/packages/upnp.scm
@@ -92,15 +92,20 @@ over IRC, instant messaging, network games, and most server software.")
 (define-public libupnp
   (package
     (name "libupnp")
-    (version "1.6.25")
+    (version "1.8.3")
     (source
      (origin
-      (method url-fetch)
-      (uri (string-append "mirror://sourceforge/pupnp/pupnp/libUPnP%20"
-                          version "/" name "-" version ".tar.bz2"))
+      (method git-fetch)
+      (uri (git-reference
+	    (url "https://github.com/mrjimenez/pupnp.git")
+	    (commit (string-append "release-" version))))
       (sha256
        (base32
-        "0hzsd7rvfa87b4hxg9yj4xhdfxx9sp09r9sqdl3mqhvmcyw018y5"))))
+        "1w0kfq1pg3y2wl6gwkm1w872g0qz29w1z9wj08xxmwnk5mkpvsrl"))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)))
     (build-system gnu-build-system)
     (arguments
      ;; The tests require a network device capable of multicasting which is
-- 
2.24.1

bug#38975: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38977] [PATCH 05/22] gnu: Jami: add libnatpmp (an optional dependency)

[Jan Wielkiewicz]

---
 gnu/packages/telephony.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index e6660c00e1..a2970c817b 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -781,7 +781,6 @@ Initiation Protocol (SIP) and a multimedia framework.")
     (source (jami-source #:without-daemon #t))
     (build-system gnu-build-system)
     (inputs
-     ;; Missing (optional?) dep: libnatpmp.
      `(("alsa-lib" ,alsa-lib)
        ("boost" ,boost)
        ("dbus-c++" ,dbus-c++)
@@ -802,6 +801,7 @@ Initiation Protocol (SIP) and a multimedia framework.")
        ("libsndfile" ,libsndfile)
        ("speex" ,speex)
        ("speexdsp" ,speexdsp)
+       ("libnatpmp" ,libnatpmp)
        ("libupnp" ,libupnp)
        ("libvorbis" ,libvorbis)
        ("libx264" ,libx264)
-- 
2.24.1

bug#38977: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38964] [PATCH 06/22] gnu: jami: Move Jami and its dependencies to a separate file (jami.scm).

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm      | 352 +++++++++++++++++++++++++++++++++++++
 gnu/packages/telephony.scm | 291 ------------------------------
 2 files changed, 352 insertions(+), 291 deletions(-)
 create mode 100644 gnu/packages/jami.scm

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
new file mode 100644
index 0000000000..c6f38d4a8c
--- /dev/null
+++ b/gnu/packages/jami.scm
@@ -0,0 +1,352 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages jami)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages aidc)
+  #:use-module (gnu packages audio)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages check)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages crypto)
+  #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages libcanberra)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages networking)
+  #:use-module (gnu packages pcre)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages serialization)
+  #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages telephony)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages upnp)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages webkit)
+  #:use-module (gnu packages xiph)
+  #:use-module (gnu packages xorg)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download))
+
+(define %jami-version "20191128.1.4c44bb7")
+
+(define* (jami-source #:key without-daemon)
+  (origin
+    (method url-fetch)
+    (uri (string-append "https://dl.jami.net/ring-release/tarballs/jami_"
+                        %jami-version
+                        ".tar.gz"))
+    (modules '((guix build utils)))
+    (snippet
+     (if without-daemon
+       '(begin
+          (delete-file-recursively "daemon/contrib"))
+       #f))
+    (sha256
+     (base32
+      "1d1rvvb1qx8h464s2650zd9c1nhpwymvq6h058a8fzp4pzxxb64v"))))
+
+(define-public pjproject-jami
+  (package
+    (inherit pjproject)
+    (name "pjproject-jami")
+    (native-inputs
+     `(("savoir-faire-linux-patches" ,(jami-source))
+       ,@(package-native-inputs pjproject)))
+    (arguments
+     `(#:tests? #f
+       ;; See ring-project/daemon/contrib/src/pjproject/rules.mak.
+       #:configure-flags
+       (list "--disable-oss"
+             "--disable-sound"
+             "--disable-video"
+             "--enable-ext-sound"
+             "--disable-speex-aec"
+             "--disable-g711-codec"
+             "--disable-l16-codec"
+             "--disable-gsm-codec"
+             "--disable-g722-codec"
+             "--disable-g7221-codec"
+             "--disable-speex-codec"
+             "--disable-ilbc-codec"
+             "--disable-opencore-amr"
+             "--disable-silk"
+             "--disable-sdl"
+             "--disable-ffmpeg"
+             "--disable-v4l2"
+             "--disable-openh264"
+             "--disable-resample"
+             "--disable-libwebrtc"
+             "--with-gnutls"
+             "--with-external-srtp"
+             ;; We need -fPIC or else we get the following error when linking
+             ;; against pjproject-jami:
+             ;;   relocation R_X86_64_32S against `.rodata' can not be used when
+             ;;   making a shared object;
+             "CFLAGS=-fPIC"
+             "CXXFLAGS=-fPIC")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'make-git-checkout-writable
+           (lambda _
+             (for-each make-file-writable (find-files "."))
+             #t))
+         (add-after 'unpack 'apply-patches
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches")
+                   ;; Comes from
+                   ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
+                   ;; WARNING: These amount for huge changes in pjproject.
+                   (savoir-faire-linux-patches
+                    '("fix_turn_alloc_failure"
+                      "rfc2466"
+                      "ipv6"
+                      "multiple_listeners"
+                      "pj_ice_sess"
+                      "fix_turn_fallback"
+                      "fix_ioqueue_ipv6_sendto"
+                      "add_dtls_transport"
+                      "rfc6544"
+                      "ice_config"
+                      "sip_config"
+                      "fix_first_packet_turn_tcp"
+                      "fix_ebusy_turn"
+                      "ignore_ipv6_on_transport_check"
+                      "fix_turn_connection_failure"
+                      ;; "uwp_vs" ; for windows
+                      "disable_local_resolution")))
+               (mkdir-p savoir-faire-linux-patches-directory)
+               (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches")
+                       "-C" savoir-faire-linux-patches-directory
+                       "--strip-components=5"
+                       "ring-project/daemon/contrib/src/pjproject")
+               (for-each
+                (lambda (file)
+                  (invoke "patch" "--force" "-p1" "-i"
+                          (string-append savoir-faire-linux-patches-directory "/"
+                                         file ".patch")))
+                savoir-faire-linux-patches))
+             #t))
+         ;; TODO: We could use substitute-keyword-arguments instead of
+         ;; repeating the phases from pjproject, but somehow it does
+         ;; not work.
+         (add-before 'build 'build-dep
+           (lambda _ (invoke "make" "dep")))
+         (add-before 'patch-source-shebangs 'autoconf
+           (lambda _
+             (invoke "autoconf" "-v" "-f" "-i" "-o"
+                     "aconfigure" "aconfigure.ac")))
+         (add-before 'autoconf 'disable-some-tests
+           ;; Three of the six test programs fail due to missing network
+           ;; access.
+           (lambda _
+             (substitute* "Makefile"
+               (("selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test")
+                "selftest: pjlib-test pjlib-util-test pjmedia-test"))
+             #t)))))))
+
+(define-public libring
+  (package
+    (name "libring")
+    (version %jami-version)
+    (source (jami-source #:without-daemon #t))
+    (build-system gnu-build-system)
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("boost" ,boost)
+       ("dbus-c++" ,dbus-c++)
+       ("eudev" ,eudev)
+       ("ffmpeg" ,ffmpeg)
+       ("flac" ,flac)
+       ("gmp" ,gmp)
+       ("gsm" ,gsm)
+       ("jack" ,jack-1)
+       ("jsoncpp" ,jsoncpp)
+       ("libogg" ,libogg)
+       ("libva" ,libva)
+       ("opendht" ,opendht)
+       ("opus" ,opus)
+       ("pcre" ,pcre)
+       ("pulseaudio" ,pulseaudio)
+       ("libsamplerate" ,libsamplerate)
+       ("libsndfile" ,libsndfile)
+       ("speex" ,speex)
+       ("speexdsp" ,speexdsp)
+       ("libnatpmp" ,libnatpmp)
+       ("libupnp" ,libupnp)
+       ("libvorbis" ,libvorbis)
+       ("libx264" ,libx264)
+       ("libvdpau" ,libvdpau)
+       ("yaml-cpp" ,yaml-cpp)
+       ("zlib" ,zlib)
+       ("openssl" ,openssl)
+       ("libsecp256k1" ,libsecp256k1)
+       ("python" ,python)
+       ("python-wrapper" ,python-wrapper)
+       ("restinio" ,restinio)
+       ("libx11" ,libx11)
+       ("asio" ,asio)
+       ;; TODO: Upstream seems to rely on a custom pjproject (a.k.a. pjsip) version.
+       ;; See https://git.jami.net/savoirfairelinux/ring-daemon/issues/24.
+       ("pjproject" ,pjproject-jami)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)
+       ("which" ,which)
+       ("cppunit" ,cppunit)
+       ("perl" ,perl)))                 ; Needed for documentation.
+    (arguments
+     `(#:tests? #f         ; The tests fail to compile due to missing headers.
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'change-directory
+           (lambda _
+             (chdir "daemon")
+             #t))
+         (add-before 'build 'add-lib-dir
+           (lambda _
+             (mkdir-p "src/lib")
+             #t)))))
+    (synopsis "Distributed multimedia communications platform")
+    (description "Jami (formerly GNU Ring) is a secure and distributed voice,
+video and chat communication platform that requires no centralized server and
+leaves the power of privacy in the hands of the user.  It supports the SIP and
+IAX protocols, as well as decentralized calling using P2P-DHT.
+
+This package provides a library and daemon implementing the Jami core
+functionality.")
+    (home-page "https://jami.net/")
+    (license license:gpl3+)))
+
+(define-public libringclient
+  (package
+    (inherit libring)
+    (name "libringclient")
+    (build-system cmake-build-system)
+    (propagated-inputs
+     `(("libring" ,libring)     ; For 'dring'.
+       ("qtbase" ,qtbase)       ; Qt is included in several installed headers.
+       ("qttools" ,qttools)))
+    (arguments
+     `(#:tests? #f                      ; There is no testsuite.
+       #:configure-flags
+       (list (string-append "-DRING_BUILD_DIR="
+                            (assoc-ref %build-inputs "libring") "/include"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'change-directory
+           (lambda _
+             (chdir "lrc")
+             #t))
+         (add-before 'configure 'fix-dbus-interfaces-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "CMakeLists.txt"
+               (("\\$\\{CMAKE_INSTALL_PREFIX\\}(/share/dbus-1/interfaces)" _ dbus-interfaces-path-suffix)
+                (string-append (assoc-ref inputs "libring")
+                               dbus-interfaces-path-suffix))))))))
+    (synopsis "Distributed multimedia communications platform")
+    (description "Jami (formerly GNU Ring) is a secure and distributed voice,
+video and chat communication platform that requires no centralized server and
+leaves the power of privacy in the hands of the user.  It supports the SIP and
+IAX protocols, as well as decentralized calling using P2P-DHT.
+
+This package provides a library common to all Jami clients.")
+    (home-page "https://jami.net")
+    (license license:gpl3+)))
+
+(define-public jami
+  (package
+    (inherit libring)
+    (name "jami")
+    (build-system cmake-build-system)
+    (inputs
+     `(("libringclient" ,libringclient)
+       ("gtk+" ,gtk+)
+       ("qrencode" ,qrencode)
+       ("libnotify" ,libnotify)
+       ("clutter" ,clutter)
+       ("clutter-gtk" ,clutter-gtk)
+       ("gettext" ,gnu-gettext)
+       ("libcanberra" ,libcanberra)
+       ("webkitgtk" ,webkitgtk)
+       ;; TODO: We must wrap ring-client-gnome to force using the
+       ;; `sqlite-with-column-metadata' package instead of `sqlite' or else it
+       ;; fails with:
+       ;;
+       ;;   /gnu/store/...-qtbase-5.11.2/lib/qt5/plugins/sqldrivers/libqsqlite.so:
+       ;;   undefined symbol: sqlite3_column_table_name16
+       ;;
+       ;; qtbase is built against sqlite-with-column-metadata but somehow
+       ;; jami-client-gnome ends up with both `sqlite' and
+       ;; `sqlite-with-column-metadata' as inputs and it seems that
+       ;; libqsqlite.so gets confused.
+       ("sqlite" ,sqlite-with-column-metadata)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("glib:bin" ,glib "bin")
+       ("doxygen" ,doxygen)))
+    (propagated-inputs
+     `(("libring" ,libring) ; Contains `dring', the daemon, which is automatically by d-bus.
+       ("adwaita-icon-theme" ,adwaita-icon-theme)
+       ("evolution-data-server" ,evolution-data-server)))
+    (arguments
+     `(#:tests? #f                      ; There is no testsuite.
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'change-directory
+           (lambda _
+             (chdir "client-gnome")
+             #t))
+         (add-after 'install 'wrap
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (path (string-append (assoc-ref inputs "sqlite") "/lib")))
+               (wrap-program (string-append out "/bin/jami-gnome")
+                 `("LD_LIBRARY_PATH" ":" prefix (,path))))
+             #t)))))
+    (synopsis "Distributed, privacy-respecting communication program")
+    (description "Jami (formerly GNU Ring) is a secure and distributed voice,
+video and chat communication platform that requires no centralized server and
+leaves the power of privacy in the hands of the user.  It supports the SIP and
+IAX protocols, as well as decentralized calling using P2P-DHT.
+
+This package provides the Jami client for the GNOME desktop.")
+    (home-page "https://jami.net")
+    (license license:gpl3+)))
+
+(define-public jami-client-gnome
+  (deprecated-package "jami-client-gnome" jami))
+
+
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index a2970c817b..dc3a545011 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -656,294 +656,3 @@ calls and messages")
     (description "PJProject provides an implementation of the Session
 Initiation Protocol (SIP) and a multimedia framework.")
     (license license:gpl2+)))
-
-(define %jami-version "20191128.1.4c44bb7")
-
-(define* (jami-source #:key without-daemon)
-  (origin
-    (method url-fetch)
-    (uri (string-append "https://dl.jami.net/ring-release/tarballs/jami_"
-                        %jami-version
-                        ".tar.gz"))
-    (modules '((guix build utils)))
-    (snippet
-     (if without-daemon
-       '(begin
-          (delete-file-recursively "daemon/contrib"))
-       #f))
-    (sha256
-     (base32
-      "1d1rvvb1qx8h464s2650zd9c1nhpwymvq6h058a8fzp4pzxxb64v"))))
-
-(define-public pjproject-jami
-  (package
-    (inherit pjproject)
-    (name "pjproject-jami")
-    (native-inputs
-     `(("savoir-faire-linux-patches" ,(jami-source))
-       ,@(package-native-inputs pjproject)))
-    (arguments
-     `(#:tests? #f
-       ;; See ring-project/daemon/contrib/src/pjproject/rules.mak.
-       #:configure-flags
-       (list "--disable-oss"
-             "--disable-sound"
-             "--disable-video"
-             "--enable-ext-sound"
-             "--disable-speex-aec"
-             "--disable-g711-codec"
-             "--disable-l16-codec"
-             "--disable-gsm-codec"
-             "--disable-g722-codec"
-             "--disable-g7221-codec"
-             "--disable-speex-codec"
-             "--disable-ilbc-codec"
-             "--disable-opencore-amr"
-             "--disable-silk"
-             "--disable-sdl"
-             "--disable-ffmpeg"
-             "--disable-v4l2"
-             "--disable-openh264"
-             "--disable-resample"
-             "--disable-libwebrtc"
-             "--with-gnutls"
-             "--with-external-srtp"
-             ;; We need -fPIC or else we get the following error when linking
-             ;; against pjproject-jami:
-             ;;   relocation R_X86_64_32S against `.rodata' can not be used when
-             ;;   making a shared object;
-             "CFLAGS=-fPIC"
-             "CXXFLAGS=-fPIC")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'make-git-checkout-writable
-           (lambda _
-             (for-each make-file-writable (find-files "."))
-             #t))
-         (add-after 'unpack 'apply-patches
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches")
-                   ;; Comes from
-                   ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
-                   ;; WARNING: These amount for huge changes in pjproject.
-                   (savoir-faire-linux-patches
-                    '("fix_turn_alloc_failure"
-                      "rfc2466"
-                      "ipv6"
-                      "multiple_listeners"
-                      "pj_ice_sess"
-                      "fix_turn_fallback"
-                      "fix_ioqueue_ipv6_sendto"
-                      "add_dtls_transport"
-                      "rfc6544"
-                      "ice_config"
-                      "sip_config"
-                      "fix_first_packet_turn_tcp"
-                      "fix_ebusy_turn"
-                      "ignore_ipv6_on_transport_check"
-                      "fix_turn_connection_failure"
-                      ;; "uwp_vs" ; for windows
-                      "disable_local_resolution")))
-               (mkdir-p savoir-faire-linux-patches-directory)
-               (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches")
-                       "-C" savoir-faire-linux-patches-directory
-                       "--strip-components=5"
-                       "ring-project/daemon/contrib/src/pjproject")
-               (for-each
-                (lambda (file)
-                  (invoke "patch" "--force" "-p1" "-i"
-                          (string-append savoir-faire-linux-patches-directory "/"
-                                         file ".patch")))
-                savoir-faire-linux-patches))
-             #t))
-         ;; TODO: We could use substitute-keyword-arguments instead of
-         ;; repeating the phases from pjproject, but somehow it does
-         ;; not work.
-         (add-before 'build 'build-dep
-           (lambda _ (invoke "make" "dep")))
-         (add-before 'patch-source-shebangs 'autoconf
-           (lambda _
-             (invoke "autoconf" "-v" "-f" "-i" "-o"
-                     "aconfigure" "aconfigure.ac")))
-         (add-before 'autoconf 'disable-some-tests
-           ;; Three of the six test programs fail due to missing network
-           ;; access.
-           (lambda _
-             (substitute* "Makefile"
-               (("selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test")
-                "selftest: pjlib-test pjlib-util-test pjmedia-test"))
-             #t)))))))
-
-(define-public libring
-  (package
-    (name "libring")
-    (version %jami-version)
-    (source (jami-source #:without-daemon #t))
-    (build-system gnu-build-system)
-    (inputs
-     `(("alsa-lib" ,alsa-lib)
-       ("boost" ,boost)
-       ("dbus-c++" ,dbus-c++)
-       ("eudev" ,eudev)
-       ("ffmpeg" ,ffmpeg)
-       ("flac" ,flac)
-       ("gmp" ,gmp)
-       ("gsm" ,gsm)
-       ("jack" ,jack-1)
-       ("jsoncpp" ,jsoncpp)
-       ("libogg" ,libogg)
-       ("libva" ,libva)
-       ("opendht" ,opendht)
-       ("opus" ,opus)
-       ("pcre" ,pcre)
-       ("pulseaudio" ,pulseaudio)
-       ("libsamplerate" ,libsamplerate)
-       ("libsndfile" ,libsndfile)
-       ("speex" ,speex)
-       ("speexdsp" ,speexdsp)
-       ("libnatpmp" ,libnatpmp)
-       ("libupnp" ,libupnp)
-       ("libvorbis" ,libvorbis)
-       ("libx264" ,libx264)
-       ("libvdpau" ,libvdpau)
-       ("yaml-cpp" ,yaml-cpp)
-       ("zlib" ,zlib)
-       ("openssl" ,openssl)
-       ("libsecp256k1" ,libsecp256k1)
-       ("python" ,python)
-       ("python-wrapper" ,python-wrapper)
-       ("restinio" ,restinio)
-       ("libx11" ,libx11)
-       ("asio" ,asio)
-       ;; TODO: Upstream seems to rely on a custom pjproject (a.k.a. pjsip) version.
-       ;; See https://git.jami.net/savoirfairelinux/ring-daemon/issues/24.
-       ("pjproject" ,pjproject-jami)))
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("libtool" ,libtool)
-       ("pkg-config" ,pkg-config)
-       ("which" ,which)
-       ("cppunit" ,cppunit)
-       ("perl" ,perl)))                 ; Needed for documentation.
-    (arguments
-     `(#:tests? #f         ; The tests fail to compile due to missing headers.
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'change-directory
-           (lambda _
-             (chdir "daemon")
-             #t))
-         (add-before 'build 'add-lib-dir
-           (lambda _
-             (mkdir-p "src/lib")
-             #t)))))
-    (synopsis "Distributed multimedia communications platform")
-    (description "Jami (formerly GNU Ring) is a secure and distributed voice,
-video and chat communication platform that requires no centralized server and
-leaves the power of privacy in the hands of the user.  It supports the SIP and
-IAX protocols, as well as decentralized calling using P2P-DHT.
-
-This package provides a library and daemon implementing the Jami core
-functionality.")
-    (home-page "https://jami.net/")
-    (license license:gpl3+)))
-
-(define-public libringclient
-  (package
-    (inherit libring)
-    (name "libringclient")
-    (build-system cmake-build-system)
-    (propagated-inputs
-     `(("libring" ,libring)     ; For 'dring'.
-       ("qtbase" ,qtbase)       ; Qt is included in several installed headers.
-       ("qttools" ,qttools)))
-    (arguments
-     `(#:tests? #f                      ; There is no testsuite.
-       #:configure-flags
-       (list (string-append "-DRING_BUILD_DIR="
-                            (assoc-ref %build-inputs "libring") "/include"))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'change-directory
-           (lambda _
-             (chdir "lrc")
-             #t))
-         (add-before 'configure 'fix-dbus-interfaces-path
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "CMakeLists.txt"
-               (("\\$\\{CMAKE_INSTALL_PREFIX\\}(/share/dbus-1/interfaces)" _ dbus-interfaces-path-suffix)
-                (string-append (assoc-ref inputs "libring")
-                               dbus-interfaces-path-suffix))))))))
-    (synopsis "Distributed multimedia communications platform")
-    (description "Jami (formerly GNU Ring) is a secure and distributed voice,
-video and chat communication platform that requires no centralized server and
-leaves the power of privacy in the hands of the user.  It supports the SIP and
-IAX protocols, as well as decentralized calling using P2P-DHT.
-
-This package provides a library common to all Jami clients.")
-    (home-page "https://jami.net")
-    (license license:gpl3+)))
-
-(define-public jami
-  (package
-    (inherit libring)
-    (name "jami")
-    (build-system cmake-build-system)
-    (inputs
-     `(("libringclient" ,libringclient)
-       ("gtk+" ,gtk+)
-       ("qrencode" ,qrencode)
-       ("libnotify" ,libnotify)
-       ("clutter" ,clutter)
-       ("clutter-gtk" ,clutter-gtk)
-       ("gettext" ,gnu-gettext)
-       ("libcanberra" ,libcanberra)
-       ("webkitgtk" ,webkitgtk)
-       ;; TODO: We must wrap ring-client-gnome to force using the
-       ;; `sqlite-with-column-metadata' package instead of `sqlite' or else it
-       ;; fails with:
-       ;;
-       ;;   /gnu/store/...-qtbase-5.11.2/lib/qt5/plugins/sqldrivers/libqsqlite.so:
-       ;;   undefined symbol: sqlite3_column_table_name16
-       ;;
-       ;; qtbase is built against sqlite-with-column-metadata but somehow
-       ;; jami-client-gnome ends up with both `sqlite' and
-       ;; `sqlite-with-column-metadata' as inputs and it seems that
-       ;; libqsqlite.so gets confused.
-       ("sqlite" ,sqlite-with-column-metadata)))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("glib:bin" ,glib "bin")
-       ("doxygen" ,doxygen)))
-    (propagated-inputs
-     `(("libring" ,libring) ; Contains `dring', the daemon, which is automatically by d-bus.
-       ("adwaita-icon-theme" ,adwaita-icon-theme)
-       ("evolution-data-server" ,evolution-data-server)))
-    (arguments
-     `(#:tests? #f                      ; There is no testsuite.
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'change-directory
-           (lambda _
-             (chdir "client-gnome")
-             #t))
-         (add-after 'install 'wrap
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (path (string-append (assoc-ref inputs "sqlite") "/lib")))
-               (wrap-program (string-append out "/bin/jami-gnome")
-                 `("LD_LIBRARY_PATH" ":" prefix (,path))))
-             #t)))))
-    (synopsis "Distributed, privacy-respecting communication program")
-    (description "Jami (formerly GNU Ring) is a secure and distributed voice,
-video and chat communication platform that requires no centralized server and
-leaves the power of privacy in the hands of the user.  It supports the SIP and
-IAX protocols, as well as decentralized calling using P2P-DHT.
-
-This package provides the Jami client for the GNOME desktop.")
-    (home-page "https://jami.net")
-    (license license:gpl3+)))
-
-(define-public jami-client-gnome
-  (deprecated-package "jami-client-gnome" jami))
-- 
2.24.1

bug#38964: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38979] [PATCH 07/22] gnu: jami: Fix the procedure for applying patches. Use the procedure correctly in pjproject-jami.

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index c6f38d4a8c..f257767a85 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -58,6 +58,22 @@
   #:use-module (guix download)
   #:use-module (guix git-download))
 
+(define-public jami-apply-dependency-patches
+  '(lambda* (#:key inputs dep-name patches)
+	    (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches"))
+	      (mkdir-p savoir-faire-linux-patches-directory)
+	      (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches")
+				  "-C" savoir-faire-linux-patches-directory
+				  "--strip-components=5"
+				  (string-append "ring-project/daemon/contrib/src/"
+						 dep-name))
+	      (for-each
+       (lambda (file)
+	 (invoke "patch" "--force" "-p1" "-i"
+			     (string-append savoir-faire-linux-patches-directory "/"
+					    file ".patch")))
+       patches))))
+
 (define %jami-version "20191128.1.4c44bb7")
 
 (define* (jami-source #:key without-daemon)
@@ -115,6 +131,8 @@
              ;;   making a shared object;
              "CFLAGS=-fPIC"
              "CXXFLAGS=-fPIC")
+       #:modules ((guix build utils)
+		  ,@(@@ (guix build-system gnu) %default-modules))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'make-git-checkout-writable
@@ -157,6 +175,31 @@
                                          file ".patch")))
                 savoir-faire-linux-patches))
              #t))
+		    (lambda* (#:key inputs #:allow-other-keys)
+			     (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
+			       ;; Comes from
+			       ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
+			       ;; WARNING: These amount for huge changes in pjproject.
+			       (jami-apply-dependency-patches #:inputs inputs
+							      #:dep-name "pjproject"
+							      #:patches
+							      '("fix_turn_alloc_failure"
+								"rfc2466"
+								"ipv6"
+								"multiple_listeners"
+								"pj_ice_sess"
+								"fix_turn_fallback"
+								"fix_ioqueue_ipv6_sendto"
+								"add_dtls_transport"
+								"rfc6544"
+								"ice_config"
+								"sip_config"
+								"fix_first_packet_turn_tcp"
+								"fix_ebusy_turn"
+								"ignore_ipv6_on_transport_check"
+								"fix_turn_connection_failure"
+								"disable_local_resolution"))
+			       #t))
          ;; TODO: We could use substitute-keyword-arguments instead of
          ;; repeating the phases from pjproject, but somehow it does
          ;; not work.
-- 
2.24.1

bug#38979: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38961] [PATCH 08/22] gnu: Add ffmpeg-jami.

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm | 213 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 212 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index f257767a85..7320104c88 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -56,7 +56,8 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
-  #:use-module (guix git-download))
+  #:use-module (guix git-download)
+  #:use-module (guix utils))
 
 (define-public jami-apply-dependency-patches
   '(lambda* (#:key inputs dep-name patches)
@@ -218,6 +219,216 @@
                 "selftest: pjlib-test pjlib-util-test pjmedia-test"))
              #t)))))))
 
+(define-public ffmpeg-jami
+  (package
+   (inherit ffmpeg)
+   (name "ffmpeg-jami")
+   (version "4.2.1")
+   (source (origin
+             (method git-fetch)
+             (uri (git-reference
+		   (url "https://git.ffmpeg.org/ffmpeg.git")
+		   (commit "59da9dcd7ef6277e4e04998ced71b05a6083c635")))
+	     (file-name (git-file-name "ffmpeg" version))
+             (sha256
+              (base32
+               "0cm58kd06lvslc7knnfajv5p63v4cc6502badjcic5m9izd03lz2"))))
+   (native-inputs
+    `(("savoir-faire-linux-patches" ,(jami-source))
+      ,@(package-native-inputs ffmpeg)))
+   (arguments
+    (substitute-keyword-arguments (package-arguments ffmpeg)
+				  ((#:configure-flags '())
+				   (append '("--disable-everything"
+					     "--enable-zlib"
+					     "--enable-gpl"
+					     "--enable-swscale"
+					     "--enable-bsfs"
+					     "--disable-filters"
+					     "--disable-programs"
+					     "--disable-postproc"
+					     "--disable-protocols"
+					     "--enable-protocol=crypto"
+					     "--enable-protocol=file"
+					     "--enable-protocol=rtp"
+					     "--enable-protocol=srtp"
+					     "--enable-protocol=tcp"
+					     "--enable-protocol=udp"
+					     "--enable-protocol=unix"
+					     "--enable-protocol=pipe"
+					     "--disable-demuxers"
+					     "--disable-muxers"
+					     "--enable-muxer=rtp"
+					     "--enable-muxer=g722"
+					     "--enable-muxer=h263"
+					     "--enable-muxer=h264"
+					     "--enable-muxer=hevc"
+					     "--enable-muxer=webm"
+					     "--enable-muxer=ogg"
+					     "--enable-muxer=pcm_s16be"
+					     "--enable-muxer=pcm_s16le"
+					     "--enable-demuxer=rtp"
+					     "--enable-demuxer=mjpeg"
+					     "--enable-demuxer=mjpeg_2000"
+					     "--enable-demuxer=mpegvideo"
+					     "--enable-demuxer=gif"
+					     "--enable-demuxer=image_jpeg_pipe"
+					     "--enable-demuxer=image_png_pipe"
+					     "--enable-demuxer=image_webp_pipe"
+					     "--enable-demuxer=matroska"
+					     "--enable-demuxer=m4v"
+					     "--enable-demuxer=mp3"
+					     "--enable-demuxer=ogg"
+					     "--enable-demuxer=flac"
+					     "--enable-demuxer=wav"
+					     "--enable-demuxer=ac3"
+					     "--enable-demuxer=g722"
+					     "--enable-demuxer=pcm_mulaw"
+					     "--enable-demuxer=pcm_alaw"
+					     "--enable-demuxer=pcm_s16be"
+					     "--enable-demuxer=pcm_s16le"
+					     "--enable-demuxer=h263"
+					     "--enable-demuxer=h264"
+					     "--enable-demuxer=hevc"
+					     "--enable-parser=h263"
+					     "--enable-parser=h264"
+					     "--enable-parser=mpeg4video"
+					     "--enable-parser=vp8"
+					     "--enable-parser=vp9"
+					     "--enable-parser=opus"
+					     "--enable-encoder=adpcm_g722"
+					     "--enable-decoder=adpcm_g722"
+					     "--enable-encoder=rawvideo"
+					     "--enable-decoder=rawvideo"
+					     "--enable-encoder=libx264"
+					     "--enable-decoder=h264"
+					     "--enable-encoder=pcm_alaw"
+					     "--enable-decoder=pcm_alaw"
+					     "--enable-encoder=pcm_mulaw"
+					     "--enable-decoder=pcm_mulaw"
+					     "--enable-encoder=mpeg4"
+					     "--enable-decoder=mpeg4"
+					     "--enable-encoder=libvpx_vp8"
+					     "--enable-decoder=vp8"
+					     "--enable-decoder=vp9"
+					     "--enable-encoder=h263"
+					     "--enable-encoder=h263p"
+					     "--enable-decoder=h263"
+					     "--enable-encoder=mjpeg"
+					     "--enable-decoder=mjpeg"
+					     "--enable-decoder=mjpegb"
+					     "--enable-libspeex"
+					     "--enable-libopus"
+					     "--enable-libvpx"
+					     "--enable-libx264"
+					     "--enable-encoder=libspeex"
+					     "--enable-decoder=libspeex"
+					     "--enable-encoder=libopus"
+					     "--enable-decoder=libopus"
+					     "--enable-decoder=flac"
+					     "--enable-decoder=vorbis"
+					     "--enable-decoder=aac"
+					     "--enable-decoder=ac3"
+					     "--enable-decoder=eac3"
+					     "--enable-decoder=mp3"
+					     "--enable-decoder=pcm_u24be"
+					     "--enable-decoder=pcm_u24le"
+					     "--enable-decoder=pcm_u32be"
+					     "--enable-decoder=pcm_u32le"
+					     "--enable-decoder=pcm_u8"
+					     "--enable-decoder=pcm_f16le"
+					     "--enable-decoder=pcm_f24le"
+					     "--enable-decoder=pcm_f32be"
+					     "--enable-decoder=pcm_f32le"
+					     "--enable-decoder=pcm_f64be"
+					     "--enable-decoder=pcm_f64le"
+					     "--enable-decoder=pcm_s16be"
+					     "--enable-decoder=pcm_s16be_planar"
+					     "--enable-decoder=pcm_s16le"
+					     "--enable-decoder=pcm_s16le_planar"
+					     "--enable-decoder=pcm_s24be"
+					     "--enable-decoder=pcm_s24le"
+					     "--enable-decoder=pcm_s24le_planar"
+					     "--enable-decoder=pcm_s32be"
+					     "--enable-decoder=pcm_s32le"
+					     "--enable-decoder=pcm_s32le_planar"
+					     "--enable-decoder=pcm_s64be"
+					     "--enable-decoder=pcm_s64le"
+					     "--enable-decoder=pcm_s8"
+					     "--enable-decoder=pcm_s8_planar"
+					     "--enable-decoder=pcm_u16be"
+					     "--enable-decoder=pcm_u16le"
+					     "--enable-encoder=gif"
+					     "--enable-decoder=gif"
+					     "--enable-encoder=jpegls"
+					     "--enable-decoder=jpegls"
+					     "--enable-encoder=ljpeg"
+					     "--enable-decoder=jpeg2000"
+					     "--enable-encoder=png"
+					     "--enable-decoder=png"
+					     "--enable-encoder=bmp"
+					     "--enable-decoder=bmp"
+					     "--enable-encoder=tiff"
+					     "--enable-decoder=tiff"
+					     "--enable-filter=scale"
+					     "--enable-filter=overlay"
+					     "--enable-filter=amix"
+					     "--enable-filter=amerge"
+					     "--enable-filter=aresample"
+					     "--enable-filter=format"
+					     "--enable-filter=aformat"
+					     "--enable-filter=fps"
+					     "--enable-filter=transpose"
+					     "--enable-filter=pad")
+					   (if (string-contains (%current-system) "linux")
+						'("--enable-pic"
+						  "--extra-cxxflags=-fPIC"
+						  "--extra-cflags=-fPIC"
+						  "--target-os=linux"
+						  "--enable-indev=v4l2"
+						  "--enable-indev=xcbgrab"
+						  "--enable-vdpau"
+						  "--enable-hwaccel=h264_vdpau"
+						  "--enable-hwaccel=mpeg4_vdpau"
+						  "--enable-vaapi"
+						  "--enable-hwaccel=h264_vaapi"
+						  "--enable-hwaccel=mpeg4_vaapi"
+						  "--enable-hwaccel=h263_vaapi"
+						  "--enable-hwaccel=vp8_vaapi"
+						  "--enable-hwaccel=mjpeg_vaapi"
+						  "--enable-encoder=h264_vaapi"
+						  "--enable-encoder=vp8_vaapi"
+						  "--enable-encoder=mjpeg_vaapi"
+						  "--enable-cuvid"
+						  "--enable-ffnvcodec"
+						  "--enable-nvdec"
+						  "--enable-nvenc"
+						  "--enable-hwaccel=h264_nvdec"
+						  "--enable-hwaccel=hevc_nvdec"
+						  "--enable-hwaccel=vp8_nvdec"
+						  "--enable-hwaccel=mjpeg_nvdec"
+						  "--enable-encoder=h264_nvenc"
+						  "--enable-encoder=hevc_nvenc"))
+					   (if (string?= (%current-system) "aarch64-linux")
+						'("--arch=aarch64"))
+					   (if (string?= (%current-system) "arm64-linux")
+						'("--arch=aarch64"))))
+				  ((#:phases phases)
+				   `(modify-phases ,phases
+						   (add-after 'unpack 'apply-patches
+							      (lambda* (#:key inputs #:allow-other-keys)
+								       (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
+									 ;; Comes from
+									 ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
+									 ;; WARNING: These amount for huge changes in pjproject.
+									 (jami-apply-dependency-patches #:inputs inputs
+													#:dep-name "ffmpeg"
+													#:patches
+													'("remove-mjpeg-log"
+													  "change-RTCP-ratio"
+													  "rtp_ext_abs_send_time"))
+									 #t))))))))) 
+
 (define-public libring
   (package
     (name "libring")
-- 
2.24.1

bug#38961: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38983] [PATCH 09/22] gnu: jami: Bump to 20191209.1.4b48135.

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 7320104c88..8b24984bd5 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -75,7 +75,7 @@
 					    file ".patch")))
        patches))))
 
-(define %jami-version "20191128.1.4c44bb7")
+(define %jami-version "20191209.1.4b48135")
 
 (define* (jami-source #:key without-daemon)
   (origin
@@ -91,7 +91,7 @@
        #f))
     (sha256
      (base32
-      "1d1rvvb1qx8h464s2650zd9c1nhpwymvq6h058a8fzp4pzxxb64v"))))
+      "1mdaqamx12dimvpvr5cr2c12v7cwwx28a2cqpp3c720v8c2hl74g"))))
 
 (define-public pjproject-jami
   (package
-- 
2.24.1

bug#38983: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38982] [PATCH 10/22] gnu: Add gnutls-jami (not yet working).

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm | 51 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 8b24984bd5..db2e52d27f 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -45,6 +45,7 @@
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages telephony)
+  #:use-module (gnu packages time)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages upnp)
   #:use-module (gnu packages video)
@@ -219,6 +220,56 @@
                 "selftest: pjlib-test pjlib-util-test pjmedia-test"))
              #t)))))))
 
+(define-public gnutls-jami
+  (package
+   (inherit gnutls)
+   (name "gnutls-jami")
+   (native-inputs
+    `(("savoir-faire-linux-patches" ,(jami-source))
+      ("automake" ,automake)
+      ("autoconf" ,autoconf)
+      ("datefudge" ,datefudge)
+      ("openssl" ,openssl)
+      ,@(package-native-inputs gnutls)))
+   (version "3.6.10")
+    (source (origin
+             (method url-fetch)
+             (uri
+              (string-append "mirror://gnupg/gnutls/v"
+                             (version-major+minor version)
+                             "/gnutls-" version ".tar.xz"))
+             ;;(patches (search-patches "gnutls-skip-trust-store-test.patch"))
+             (sha256
+              (base32
+               "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi"))))
+   (arguments
+    (substitute-keyword-arguments (package-arguments gnutls)
+				  ((#:configure-flags '())
+				   '("--disable-gtk-doc"
+				     "--without-p11-kit"
+				     "--disable-cxx"
+				     "--disable-srp-authentication"
+				     "--disable-psk-authentication-FIXME"
+				     "--with-included-libtasn1"
+				     "--with-included-unistring"
+				     "--disable-openpgp-authentication"
+				     "--disable-openssl-compatibility"
+				     "--disable-guile"
+				     "--disable-nls"
+				     "--disable-dtls-srtp-support"
+				     "--without-libintl-prefix"
+				     "--without-idn"))
+				  ((#:phases phases)
+				   `(modify-phases ,phases
+						   (add-after 'unpack 'apply-patches
+							      (lambda* (#:key inputs #:allow-other-keys)
+								       (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
+									 (jami-apply-dependency-patches #:inputs inputs
+													#:dep-name "gnutls"
+													#:patches
+													'("downgrade-gettext-requirement"))
+									 #t)))))))))
+
 (define-public ffmpeg-jami
   (package
    (inherit ffmpeg)
-- 
2.24.1

bug#38982: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38984] [PATCH 11/22] gnu: jami: Bump to 20191214.1.07edb5e.

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index db2e52d27f..9197c4e6a4 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -76,7 +76,7 @@
 					    file ".patch")))
        patches))))
 
-(define %jami-version "20191209.1.4b48135")
+(define %jami-version "20191214.1.07edb5e")
 
 (define* (jami-source #:key without-daemon)
   (origin
@@ -92,7 +92,7 @@
        #f))
     (sha256
      (base32
-      "1mdaqamx12dimvpvr5cr2c12v7cwwx28a2cqpp3c720v8c2hl74g"))))
+      "1g5crffqfw7rb96iqamsfv63pjql9dli9m3nd1hsx28apkffkbnd"))))
 
 (define-public pjproject-jami
   (package
-- 
2.24.1

[bug#38960] [PATCH 12/22] gnu: ffmpeg-jami: skip tests.

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm | 335 ++++++++++++++++++++++--------------------
 1 file changed, 172 insertions(+), 163 deletions(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 9197c4e6a4..a48bc7f286 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -286,152 +286,155 @@
                "0cm58kd06lvslc7knnfajv5p63v4cc6502badjcic5m9izd03lz2"))))
    (native-inputs
     `(("savoir-faire-linux-patches" ,(jami-source))
+      ("libiconv" ,libiconv)
       ,@(package-native-inputs ffmpeg)))
    (arguments
-    (substitute-keyword-arguments (package-arguments ffmpeg)
-				  ((#:configure-flags '())
-				   (append '("--disable-everything"
-					     "--enable-zlib"
-					     "--enable-gpl"
-					     "--enable-swscale"
-					     "--enable-bsfs"
-					     "--disable-filters"
-					     "--disable-programs"
-					     "--disable-postproc"
-					     "--disable-protocols"
-					     "--enable-protocol=crypto"
-					     "--enable-protocol=file"
-					     "--enable-protocol=rtp"
-					     "--enable-protocol=srtp"
-					     "--enable-protocol=tcp"
-					     "--enable-protocol=udp"
-					     "--enable-protocol=unix"
-					     "--enable-protocol=pipe"
-					     "--disable-demuxers"
-					     "--disable-muxers"
-					     "--enable-muxer=rtp"
-					     "--enable-muxer=g722"
-					     "--enable-muxer=h263"
-					     "--enable-muxer=h264"
-					     "--enable-muxer=hevc"
-					     "--enable-muxer=webm"
-					     "--enable-muxer=ogg"
-					     "--enable-muxer=pcm_s16be"
-					     "--enable-muxer=pcm_s16le"
-					     "--enable-demuxer=rtp"
-					     "--enable-demuxer=mjpeg"
-					     "--enable-demuxer=mjpeg_2000"
-					     "--enable-demuxer=mpegvideo"
-					     "--enable-demuxer=gif"
-					     "--enable-demuxer=image_jpeg_pipe"
-					     "--enable-demuxer=image_png_pipe"
-					     "--enable-demuxer=image_webp_pipe"
-					     "--enable-demuxer=matroska"
-					     "--enable-demuxer=m4v"
-					     "--enable-demuxer=mp3"
-					     "--enable-demuxer=ogg"
-					     "--enable-demuxer=flac"
-					     "--enable-demuxer=wav"
-					     "--enable-demuxer=ac3"
-					     "--enable-demuxer=g722"
-					     "--enable-demuxer=pcm_mulaw"
-					     "--enable-demuxer=pcm_alaw"
-					     "--enable-demuxer=pcm_s16be"
-					     "--enable-demuxer=pcm_s16le"
-					     "--enable-demuxer=h263"
-					     "--enable-demuxer=h264"
-					     "--enable-demuxer=hevc"
-					     "--enable-parser=h263"
-					     "--enable-parser=h264"
-					     "--enable-parser=mpeg4video"
-					     "--enable-parser=vp8"
-					     "--enable-parser=vp9"
-					     "--enable-parser=opus"
-					     "--enable-encoder=adpcm_g722"
-					     "--enable-decoder=adpcm_g722"
-					     "--enable-encoder=rawvideo"
-					     "--enable-decoder=rawvideo"
-					     "--enable-encoder=libx264"
-					     "--enable-decoder=h264"
-					     "--enable-encoder=pcm_alaw"
-					     "--enable-decoder=pcm_alaw"
-					     "--enable-encoder=pcm_mulaw"
-					     "--enable-decoder=pcm_mulaw"
-					     "--enable-encoder=mpeg4"
-					     "--enable-decoder=mpeg4"
-					     "--enable-encoder=libvpx_vp8"
-					     "--enable-decoder=vp8"
-					     "--enable-decoder=vp9"
-					     "--enable-encoder=h263"
-					     "--enable-encoder=h263p"
-					     "--enable-decoder=h263"
-					     "--enable-encoder=mjpeg"
-					     "--enable-decoder=mjpeg"
-					     "--enable-decoder=mjpegb"
-					     "--enable-libspeex"
-					     "--enable-libopus"
-					     "--enable-libvpx"
-					     "--enable-libx264"
-					     "--enable-encoder=libspeex"
-					     "--enable-decoder=libspeex"
-					     "--enable-encoder=libopus"
-					     "--enable-decoder=libopus"
-					     "--enable-decoder=flac"
-					     "--enable-decoder=vorbis"
-					     "--enable-decoder=aac"
-					     "--enable-decoder=ac3"
-					     "--enable-decoder=eac3"
-					     "--enable-decoder=mp3"
-					     "--enable-decoder=pcm_u24be"
-					     "--enable-decoder=pcm_u24le"
-					     "--enable-decoder=pcm_u32be"
-					     "--enable-decoder=pcm_u32le"
-					     "--enable-decoder=pcm_u8"
-					     "--enable-decoder=pcm_f16le"
-					     "--enable-decoder=pcm_f24le"
-					     "--enable-decoder=pcm_f32be"
-					     "--enable-decoder=pcm_f32le"
-					     "--enable-decoder=pcm_f64be"
-					     "--enable-decoder=pcm_f64le"
-					     "--enable-decoder=pcm_s16be"
-					     "--enable-decoder=pcm_s16be_planar"
-					     "--enable-decoder=pcm_s16le"
-					     "--enable-decoder=pcm_s16le_planar"
-					     "--enable-decoder=pcm_s24be"
-					     "--enable-decoder=pcm_s24le"
-					     "--enable-decoder=pcm_s24le_planar"
-					     "--enable-decoder=pcm_s32be"
-					     "--enable-decoder=pcm_s32le"
-					     "--enable-decoder=pcm_s32le_planar"
-					     "--enable-decoder=pcm_s64be"
-					     "--enable-decoder=pcm_s64le"
-					     "--enable-decoder=pcm_s8"
-					     "--enable-decoder=pcm_s8_planar"
-					     "--enable-decoder=pcm_u16be"
-					     "--enable-decoder=pcm_u16le"
-					     "--enable-encoder=gif"
-					     "--enable-decoder=gif"
-					     "--enable-encoder=jpegls"
-					     "--enable-decoder=jpegls"
-					     "--enable-encoder=ljpeg"
-					     "--enable-decoder=jpeg2000"
-					     "--enable-encoder=png"
-					     "--enable-decoder=png"
-					     "--enable-encoder=bmp"
-					     "--enable-decoder=bmp"
-					     "--enable-encoder=tiff"
-					     "--enable-decoder=tiff"
-					     "--enable-filter=scale"
-					     "--enable-filter=overlay"
-					     "--enable-filter=amix"
-					     "--enable-filter=amerge"
-					     "--enable-filter=aresample"
-					     "--enable-filter=format"
-					     "--enable-filter=aformat"
-					     "--enable-filter=fps"
-					     "--enable-filter=transpose"
-					     "--enable-filter=pad")
-					   (if (string-contains (%current-system) "linux")
+    (append
+     '(#:tests? #f)
+     (substitute-keyword-arguments (package-arguments ffmpeg)
+				   ((#:configure-flags '())
+				    (append '("--disable-everything"
+					      "--enable-zlib"
+					      "--enable-gpl"
+					      "--enable-swscale"
+					      "--enable-bsfs"
+					      "--disable-filters"
+					      "--disable-programs"
+					      "--disable-postproc"
+					      "--disable-protocols"
+					      "--enable-protocol=crypto"
+					      "--enable-protocol=file"
+					      "--enable-protocol=rtp"
+					      "--enable-protocol=srtp"
+					      "--enable-protocol=tcp"
+					      "--enable-protocol=udp"
+					      "--enable-protocol=unix"
+					      "--enable-protocol=pipe"
+					      "--disable-demuxers"
+					      "--disable-muxers"
+					      "--enable-muxer=rtp"
+					      "--enable-muxer=g722"
+					      "--enable-muxer=h263"
+					      "--enable-muxer=h264"
+					      "--enable-muxer=hevc"
+					      "--enable-muxer=webm"
+					      "--enable-muxer=ogg"
+					      "--enable-muxer=pcm_s16be"
+					      "--enable-muxer=pcm_s16le"
+					      "--enable-demuxer=rtp"
+					      "--enable-demuxer=mjpeg"
+					      "--enable-demuxer=mjpeg_2000"
+					      "--enable-demuxer=mpegvideo"
+					      "--enable-demuxer=gif"
+					      "--enable-demuxer=image_jpeg_pipe"
+					      "--enable-demuxer=image_png_pipe"
+					      "--enable-demuxer=image_webp_pipe"
+					      "--enable-demuxer=matroska"
+					      "--enable-demuxer=m4v"
+					      "--enable-demuxer=mp3"
+					      "--enable-demuxer=ogg"
+					      "--enable-demuxer=flac"
+					      "--enable-demuxer=wav"
+					      "--enable-demuxer=ac3"
+					      "--enable-demuxer=g722"
+					      "--enable-demuxer=pcm_mulaw"
+					      "--enable-demuxer=pcm_alaw"
+					      "--enable-demuxer=pcm_s16be"
+					      "--enable-demuxer=pcm_s16le"
+					      "--enable-demuxer=h263"
+					      "--enable-demuxer=h264"
+					      "--enable-demuxer=hevc"
+					      "--enable-parser=h263"
+					      "--enable-parser=h264"
+					      "--enable-parser=mpeg4video"
+					      "--enable-parser=vp8"
+					      "--enable-parser=vp9"
+					      "--enable-parser=opus"
+					      "--enable-encoder=adpcm_g722"
+					      "--enable-decoder=adpcm_g722"
+					      "--enable-encoder=rawvideo"
+					      "--enable-decoder=rawvideo"
+					      "--enable-encoder=libx264"
+					      "--enable-decoder=h264"
+					      "--enable-encoder=pcm_alaw"
+					      "--enable-decoder=pcm_alaw"
+					      "--enable-encoder=pcm_mulaw"
+					      "--enable-decoder=pcm_mulaw"
+					      "--enable-encoder=mpeg4"
+					      "--enable-decoder=mpeg4"
+					      "--enable-encoder=libvpx_vp8"
+					      "--enable-decoder=vp8"
+					      "--enable-decoder=vp9"
+					      "--enable-encoder=h263"
+					      "--enable-encoder=h263p"
+					      "--enable-decoder=h263"
+					      "--enable-encoder=mjpeg"
+					      "--enable-decoder=mjpeg"
+					      "--enable-decoder=mjpegb"
+					      "--enable-libspeex"
+					      "--enable-libopus"
+					      "--enable-libvpx"
+					      "--enable-libx264"
+					      "--enable-encoder=libspeex"
+					      "--enable-decoder=libspeex"
+					      "--enable-encoder=libopus"
+					      "--enable-decoder=libopus"
+					      "--enable-decoder=flac"
+					      "--enable-decoder=vorbis"
+					      "--enable-decoder=aac"
+					      "--enable-decoder=ac3"
+					      "--enable-decoder=eac3"
+					      "--enable-decoder=mp3"
+					      "--enable-decoder=pcm_u24be"
+					      "--enable-decoder=pcm_u24le"
+					      "--enable-decoder=pcm_u32be"
+					      "--enable-decoder=pcm_u32le"
+					      "--enable-decoder=pcm_u8"
+					      "--enable-decoder=pcm_f16le"
+					      "--enable-decoder=pcm_f24le"
+					      "--enable-decoder=pcm_f32be"
+					      "--enable-decoder=pcm_f32le"
+					      "--enable-decoder=pcm_f64be"
+					      "--enable-decoder=pcm_f64le"
+					      "--enable-decoder=pcm_s16be"
+					      "--enable-decoder=pcm_s16be_planar"
+					      "--enable-decoder=pcm_s16le"
+					      "--enable-decoder=pcm_s16le_planar"
+					      "--enable-decoder=pcm_s24be"
+					      "--enable-decoder=pcm_s24le"
+					      "--enable-decoder=pcm_s24le_planar"
+					      "--enable-decoder=pcm_s32be"
+					      "--enable-decoder=pcm_s32le"
+					      "--enable-decoder=pcm_s32le_planar"
+					      "--enable-decoder=pcm_s64be"
+					      "--enable-decoder=pcm_s64le"
+					      "--enable-decoder=pcm_s8"
+					      "--enable-decoder=pcm_s8_planar"
+					      "--enable-decoder=pcm_u16be"
+					      "--enable-decoder=pcm_u16le"
+					      "--enable-encoder=gif"
+					      "--enable-decoder=gif"
+					      "--enable-encoder=jpegls"
+					      "--enable-decoder=jpegls"
+					      "--enable-encoder=ljpeg"
+					      "--enable-decoder=jpeg2000"
+					      "--enable-encoder=png"
+					      "--enable-decoder=png"
+					      "--enable-encoder=bmp"
+					      "--enable-decoder=bmp"
+					      "--enable-encoder=tiff"
+					      "--enable-decoder=tiff"
+					      "--enable-filter=scale"
+					      "--enable-filter=overlay"
+					      "--enable-filter=amix"
+					      "--enable-filter=amerge"
+					      "--enable-filter=aresample"
+					      "--enable-filter=format"
+					      "--enable-filter=aformat"
+					      "--enable-filter=fps"
+					      "--enable-filter=transpose"
+					      "--enable-filter=pad")
+					    (if (string-contains (%current-system) "linux")
 						'("--enable-pic"
 						  "--extra-cxxflags=-fPIC"
 						  "--extra-cflags=-fPIC"
@@ -460,25 +463,31 @@
 						  "--enable-hwaccel=mjpeg_nvdec"
 						  "--enable-encoder=h264_nvenc"
 						  "--enable-encoder=hevc_nvenc"))
-					   (if (string?= (%current-system) "aarch64-linux")
-						'("--arch=aarch64"))
-					   (if (string?= (%current-system) "arm64-linux")
-						'("--arch=aarch64"))))
-				  ((#:phases phases)
-				   `(modify-phases ,phases
-						   (add-after 'unpack 'apply-patches
-							      (lambda* (#:key inputs #:allow-other-keys)
-								       (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
-									 ;; Comes from
-									 ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
-									 ;; WARNING: These amount for huge changes in pjproject.
-									 (jami-apply-dependency-patches #:inputs inputs
-													#:dep-name "ffmpeg"
-													#:patches
-													'("remove-mjpeg-log"
-													  "change-RTCP-ratio"
-													  "rtp_ext_abs_send_time"))
-									 #t))))))))) 
+					    (if (string?= (%current-system) "aarch64-linux")
+						'("--arch=aarch64")
+						'())
+					    (if (string?= (%current-system) "arm64-linux")
+						'("--arch=aarch64")
+						'())))
+				   ((#:phases phases)
+				    `(modify-phases ,phases
+						    (add-after 'unpack 'make-git-checkout-writable
+							       (lambda _
+								 (for-each make-file-writable (find-files "."))
+								 #t))
+						    (add-after 'unpack 'apply-patches
+							       (lambda* (#:key inputs #:allow-other-keys)
+									(let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
+									  ;; Comes from
+									  ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
+									  ;; WARNING: These amount for huge changes in pjproject.
+									  (jami-apply-dependency-patches #:inputs inputs
+													 #:dep-name "ffmpeg"
+													 #:patches
+													 '("remove-mjpeg-log"
+													   "change-RTCP-ratio"
+													   "rtp_ext_abs_send_time"))
+									  #t)))))))))) 
 
 (define-public libring
   (package
-- 
2.24.1

bug#38960: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38971] [PATCH 13/22] gnu: jami: bump to 20191217.1.ce5f295.

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index a48bc7f286..fe797a78ea 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -76,7 +76,7 @@
 					    file ".patch")))
        patches))))
 
-(define %jami-version "20191214.1.07edb5e")
+(define %jami-version "20191217.1.ce5f295")
 
 (define* (jami-source #:key without-daemon)
   (origin
@@ -92,7 +92,7 @@
        #f))
     (sha256
      (base32
-      "1g5crffqfw7rb96iqamsfv63pjql9dli9m3nd1hsx28apkffkbnd"))))
+      "00d1c5f3v3wgsfyfdh3m9h8r3i6ivfk6pl70blw60b38jvdh2n06"))))
 
 (define-public pjproject-jami
   (package
-- 
2.24.1

bug#38971: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38974] [PATCH 14/22] gnu: opendht: Bump to 2.0.0beta3.

[Jan Wielkiewicz]

---
 gnu/packages/networking.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 76a36111f1..42d8b01007 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -2594,7 +2594,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
 (define-public opendht
   (package
     (name "opendht")
-    (version "2.0.0beta2")
+    (version "2.0.0beta3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2603,7 +2603,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "02ix0rvvyhq22gd5djcq84qz08ji7ln93faf23b27zjzni2klzv5"))))
+                "0y9br1g1y5gf4v0v6n3lfnx7mpd238rigc94nl7h8f9pfhbk86jl"))))
     ;; Since 2.0, the gnu-build-system does not seem to work anymore, upstream bug?
     (build-system cmake-build-system)
     (inputs
-- 
2.24.1

bug#38974: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38976] [PATCH 15/22] gnu: restinio: Bump to 0.6.1.1.

[Jan Wielkiewicz]

---
 gnu/packages/networking.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 42d8b01007..697668f9d1 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -2552,7 +2552,7 @@ communication over HTTP.")
 (define-public restinio
   (package
     (name "restinio")
-    (version "0.6.0.1")
+    (version "0.6.1.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2561,7 +2561,7 @@ communication over HTTP.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1c25kpx652nng8m1sqf5an2c3c4g3k6zj85mkkaxzk88iwfzq1s8"))))
+                "141a96hx8zhcdv121g6cs91n46kb47y040v25pnvz5f54964z7f5"))))
     (build-system cmake-build-system)
     (inputs                             ; TODO: Need to force-keep references on some inputs, e.g. boost.
      `(("zlib" ,zlib)
-- 
2.24.1

bug#38976: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38978] [PATCH 16/22] gnu: pjproject-jami: Fix formatting - replace a tab sign with a space. No code changes!

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index fe797a78ea..92a89f8dc6 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -134,7 +134,7 @@
              "CFLAGS=-fPIC"
              "CXXFLAGS=-fPIC")
        #:modules ((guix build utils)
-		  ,@(@@ (guix build-system gnu) %default-modules))
+                  ,@(@@ (guix build-system gnu) %default-modules))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'make-git-checkout-writable
-- 
2.24.1

bug#38978: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38962] [PATCH 17/22] gnu: pjproject-jami: Remove unnecessary lambda, which came from doing rebase improperly; jami.scm: untabify, remove trailing whitespace.

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm | 591 ++++++++++++++++++++----------------------
 1 file changed, 277 insertions(+), 314 deletions(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 92a89f8dc6..a9af081450 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -62,18 +62,18 @@
 
 (define-public jami-apply-dependency-patches
   '(lambda* (#:key inputs dep-name patches)
-	    (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches"))
-	      (mkdir-p savoir-faire-linux-patches-directory)
-	      (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches")
-				  "-C" savoir-faire-linux-patches-directory
-				  "--strip-components=5"
-				  (string-append "ring-project/daemon/contrib/src/"
-						 dep-name))
-	      (for-each
+            (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches"))
+              (mkdir-p savoir-faire-linux-patches-directory)
+              (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches")
+                                  "-C" savoir-faire-linux-patches-directory
+                                  "--strip-components=5"
+                                  (string-append "ring-project/daemon/contrib/src/"
+                                                 dep-name))
+              (for-each
        (lambda (file)
-	 (invoke "patch" "--force" "-p1" "-i"
-			     (string-append savoir-faire-linux-patches-directory "/"
-					    file ".patch")))
+         (invoke "patch" "--force" "-p1" "-i"
+                             (string-append savoir-faire-linux-patches-directory "/"
+                                            file ".patch")))
        patches))))
 
 (define %jami-version "20191217.1.ce5f295")
@@ -142,83 +142,48 @@
              (for-each make-file-writable (find-files "."))
              #t))
          (add-after 'unpack 'apply-patches
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches")
-                   ;; Comes from
-                   ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
-                   ;; WARNING: These amount for huge changes in pjproject.
-                   (savoir-faire-linux-patches
-                    '("fix_turn_alloc_failure"
-                      "rfc2466"
-                      "ipv6"
-                      "multiple_listeners"
-                      "pj_ice_sess"
-                      "fix_turn_fallback"
-                      "fix_ioqueue_ipv6_sendto"
-                      "add_dtls_transport"
-                      "rfc6544"
-                      "ice_config"
-                      "sip_config"
-                      "fix_first_packet_turn_tcp"
-                      "fix_ebusy_turn"
-                      "ignore_ipv6_on_transport_check"
-                      "fix_turn_connection_failure"
-                      ;; "uwp_vs" ; for windows
-                      "disable_local_resolution")))
-               (mkdir-p savoir-faire-linux-patches-directory)
-               (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches")
-                       "-C" savoir-faire-linux-patches-directory
-                       "--strip-components=5"
-                       "ring-project/daemon/contrib/src/pjproject")
-               (for-each
-                (lambda (file)
-                  (invoke "patch" "--force" "-p1" "-i"
-                          (string-append savoir-faire-linux-patches-directory "/"
-                                         file ".patch")))
-                savoir-faire-linux-patches))
-             #t))
-		    (lambda* (#:key inputs #:allow-other-keys)
-			     (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
-			       ;; Comes from
-			       ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
-			       ;; WARNING: These amount for huge changes in pjproject.
-			       (jami-apply-dependency-patches #:inputs inputs
-							      #:dep-name "pjproject"
-							      #:patches
-							      '("fix_turn_alloc_failure"
-								"rfc2466"
-								"ipv6"
-								"multiple_listeners"
-								"pj_ice_sess"
-								"fix_turn_fallback"
-								"fix_ioqueue_ipv6_sendto"
-								"add_dtls_transport"
-								"rfc6544"
-								"ice_config"
-								"sip_config"
-								"fix_first_packet_turn_tcp"
-								"fix_ebusy_turn"
-								"ignore_ipv6_on_transport_check"
-								"fix_turn_connection_failure"
-								"disable_local_resolution"))
-			       #t))
-         ;; TODO: We could use substitute-keyword-arguments instead of
-         ;; repeating the phases from pjproject, but somehow it does
-         ;; not work.
-         (add-before 'build 'build-dep
-           (lambda _ (invoke "make" "dep")))
-         (add-before 'patch-source-shebangs 'autoconf
-           (lambda _
-             (invoke "autoconf" "-v" "-f" "-i" "-o"
-                     "aconfigure" "aconfigure.ac")))
-         (add-before 'autoconf 'disable-some-tests
-           ;; Three of the six test programs fail due to missing network
-           ;; access.
-           (lambda _
-             (substitute* "Makefile"
-               (("selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test")
-                "selftest: pjlib-test pjlib-util-test pjmedia-test"))
-             #t)))))))
+                    (lambda* (#:key inputs #:allow-other-keys)
+                             (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
+                               ;; Comes from
+                               ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
+                               ;; WARNING: These amount for huge changes in pjproject.
+                               (jami-apply-dependency-patches #:inputs inputs
+                                                              #:dep-name "pjproject"
+                                                              #:patches
+                                                              '("fix_turn_alloc_failure"
+                                                                "rfc2466"
+                                                                "ipv6"
+                                                                "multiple_listeners"
+                                                                "pj_ice_sess"
+                                                                "fix_turn_fallback"
+                                                                "fix_ioqueue_ipv6_sendto"
+                                                                "add_dtls_transport"
+                                                                "rfc6544"
+                                                                "ice_config"
+                                                                "sip_config"
+                                                                "fix_first_packet_turn_tcp"
+                                                                "fix_ebusy_turn"
+                                                                "ignore_ipv6_on_transport_check"
+                                                                "fix_turn_connection_failure"
+                                                                "disable_local_resolution"))
+                               #t)))
+                     ;; TODO: We could use substitute-keyword-arguments instead of
+                     ;; repeating the phases from pjproject, but somehow it does
+                     ;; not work.
+                     (add-before 'build 'build-dep
+                                 (lambda _ (invoke "make" "dep")))
+                     (add-before 'patch-source-shebangs 'autoconf
+                                 (lambda _
+                                   (invoke "autoconf" "-v" "-f" "-i" "-o"
+                                           "aconfigure" "aconfigure.ac")))
+                     (add-before 'autoconf 'disable-some-tests
+                                 ;; Three of the six test programs fail due to missing network
+                                 ;; access.
+                                 (lambda _
+                                   (substitute* "Makefile"
+                                                (("selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test")
+                                                 "selftest: pjlib-test pjlib-util-test pjmedia-test"))
+                                   #t)))))))
 
 (define-public gnutls-jami
   (package
@@ -244,31 +209,31 @@
                "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi"))))
    (arguments
     (substitute-keyword-arguments (package-arguments gnutls)
-				  ((#:configure-flags '())
-				   '("--disable-gtk-doc"
-				     "--without-p11-kit"
-				     "--disable-cxx"
-				     "--disable-srp-authentication"
-				     "--disable-psk-authentication-FIXME"
-				     "--with-included-libtasn1"
-				     "--with-included-unistring"
-				     "--disable-openpgp-authentication"
-				     "--disable-openssl-compatibility"
-				     "--disable-guile"
-				     "--disable-nls"
-				     "--disable-dtls-srtp-support"
-				     "--without-libintl-prefix"
-				     "--without-idn"))
-				  ((#:phases phases)
-				   `(modify-phases ,phases
-						   (add-after 'unpack 'apply-patches
-							      (lambda* (#:key inputs #:allow-other-keys)
-								       (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
-									 (jami-apply-dependency-patches #:inputs inputs
-													#:dep-name "gnutls"
-													#:patches
-													'("downgrade-gettext-requirement"))
-									 #t)))))))))
+                                  ((#:configure-flags '())
+                                   '("--disable-gtk-doc"
+                                     "--without-p11-kit"
+                                     "--disable-cxx"
+                                     "--disable-srp-authentication"
+                                     "--disable-psk-authentication-FIXME"
+                                     "--with-included-libtasn1"
+                                     "--with-included-unistring"
+                                     "--disable-openpgp-authentication"
+                                     "--disable-openssl-compatibility"
+                                     "--disable-guile"
+                                     "--disable-nls"
+                                     "--disable-dtls-srtp-support"
+                                     "--without-libintl-prefix"
+                                     "--without-idn"))
+                                  ((#:phases phases)
+                                   `(modify-phases ,phases
+                                                   (add-after 'unpack 'apply-patches
+                                                              (lambda* (#:key inputs #:allow-other-keys)
+                                                                       (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
+                                                                         (jami-apply-dependency-patches #:inputs inputs
+                                                                                                        #:dep-name "gnutls"
+                                                                                                        #:patches
+                                                                                                        '("downgrade-gettext-requirement"))
+                                                                         #t)))))))))
 
 (define-public ffmpeg-jami
   (package
@@ -278,9 +243,9 @@
    (source (origin
              (method git-fetch)
              (uri (git-reference
-		   (url "https://git.ffmpeg.org/ffmpeg.git")
-		   (commit "59da9dcd7ef6277e4e04998ced71b05a6083c635")))
-	     (file-name (git-file-name "ffmpeg" version))
+                   (url "https://git.ffmpeg.org/ffmpeg.git")
+                   (commit "59da9dcd7ef6277e4e04998ced71b05a6083c635")))
+             (file-name (git-file-name "ffmpeg" version))
              (sha256
               (base32
                "0cm58kd06lvslc7knnfajv5p63v4cc6502badjcic5m9izd03lz2"))))
@@ -292,202 +257,202 @@
     (append
      '(#:tests? #f)
      (substitute-keyword-arguments (package-arguments ffmpeg)
-				   ((#:configure-flags '())
-				    (append '("--disable-everything"
-					      "--enable-zlib"
-					      "--enable-gpl"
-					      "--enable-swscale"
-					      "--enable-bsfs"
-					      "--disable-filters"
-					      "--disable-programs"
-					      "--disable-postproc"
-					      "--disable-protocols"
-					      "--enable-protocol=crypto"
-					      "--enable-protocol=file"
-					      "--enable-protocol=rtp"
-					      "--enable-protocol=srtp"
-					      "--enable-protocol=tcp"
-					      "--enable-protocol=udp"
-					      "--enable-protocol=unix"
-					      "--enable-protocol=pipe"
-					      "--disable-demuxers"
-					      "--disable-muxers"
-					      "--enable-muxer=rtp"
-					      "--enable-muxer=g722"
-					      "--enable-muxer=h263"
-					      "--enable-muxer=h264"
-					      "--enable-muxer=hevc"
-					      "--enable-muxer=webm"
-					      "--enable-muxer=ogg"
-					      "--enable-muxer=pcm_s16be"
-					      "--enable-muxer=pcm_s16le"
-					      "--enable-demuxer=rtp"
-					      "--enable-demuxer=mjpeg"
-					      "--enable-demuxer=mjpeg_2000"
-					      "--enable-demuxer=mpegvideo"
-					      "--enable-demuxer=gif"
-					      "--enable-demuxer=image_jpeg_pipe"
-					      "--enable-demuxer=image_png_pipe"
-					      "--enable-demuxer=image_webp_pipe"
-					      "--enable-demuxer=matroska"
-					      "--enable-demuxer=m4v"
-					      "--enable-demuxer=mp3"
-					      "--enable-demuxer=ogg"
-					      "--enable-demuxer=flac"
-					      "--enable-demuxer=wav"
-					      "--enable-demuxer=ac3"
-					      "--enable-demuxer=g722"
-					      "--enable-demuxer=pcm_mulaw"
-					      "--enable-demuxer=pcm_alaw"
-					      "--enable-demuxer=pcm_s16be"
-					      "--enable-demuxer=pcm_s16le"
-					      "--enable-demuxer=h263"
-					      "--enable-demuxer=h264"
-					      "--enable-demuxer=hevc"
-					      "--enable-parser=h263"
-					      "--enable-parser=h264"
-					      "--enable-parser=mpeg4video"
-					      "--enable-parser=vp8"
-					      "--enable-parser=vp9"
-					      "--enable-parser=opus"
-					      "--enable-encoder=adpcm_g722"
-					      "--enable-decoder=adpcm_g722"
-					      "--enable-encoder=rawvideo"
-					      "--enable-decoder=rawvideo"
-					      "--enable-encoder=libx264"
-					      "--enable-decoder=h264"
-					      "--enable-encoder=pcm_alaw"
-					      "--enable-decoder=pcm_alaw"
-					      "--enable-encoder=pcm_mulaw"
-					      "--enable-decoder=pcm_mulaw"
-					      "--enable-encoder=mpeg4"
-					      "--enable-decoder=mpeg4"
-					      "--enable-encoder=libvpx_vp8"
-					      "--enable-decoder=vp8"
-					      "--enable-decoder=vp9"
-					      "--enable-encoder=h263"
-					      "--enable-encoder=h263p"
-					      "--enable-decoder=h263"
-					      "--enable-encoder=mjpeg"
-					      "--enable-decoder=mjpeg"
-					      "--enable-decoder=mjpegb"
-					      "--enable-libspeex"
-					      "--enable-libopus"
-					      "--enable-libvpx"
-					      "--enable-libx264"
-					      "--enable-encoder=libspeex"
-					      "--enable-decoder=libspeex"
-					      "--enable-encoder=libopus"
-					      "--enable-decoder=libopus"
-					      "--enable-decoder=flac"
-					      "--enable-decoder=vorbis"
-					      "--enable-decoder=aac"
-					      "--enable-decoder=ac3"
-					      "--enable-decoder=eac3"
-					      "--enable-decoder=mp3"
-					      "--enable-decoder=pcm_u24be"
-					      "--enable-decoder=pcm_u24le"
-					      "--enable-decoder=pcm_u32be"
-					      "--enable-decoder=pcm_u32le"
-					      "--enable-decoder=pcm_u8"
-					      "--enable-decoder=pcm_f16le"
-					      "--enable-decoder=pcm_f24le"
-					      "--enable-decoder=pcm_f32be"
-					      "--enable-decoder=pcm_f32le"
-					      "--enable-decoder=pcm_f64be"
-					      "--enable-decoder=pcm_f64le"
-					      "--enable-decoder=pcm_s16be"
-					      "--enable-decoder=pcm_s16be_planar"
-					      "--enable-decoder=pcm_s16le"
-					      "--enable-decoder=pcm_s16le_planar"
-					      "--enable-decoder=pcm_s24be"
-					      "--enable-decoder=pcm_s24le"
-					      "--enable-decoder=pcm_s24le_planar"
-					      "--enable-decoder=pcm_s32be"
-					      "--enable-decoder=pcm_s32le"
-					      "--enable-decoder=pcm_s32le_planar"
-					      "--enable-decoder=pcm_s64be"
-					      "--enable-decoder=pcm_s64le"
-					      "--enable-decoder=pcm_s8"
-					      "--enable-decoder=pcm_s8_planar"
-					      "--enable-decoder=pcm_u16be"
-					      "--enable-decoder=pcm_u16le"
-					      "--enable-encoder=gif"
-					      "--enable-decoder=gif"
-					      "--enable-encoder=jpegls"
-					      "--enable-decoder=jpegls"
-					      "--enable-encoder=ljpeg"
-					      "--enable-decoder=jpeg2000"
-					      "--enable-encoder=png"
-					      "--enable-decoder=png"
-					      "--enable-encoder=bmp"
-					      "--enable-decoder=bmp"
-					      "--enable-encoder=tiff"
-					      "--enable-decoder=tiff"
-					      "--enable-filter=scale"
-					      "--enable-filter=overlay"
-					      "--enable-filter=amix"
-					      "--enable-filter=amerge"
-					      "--enable-filter=aresample"
-					      "--enable-filter=format"
-					      "--enable-filter=aformat"
-					      "--enable-filter=fps"
-					      "--enable-filter=transpose"
-					      "--enable-filter=pad")
-					    (if (string-contains (%current-system) "linux")
-						'("--enable-pic"
-						  "--extra-cxxflags=-fPIC"
-						  "--extra-cflags=-fPIC"
-						  "--target-os=linux"
-						  "--enable-indev=v4l2"
-						  "--enable-indev=xcbgrab"
-						  "--enable-vdpau"
-						  "--enable-hwaccel=h264_vdpau"
-						  "--enable-hwaccel=mpeg4_vdpau"
-						  "--enable-vaapi"
-						  "--enable-hwaccel=h264_vaapi"
-						  "--enable-hwaccel=mpeg4_vaapi"
-						  "--enable-hwaccel=h263_vaapi"
-						  "--enable-hwaccel=vp8_vaapi"
-						  "--enable-hwaccel=mjpeg_vaapi"
-						  "--enable-encoder=h264_vaapi"
-						  "--enable-encoder=vp8_vaapi"
-						  "--enable-encoder=mjpeg_vaapi"
-						  "--enable-cuvid"
-						  "--enable-ffnvcodec"
-						  "--enable-nvdec"
-						  "--enable-nvenc"
-						  "--enable-hwaccel=h264_nvdec"
-						  "--enable-hwaccel=hevc_nvdec"
-						  "--enable-hwaccel=vp8_nvdec"
-						  "--enable-hwaccel=mjpeg_nvdec"
-						  "--enable-encoder=h264_nvenc"
-						  "--enable-encoder=hevc_nvenc"))
-					    (if (string?= (%current-system) "aarch64-linux")
-						'("--arch=aarch64")
-						'())
-					    (if (string?= (%current-system) "arm64-linux")
-						'("--arch=aarch64")
-						'())))
-				   ((#:phases phases)
-				    `(modify-phases ,phases
-						    (add-after 'unpack 'make-git-checkout-writable
-							       (lambda _
-								 (for-each make-file-writable (find-files "."))
-								 #t))
-						    (add-after 'unpack 'apply-patches
-							       (lambda* (#:key inputs #:allow-other-keys)
-									(let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
-									  ;; Comes from
-									  ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
-									  ;; WARNING: These amount for huge changes in pjproject.
-									  (jami-apply-dependency-patches #:inputs inputs
-													 #:dep-name "ffmpeg"
-													 #:patches
-													 '("remove-mjpeg-log"
-													   "change-RTCP-ratio"
-													   "rtp_ext_abs_send_time"))
-									  #t)))))))))) 
+                                   ((#:configure-flags '())
+                                    (append '("--disable-everything"
+                                              "--enable-zlib"
+                                              "--enable-gpl"
+                                              "--enable-swscale"
+                                              "--enable-bsfs"
+                                              "--disable-filters"
+                                              "--disable-programs"
+                                              "--disable-postproc"
+                                              "--disable-protocols"
+                                              "--enable-protocol=crypto"
+                                              "--enable-protocol=file"
+                                              "--enable-protocol=rtp"
+                                              "--enable-protocol=srtp"
+                                              "--enable-protocol=tcp"
+                                              "--enable-protocol=udp"
+                                              "--enable-protocol=unix"
+                                              "--enable-protocol=pipe"
+                                              "--disable-demuxers"
+                                              "--disable-muxers"
+                                              "--enable-muxer=rtp"
+                                              "--enable-muxer=g722"
+                                              "--enable-muxer=h263"
+                                              "--enable-muxer=h264"
+                                              "--enable-muxer=hevc"
+                                              "--enable-muxer=webm"
+                                              "--enable-muxer=ogg"
+                                              "--enable-muxer=pcm_s16be"
+                                              "--enable-muxer=pcm_s16le"
+                                              "--enable-demuxer=rtp"
+                                              "--enable-demuxer=mjpeg"
+                                              "--enable-demuxer=mjpeg_2000"
+                                              "--enable-demuxer=mpegvideo"
+                                              "--enable-demuxer=gif"
+                                              "--enable-demuxer=image_jpeg_pipe"
+                                              "--enable-demuxer=image_png_pipe"
+                                              "--enable-demuxer=image_webp_pipe"
+                                              "--enable-demuxer=matroska"
+                                              "--enable-demuxer=m4v"
+                                              "--enable-demuxer=mp3"
+                                              "--enable-demuxer=ogg"
+                                              "--enable-demuxer=flac"
+                                              "--enable-demuxer=wav"
+                                              "--enable-demuxer=ac3"
+                                              "--enable-demuxer=g722"
+                                              "--enable-demuxer=pcm_mulaw"
+                                              "--enable-demuxer=pcm_alaw"
+                                              "--enable-demuxer=pcm_s16be"
+                                              "--enable-demuxer=pcm_s16le"
+                                              "--enable-demuxer=h263"
+                                              "--enable-demuxer=h264"
+                                              "--enable-demuxer=hevc"
+                                              "--enable-parser=h263"
+                                              "--enable-parser=h264"
+                                              "--enable-parser=mpeg4video"
+                                              "--enable-parser=vp8"
+                                              "--enable-parser=vp9"
+                                              "--enable-parser=opus"
+                                              "--enable-encoder=adpcm_g722"
+                                              "--enable-decoder=adpcm_g722"
+                                              "--enable-encoder=rawvideo"
+                                              "--enable-decoder=rawvideo"
+                                              "--enable-encoder=libx264"
+                                              "--enable-decoder=h264"
+                                              "--enable-encoder=pcm_alaw"
+                                              "--enable-decoder=pcm_alaw"
+                                              "--enable-encoder=pcm_mulaw"
+                                              "--enable-decoder=pcm_mulaw"
+                                              "--enable-encoder=mpeg4"
+                                              "--enable-decoder=mpeg4"
+                                              "--enable-encoder=libvpx_vp8"
+                                              "--enable-decoder=vp8"
+                                              "--enable-decoder=vp9"
+                                              "--enable-encoder=h263"
+                                              "--enable-encoder=h263p"
+                                              "--enable-decoder=h263"
+                                              "--enable-encoder=mjpeg"
+                                              "--enable-decoder=mjpeg"
+                                              "--enable-decoder=mjpegb"
+                                              "--enable-libspeex"
+                                              "--enable-libopus"
+                                              "--enable-libvpx"
+                                              "--enable-libx264"
+                                              "--enable-encoder=libspeex"
+                                              "--enable-decoder=libspeex"
+                                              "--enable-encoder=libopus"
+                                              "--enable-decoder=libopus"
+                                              "--enable-decoder=flac"
+                                              "--enable-decoder=vorbis"
+                                              "--enable-decoder=aac"
+                                              "--enable-decoder=ac3"
+                                              "--enable-decoder=eac3"
+                                              "--enable-decoder=mp3"
+                                              "--enable-decoder=pcm_u24be"
+                                              "--enable-decoder=pcm_u24le"
+                                              "--enable-decoder=pcm_u32be"
+                                              "--enable-decoder=pcm_u32le"
+                                              "--enable-decoder=pcm_u8"
+                                              "--enable-decoder=pcm_f16le"
+                                              "--enable-decoder=pcm_f24le"
+                                              "--enable-decoder=pcm_f32be"
+                                              "--enable-decoder=pcm_f32le"
+                                              "--enable-decoder=pcm_f64be"
+                                              "--enable-decoder=pcm_f64le"
+                                              "--enable-decoder=pcm_s16be"
+                                              "--enable-decoder=pcm_s16be_planar"
+                                              "--enable-decoder=pcm_s16le"
+                                              "--enable-decoder=pcm_s16le_planar"
+                                              "--enable-decoder=pcm_s24be"
+                                              "--enable-decoder=pcm_s24le"
+                                              "--enable-decoder=pcm_s24le_planar"
+                                              "--enable-decoder=pcm_s32be"
+                                              "--enable-decoder=pcm_s32le"
+                                              "--enable-decoder=pcm_s32le_planar"
+                                              "--enable-decoder=pcm_s64be"
+                                              "--enable-decoder=pcm_s64le"
+                                              "--enable-decoder=pcm_s8"
+                                              "--enable-decoder=pcm_s8_planar"
+                                              "--enable-decoder=pcm_u16be"
+                                              "--enable-decoder=pcm_u16le"
+                                              "--enable-encoder=gif"
+                                              "--enable-decoder=gif"
+                                              "--enable-encoder=jpegls"
+                                              "--enable-decoder=jpegls"
+                                              "--enable-encoder=ljpeg"
+                                              "--enable-decoder=jpeg2000"
+                                              "--enable-encoder=png"
+                                              "--enable-decoder=png"
+                                              "--enable-encoder=bmp"
+                                              "--enable-decoder=bmp"
+                                              "--enable-encoder=tiff"
+                                              "--enable-decoder=tiff"
+                                              "--enable-filter=scale"
+                                              "--enable-filter=overlay"
+                                              "--enable-filter=amix"
+                                              "--enable-filter=amerge"
+                                              "--enable-filter=aresample"
+                                              "--enable-filter=format"
+                                              "--enable-filter=aformat"
+                                              "--enable-filter=fps"
+                                              "--enable-filter=transpose"
+                                              "--enable-filter=pad")
+                                            (if (string-contains (%current-system) "linux")
+                                                '("--enable-pic"
+                                                  "--extra-cxxflags=-fPIC"
+                                                  "--extra-cflags=-fPIC"
+                                                  "--target-os=linux"
+                                                  "--enable-indev=v4l2"
+                                                  "--enable-indev=xcbgrab"
+                                                  "--enable-vdpau"
+                                                  "--enable-hwaccel=h264_vdpau"
+                                                  "--enable-hwaccel=mpeg4_vdpau"
+                                                  "--enable-vaapi"
+                                                  "--enable-hwaccel=h264_vaapi"
+                                                  "--enable-hwaccel=mpeg4_vaapi"
+                                                  "--enable-hwaccel=h263_vaapi"
+                                                  "--enable-hwaccel=vp8_vaapi"
+                                                  "--enable-hwaccel=mjpeg_vaapi"
+                                                  "--enable-encoder=h264_vaapi"
+                                                  "--enable-encoder=vp8_vaapi"
+                                                  "--enable-encoder=mjpeg_vaapi"
+                                                  "--enable-cuvid"
+                                                  "--enable-ffnvcodec"
+                                                  "--enable-nvdec"
+                                                  "--enable-nvenc"
+                                                  "--enable-hwaccel=h264_nvdec"
+                                                  "--enable-hwaccel=hevc_nvdec"
+                                                  "--enable-hwaccel=vp8_nvdec"
+                                                  "--enable-hwaccel=mjpeg_nvdec"
+                                                  "--enable-encoder=h264_nvenc"
+                                                  "--enable-encoder=hevc_nvenc"))
+                                            (if (string?= (%current-system) "aarch64-linux")
+                                                '("--arch=aarch64")
+                                                '())
+                                            (if (string?= (%current-system) "arm64-linux")
+                                                '("--arch=aarch64")
+                                                '())))
+                                   ((#:phases phases)
+                                    `(modify-phases ,phases
+                                                    (add-after 'unpack 'make-git-checkout-writable
+                                                               (lambda _
+                                                                 (for-each make-file-writable (find-files "."))
+                                                                 #t))
+                                                    (add-after 'unpack 'apply-patches
+                                                               (lambda* (#:key inputs #:allow-other-keys)
+                                                                        (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
+                                                                          ;; Comes from
+                                                                          ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
+                                                                          ;; WARNING: These amount for huge changes in pjproject.
+                                                                          (jami-apply-dependency-patches #:inputs inputs
+                                                                                                         #:dep-name "ffmpeg"
+                                                                                                         #:patches
+                                                                                                         '("remove-mjpeg-log"
+                                                                                                           "change-RTCP-ratio"
+                                                                                                           "rtp_ext_abs_send_time"))
+                                                                          #t))))))))))
 
 (define-public libring
   (package
@@ -662,5 +627,3 @@ This package provides the Jami client for the GNOME desktop.")
 
 (define-public jami-client-gnome
   (deprecated-package "jami-client-gnome" jami))
-
-
-- 
2.24.1

bug#38962: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38963] [PATCH 18/22] gnu: jami.scm: Fix formatting. No code changes!

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm | 640 +++++++++++++++++++++---------------------
 1 file changed, 320 insertions(+), 320 deletions(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index a9af081450..c6d65d5688 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -62,19 +62,19 @@
 
 (define-public jami-apply-dependency-patches
   '(lambda* (#:key inputs dep-name patches)
-            (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches"))
-              (mkdir-p savoir-faire-linux-patches-directory)
-              (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches")
-                                  "-C" savoir-faire-linux-patches-directory
-                                  "--strip-components=5"
-                                  (string-append "ring-project/daemon/contrib/src/"
-                                                 dep-name))
-              (for-each
-       (lambda (file)
-         (invoke "patch" "--force" "-p1" "-i"
-                             (string-append savoir-faire-linux-patches-directory "/"
-                                            file ".patch")))
-       patches))))
+     (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux patches"))
+       (mkdir-p savoir-faire-linux-patches-directory)
+       (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patches")
+               "-C" savoir-faire-linux-patches-directory
+               "--strip-components=5"
+               (string-append "ring-project/daemon/contrib/src/"
+                              dep-name))
+       (for-each
+        (lambda (file)
+          (invoke "patch" "--force" "-p1" "-i"
+                  (string-append savoir-faire-linux-patches-directory "/"
+                                 file ".patch")))
+        patches))))
 
 (define %jami-version "20191217.1.ce5f295")
 
@@ -87,9 +87,9 @@
     (modules '((guix build utils)))
     (snippet
      (if without-daemon
-       '(begin
-          (delete-file-recursively "daemon/contrib"))
-       #f))
+         '(begin
+            (delete-file-recursively "daemon/contrib"))
+         #f))
     (sha256
      (base32
       "00d1c5f3v3wgsfyfdh3m9h8r3i6ivfk6pl70blw60b38jvdh2n06"))))
@@ -142,317 +142,317 @@
              (for-each make-file-writable (find-files "."))
              #t))
          (add-after 'unpack 'apply-patches
-                    (lambda* (#:key inputs #:allow-other-keys)
-                             (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
-                               ;; Comes from
-                               ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
-                               ;; WARNING: These amount for huge changes in pjproject.
-                               (jami-apply-dependency-patches #:inputs inputs
-                                                              #:dep-name "pjproject"
-                                                              #:patches
-                                                              '("fix_turn_alloc_failure"
-                                                                "rfc2466"
-                                                                "ipv6"
-                                                                "multiple_listeners"
-                                                                "pj_ice_sess"
-                                                                "fix_turn_fallback"
-                                                                "fix_ioqueue_ipv6_sendto"
-                                                                "add_dtls_transport"
-                                                                "rfc6544"
-                                                                "ice_config"
-                                                                "sip_config"
-                                                                "fix_first_packet_turn_tcp"
-                                                                "fix_ebusy_turn"
-                                                                "ignore_ipv6_on_transport_check"
-                                                                "fix_turn_connection_failure"
-                                                                "disable_local_resolution"))
-                               #t)))
-                     ;; TODO: We could use substitute-keyword-arguments instead of
-                     ;; repeating the phases from pjproject, but somehow it does
-                     ;; not work.
-                     (add-before 'build 'build-dep
-                                 (lambda _ (invoke "make" "dep")))
-                     (add-before 'patch-source-shebangs 'autoconf
-                                 (lambda _
-                                   (invoke "autoconf" "-v" "-f" "-i" "-o"
-                                           "aconfigure" "aconfigure.ac")))
-                     (add-before 'autoconf 'disable-some-tests
-                                 ;; Three of the six test programs fail due to missing network
-                                 ;; access.
-                                 (lambda _
-                                   (substitute* "Makefile"
-                                                (("selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test")
-                                                 "selftest: pjlib-test pjlib-util-test pjmedia-test"))
-                                   #t)))))))
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
+               ;; Comes from
+               ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
+               ;; WARNING: These amount for huge changes in pjproject.
+               (jami-apply-dependency-patches #:inputs inputs
+                                              #:dep-name "pjproject"
+                                              #:patches
+                                              '("fix_turn_alloc_failure"
+                                                "rfc2466"
+                                                "ipv6"
+                                                "multiple_listeners"
+                                                "pj_ice_sess"
+                                                "fix_turn_fallback"
+                                                "fix_ioqueue_ipv6_sendto"
+                                                "add_dtls_transport"
+                                                "rfc6544"
+                                                "ice_config"
+                                                "sip_config"
+                                                "fix_first_packet_turn_tcp"
+                                                "fix_ebusy_turn"
+                                                "ignore_ipv6_on_transport_check"
+                                                "fix_turn_connection_failure"
+                                                "disable_local_resolution"))
+               #t)))
+         ;; TODO: We could use substitute-keyword-arguments instead of
+         ;; repeating the phases from pjproject, but somehow it does
+         ;; not work.
+         (add-before 'build 'build-dep
+           (lambda _ (invoke "make" "dep")))
+         (add-before 'patch-source-shebangs 'autoconf
+           (lambda _
+             (invoke "autoconf" "-v" "-f" "-i" "-o"
+                     "aconfigure" "aconfigure.ac")))
+         (add-before 'autoconf 'disable-some-tests
+           ;; Three of the six test programs fail due to missing network
+           ;; access.
+           (lambda _
+             (substitute* "Makefile"
+               (("selftest: pjlib-test pjlib-util-test pjnath-test pjmedia-test pjsip-test pjsua-test")
+                "selftest: pjlib-test pjlib-util-test pjmedia-test"))
+             #t)))))))
 
 (define-public gnutls-jami
   (package
-   (inherit gnutls)
-   (name "gnutls-jami")
-   (native-inputs
-    `(("savoir-faire-linux-patches" ,(jami-source))
-      ("automake" ,automake)
-      ("autoconf" ,autoconf)
-      ("datefudge" ,datefudge)
-      ("openssl" ,openssl)
-      ,@(package-native-inputs gnutls)))
-   (version "3.6.10")
+    (inherit gnutls)
+    (name "gnutls-jami")
+    (native-inputs
+     `(("savoir-faire-linux-patches" ,(jami-source))
+       ("automake" ,automake)
+       ("autoconf" ,autoconf)
+       ("datefudge" ,datefudge)
+       ("openssl" ,openssl)
+       ,@(package-native-inputs gnutls)))
+    (version "3.6.10")
     (source (origin
-             (method url-fetch)
-             (uri
-              (string-append "mirror://gnupg/gnutls/v"
-                             (version-major+minor version)
-                             "/gnutls-" version ".tar.xz"))
-             ;;(patches (search-patches "gnutls-skip-trust-store-test.patch"))
-             (sha256
-              (base32
-               "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi"))))
-   (arguments
-    (substitute-keyword-arguments (package-arguments gnutls)
-                                  ((#:configure-flags '())
-                                   '("--disable-gtk-doc"
-                                     "--without-p11-kit"
-                                     "--disable-cxx"
-                                     "--disable-srp-authentication"
-                                     "--disable-psk-authentication-FIXME"
-                                     "--with-included-libtasn1"
-                                     "--with-included-unistring"
-                                     "--disable-openpgp-authentication"
-                                     "--disable-openssl-compatibility"
-                                     "--disable-guile"
-                                     "--disable-nls"
-                                     "--disable-dtls-srtp-support"
-                                     "--without-libintl-prefix"
-                                     "--without-idn"))
-                                  ((#:phases phases)
-                                   `(modify-phases ,phases
-                                                   (add-after 'unpack 'apply-patches
-                                                              (lambda* (#:key inputs #:allow-other-keys)
-                                                                       (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
-                                                                         (jami-apply-dependency-patches #:inputs inputs
-                                                                                                        #:dep-name "gnutls"
-                                                                                                        #:patches
-                                                                                                        '("downgrade-gettext-requirement"))
-                                                                         #t)))))))))
+              (method url-fetch)
+              (uri
+               (string-append "mirror://gnupg/gnutls/v"
+                              (version-major+minor version)
+                              "/gnutls-" version ".tar.xz"))
+              ;;(patches (search-patches "gnutls-skip-trust-store-test.patch"))
+              (sha256
+               (base32
+                "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments gnutls)
+       ((#:configure-flags '())
+        '("--disable-gtk-doc"
+          "--without-p11-kit"
+          "--disable-cxx"
+          "--disable-srp-authentication"
+          "--disable-psk-authentication-FIXME"
+          "--with-included-libtasn1"
+          "--with-included-unistring"
+          "--disable-openpgp-authentication"
+          "--disable-openssl-compatibility"
+          "--disable-guile"
+          "--disable-nls"
+          "--disable-dtls-srtp-support"
+          "--without-libintl-prefix"
+          "--without-idn"))
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-after 'unpack 'apply-patches
+             (lambda* (#:key inputs #:allow-other-keys)
+               (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
+                 (jami-apply-dependency-patches #:inputs inputs
+                                                #:dep-name "gnutls"
+                                                #:patches
+                                                '("downgrade-gettext-requirement"))
+                 #t)))))))))
 
 (define-public ffmpeg-jami
   (package
-   (inherit ffmpeg)
-   (name "ffmpeg-jami")
-   (version "4.2.1")
-   (source (origin
-             (method git-fetch)
-             (uri (git-reference
-                   (url "https://git.ffmpeg.org/ffmpeg.git")
-                   (commit "59da9dcd7ef6277e4e04998ced71b05a6083c635")))
-             (file-name (git-file-name "ffmpeg" version))
-             (sha256
-              (base32
-               "0cm58kd06lvslc7knnfajv5p63v4cc6502badjcic5m9izd03lz2"))))
-   (native-inputs
-    `(("savoir-faire-linux-patches" ,(jami-source))
-      ("libiconv" ,libiconv)
-      ,@(package-native-inputs ffmpeg)))
-   (arguments
-    (append
-     '(#:tests? #f)
-     (substitute-keyword-arguments (package-arguments ffmpeg)
-                                   ((#:configure-flags '())
-                                    (append '("--disable-everything"
-                                              "--enable-zlib"
-                                              "--enable-gpl"
-                                              "--enable-swscale"
-                                              "--enable-bsfs"
-                                              "--disable-filters"
-                                              "--disable-programs"
-                                              "--disable-postproc"
-                                              "--disable-protocols"
-                                              "--enable-protocol=crypto"
-                                              "--enable-protocol=file"
-                                              "--enable-protocol=rtp"
-                                              "--enable-protocol=srtp"
-                                              "--enable-protocol=tcp"
-                                              "--enable-protocol=udp"
-                                              "--enable-protocol=unix"
-                                              "--enable-protocol=pipe"
-                                              "--disable-demuxers"
-                                              "--disable-muxers"
-                                              "--enable-muxer=rtp"
-                                              "--enable-muxer=g722"
-                                              "--enable-muxer=h263"
-                                              "--enable-muxer=h264"
-                                              "--enable-muxer=hevc"
-                                              "--enable-muxer=webm"
-                                              "--enable-muxer=ogg"
-                                              "--enable-muxer=pcm_s16be"
-                                              "--enable-muxer=pcm_s16le"
-                                              "--enable-demuxer=rtp"
-                                              "--enable-demuxer=mjpeg"
-                                              "--enable-demuxer=mjpeg_2000"
-                                              "--enable-demuxer=mpegvideo"
-                                              "--enable-demuxer=gif"
-                                              "--enable-demuxer=image_jpeg_pipe"
-                                              "--enable-demuxer=image_png_pipe"
-                                              "--enable-demuxer=image_webp_pipe"
-                                              "--enable-demuxer=matroska"
-                                              "--enable-demuxer=m4v"
-                                              "--enable-demuxer=mp3"
-                                              "--enable-demuxer=ogg"
-                                              "--enable-demuxer=flac"
-                                              "--enable-demuxer=wav"
-                                              "--enable-demuxer=ac3"
-                                              "--enable-demuxer=g722"
-                                              "--enable-demuxer=pcm_mulaw"
-                                              "--enable-demuxer=pcm_alaw"
-                                              "--enable-demuxer=pcm_s16be"
-                                              "--enable-demuxer=pcm_s16le"
-                                              "--enable-demuxer=h263"
-                                              "--enable-demuxer=h264"
-                                              "--enable-demuxer=hevc"
-                                              "--enable-parser=h263"
-                                              "--enable-parser=h264"
-                                              "--enable-parser=mpeg4video"
-                                              "--enable-parser=vp8"
-                                              "--enable-parser=vp9"
-                                              "--enable-parser=opus"
-                                              "--enable-encoder=adpcm_g722"
-                                              "--enable-decoder=adpcm_g722"
-                                              "--enable-encoder=rawvideo"
-                                              "--enable-decoder=rawvideo"
-                                              "--enable-encoder=libx264"
-                                              "--enable-decoder=h264"
-                                              "--enable-encoder=pcm_alaw"
-                                              "--enable-decoder=pcm_alaw"
-                                              "--enable-encoder=pcm_mulaw"
-                                              "--enable-decoder=pcm_mulaw"
-                                              "--enable-encoder=mpeg4"
-                                              "--enable-decoder=mpeg4"
-                                              "--enable-encoder=libvpx_vp8"
-                                              "--enable-decoder=vp8"
-                                              "--enable-decoder=vp9"
-                                              "--enable-encoder=h263"
-                                              "--enable-encoder=h263p"
-                                              "--enable-decoder=h263"
-                                              "--enable-encoder=mjpeg"
-                                              "--enable-decoder=mjpeg"
-                                              "--enable-decoder=mjpegb"
-                                              "--enable-libspeex"
-                                              "--enable-libopus"
-                                              "--enable-libvpx"
-                                              "--enable-libx264"
-                                              "--enable-encoder=libspeex"
-                                              "--enable-decoder=libspeex"
-                                              "--enable-encoder=libopus"
-                                              "--enable-decoder=libopus"
-                                              "--enable-decoder=flac"
-                                              "--enable-decoder=vorbis"
-                                              "--enable-decoder=aac"
-                                              "--enable-decoder=ac3"
-                                              "--enable-decoder=eac3"
-                                              "--enable-decoder=mp3"
-                                              "--enable-decoder=pcm_u24be"
-                                              "--enable-decoder=pcm_u24le"
-                                              "--enable-decoder=pcm_u32be"
-                                              "--enable-decoder=pcm_u32le"
-                                              "--enable-decoder=pcm_u8"
-                                              "--enable-decoder=pcm_f16le"
-                                              "--enable-decoder=pcm_f24le"
-                                              "--enable-decoder=pcm_f32be"
-                                              "--enable-decoder=pcm_f32le"
-                                              "--enable-decoder=pcm_f64be"
-                                              "--enable-decoder=pcm_f64le"
-                                              "--enable-decoder=pcm_s16be"
-                                              "--enable-decoder=pcm_s16be_planar"
-                                              "--enable-decoder=pcm_s16le"
-                                              "--enable-decoder=pcm_s16le_planar"
-                                              "--enable-decoder=pcm_s24be"
-                                              "--enable-decoder=pcm_s24le"
-                                              "--enable-decoder=pcm_s24le_planar"
-                                              "--enable-decoder=pcm_s32be"
-                                              "--enable-decoder=pcm_s32le"
-                                              "--enable-decoder=pcm_s32le_planar"
-                                              "--enable-decoder=pcm_s64be"
-                                              "--enable-decoder=pcm_s64le"
-                                              "--enable-decoder=pcm_s8"
-                                              "--enable-decoder=pcm_s8_planar"
-                                              "--enable-decoder=pcm_u16be"
-                                              "--enable-decoder=pcm_u16le"
-                                              "--enable-encoder=gif"
-                                              "--enable-decoder=gif"
-                                              "--enable-encoder=jpegls"
-                                              "--enable-decoder=jpegls"
-                                              "--enable-encoder=ljpeg"
-                                              "--enable-decoder=jpeg2000"
-                                              "--enable-encoder=png"
-                                              "--enable-decoder=png"
-                                              "--enable-encoder=bmp"
-                                              "--enable-decoder=bmp"
-                                              "--enable-encoder=tiff"
-                                              "--enable-decoder=tiff"
-                                              "--enable-filter=scale"
-                                              "--enable-filter=overlay"
-                                              "--enable-filter=amix"
-                                              "--enable-filter=amerge"
-                                              "--enable-filter=aresample"
-                                              "--enable-filter=format"
-                                              "--enable-filter=aformat"
-                                              "--enable-filter=fps"
-                                              "--enable-filter=transpose"
-                                              "--enable-filter=pad")
-                                            (if (string-contains (%current-system) "linux")
-                                                '("--enable-pic"
-                                                  "--extra-cxxflags=-fPIC"
-                                                  "--extra-cflags=-fPIC"
-                                                  "--target-os=linux"
-                                                  "--enable-indev=v4l2"
-                                                  "--enable-indev=xcbgrab"
-                                                  "--enable-vdpau"
-                                                  "--enable-hwaccel=h264_vdpau"
-                                                  "--enable-hwaccel=mpeg4_vdpau"
-                                                  "--enable-vaapi"
-                                                  "--enable-hwaccel=h264_vaapi"
-                                                  "--enable-hwaccel=mpeg4_vaapi"
-                                                  "--enable-hwaccel=h263_vaapi"
-                                                  "--enable-hwaccel=vp8_vaapi"
-                                                  "--enable-hwaccel=mjpeg_vaapi"
-                                                  "--enable-encoder=h264_vaapi"
-                                                  "--enable-encoder=vp8_vaapi"
-                                                  "--enable-encoder=mjpeg_vaapi"
-                                                  "--enable-cuvid"
-                                                  "--enable-ffnvcodec"
-                                                  "--enable-nvdec"
-                                                  "--enable-nvenc"
-                                                  "--enable-hwaccel=h264_nvdec"
-                                                  "--enable-hwaccel=hevc_nvdec"
-                                                  "--enable-hwaccel=vp8_nvdec"
-                                                  "--enable-hwaccel=mjpeg_nvdec"
-                                                  "--enable-encoder=h264_nvenc"
-                                                  "--enable-encoder=hevc_nvenc"))
-                                            (if (string?= (%current-system) "aarch64-linux")
-                                                '("--arch=aarch64")
-                                                '())
-                                            (if (string?= (%current-system) "arm64-linux")
-                                                '("--arch=aarch64")
-                                                '())))
-                                   ((#:phases phases)
-                                    `(modify-phases ,phases
-                                                    (add-after 'unpack 'make-git-checkout-writable
-                                                               (lambda _
-                                                                 (for-each make-file-writable (find-files "."))
-                                                                 #t))
-                                                    (add-after 'unpack 'apply-patches
-                                                               (lambda* (#:key inputs #:allow-other-keys)
-                                                                        (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
-                                                                          ;; Comes from
-                                                                          ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
-                                                                          ;; WARNING: These amount for huge changes in pjproject.
-                                                                          (jami-apply-dependency-patches #:inputs inputs
-                                                                                                         #:dep-name "ffmpeg"
-                                                                                                         #:patches
-                                                                                                         '("remove-mjpeg-log"
-                                                                                                           "change-RTCP-ratio"
-                                                                                                           "rtp_ext_abs_send_time"))
-                                                                          #t))))))))))
+    (inherit ffmpeg)
+    (name "ffmpeg-jami")
+    (version "4.2.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.ffmpeg.org/ffmpeg.git")
+                    (commit "59da9dcd7ef6277e4e04998ced71b05a6083c635")))
+              (file-name (git-file-name "ffmpeg" version))
+              (sha256
+               (base32
+                "0cm58kd06lvslc7knnfajv5p63v4cc6502badjcic5m9izd03lz2"))))
+    (native-inputs
+     `(("savoir-faire-linux-patches" ,(jami-source))
+       ("libiconv" ,libiconv)
+       ,@(package-native-inputs ffmpeg)))
+    (arguments
+     (append
+      '(#:tests? #f)
+      (substitute-keyword-arguments (package-arguments ffmpeg)
+        ((#:configure-flags '())
+         (append '("--disable-everything"
+                   "--enable-zlib"
+                   "--enable-gpl"
+                   "--enable-swscale"
+                   "--enable-bsfs"
+                   "--disable-filters"
+                   "--disable-programs"
+                   "--disable-postproc"
+                   "--disable-protocols"
+                   "--enable-protocol=crypto"
+                   "--enable-protocol=file"
+                   "--enable-protocol=rtp"
+                   "--enable-protocol=srtp"
+                   "--enable-protocol=tcp"
+                   "--enable-protocol=udp"
+                   "--enable-protocol=unix"
+                   "--enable-protocol=pipe"
+                   "--disable-demuxers"
+                   "--disable-muxers"
+                   "--enable-muxer=rtp"
+                   "--enable-muxer=g722"
+                   "--enable-muxer=h263"
+                   "--enable-muxer=h264"
+                   "--enable-muxer=hevc"
+                   "--enable-muxer=webm"
+                   "--enable-muxer=ogg"
+                   "--enable-muxer=pcm_s16be"
+                   "--enable-muxer=pcm_s16le"
+                   "--enable-demuxer=rtp"
+                   "--enable-demuxer=mjpeg"
+                   "--enable-demuxer=mjpeg_2000"
+                   "--enable-demuxer=mpegvideo"
+                   "--enable-demuxer=gif"
+                   "--enable-demuxer=image_jpeg_pipe"
+                   "--enable-demuxer=image_png_pipe"
+                   "--enable-demuxer=image_webp_pipe"
+                   "--enable-demuxer=matroska"
+                   "--enable-demuxer=m4v"
+                   "--enable-demuxer=mp3"
+                   "--enable-demuxer=ogg"
+                   "--enable-demuxer=flac"
+                   "--enable-demuxer=wav"
+                   "--enable-demuxer=ac3"
+                   "--enable-demuxer=g722"
+                   "--enable-demuxer=pcm_mulaw"
+                   "--enable-demuxer=pcm_alaw"
+                   "--enable-demuxer=pcm_s16be"
+                   "--enable-demuxer=pcm_s16le"
+                   "--enable-demuxer=h263"
+                   "--enable-demuxer=h264"
+                   "--enable-demuxer=hevc"
+                   "--enable-parser=h263"
+                   "--enable-parser=h264"
+                   "--enable-parser=mpeg4video"
+                   "--enable-parser=vp8"
+                   "--enable-parser=vp9"
+                   "--enable-parser=opus"
+                   "--enable-encoder=adpcm_g722"
+                   "--enable-decoder=adpcm_g722"
+                   "--enable-encoder=rawvideo"
+                   "--enable-decoder=rawvideo"
+                   "--enable-encoder=libx264"
+                   "--enable-decoder=h264"
+                   "--enable-encoder=pcm_alaw"
+                   "--enable-decoder=pcm_alaw"
+                   "--enable-encoder=pcm_mulaw"
+                   "--enable-decoder=pcm_mulaw"
+                   "--enable-encoder=mpeg4"
+                   "--enable-decoder=mpeg4"
+                   "--enable-encoder=libvpx_vp8"
+                   "--enable-decoder=vp8"
+                   "--enable-decoder=vp9"
+                   "--enable-encoder=h263"
+                   "--enable-encoder=h263p"
+                   "--enable-decoder=h263"
+                   "--enable-encoder=mjpeg"
+                   "--enable-decoder=mjpeg"
+                   "--enable-decoder=mjpegb"
+                   "--enable-libspeex"
+                   "--enable-libopus"
+                   "--enable-libvpx"
+                   "--enable-libx264"
+                   "--enable-encoder=libspeex"
+                   "--enable-decoder=libspeex"
+                   "--enable-encoder=libopus"
+                   "--enable-decoder=libopus"
+                   "--enable-decoder=flac"
+                   "--enable-decoder=vorbis"
+                   "--enable-decoder=aac"
+                   "--enable-decoder=ac3"
+                   "--enable-decoder=eac3"
+                   "--enable-decoder=mp3"
+                   "--enable-decoder=pcm_u24be"
+                   "--enable-decoder=pcm_u24le"
+                   "--enable-decoder=pcm_u32be"
+                   "--enable-decoder=pcm_u32le"
+                   "--enable-decoder=pcm_u8"
+                   "--enable-decoder=pcm_f16le"
+                   "--enable-decoder=pcm_f24le"
+                   "--enable-decoder=pcm_f32be"
+                   "--enable-decoder=pcm_f32le"
+                   "--enable-decoder=pcm_f64be"
+                   "--enable-decoder=pcm_f64le"
+                   "--enable-decoder=pcm_s16be"
+                   "--enable-decoder=pcm_s16be_planar"
+                   "--enable-decoder=pcm_s16le"
+                   "--enable-decoder=pcm_s16le_planar"
+                   "--enable-decoder=pcm_s24be"
+                   "--enable-decoder=pcm_s24le"
+                   "--enable-decoder=pcm_s24le_planar"
+                   "--enable-decoder=pcm_s32be"
+                   "--enable-decoder=pcm_s32le"
+                   "--enable-decoder=pcm_s32le_planar"
+                   "--enable-decoder=pcm_s64be"
+                   "--enable-decoder=pcm_s64le"
+                   "--enable-decoder=pcm_s8"
+                   "--enable-decoder=pcm_s8_planar"
+                   "--enable-decoder=pcm_u16be"
+                   "--enable-decoder=pcm_u16le"
+                   "--enable-encoder=gif"
+                   "--enable-decoder=gif"
+                   "--enable-encoder=jpegls"
+                   "--enable-decoder=jpegls"
+                   "--enable-encoder=ljpeg"
+                   "--enable-decoder=jpeg2000"
+                   "--enable-encoder=png"
+                   "--enable-decoder=png"
+                   "--enable-encoder=bmp"
+                   "--enable-decoder=bmp"
+                   "--enable-encoder=tiff"
+                   "--enable-decoder=tiff"
+                   "--enable-filter=scale"
+                   "--enable-filter=overlay"
+                   "--enable-filter=amix"
+                   "--enable-filter=amerge"
+                   "--enable-filter=aresample"
+                   "--enable-filter=format"
+                   "--enable-filter=aformat"
+                   "--enable-filter=fps"
+                   "--enable-filter=transpose"
+                   "--enable-filter=pad")
+                 (if (string-contains (%current-system) "linux")
+                     '("--enable-pic"
+                       "--extra-cxxflags=-fPIC"
+                       "--extra-cflags=-fPIC"
+                       "--target-os=linux"
+                       "--enable-indev=v4l2"
+                       "--enable-indev=xcbgrab"
+                       "--enable-vdpau"
+                       "--enable-hwaccel=h264_vdpau"
+                       "--enable-hwaccel=mpeg4_vdpau"
+                       "--enable-vaapi"
+                       "--enable-hwaccel=h264_vaapi"
+                       "--enable-hwaccel=mpeg4_vaapi"
+                       "--enable-hwaccel=h263_vaapi"
+                       "--enable-hwaccel=vp8_vaapi"
+                       "--enable-hwaccel=mjpeg_vaapi"
+                       "--enable-encoder=h264_vaapi"
+                       "--enable-encoder=vp8_vaapi"
+                       "--enable-encoder=mjpeg_vaapi"
+                       "--enable-cuvid"
+                       "--enable-ffnvcodec"
+                       "--enable-nvdec"
+                       "--enable-nvenc"
+                       "--enable-hwaccel=h264_nvdec"
+                       "--enable-hwaccel=hevc_nvdec"
+                       "--enable-hwaccel=vp8_nvdec"
+                       "--enable-hwaccel=mjpeg_nvdec"
+                       "--enable-encoder=h264_nvenc"
+                       "--enable-encoder=hevc_nvenc"))
+                 (if (string?= (%current-system) "aarch64-linux")
+                     '("--arch=aarch64")
+                     '())
+                 (if (string?= (%current-system) "arm64-linux")
+                     '("--arch=aarch64")
+                     '())))
+        ((#:phases phases)
+         `(modify-phases ,phases
+            (add-after 'unpack 'make-git-checkout-writable
+              (lambda _
+                (for-each make-file-writable (find-files "."))
+                #t))
+            (add-after 'unpack 'apply-patches
+              (lambda* (#:key inputs #:allow-other-keys)
+                (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches))
+                  ;; Comes from
+                  ;; "ring-project/daemon/contrib/src/pjproject/rules.mak".
+                  ;; WARNING: These amount for huge changes in pjproject.
+                  (jami-apply-dependency-patches #:inputs inputs
+                                                 #:dep-name "ffmpeg"
+                                                 #:patches
+                                                 '("remove-mjpeg-log"
+                                                   "change-RTCP-ratio"
+                                                   "rtp_ext_abs_send_time"))
+                  #t))))))))))
 
 (define-public libring
   (package
-- 
2.24.1

bug#38963: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38984] [PATCH 19/22] gnu: jami: Bump to 20191224.1.5c0154a

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index c6d65d5688..b13dce8154 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -76,7 +76,7 @@
                                  file ".patch")))
         patches))))
 
-(define %jami-version "20191217.1.ce5f295")
+(define %jami-version "20191224.1.5c0154a")
 
 (define* (jami-source #:key without-daemon)
   (origin
@@ -92,7 +92,7 @@
          #f))
     (sha256
      (base32
-      "00d1c5f3v3wgsfyfdh3m9h8r3i6ivfk6pl70blw60b38jvdh2n06"))))
+      "1mrnc4m2xmrb5b4bkm4hmh514g2hixin3dqxmi3z0adw5ay6ivr2"))))
 
 (define-public pjproject-jami
   (package
-- 
2.24.1

[bug#38984] [PATCH 20/22] gnu: libring: Use ffmpeg-jami instead of ffmpeg.

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index b13dce8154..ea66bed8a5 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -465,7 +465,7 @@
        ("boost" ,boost)
        ("dbus-c++" ,dbus-c++)
        ("eudev" ,eudev)
-       ("ffmpeg" ,ffmpeg)
+       ("ffmpeg" ,ffmpeg-jami)
        ("flac" ,flac)
        ("gmp" ,gmp)
        ("gsm" ,gsm)
-- 
2.24.1

[bug#38970] [PATCH 21/22] gnu: pjproject-jami: Apply a missing patch.

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index ea66bed8a5..22c86e9b5b 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -165,7 +165,8 @@
                                                 "fix_ebusy_turn"
                                                 "ignore_ipv6_on_transport_check"
                                                 "fix_turn_connection_failure"
-                                                "disable_local_resolution"))
+                                                "disable_local_resolution"
+						"fix_assert_on_connection_attempt"))
                #t)))
          ;; TODO: We could use substitute-keyword-arguments instead of
          ;; repeating the phases from pjproject, but somehow it does
-- 
2.24.1

bug#38970: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

[bug#38972] [PATCH 22/22] gnu: jami: Bump to 20191227.2.74b55b6.

[Jan Wielkiewicz]

---
 gnu/packages/jami.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 22c86e9b5b..7012f5c9bc 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -76,7 +76,7 @@
                                  file ".patch")))
         patches))))
 
-(define %jami-version "20191224.1.5c0154a")
+(define %jami-version "20191227.2.74b55b6")
 
 (define* (jami-source #:key without-daemon)
   (origin
@@ -92,7 +92,7 @@
          #f))
     (sha256
      (base32
-      "1mrnc4m2xmrb5b4bkm4hmh514g2hixin3dqxmi3z0adw5ay6ivr2"))))
+      "1x9alsb8r1vvcxml4mlla8v4ckylfh8ad0falxg1a78dj0lslw4d"))))
 
 (define-public pjproject-jami
   (package
-- 
2.24.1

bug#38972: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz

bug#38984: Closing the broken patch

[Jan]

I broke the whole patch series, sorry, hope this solves everything.
I got smtp error and thought patches didn't send.


Jan Wielkiewicz