Initial revision

4 files changed, 110 insertions, 0 deletions

diff --git a/vlc/build/patches/libshout_stdio.patch b/vlc/build/patches/libshout_stdio.patch
new file mode 100644
index 00000000..29ba6121
--- /dev/null
+++ b/vlc/build/patches/libshout_stdio.patch
@@ -0,0 +1,22 @@
+--- a/src/legacy.c	2022-04-10 12:10:14.000000000 +0200
++++ b/src/legacy.c	2022-09-14 16:16:30.000000000 +0200
+@@ -28,6 +28,8 @@
+ #include "shout_private.h"
+ #include "util.h"
+ 
++#include <stdlib.h>
++
+ int shout_set_format(shout_t *self, unsigned int format)
+ {
+     if (!self)
+--- a/src/icy.c	2022-04-10 12:10:14.000000000 +0200
++++ b/src/icy.c	2022-09-14 16:19:42.000000000 +0200
+@@ -25,6 +25,8 @@
+ 
+ #include <stdbool.h>
+ #include <string.h>
++#include <stdlib.h>
++#include <stdio.h>
+ 
+ #include <shout/shout.h>
+ 
diff --git a/vlc/build/patches/libshout_strings.patch b/vlc/build/patches/libshout_strings.patch
new file mode 100644
index 00000000..475057c6
--- /dev/null
+++ b/vlc/build/patches/libshout_strings.patch
@@ -0,0 +1,12 @@
+--- libshout/src/common/httpp/encoding.c.strings	2015-11-20 20:51:36.000000000 +0100
++++ libshout/src/common/httpp/encoding.c	2018-03-29 11:00:04.524097700 +0200
+@@ -27,7 +27,9 @@
+ #endif
+ 
+ #include <sys/types.h>
++#ifdef HAVE_STRINGS_H
+ #include <strings.h>
++#endif
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
diff --git a/vlc/build/patches/soxr_expose_privatelibs.patch b/vlc/build/patches/soxr_expose_privatelibs.patch
new file mode 100755
index 00000000..134e5ecc
--- /dev/null
+++ b/vlc/build/patches/soxr_expose_privatelibs.patch
@@ -0,0 +1,48 @@
+From 09360cec54474d8739efd058d995646160594421 Mon Sep 17 00:00:00 2001
+From: Thomas Guillem <thomas@gllm.fr>
+Date: Tue, 13 Mar 2018 10:57:27 +0100
+Subject: [PATCH 2/2] expose Libs.private in .pc
+
+This fixes static build when avcodec and/or avutil is used.
+---
+ CMakeLists.txt     | 2 ++
+ src/soxr-lsr.pc.in | 1 +
+ src/soxr.pc.in     | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ee48f6c..5adb583 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,6 +142,8 @@ if (WITH_AVFFT OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND SIMD32_FOUND AND WI
+   endif ()
+ endif ()
+ 
++string(REPLACE ";" " " LIBS_PRIVATE_PC "${LIBS}")
++
+ check_function_exists (lrint HAVE_LRINT)
+ check_include_files (fenv.h HAVE_FENV_H)
+ check_include_files (stdbool.h HAVE_STDBOOL_H)
+diff --git a/src/soxr-lsr.pc.in b/src/soxr-lsr.pc.in
+index 7b75757..5d51778 100644
+--- a/src/soxr-lsr.pc.in
++++ b/src/soxr-lsr.pc.in
+@@ -2,4 +2,5 @@ Name: ${LSR}
+ Description: ${DESCRIPTION_SUMMARY} (with libsamplerate-like bindings)
+ Version: ${PROJECT_VERSION}
+ Libs: -L${LIB_INSTALL_DIR} -l${LSR}
++Libs.private: ${LIBS_PRIVATE_PC}
+ Cflags: -I${INCLUDE_INSTALL_DIR}
+diff --git a/src/soxr.pc.in b/src/soxr.pc.in
+index 69d225b..30f0d2d 100644
+--- a/src/soxr.pc.in
++++ b/src/soxr.pc.in
+@@ -2,4 +2,5 @@ Name: ${PROJECT_NAME}
+ Description: ${DESCRIPTION_SUMMARY}
+ Version: ${PROJECT_VERSION}
+ Libs: -L${LIB_INSTALL_DIR} -l${PROJECT_NAME}
++Libs.private: ${LIBS_PRIVATE_PC}
+ Cflags: -I${INCLUDE_INSTALL_DIR}
+-- 
+2.11.0
+
diff --git a/vlc/build/patches/soxr_find_ffmpeg.patch b/vlc/build/patches/soxr_find_ffmpeg.patch
new file mode 100755
index 00000000..0627c97a
--- /dev/null
+++ b/vlc/build/patches/soxr_find_ffmpeg.patch
@@ -0,0 +1,28 @@
+--- soxr/CMakeLists.txt.orig	2018-10-15 12:15:01.620074074 +0200
++++ soxr/CMakeLists.txt	2018-10-15 12:16:27.269662032 +0200
+@@ -126,19 +126,21 @@
+   set (WITH_CR64S ${SIMD64_FOUND})
+ endif ()
+ 
++find_package(PkgConfig)
++
+ if (WITH_AVFFT)
+-  find_package (LibAVCodec REQUIRED)
++  pkg_check_modules(AVCODEC REQUIRED libavcodec)
+   if (AVCODEC_FOUND)
+     include_directories (${AVCODEC_INCLUDE_DIRS})
+-    set (LIBS ${LIBS} ${AVCODEC_LIBRARIES})
++    set (LIBS ${LIBS} ${AVCODEC_LDFLAGS})
+   endif ()
+ endif ()
+ 
+ if (WITH_AVFFT OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND SIMD32_FOUND AND WITH_CR32))
+-  find_package (LibAVUtil)
++  pkg_check_modules(AVUTIL REQUIRED libavutil)
+   if (AVUTIL_FOUND)
+     include_directories (${AVUTIL_INCLUDE_DIRS})
+-    set (LIBS ${LIBS} ${AVUTIL_LIBRARIES})
++    set (LIBS ${LIBS} ${AVUTIL_LDFLAGS})
+   endif ()
+ endif ()
+