mpd @0.17: patch fails to apply on Snow Leopard

[coredumpling@…]

Attempting to upgrade mpd to v0.17 or reinstall from scratch fails when trying to apply the macports patch:

$ sudo port install mpd
--->  Computing dependencies for mpd
--->  Fetching archive for mpd
--->  Attempting to fetch mpd-0.17_0.darwin_10.x86_64.tbz2 from http://packages.macports.org/mpd
--->  Fetching distfiles for mpd
--->  Verifying checksum(s) for mpd
--->  Extracting mpd
--->  Applying patches to mpd
Error: org.macports.patch for port mpd returned: command execution failed
Please see the log file for port mpd for details:
    /opt/local/var/macports/logs/_opt_local_var_macports_sources_rsync.macports.org_release_ports_audio_mpd/mpd/main.log
To report a bug, follow the instructions in the guide:
    http://guide.macports.org/#project.tickets
Error: Processing of port mpd failed

It appears that v0.17 made some substantial changes to src/output/osx_output_plugin.c such that the patch will no longer apply cleanly. The package will still build and run if I replace the patch file with an empty text file, or if I make the analogous changes in the work directory. See attachment for diffs -- I am only following the pattern I see in the original patch file and cannot confirm the validity of this.

[coredumpling@…]

Cc Me!

[coredumpling@…]

Oops - thanks for correcting the title to match your guidelines. I must've skimmed past that part of the guide.

[flobakk@…]

Cc Me!

[dale+macports@…]

Cc Me!

[jmr@…]

Please don't remove the version info, Ryan.

[jmr@…]

This is definitely still broken with 0.17.1. But surely if the changes are needed on 10.6, they are also needed on newer OS versions?

[flobakk@…]

Still broken when trying to install mpd @0.17.2_0 on Snow Leopard.

Log:

:notice:patch --->  Applying patches to mpd
:info:patch --->  Applying patch-src-output-osx_plugin.c
:debug:patch Environment: CPATH='/opt/local/include' CC_PRINT_OPTIONS_FILE='/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_audio_mpd/mpd/work/.CC_PRINT_OPTIONS' LIBRARY_PATH='/opt/local/lib' CC_PRINT_OPTIONS='YES' MACOSX_DEPLOYMENT_TARGET='10.6'
:debug:patch Assembled command: 'cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_audio_mpd/mpd/work/mpd-0.17.2" && /usr/bin/patch -p0'
:debug:patch Executing command line:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_audio_mpd/mpd/work/mpd-0.17.2" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/rsync.macports.org/release/ports/audio/mpd/files/patch-src-output-osx_plugin.c'
:info:patch can't find file to patch at input line 3
:info:patch Perhaps you used the wrong -p or --strip option?
:info:patch The text leading up to this was:
:info:patch --------------------------
:info:patch |--- src/output/osx_plugin.c.orig	2009-09-11 00:11:55.000000000 -0500
:info:patch |+++ src/output/osx_plugin.c	2009-09-11 22:02:46.000000000 -0500
:info:patch --------------------------
:info:patch File to patch: 
:info:patch Skip this patch? [y] 
:info:patch Skipping patch.
:info:patch 6 out of 6 hunks ignored
:info:patch Command failed:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_audio_mpd/mpd/work/mpd-0.17.2" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/rsync.macports.org/release/ports/audio/mpd/files/patch-src-output-osx_plugin.c'
:info:patch Exit code: 1
:error:patch org.macports.patch for port mpd returned: command execution failed
:debug:patch Error code: CHILDSTATUS 48329 1
:debug:patch Backtrace: command execution failed
    while executing
"system $fullcmdstring"
    ("eval" body line 1)
    invoked from within
"eval system $notty $nice \$fullcmdstring"
    invoked from within
"command_exec patch "" "< '$patch'""
    (procedure "portpatch::patch_main" line 35)
    invoked from within
"$procedure $targetname"
:info:patch Warning: targets not executed for mpd: org.macports.install org.macports.patch org.macports.configure org.macports.build org.macports.destroot
:notice:patch Please see the log file for port mpd for details:
    /opt/local/var/macports/logs/_opt_local_var_macports_sources_rsync.macports.org_release_ports_audio_mpd/mpd/main.log

[rmstonecipher@…]

This patch was added in r57514 to fix syntax deprecated in Snow Leopard.
This port builds on Lion without the patch, so I have removed the version-specific patch from the portfile and will see if the Snow Leopard BuildBot has errors.

Ryan Stonecipher

[rmstonecipher@…]

I received no buildbot error reports. I am considering this fixed as of r99166.

[coredumpling@…]

Replying to rmstonecipher@…:

I received no buildbot error reports. I am considering this fixed as of r99166.

Successful build confirmed by original reporter. Thank you very much!