Skip to content

Add openal alext.h header #21857

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

Merged
merged 6 commits into from
May 3, 2024

Conversation

gabeklavans
Copy link
Contributor

@gabeklavans gabeklavans commented Apr 30, 2024

I couldn't find mention of the version of openal-soft that al.h and alc.h were pulled from, so I somewhat arbitrarily pulled alext.h from openal-soft v1.19.1. Let me know if those versions are recorded somewhere.

resolves #21723

Comment on lines +1 to +19
/**
* OpenAL cross platform audio library
* Copyright (C) 2008 by authors.
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* Or go to http://www.gnu.org/copyleft/lgpl.html
*/
Copy link
Contributor Author

Choose a reason for hiding this comment

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

not sure if I should leave this here, especially since I modified the file

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes, you should leave this here.

What modifications did you make exactly?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I removed a bunch of typedefs that were causing errors, as well as removed the import of efx.h

@@ -0,0 +1,71 @@
// So far just does some sanity checks for the available extensions.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do I need to add some license info at the top here

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yup, you can copy the one from any of the other test files.

Copy link
Collaborator

@sbc100 sbc100 left a comment

Choose a reason for hiding this comment

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

Thanks!

Comment on lines +1 to +19
/**
* OpenAL cross platform audio library
* Copyright (C) 2008 by authors.
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* Or go to http://www.gnu.org/copyleft/lgpl.html
*/
Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes, you should leave this here.

What modifications did you make exactly?

@@ -0,0 +1,71 @@
// So far just does some sanity checks for the available extensions.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Yup, you can copy the one from any of the other test files.

@gabeklavans
Copy link
Contributor Author

@sbc100 it looks like I'm failing some tests. I'm not exactly sure how to parse the output, but it seems it might have something to do with size? Is the alext.h perhaps too large?

@sbc100
Copy link
Collaborator

sbc100 commented Apr 30, 2024

It looks like maybe your branch is not up-to-date with the current main branch? Can you try rebasing or merging?

@gabeklavans gabeklavans force-pushed the openal-alext-support branch from 809a594 to 19827be Compare May 2, 2024 21:34
@gabeklavans gabeklavans requested a review from sbc100 May 2, 2024 21:49
@sbc100
Copy link
Collaborator

sbc100 commented May 2, 2024

The test failure you are seeing here is unrelated and should be fixed in #21885

@gabeklavans gabeklavans force-pushed the openal-alext-support branch from 6a1c290 to 49644a6 Compare May 3, 2024 01:44
@sbc100 sbc100 enabled auto-merge (squash) May 3, 2024 05:31
@sbc100 sbc100 merged commit fa80cf2 into emscripten-core:main May 3, 2024
@gabeklavans gabeklavans deleted the openal-alext-support branch August 2, 2024 14:12
@sbc100
Copy link
Collaborator

sbc100 commented Aug 6, 2024

It was pointed out that this header is licences under the BSD licence and so far all our runtime code is MIT licenced. So I think we will have to revert this and create our own version of this header outselves. @gabeklavans would you be up for doing this? If you can do it in the next few days we can maybe avoid reverting this PR

@gabeklavans
Copy link
Contributor Author

gabeklavans commented Aug 6, 2024

It was pointed out that this header is licences under the BSD licence and so far all our runtime code is MIT licenced. So I think we will have to revert this and create our own version of this header outselves. @gabeklavans would you be up for doing this? If you can do it in the next few days we can maybe avoid reverting this PR

How's this sound: if I don't get it done by Friday (Aug 9th) 11:00 PM EST you can go ahead and revert. I'm not sure if I'll be able to finish it up but I can give it a shot.

Additionally, what would constitute our own version? I'd want to keep all the API-side defines the same as what is documented for OpenAL soft. So I suppose if I just start the header from scratch and only define what we need, would that suffice?

@sbc100
Copy link
Collaborator

sbc100 commented Aug 6, 2024

Yes, something like this: 38a151b

@gabeklavans
Copy link
Contributor Author

@sbc100 just for a thorough notification, I have #22349 up ready for review.

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.

Include alext.h header for AL
2 participants