Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[speex] init port #958 #1357

Merged
merged 7 commits into from
Jun 29, 2017
Merged

[speex] init port #958 #1357

merged 7 commits into from
Jun 29, 2017

Conversation

atkawa7
Copy link
Contributor

@atkawa7 atkawa7 commented Jun 26, 2017

No description provided.

@msftclas
Copy link

@atkawa7,
Thanks for having already signed the Contribution License Agreement. Your agreement was validated by Microsoft. We will now review your pull request.
Thanks,
Microsoft Pull Request Bot

@atkawa7
Copy link
Contributor Author

atkawa7 commented Jun 27, 2017

@bagong Thanks for the info. My cmake is only for building on windows. It uses the already configured config.h. Once that pull is merged we might have to come back to it.

@ras0219-msft
Copy link
Contributor

Thanks for the PR!

I simplified the CMakeListst.txt as in the other PRs, however I noticed you haven't filled out the version and description. Could you add those?

Otherwise, looks good to me!

if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
message(STATUS "Speex doesn't support visibility on Win32 yet. Building static.")
message(STATUS "See https://github.com/xiph/speex/blob/master/win32/config.h for more")
set(VCPKG_LIBRARY_LINKAGE static)
Copy link
Contributor

@codicodi codicodi Jun 28, 2017

Choose a reason for hiding this comment

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

Upstream PR supports dynamic build on Windows with the help of a .def file: https://github.com/xiph/speex/blob/master/win32/libspeex.def.
Maybe we could do the same? Alternatively (.def file wasn't touched in like 10 years, so it may not be up to date...) we could use CMake's autoexport: -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON

Copy link
Contributor

Choose a reason for hiding this comment

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

The def file would be ideal.

Copy link
Contributor Author

@atkawa7 atkawa7 Jun 28, 2017

Choose a reason for hiding this comment

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

Thanks @codicodi I am new to this.

Upstream CMake PR supports dynamic build on Windows with the help of a .def file:

So your guidance on this one might be really appreciated

Copy link
Contributor

@codicodi codicodi Jun 28, 2017

Choose a reason for hiding this comment

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

Just add win32/libspeex.def to library sources. CMake will automatically pass it to the linker in shared build, so that the linker will know what symbols to export.

@atkawa7
Copy link
Contributor Author

atkawa7 commented Jun 28, 2017

@ras0219-msft Thanks. I have added the descriptions

@atkawa7
Copy link
Contributor Author

atkawa7 commented Jun 28, 2017

Worked like charm

Just add win32/libspeex.def to library sources. CMake will automatically pass it to the linker in shared build, so that the linker will know what symbols to export.

@codicodi @ras0219-msft Changes added

@@ -0,0 +1,3 @@
Source: speex
Version: 2017-06-28-cae5026cfd88782c7051af6e685059223578b7e9
Copy link
Contributor

Choose a reason for hiding this comment

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

Why use specific commit instead of an official tag Speex-1.2.0? There doesn't seem to be any meaningful changes between them: xiph/speex@Speex-1.2.0...cae5026

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@codicodi Thanks for the suggestion. I agree that using official tag is better in this case. I hadn't taken notice since I was working in the master.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@codicodi Thanks. I have added official tags

@ras0219-msft ras0219-msft merged commit 4f3d6b4 into microsoft:master Jun 29, 2017
@ras0219-msft
Copy link
Contributor

ras0219-msft commented Jun 29, 2017

Thanks for the changes!

While merging, I simplified the version to just 1.2.0 instead of speex-1.2.0.

@atkawa7 atkawa7 deleted the speex branch June 29, 2017 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants