Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

sfml/csfml 2.3 #39900

Closed
wants to merge 1 commit into from
Closed

sfml/csfml 2.3 #39900

wants to merge 1 commit into from

Conversation

dunn
Copy link
Contributor

@dunn dunn commented May 19, 2015

The last update was a bit tricky (#35279) so let me know if there's anything I overlooked here.

@DomT4
Copy link
Member

DomT4 commented May 19, 2015

I knew I'd forgotten something. They've made major changes to the deps, see SFML/SFML#852 (comment).

@dunn
Copy link
Contributor Author

dunn commented May 19, 2015

From that thread:

Also on OS X we don't use the default OpenAL shipped by Apple.

Does that mean openal-soft for us?

@DomT4
Copy link
Member

DomT4 commented May 19, 2015

Looking at what upstream do for other platforms, yup.

@dunn
Copy link
Contributor Author

dunn commented May 20, 2015

They're recommending we wait for 2.3 of CSFML

@mantognini
Copy link

@dunn Thanks for updating those! :-)

if dir != "extlibs/headers"
rm_rf dir
end
end
Copy link
Contributor

Choose a reason for hiding this comment

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

rm_rf Dir["extlibs/*"] - ["extlibs/headers"]?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks!

@dunn
Copy link
Contributor Author

dunn commented May 21, 2015

Is an update warning at the top of each formula appropriate?

@MikeMcQuaid
Copy link
Member

Is an update warning at the top of each formula appropriate?

👍

@dunn dunn changed the title sfml 2.3 sfml/csfml 2.3 May 25, 2015
@dunn
Copy link
Contributor Author

dunn commented May 25, 2015

Linking CSFML fails because it has some of the same headers SFML has:

Error: The `brew link` step did not complete successfully
The formula built, but is not symlinked into /usr/local
Could not symlink include/SFML/Audio/AlResource.hpp
Target /usr/local/include/SFML/Audio/AlResource.hpp
is a symlink belonging to sfml. You can unlink it:
  brew unlink sfml

To force the link and overwrite all conflicting files:
  brew link --overwrite csfml

To list all files that would be deleted:
  brew link --overwrite --dry-run csfml

Possible conflicting files are:
/usr/local/include/SFML/Audio/AlResource.hpp -> /usr/local/Cellar/sfml/2.3/include/SFML/Audio/AlResource.hpp

Would it be safe to just remove CSFML's include/SFML directory, @mantognini?

@mantognini
Copy link

That's a strange error you got there... there is no AlResource.hpp in CSFML as far as I know.

@DomT4
Copy link
Member

DomT4 commented May 25, 2015

Linking CSFML fails because it has some of the same headers SFML has:

You seem to be using the same tarball for the two formulae? Were the two tarballs merged?

@dunn
Copy link
Contributor Author

dunn commented May 25, 2015

ahahahaha, my bad.

@DomT4
Copy link
Member

DomT4 commented May 25, 2015

Is this ready to ship? Not waiting on anything else now?

@dunn
Copy link
Contributor Author

dunn commented May 25, 2015

@mantognini, should we wait until the CSFML 2.3 source is available from http://www.sfml-dev.org/download/csfml/ and use that instead of the GitHub archive?

@mantognini
Copy link

For CSFML you can safely use GitHub zip archive, yes.

For SFML, we remove some files from it so it's safer to use the one from sfml-dev.org (currently we only remove .gitattributes but it used to be more than that -- don't know about the future though ;-))

@DomT4 DomT4 closed this in e2de038 May 26, 2015
@DomT4
Copy link
Member

DomT4 commented May 26, 2015

🚢'd in e2de038. Thanks @dunn @mantognini!

I removed the desc lines manually before merge as Mike requested we don't add any to existing formulae for now. Side note: Separate commits per formula (Inside the same PR) in this situation is preferable.

@dunn
Copy link
Contributor Author

dunn commented May 26, 2015

Good to know, thanks.

@dunn dunn deleted the sfml branch May 26, 2015 18:31
@Homebrew Homebrew locked and limited conversation to collaborators Jul 10, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants