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.

Sign up for GitHub

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

cdparanoia: Fix private keyword in header #36979

Merged
merged 1 commit into from Apr 23, 2018
Merged

cdparanoia: Fix private keyword in header #36979

merged 1 commit into from Apr 23, 2018

Conversation

clearyf
Copy link

@clearyf clearyf commented Mar 14, 2018

Patch taken from SVN, cdparanoia has not had a release since September
11, 2008. Allows including the header in C++ files.

https://trac.xiph.org/changeset/15338/

Motivation for this change

The official cdparanoia releases are incredibly outdated and are missing many important patches, including this one, which allows one to build a C++ application that includes the cdparanoia headers. This patch is already included in debian & fedora.

Things done

Tested via building and running proprietary C++ application that uses cdparanoia as a library. However, this patch is a) already in upstream SVN and in multiple distros (debian, fedora + derivatives at a minimum) and b) only renames an opaque internal pointer, so the chance of breakage is extremely low.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions (Ubuntu 16.04)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@clearyf
cdparanoia: Fix private keyword in header
560891d 
Patch taken from SVN, cdparanoia has not had a release since September
11, 2008.  Allows including the header in C++ files.

https://trac.xiph.org/changeset/15338/
@matthewbauer
Copy link
Member

@GrahamcOfBorg build cdparanoia

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: cdparanoia

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/04k7zfdm7lvsg457sihd2ym0wmbm0v0d-cdparanoia-III-10.2
shrinking /nix/store/04k7zfdm7lvsg457sihd2ym0wmbm0v0d-cdparanoia-III-10.2/bin/cdparanoia
shrinking /nix/store/04k7zfdm7lvsg457sihd2ym0wmbm0v0d-cdparanoia-III-10.2/lib/libcdda_paranoia.so.0.10.2
shrinking /nix/store/04k7zfdm7lvsg457sihd2ym0wmbm0v0d-cdparanoia-III-10.2/lib/libcdda_interface.so.0.10.2
gzipping man pages under /nix/store/04k7zfdm7lvsg457sihd2ym0wmbm0v0d-cdparanoia-III-10.2/share/man/
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/04k7zfdm7lvsg457sihd2ym0wmbm0v0d-cdparanoia-III-10.2/lib  /nix/store/04k7zfdm7lvsg457sihd2ym0wmbm0v0d-cdparanoia-III-10.2/bin
patching script interpreter paths in /nix/store/04k7zfdm7lvsg457sihd2ym0wmbm0v0d-cdparanoia-III-10.2
checking for references to /build in /nix/store/04k7zfdm7lvsg457sihd2ym0wmbm0v0d-cdparanoia-III-10.2...
/nix/store/04k7zfdm7lvsg457sihd2ym0wmbm0v0d-cdparanoia-III-10.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: cdparanoia

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/svz6ymj04cf6m7spw18r7f1jm86xnxds-cdparanoia-III-10.2
shrinking /nix/store/svz6ymj04cf6m7spw18r7f1jm86xnxds-cdparanoia-III-10.2/lib/libcdda_interface.so.0.10.2
shrinking /nix/store/svz6ymj04cf6m7spw18r7f1jm86xnxds-cdparanoia-III-10.2/lib/libcdda_paranoia.so.0.10.2
shrinking /nix/store/svz6ymj04cf6m7spw18r7f1jm86xnxds-cdparanoia-III-10.2/bin/cdparanoia
gzipping man pages under /nix/store/svz6ymj04cf6m7spw18r7f1jm86xnxds-cdparanoia-III-10.2/share/man/
strip is /nix/store/j7d4mr0ikv974ig7yzhknpsq288js4bs-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/svz6ymj04cf6m7spw18r7f1jm86xnxds-cdparanoia-III-10.2/lib  /nix/store/svz6ymj04cf6m7spw18r7f1jm86xnxds-cdparanoia-III-10.2/bin
patching script interpreter paths in /nix/store/svz6ymj04cf6m7spw18r7f1jm86xnxds-cdparanoia-III-10.2
checking for references to /build in /nix/store/svz6ymj04cf6m7spw18r7f1jm86xnxds-cdparanoia-III-10.2...
/nix/store/svz6ymj04cf6m7spw18r7f1jm86xnxds-cdparanoia-III-10.2

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: cdparanoia

Partial log (click to expand)

/nix/store/4yrrwk5f185zy41yjn448qak2g3189pd-cdparanoia-III-10.2/lib/libcdda_paranoia.0.10.2.dylib: fixing dylib
/nix/store/4yrrwk5f185zy41yjn448qak2g3189pd-cdparanoia-III-10.2/lib/libcdda_interface.0.10.2.dylib: fixing dylib
/nix/store/4yrrwk5f185zy41yjn448qak2g3189pd-cdparanoia-III-10.2/lib/libcdda_paranoia.0.10.2.dylib: fixing dylib
/nix/store/4yrrwk5f185zy41yjn448qak2g3189pd-cdparanoia-III-10.2/lib/libcdda_interface.0.10.2.dylib: fixing dylib
/nix/store/4yrrwk5f185zy41yjn448qak2g3189pd-cdparanoia-III-10.2/lib/libcdda_paranoia.0.10.2.dylib: fixing dylib
/nix/store/4yrrwk5f185zy41yjn448qak2g3189pd-cdparanoia-III-10.2/lib/libcdda_interface.0.10.2.dylib: fixing dylib
/nix/store/4yrrwk5f185zy41yjn448qak2g3189pd-cdparanoia-III-10.2/lib/libcdda_paranoia.0.10.2.dylib: fixing dylib
/nix/store/4yrrwk5f185zy41yjn448qak2g3189pd-cdparanoia-III-10.2/lib/libcdda_interface.0.10.2.dylib: fixing dylib
/nix/store/4yrrwk5f185zy41yjn448qak2g3189pd-cdparanoia-III-10.2/lib/libcdda_paranoia.0.10.2.dylib: fixing dylib
/nix/store/4yrrwk5f185zy41yjn448qak2g3189pd-cdparanoia-III-10.2

@matthewbauer matthewbauer merged commit 3678dca into NixOS:master Apr 23, 2018
@clearyf
Copy link
Author

clearyf commented Apr 23, 2018

Thanks @matthewbauer!

@clearyf clearyf deleted the cdparanoia branch April 23, 2018 18:26
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
10.rebuild-darwin: 11-100 10.rebuild-linux: 501+ 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@clearyf @matthewbauer @GrahamcOfBorg @Janik-Haag