diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/libsoundio | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/libsoundio')
| -rw-r--r-- | ports/libsoundio/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libsoundio/fix_example.patch | 36 | ||||
| -rw-r--r-- | ports/libsoundio/fix_test.patch | 82 | ||||
| -rw-r--r-- | ports/libsoundio/portfile.cmake | 2 |
4 files changed, 1 insertions, 121 deletions
diff --git a/ports/libsoundio/CONTROL b/ports/libsoundio/CONTROL index 9b2072115..52ab4845f 100644 --- a/ports/libsoundio/CONTROL +++ b/ports/libsoundio/CONTROL @@ -1,4 +1,4 @@ Source: libsoundio
-Version: 2.0.0
+Version: 2.0.0-1
Description: libsoundio is C library providing cross-platform audio input and output.
Homepage: http://libsound.io/
diff --git a/ports/libsoundio/fix_example.patch b/ports/libsoundio/fix_example.patch deleted file mode 100644 index 39bbb9b02..000000000 --- a/ports/libsoundio/fix_example.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/sio_microphone.c b/sio_microphone.c -index 0fa8cca..5c89656 100644 ---- a/sio_microphone.c -+++ b/sio_microphone.c -@@ -45,10 +45,13 @@ static int prioritized_sample_rates[] = { - 0, - }; - -- -+#ifdef _MSC_VER -+__declspec (noreturn) -+#else - __attribute__ ((cold)) - __attribute__ ((noreturn)) - __attribute__ ((format (printf, 1, 2))) -+#endif - static void panic(const char *format, ...) { - va_list ap; - va_start(ap, format); -diff --git a/sio_record.c b/sio_record.c -index 61d584d..c33b05e 100644 ---- a/sio_record.c -+++ b/sio_record.c -@@ -12,7 +12,12 @@ - #include <string.h> - #include <math.h> - #include <errno.h> -+#ifdef _WIN32 -+#include <windows.h> -+#define sleep(n) Sleep(n * 1000) -+#else - #include <unistd.h> -+#endif - - struct RecordContext { - struct SoundIoRingBuffer *ring_buffer; diff --git a/ports/libsoundio/fix_test.patch b/ports/libsoundio/fix_test.patch deleted file mode 100644 index dc92c2d1b..000000000 --- a/ports/libsoundio/fix_test.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/backend_disconnect_recover.c b/backend_disconnect_recover.c -index 046a150..7c89df7 100644 ---- a/backend_disconnect_recover.c -+++ b/backend_disconnect_recover.c -@@ -12,11 +12,20 @@ - #include <stdlib.h> - #include <string.h> - #include <math.h> -+#ifdef _WIN32 -+#include <windows.h> -+#define sleep(n) Sleep(n * 1000) -+#else - #include <unistd.h> -+#endif - -+#ifdef _MSC_VER -+__declspec (noreturn) -+#else - __attribute__ ((cold)) - __attribute__ ((noreturn)) - __attribute__ ((format (printf, 1, 2))) -+#endif - static void panic(const char *format, ...) { - va_list ap; - va_start(ap, format); -diff --git a/overflow.c b/overflow.c -index 43b6d22..67947fe 100644 ---- a/overflow.c -+++ b/overflow.c -@@ -12,7 +12,12 @@ - #include <stdlib.h> - #include <string.h> - #include <math.h> -+#ifdef _WIN32 -+#include <windows.h> -+#define sleep(n) Sleep(n * 1000) -+#else - #include <unistd.h> -+#endif - - static enum SoundIoFormat prioritized_formats[] = { - SoundIoFormatFloat32NE, -@@ -36,9 +41,13 @@ static enum SoundIoFormat prioritized_formats[] = { - SoundIoFormatInvalid, - }; - -+#ifdef _MSC_VER -+__declspec (noreturn) -+#else - __attribute__ ((cold)) - __attribute__ ((noreturn)) - __attribute__ ((format (printf, 1, 2))) -+#endif - static void panic(const char *format, ...) { - va_list ap; - va_start(ap, format); -diff --git a/underflow.c b/underflow.c -index 083e92d..32907de 100644 ---- a/underflow.c -+++ b/underflow.c -@@ -12,12 +12,21 @@ - #include <stdlib.h> - #include <string.h> - #include <math.h> -+#ifdef _WIN32 -+#include <windows.h> -+#define sleep(n) Sleep(n * 1000) -+#else - #include <unistd.h> -+#endif - #include <stdint.h> - -+#ifdef _MSC_VER -+__declspec (noreturn) -+#else - __attribute__ ((cold)) - __attribute__ ((noreturn)) - __attribute__ ((format (printf, 1, 2))) -+#endif - static void panic(const char *format, ...) { - va_list ap; - va_start(ap, format); diff --git a/ports/libsoundio/portfile.cmake b/ports/libsoundio/portfile.cmake index c298e0ab8..0e1b7f561 100644 --- a/ports/libsoundio/portfile.cmake +++ b/ports/libsoundio/portfile.cmake @@ -12,8 +12,6 @@ vcpkg_from_github( HEAD_REF master
PATCHES
fix_cmakelists.patch
- fix_example.patch
- fix_test.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS)
|
