-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
libcdio: fix crash reading CD TOC on macOS Ventura #22701
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the contribution! A very small issue you might want to take care of.
46211e9
to
803f5de
Compare
devel/libcdio/Portfile
Outdated
# Fix the crash reading CD on macos Ventura | ||
# Remove the unecessary addtional byte added to the TOC buffer | ||
if {${os.platform} eq "darwin" && ${os.major} >= 22} { | ||
patchfiles remove-additional-byte-TOC-buffer.diff |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sorry, one more change needed and then I'll merge. You will need to use "patchfiles-append", otherwise you will remove the patchfile added a few lines above.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed! Good catch!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh crap I'm sorry. I edit right away.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change requires a rebuild, so the revision should be incremented, correct?
Indeed! |
@chrstphrchvz Sorry for the beginner question, but what revision number should I increment? I don't see anything else than the libcdio version in the Portfile. |
--- a/devel/libcdio/Portfile
+++ b/devel/libcdio/Portfile
@@ -4,6 +4,7 @@ PortSystem 1.0
name libcdio
version 2.1.0
+revision 1
categories devel
license GPL-3+ There is no |
@jmon12 please make the requested changes so that we can merge this PR |
Remove the unnecessary byte added to the TOC buffer. See the upstream patch: https://git.savannah.gnu.org/cgit/libcdio.git/commit/?id=6f2426e8bf4dc5269ccbd9fbfa94340895f8be6e
OK, I just added the multiple changes requests and tested with
I hope everything is fine now. I'm sorry for the late answer/action. |
Remove the unnecessary byte added to the TOC buffer. See the upstream patch: https://git.savannah.gnu.org/cgit/libcdio.git/commit/?id=6f2426e8bf4dc5269ccbd9fbfa94340895f8be6e
Description
The test is rudimentary. I'm using the library only through freac which was crashing because of this bug, see for example this ticket. After the fix, it works.
This is my first contribution to macports, and I'd be happy to contribute more. Please feel free to add any "pedagogical comment"/recommendation.
Type(s)
Tested on
macOS 14.3.1 23D60 x86_64
Command Line Tools 15.1.0.0.1.1700200546
Verification
Have you
port lint --nitpick
?sudo port test
?sudo port -vst install
?