Skip to content

[libcanberra] new port#19816

Merged
BillyONeal merged 12 commits intomicrosoft:masterfrom
wrobelda:libcanberra
Sep 28, 2021
Merged

[libcanberra] new port#19816
BillyONeal merged 12 commits intomicrosoft:masterfrom
wrobelda:libcanberra

Conversation

@wrobelda
Copy link
Contributor

@wrobelda wrobelda commented Aug 31, 2021

Describe the pull request

Adds new libcanberra port.
Depends on:

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 9fb1585e7a375cfa873697557ced116dfacbd1d7 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 39630f5..2f96fe5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3112,6 +3112,10 @@
       "baseline": "1.16.1",
       "port-version": 2
     },
+    "libcanberra": {
+      "baseline": "0.30",
+      "port-version": 0
+    },
     "libcbor": {
       "baseline": "0.8.0",
       "port-version": 0

@PhoebeHui PhoebeHui self-assigned this Aug 31, 2021
@PhoebeHui PhoebeHui added the category:new-port The issue is requesting a new library to be added; consider making a PR! label Aug 31, 2021
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for libcanberra but no changes to version or port version.
-- Version: 0.30
-- Old SHA: fbbdc377caacd33ccd99189d5aebf62f3a44de12
-- New SHA: ef18fe1c336a2eae916fc8a89b7ebe18b7042ce7
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

@wrobelda wrobelda marked this pull request as ready for review August 31, 2021 16:05
@wrobelda wrobelda changed the title [libcanberra] new port (WIP) [libcanberra] new port Aug 31, 2021
@wrobelda wrobelda mentioned this pull request Aug 31, 2021
4 tasks
@wrobelda wrobelda marked this pull request as draft August 31, 2021 18:45
@wrobelda wrobelda marked this pull request as ready for review September 1, 2021 09:43
@PhoebeHui PhoebeHui added the depends:different-pr This PR or Issue depends on a PR which has been filed label Sep 10, 2021
@PhoebeHui
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@wrobelda
Copy link
Contributor Author

wrobelda commented Sep 13, 2021

@PhoebeHui FYI this currently rebuilds the world due to #19852, which this PR depends on.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one portfile where deprecated functions are used.

Details

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/libcanberra/portfile.cmake

diff --git a/ports/libcanberra/portfile.cmake b/ports/libcanberra/portfile.cmake
index 1dec621..b4d75f7 100644
--- a/ports/libcanberra/portfile.cmake
+++ b/ports/libcanberra/portfile.cmake
@@ -62,7 +62,6 @@ if(VCPKG_TARGET_IS_OSX)
 endif()

 vcpkg_fixup_pkgconfig()
-vcpkg_copy_pdbs()

 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") # empty folder
@wrobelda
Copy link
Contributor Author

@PhoebeHui this no longer has any dependencies, ready to be merged.

Copy link
Contributor

@PhoebeHui PhoebeHui left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for your contribution!

@PhoebeHui PhoebeHui added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed depends:different-pr This PR or Issue depends on a PR which has been filed labels Sep 26, 2021
@BillyONeal BillyONeal merged commit 8c7e42e into microsoft:master Sep 28, 2021
@BillyONeal
Copy link
Member

Thanks for the new port!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:new-port The issue is requesting a new library to be added; consider making a PR! info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants