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

Jump to bottom

torcs: anonscm.debian.org has moved #59316

Merged
merged 3 commits into from Apr 24, 2019
Merged

torcs: anonscm.debian.org has moved #59316

merged 3 commits into from Apr 24, 2019

Conversation

eri451
Copy link
Contributor

@eri451 eri451 commented Apr 11, 2019 •
edited by c0bw3b

Motivation for this change

the patch links returned a HTTP error 401 as
anonscm.debian.org moved to a gitlab at salsa.debian.org
I used the non access required download link generated by the new instance
As @worldofpeace suggested in #58978 I used the last commit involving the files.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@eri451
torcs: anonscm.debian.org has moved
2ca6537 
the patch links returned a HTTP error 401 as
anonscm.debian.org moved to a gitlab at salsa.debian.org
I used the non access required download link generated by the new instance
As @worldofpeace suggested in NixOS#58978 I used the last commit involving the files.
@eri451
Merge branch 'master' into eri451-patch-2
e89323d
@worldofpeace
Copy link
Contributor

@GrahamcOfBorg build torcs

@veprbl veprbl added the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 11, 2019
@eri451
Copy link
Contributor Author

eri451 commented Apr 11, 2019

Tried to build it on my system, but it failed because of a invalid conversion in OpenALMusicPlayer.cpp

make[4]: Entering directory '/build/torcs-1.3.7/src/libs/musicplayer'
gcc -E -M -D__DEPEND__ -I/build/torcs-1.3.7/export/include -I/build/torcs-1.3.7 -D_DEFAULT_SOURCE -DSHM -DHAVE_CONFIG_H SoundStream.cpp OggSoundStream.cpp OpenALMusicPlayer.cpp musicplayer.cpp > .depend
g++ -I/build/torcs-1.3.7/export/include -I/build/torcs-1.3.7 -g -O2 -Wall -fPIC -fno-strict-aliasing -O2 -DUSE_RANDR_EXT -DGL_GLEXT_PROTOTYPES -Wall -fPIC -fno-strict-aliasing -O2 -DUSE_RANDR_EXT -DGL_GLEXT_PROTOTYPES -D_DEFAULT_SOURCE -DSHM -DHAVE_CONFIG_H -c SoundStream.cpp
g++ -I/build/torcs-1.3.7/export/include -I/build/torcs-1.3.7 -g -O2 -Wall -fPIC -fno-strict-aliasing -O2 -DUSE_RANDR_EXT -DGL_GLEXT_PROTOTYPES -Wall -fPIC -fno-strict-aliasing -O2 -DUSE_RANDR_EXT -DGL_GLEXT_PROTOTYPES -D_DEFAULT_SOURCE -DSHM -DHAVE_CONFIG_H -c OggSoundStream.cpp
g++ -I/build/torcs-1.3.7/export/include -I/build/torcs-1.3.7 -g -O2 -Wall -fPIC -fno-strict-aliasing -O2 -DUSE_RANDR_EXT -DGL_GLEXT_PROTOTYPES -Wall -fPIC -fno-strict-aliasing -O2 -DUSE_RANDR_EXT -DGL_GLEXT_PROTOTYPES -D_DEFAULT_SOURCE -DSHM -DHAVE_CONFIG_H -c OpenALMusicPlayer.cpp
OpenALMusicPlayer.cpp: In member function 'virtual bool OpenALMusicPlayer::streamBuffer(ALuint)':
OpenALMusicPlayer.cpp:164:22: error: invalid conversion from 'char' to 'const char*' [-fpermissive]
const char* error = '\0';

make[4]: *** [/build/torcs-1.3.7/Make-default.mk:240: OpenALMusicPlayer.o] Error 1
make[4]: Leaving directory '/build/torcs-1.3.7/src/libs/musicplayer'
make[3]: *** [/build/torcs-1.3.7/Make-default.mk:679: subdirs] Error 1
make[3]: Leaving directory '/build/torcs-1.3.7/src/libs'
make[2]: *** [/build/torcs-1.3.7/Make-default.mk:679: subdirs] Error 1
make[2]: Leaving directory '/build/torcs-1.3.7/src'
make[1]: *** [/build/torcs-1.3.7/Make-default.mk:679: subdirs] Error 1
make[1]: Leaving directory '/build/torcs-1.3.7'
make: *** [Makefile:32: restart] Error 2
builder for '/nix/store/39nqla9fscgp525w8nqq177jc3rsrybp-torcs-1.3.7.drv' failed with exit code 2
error: build of '/nix/store/39nqla9fscgp525w8nqq177jc3rsrybp-torcs-1.3.7.drv' failed

@aanderse
Copy link
Member

See #59527
Anyone volunteering to raise this issue upstream if it hasn't already been?

@c0bw3b c0bw3b mentioned this pull request Apr 24, 2019
Closed
10 tasks
@c0bw3b
Copy link
Contributor

c0bw3b commented Apr 24, 2019

@GrahamcOfBorg build torcs

@c0bw3b
Copy link
Contributor

c0bw3b commented Apr 24, 2019

I added the patch for GCC7 and built it locally on NixOS. Let's check with ofBorg though.

@c0bw3b c0bw3b merged commit 99b9166 into NixOS:master Apr 24, 2019
c0bw3b pushed a commit to c0bw3b/nixpkgs that referenced this pull request Apr 24, 2019
@eri451 @c0bw3b
torcs: anonscm.debian.org has moved (NixOS#59316)
e60c4f5 
* torcs: anonscm.debian.org has moved

the patch links returned a HTTP error 401 as
anonscm.debian.org moved to a gitlab at salsa.debian.org
I used the non access required download link generated by the new instance
As @worldofpeace suggested in NixOS#58978 I used the last commit involving the files.

* torcs: add patch on OpenALMusicPlayer.cpp

Unbreak builds with GCC7

(cherry picked from commit 99b9166)
@c0bw3b c0bw3b mentioned this pull request Apr 24, 2019
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@eri451 @worldofpeace @aanderse @c0bw3b @veprbl @GrahamcOfBorg