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

Switch to portaudio repo in supercollider org #2088

Merged
merged 5 commits into from
May 16, 2016
Merged

Switch to portaudio repo in supercollider org #2088

merged 5 commits into from
May 16, 2016

Conversation

bagong
Copy link
Contributor

@bagong bagong commented May 13, 2016

  • use new portaudio repo in SC organization
    • this repo is forked from the new pa git repo on assembla
    • the additions for SC are added on a separate branch (supercollider)
    • master uses dsound from MinGW now for DSound support in the MinGW build
  • added small fixes to qt-less build on master
  • adjusted Readme

Fixes #2027 and #1975 except fftw localization, which I think would better be solved by configuring the install of the fftw compile

I moved the portaudio submodule to a different folder (portaudio_sc_org), trying to avoid similar problems as with the introduction of the scvim submodule. For a transitional period we will therefore have two repos (one used in 3.7, the other in master/3.8). This way the switch between these branches produces a warning that the other folder cannot be removed because it is not empty. The warning can be avoided by deinitializing the submodule if wished, but at least it is only a warning, switching branches succeeds even if you don't deinitialize... If somebody knows a better way, I'd like to know ;)

@crucialfelix crucialfelix added this to the 3.8 milestone May 14, 2016
@crucialfelix crucialfelix added the comp: build CMake build system label May 14, 2016
@sonoro1234
Copy link
Contributor

Have tried here.
Everything works!!

@bagong
Copy link
Contributor Author

bagong commented May 14, 2016

Thanks @sonoro1234 ! @crucialfelix , would be nice if this went in quickly, I would like to continue on this base to go on to server only build and a bit more. No other platform is is touched (except the submodule nuisance, but we get that on each new submodule, there is just a warning), I tested OSX. For VS also nothing changes (if yes I'll follow it up). Thanks.

@bagong
Copy link
Contributor Author

bagong commented May 15, 2016

If nobody objects (or commits) until tomorrow, I would like to commit this then. The only person I know this could hurt is Victor, and he tested it carefully. I want to do work that builds on this, and should do it tomorrow. Thanks!

@crucialfelix crucialfelix merged commit 0d22e06 into supercollider:master May 16, 2016
@crucialfelix
Copy link
Member

aber heute ist feiertag ! du sollst nicht arbeiten, herr bagong !

@vivid-synth
Copy link
Member

Is the long-term goal to get these changes merged into portaudio upstream? Ideally we won't be maintaining our own version forever (which'll lag behind, etc.)

@bagong
Copy link
Contributor Author

bagong commented Jun 15, 2016

Fortunately portaudio is a slowly moving target, so a decision is not urgently required. Most of the additions here are SC- and build-system specific and of little interest to PA, especially as they are not currently planning to support a cmake & MinGW build system. If e.g. we find in a year or so that we don't need the MinGW build for Windows any more, it will be easier to drop a SC specific PA fork. Vanilla PA and sc specific additions are in separate branches, so it shouldn't be too difficult to keep up.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
comp: build CMake build system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants