From 6c6e21152f8d8a37e3696298c02e8f40e0944454 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sat, 15 Jun 2024 21:36:18 -0400
Subject: [PATCH] gnu: mediastreamer2: Enable AV1 support via dav1d.

* gnu/packages/patches/mediastreamer2-cmake-findgsm.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/linphone.scm (mediastreamer2) [source]: Apply it.
[inputs]: Add dav1d.

Change-Id: I420342281f89a9d1569ffd8e6de87aac55be7491
---
 gnu/local.mk                                  |  1 +
 gnu/packages/linphone.scm                     |  1 +
 .../mediastreamer2-cmake-findgsm.patch        | 63 +++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 gnu/packages/patches/mediastreamer2-cmake-findgsm.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 7f05f1b8dea6da31068d2ec0cb4e1e1732cdd928..f8cf1495c096277cb444218f49d4c1f2fc102a87 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1860,6 +1860,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/lvm2-no-systemd.patch    		\
   %D%/packages/patches/maturin-no-cross-compile.patch		\
   %D%/packages/patches/mecab-variable-param.patch		\
+  %D%/packages/patches/mediastreamer2-cmake-findgsm.patch	\
   %D%/packages/patches/mediasdk-gcc-14.patch			\
   %D%/packages/patches/memtest86+-build-reproducibly.patch	\
   %D%/packages/patches/mercurial-hg-extension-path.patch	\
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 429aa322ea63c218520bf72541bd86e25ce496ce..9287413ff447e1b73f48c2ad704fc7919c3362ae 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -651,6 +651,7 @@ API.  It also comprises a simple HTTP/HTTPS client implementation.")
            bcmatroska2
            bctoolbox
            bzrtp
+           dav1d
            ffmpeg-4
            glew
            glu
diff --git a/gnu/packages/patches/mediastreamer2-cmake-findgsm.patch b/gnu/packages/patches/mediastreamer2-cmake-findgsm.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7b48e310b5bf936a0b75417ac11e4594472fdc7b
--- /dev/null
+++ b/gnu/packages/patches/mediastreamer2-cmake-findgsm.patch
@@ -0,0 +1,63 @@
+Retrieved from: https://git.pld-linux.org/?p=packages/mediastreamer.git;a=blob_plain;f=mediastreamer-cmake-find.patch;h=4f1e3577f43bf791ed5cdb180ca455f919b80c8d;hb=HEAD
+
+--- mediastreamer2-5.3.29/cmake/FindGSM.cmake.orig	2024-02-21 12:02:03.000000000 +0100
++++ mediastreamer2-5.3.29/cmake/FindGSM.cmake	2024-03-09 20:16:25.064077414 +0100
+@@ -58,7 +58,7 @@ else()
+ 	set(_GSM_ROOT_PATHS ${CMAKE_INSTALL_PREFIX})
+ 
+ 	find_path(_GSM_INCLUDE_DIRS
+-		NAMES gsm/gsm.h
++		NAMES gsm.h gsm/gsm.h
+ 		HINTS ${_GSM_ROOT_PATHS}
+ 		PATH_SUFFIXES include
+ 	)
+--- mediastreamer2-5.3.29/cmake/FindDav1d.cmake.orig	2024-02-21 12:02:03.000000000 +0100
++++ mediastreamer2-5.3.29/cmake/FindDav1d.cmake	2024-03-09 20:44:17.671682787 +0100
+@@ -65,17 +65,17 @@ else()
+ 		PATH_SUFFIXES bin lib lib/Win32
+ 	)
+ 
+-	if(_Dav1d_INCLUDE_DIRS AND _Dav1d_LIBRARY)
++	if(Dav1d_INCLUDE_DIRS AND Dav1d_LIBRARY)
+ 		add_library(libdav1d UNKNOWN IMPORTED)
+ 		if(WIN32)
+ 			set_target_properties(libdav1d PROPERTIES
+-				INTERFACE_INCLUDE_DIRECTORIES "${_Dav1d_INCLUDE_DIRS}"
+-				IMPORTED_IMPLIB "${_Dav1d_LIBRARY}"
++				INTERFACE_INCLUDE_DIRECTORIES "${Dav1d_INCLUDE_DIRS}"
++				IMPORTED_IMPLIB "${Dav1d_LIBRARY}"
+ 			)
+ 		else()
+ 			set_target_properties(libdav1d PROPERTIES
+-				INTERFACE_INCLUDE_DIRECTORIES "${_Dav1d_INCLUDE_DIRS}"
+-				IMPORTED_LOCATION "${_Dav1d_LIBRARY}"
++				INTERFACE_INCLUDE_DIRECTORIES "${Dav1d_INCLUDE_DIRS}"
++				IMPORTED_LOCATION "${Dav1d_LIBRARY}"
+ 			)
+ 		endif()
+ 
+--- mediastreamer2-5.3.29/cmake/FindAom.cmake.orig	2024-02-21 12:02:03.000000000 +0100
++++ mediastreamer2-5.3.29/cmake/FindAom.cmake	2024-03-09 20:45:16.931361750 +0100
+@@ -65,17 +65,17 @@ else()
+ 		PATH_SUFFIXES bin lib lib/Win32
+ 	)
+ 
+-	if(_Aom_INCLUDE_DIRS AND _Aom_LIBRARY)
++	if(Aom_INCLUDE_DIRS AND Aom_LIBRARY)
+ 		add_library(aom UNKNOWN IMPORTED)
+ 		if(WIN32)
+ 			set_target_properties(aom PROPERTIES
+-				INTERFACE_INCLUDE_DIRECTORIES "${_Aom_INCLUDE_DIRS}"
+-				IMPORTED_IMPLIB "${_Aom_LIBRARY}"
++				INTERFACE_INCLUDE_DIRECTORIES "${Aom_INCLUDE_DIRS}"
++				IMPORTED_IMPLIB "${Aom_LIBRARY}"
+ 			)
+ 		else()
+ 			set_target_properties(aom PROPERTIES
+-				INTERFACE_INCLUDE_DIRECTORIES "${_Aom_INCLUDE_DIRS}"
+-				IMPORTED_LOCATION "${_Aom_LIBRARY}"
++				INTERFACE_INCLUDE_DIRECTORIES "${Aom_INCLUDE_DIRS}"
++				IMPORTED_LOCATION "${Aom_LIBRARY}"
+ 			)
+ 		endif()
+