4 files changed, 66 insertions, 25 deletions

diff --git a/audio/libsamplerate/files/patch-cmake_FindSndFile.cmake b/audio/libsamplerate/files/patch-cmake_FindSndFile.cmake
new file mode 100644
index 000000000000..2407e85fce46
--- /dev/null
+++ b/audio/libsamplerate/files/patch-cmake_FindSndFile.cmake
@@ -0,0 +1,32 @@
+--- cmake/FindSndFile.cmake.orig	2021-01-28 01:50:45 UTC
++++ cmake/FindSndFile.cmake
+@@ -16,10 +16,6 @@ pkg_check_modules(PC_SndFile QUIET sndfile)
+ 
+ set(SndFile_VERSION ${PC_SndFile_VERSION})
+ 
+-find_package(Vorbis COMPONENTS Enc QUIET)
+-find_package(FLAC QUIET)
+-find_package(Opus QUIET)
+-
+ find_path(SndFile_INCLUDE_DIR sndfile.h
+   HINTS
+     ${PC_SndFile_INCLUDEDIR}
+@@ -42,15 +38,14 @@ find_package_handle_standard_args(SndFile
+ 
+ if(SndFile_FOUND)
+ 
+-  set(SndFile_LIBRARIES ${SndFile_LIBRARY} ${Vorbis_Enc_LIBRARIES} ${FLAC_LIBRARIES} ${OPUS_LIBRARIES})
+-  set(SndFile_INCLUDE_DIRS ${SndFile_INCLUDE_DIR} ${Vorbis_Enc_INCLUDE_DIRS} ${FLAC_INCLUDE_DIRS} ${OPUS_INCLUDE_DIRS})
++  set(SndFile_LIBRARIES ${SndFile_LIBRARY})
++  set(SndFile_INCLUDE_DIRS ${SndFile_INCLUDE_DIR})
+   
+   if(NOT TARGET SndFile::sndfile)
+     add_library(SndFile::sndfile UNKNOWN IMPORTED)
+     set_target_properties(SndFile::sndfile PROPERTIES
+       INTERFACE_INCLUDE_DIRECTORIES "${SndFile_INCLUDE_DIR}"
+-      IMPORTED_LOCATION "${SndFile_LIBRARY}"
+-      INTERFACE_LINK_LIBRARIES "Vorbis::vorbisenc;Opus::opus;FLAC::FLAC")
++      IMPORTED_LOCATION "${SndFile_LIBRARY}")
+   endif()
+ endif()
+ 
diff --git a/audio/libsamplerate/files/patch-examples_CMakeLists.txt b/audio/libsamplerate/files/patch-examples_CMakeLists.txt
new file mode 100644
index 000000000000..22e378ff8069
--- /dev/null
+++ b/audio/libsamplerate/files/patch-examples_CMakeLists.txt
@@ -0,0 +1,34 @@
+--- examples/CMakeLists.txt.orig	2021-01-28 01:57:53 UTC
++++ examples/CMakeLists.txt
+@@ -1,31 +1,5 @@
+-find_package(ALSA)
+-set(HAVE_ALSA ${ALSA_FOUND} PARENT_SCOPE)
+-# ALSA::ALSA target is exported since CMake >= 3.12, create it for
+-# old CMake versions
+-if(ALSA_FOUND)
+-  if(NOT TARGET ALSA::ALSA)
+-    add_library(ALSA::ALSA UNKNOWN IMPORTED)
+-    set_target_properties(ALSA::ALSA PROPERTIES
+-    INTERFACE_INCLUDE_DIRECTORIES "${ALSA_INCLUDE_DIRS}"
+-    IMPORTED_LOCATION "${ALSA_LIBRARIES}")
+-  endif()
+-endif()
+-
+ add_executable(timewarp-file timewarp-file.c)
+ target_link_libraries(timewarp-file
+   PRIVATE
+     samplerate
+     $<$<BOOL:${SndFile_FOUND}>:SndFile::sndfile>)
+-
+-add_executable(varispeed-play varispeed-play.c audio_out.c audio_out.h)
+-target_link_libraries(varispeed-play
+-  PRIVATE
+-    samplerate
+-    $<$<BOOL:${SndFile_FOUND}>:SndFile::sndfile>)
+-if(WIN32)
+-  target_link_libraries(varispeed-play PRIVATE winmm)
+-elseif(APPLE)
+-  target_link_libraries(varispeed-play PRIVATE "-framework CoreAudio")
+-elseif(ALSA_FOUND)
+-  target_link_libraries(varispeed-play PRIVATE ALSA::ALSA)
+-endif()
diff --git a/audio/libsamplerate/files/patch-examples_audio__out.c b/audio/libsamplerate/files/patch-examples_audio__out.c
deleted file mode 100644
index 769c218b654b..000000000000
--- a/audio/libsamplerate/files/patch-examples_audio__out.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- examples/audio_out.c.orig	2016-09-13 10:20:20 UTC
-+++ examples/audio_out.c
-@@ -33,9 +33,9 @@
- #define MAKE_MAGIC(a,b,c,d,e,f,g,h)		\
- 			((a) + ((b) << 1) + ((c) << 2) + ((d) << 3) + ((e) << 4) + ((f) << 5) + ((g) << 6) + ((h) << 7))
- 
--typedef	struct AUDIO_OUT_s
-+struct AUDIO_OUT_s
- {	int magic ;
--} AUDIO_OUT ;
-+};
- 
- 
- /*------------------------------------------------------------------------------
diff --git a/audio/libsamplerate/files/patch-src_samplerate.h b/audio/libsamplerate/files/patch-src_samplerate.h
deleted file mode 100644
index d28b15a618a3..000000000000
--- a/audio/libsamplerate/files/patch-src_samplerate.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/samplerate.h.orig	2016-09-13 10:13:14 UTC
-+++ src/samplerate.h
-@@ -160,7 +160,7 @@ enum
- 	SRC_SINC_MEDIUM_QUALITY		= 1,
- 	SRC_SINC_FASTEST			= 2,
- 	SRC_ZERO_ORDER_HOLD			= 3,
--	SRC_LINEAR					= 4,
-+	SRC_LINEAR					= 4
- } ;
- 
- /*