From d7fc2459bb3453d3d205292e1b06d00755116096 Mon Sep 17 00:00:00 2001 From: Joe Noel Date: Thu, 25 Mar 2021 20:21:17 +0000 Subject: [PATCH 1/9] Add support for linux backends --- ports/libsoundio/CONTROL | 12 +++++++++++- ports/libsoundio/portfile.cmake | 24 +++++++++++++++++++++--- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/ports/libsoundio/CONTROL b/ports/libsoundio/CONTROL index d8abcf070365b5..bb4e9701909cfd 100644 --- a/ports/libsoundio/CONTROL +++ b/ports/libsoundio/CONTROL @@ -2,4 +2,14 @@ Source: libsoundio Version: 2.0.0-3 Description: libsoundio is C library providing cross-platform audio input and output. Homepage: http://libsound.io/ -Supports: !uwp \ No newline at end of file +Supports: !uwp + +Feature: alsa +Description: ALSA backend for libsoundio + +Feature: jack +Description: JACK backend for libsoundio +Build-Depends: jack2 + +Feature: pulseaudio +Description: PulseAudio backend for libsoundio \ No newline at end of file diff --git a/ports/libsoundio/portfile.cmake b/ports/libsoundio/portfile.cmake index acf4d9fc682393..aea1dfd52be4ad 100644 --- a/ports/libsoundio/portfile.cmake +++ b/ports/libsoundio/portfile.cmake @@ -14,6 +14,24 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_DYNAMIC_LIBS) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +if("alsa" IN_LIST FEATURES) + set(ENABLE_ALSA ON) +else() + set(ENABLE_ALSA OFF) +endif() + +if("jack" IN_LIST FEATURES) + set(ENABLE_JACK ON) +else() + set(ENABLE_JACK OFF) +endif() + +if("pulseaudio" IN_LIST FEATURES) + set(ENABLE_PULSEAUDIO ON) +else() + set(ENABLE_PULSEAUDIO OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -22,9 +40,9 @@ vcpkg_configure_cmake( -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DBUILD_EXAMPLE_PROGRAMS=OFF -DBUILD_TESTS=OFF - -DENABLE_JACK=OFF - -DENABLE_PULSEAUDIO=OFF - -DENABLE_ALSA=OFF + -DENABLE_JACK=${ENABLE_JACK} + -DENABLE_PULSEAUDIO=${ENABLE_PULSEAUDIO} + -DENABLE_ALSA=${ENABLE_ALSA} -DENABLE_COREAUDIO=${VCPKG_TARGET_IS_OSX} -DENABLE_WASAPI=${VCPKG_TARGET_IS_WINDOWS} ) From 97461fbb55b3abc7dc052bc5cf25349fea149f61 Mon Sep 17 00:00:00 2001 From: Joe Noel Date: Thu, 25 Mar 2021 22:05:46 +0000 Subject: [PATCH 2/9] Run vcpkg format-manifest --- ports/libsoundio/CONTROL | 15 --------------- ports/libsoundio/vcpkg.json | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 15 deletions(-) delete mode 100644 ports/libsoundio/CONTROL create mode 100644 ports/libsoundio/vcpkg.json diff --git a/ports/libsoundio/CONTROL b/ports/libsoundio/CONTROL deleted file mode 100644 index bb4e9701909cfd..00000000000000 --- a/ports/libsoundio/CONTROL +++ /dev/null @@ -1,15 +0,0 @@ -Source: libsoundio -Version: 2.0.0-3 -Description: libsoundio is C library providing cross-platform audio input and output. -Homepage: http://libsound.io/ -Supports: !uwp - -Feature: alsa -Description: ALSA backend for libsoundio - -Feature: jack -Description: JACK backend for libsoundio -Build-Depends: jack2 - -Feature: pulseaudio -Description: PulseAudio backend for libsoundio \ No newline at end of file diff --git a/ports/libsoundio/vcpkg.json b/ports/libsoundio/vcpkg.json new file mode 100644 index 00000000000000..ca9148414e8de7 --- /dev/null +++ b/ports/libsoundio/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "libsoundio", + "version-string": "2.0.0-3", + "description": "libsoundio is C library providing cross-platform audio input and output.", + "homepage": "http://libsound.io/", + "supports": "!uwp", + "features": { + "alsa": { + "description": "ALSA backend for libsoundio" + }, + "jack": { + "description": "JACK backend for libsoundio", + "dependencies": [ + "jack2" + ] + }, + "pulseaudio": { + "description": "PulseAudio backend for libsoundio" + } + } +} From 66d9f47d7058dc1b0ec2c54624adb6cdc5ff7fd7 Mon Sep 17 00:00:00 2001 From: Joe Noel Date: Thu, 25 Mar 2021 22:07:18 +0000 Subject: [PATCH 3/9] Bump version --- ports/libsoundio/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libsoundio.json | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/libsoundio/vcpkg.json b/ports/libsoundio/vcpkg.json index ca9148414e8de7..bcd548348c00e9 100644 --- a/ports/libsoundio/vcpkg.json +++ b/ports/libsoundio/vcpkg.json @@ -1,5 +1,6 @@ { "name": "libsoundio", + "port-version": 1, "version-string": "2.0.0-3", "description": "libsoundio is C library providing cross-platform audio input and output.", "homepage": "http://libsound.io/", diff --git a/versions/baseline.json b/versions/baseline.json index 4411252b31d2c5..b87983efeba1e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3434,7 +3434,7 @@ }, "libsoundio": { "baseline": "2.0.0-3", - "port-version": 0 + "port-version": 1 }, "libspatialindex": { "baseline": "1.9.0", diff --git a/versions/l-/libsoundio.json b/versions/l-/libsoundio.json index 57de025bfbe8ad..d334300bc9d483 100644 --- a/versions/l-/libsoundio.json +++ b/versions/l-/libsoundio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "651105ae7e546895407daa056f6dab39b65c1462", + "version-string": "2.0.0-3", + "port-version": 1 + }, { "git-tree": "b7c77d32f74a10cb1ff43cb80c15d6a6f65d5d53", "version-string": "2.0.0-3", From 41f42ebde18180dede638cb2ae76e221ec4f7cde Mon Sep 17 00:00:00 2001 From: Joe Noel Date: Thu, 25 Mar 2021 22:08:25 +0000 Subject: [PATCH 4/9] Run vcpkg-format --- ports/libsoundio/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libsoundio/vcpkg.json b/ports/libsoundio/vcpkg.json index bcd548348c00e9..a8fc5b9a5502fc 100644 --- a/ports/libsoundio/vcpkg.json +++ b/ports/libsoundio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsoundio", - "port-version": 1, "version-string": "2.0.0-3", + "port-version": 1, "description": "libsoundio is C library providing cross-platform audio input and output.", "homepage": "http://libsound.io/", "supports": "!uwp", From 66e0211ff4d90d3444de93cc9677d0d86459264e Mon Sep 17 00:00:00 2001 From: Joe Noel Date: Thu, 25 Mar 2021 22:09:18 +0000 Subject: [PATCH 5/9] Add version --- versions/l-/libsoundio.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libsoundio.json b/versions/l-/libsoundio.json index d334300bc9d483..d0bb54d292f610 100644 --- a/versions/l-/libsoundio.json +++ b/versions/l-/libsoundio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "651105ae7e546895407daa056f6dab39b65c1462", + "git-tree": "b8772b81312859cfef91f4161ebcf236acea836e", "version-string": "2.0.0-3", "port-version": 1 }, From 211f3dc9fda1c68094b810ea6a17c08d0907c3fc Mon Sep 17 00:00:00 2001 From: Joe Noel Date: Fri, 26 Mar 2021 14:12:37 +0000 Subject: [PATCH 6/9] Use vcpkg_check_features --- ports/libsoundio/portfile.cmake | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/ports/libsoundio/portfile.cmake b/ports/libsoundio/portfile.cmake index aea1dfd52be4ad..3b5081cf970b23 100644 --- a/ports/libsoundio/portfile.cmake +++ b/ports/libsoundio/portfile.cmake @@ -14,23 +14,12 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_DYNAMIC_LIBS) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) -if("alsa" IN_LIST FEATURES) - set(ENABLE_ALSA ON) -else() - set(ENABLE_ALSA OFF) -endif() - -if("jack" IN_LIST FEATURES) - set(ENABLE_JACK ON) -else() - set(ENABLE_JACK OFF) -endif() - -if("pulseaudio" IN_LIST FEATURES) - set(ENABLE_PULSEAUDIO ON) -else() - set(ENABLE_PULSEAUDIO OFF) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + alsa ENABLE_ALSA + jack ENABLE_JACK + pulseaudio ENABLE_PULSEAUDIO +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -40,9 +29,7 @@ vcpkg_configure_cmake( -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DBUILD_EXAMPLE_PROGRAMS=OFF -DBUILD_TESTS=OFF - -DENABLE_JACK=${ENABLE_JACK} - -DENABLE_PULSEAUDIO=${ENABLE_PULSEAUDIO} - -DENABLE_ALSA=${ENABLE_ALSA} + ${FEATURE_OPTIONS} -DENABLE_COREAUDIO=${VCPKG_TARGET_IS_OSX} -DENABLE_WASAPI=${VCPKG_TARGET_IS_WINDOWS} ) From 7c1132870ce5c50332a3a3782b51a909f6af788a Mon Sep 17 00:00:00 2001 From: Joe Noel Date: Fri, 26 Mar 2021 14:13:11 +0000 Subject: [PATCH 7/9] Use version instead of version-string --- ports/libsoundio/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libsoundio/vcpkg.json b/ports/libsoundio/vcpkg.json index a8fc5b9a5502fc..6dc71724b929cf 100644 --- a/ports/libsoundio/vcpkg.json +++ b/ports/libsoundio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsoundio", - "version-string": "2.0.0-3", - "port-version": 1, + "version": "2.0.0", + "port-version": 4, "description": "libsoundio is C library providing cross-platform audio input and output.", "homepage": "http://libsound.io/", "supports": "!uwp", From d349b2d4fb1dccc7c467e56ee2cf79f49bf2325f Mon Sep 17 00:00:00 2001 From: Joe Noel Date: Fri, 26 Mar 2021 14:14:19 +0000 Subject: [PATCH 8/9] Update version --- versions/baseline.json | 4 ++-- versions/l-/libsoundio.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index b87983efeba1e8..fce599be3b9844 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3433,8 +3433,8 @@ "port-version": 3 }, "libsoundio": { - "baseline": "2.0.0-3", - "port-version": 1 + "baseline": "2.0.0", + "port-version": 4 }, "libspatialindex": { "baseline": "1.9.0", diff --git a/versions/l-/libsoundio.json b/versions/l-/libsoundio.json index d0bb54d292f610..e2f0c2a661270d 100644 --- a/versions/l-/libsoundio.json +++ b/versions/l-/libsoundio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96de946826ca6aafdc9409f9d75f02a6d082cffb", + "version": "2.0.0", + "port-version": 4 + }, { "git-tree": "b8772b81312859cfef91f4161ebcf236acea836e", "version-string": "2.0.0-3", From 8fff1f99ebc73b0a3a9e3eb677d070d32c610a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 1 Apr 2021 09:52:08 +0800 Subject: [PATCH 9/9] Update versions/l-/libsoundio.json Co-authored-by: Victor Romero --- versions/l-/libsoundio.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/l-/libsoundio.json b/versions/l-/libsoundio.json index e2f0c2a661270d..083e8b901d8e7e 100644 --- a/versions/l-/libsoundio.json +++ b/versions/l-/libsoundio.json @@ -5,11 +5,6 @@ "version": "2.0.0", "port-version": 4 }, - { - "git-tree": "b8772b81312859cfef91f4161ebcf236acea836e", - "version-string": "2.0.0-3", - "port-version": 1 - }, { "git-tree": "b7c77d32f74a10cb1ff43cb80c15d6a6f65d5d53", "version-string": "2.0.0-3",