svn commit: r402545 - in head/audio/libkcompactdisc: . files
Raphael Kubo da Costa
rakuco at FreeBSD.org
Sat Nov 28 16:51:42 UTC 2015
Author: rakuco
Date: Sat Nov 28 16:51:41 2015
New Revision: 402545
URL: https://svnweb.freebsd.org/changeset/ports/402545
Log:
Fix the ALSA=OFF build after r402530.
Both extrapatch-no_alsa and patch-git_d6927712 touch the same region of
CMakeLists.txt, and the latter was failing to apply when the ALSA option was
disabled.
Fix it by keeping patch-git_d6927712 (which fixes the CFLAGS values
regardless of the value of the ALSA option) and replacing extrapatch-no_alsa
with some post-patch/post-configure changes that achieve the same end
result.
PR: 204858
MFH: 2015Q4
Deleted:
head/audio/libkcompactdisc/files/extrapatch-no_alsa
Modified:
head/audio/libkcompactdisc/Makefile
Modified: head/audio/libkcompactdisc/Makefile
==============================================================================
--- head/audio/libkcompactdisc/Makefile Sat Nov 28 16:05:01 2015 (r402544)
+++ head/audio/libkcompactdisc/Makefile Sat Nov 28 16:51:41 2015 (r402545)
@@ -19,6 +19,12 @@ USE_LDCONFIG= yes
OPTIONS_DEFINE= ALSA
ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
-ALSA_EXTRA_PATCHES_OFF= ${FILESDIR}/extrapatch-no_alsa
+
+post-patch-ALSA-off:
+ ${REINPLACE_CMD} -e '/find_package(Alsa)/d' \
+ -e '/alsa_configure_file/d' ${WRKSRC}/CMakeLists.txt
+
+post-configure-ALSA-off:
+ ${TOUCH} ${CONFIGURE_WRKSRC}/config-alsa.h
.include <bsd.port.mk>
More information about the svn-ports-all
mailing list