kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sysutils/k3b-kde4: Restore MUSEPACK option with DPorts fix

Browse source 
- Revert r346996 entirely
- Bypass MUSEPACK detection (hardcode it as detected) to fix that option
- Bump - This was default options change

Approved by:	makc
This commit is contained in:
John Marino 2014-03-04 08:37:44 +00:00
parent f536483f0c
commit a8c7a42ccd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=346999
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sysutils/k3b-kde4/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= k3b
PORTVERSION= 2.0.2
PORTREVISION= 15
PORTREVISION= 16
CATEGORIES= sysutils multimedia kde
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
@ -16,7 +16,7 @@ RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
USE_BZIP2= yes
USES= cmake shared-mime-info
USES= cmake shared-mime-info pkgconfig
CMAKE_ARGS= -DK3B_BUILD_K3BSETUP:BOOL=OFF \
-DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF
USE_KDE4= automoc4 kdeprefix kdelibs libkcddb
@ -27,7 +27,7 @@ USE_LDCONFIG= yes
OPTIONS_DEFINE= CDRDAO DVDPLUSRW EMOVIX VCDIMAGER FFMPEG FLAC MAD \
MUSEPACK SNDFILE VORBIS_DEC LAME SOX VORBIS_ENC \
LIBDVDREAD NORMALIZE TAGLIB TRANSCODE
OPTIONS_DEFAULT=CDRDAO DVDPLUSRW FFMPEG FLAC MAD SNDFILE \
OPTIONS_DEFAULT=CDRDAO DVDPLUSRW FFMPEG FLAC MAD MUSEPACK SNDFILE \
VORBIS_DEC VORBIS_ENC LIBDVDREAD TAGLIB
NO_OPTIONS_SORT=yes
OPTIONS_SUB= yes # FFMPEG FLAC MAD MUSEPACK SNDFILE VORBIS_ENC VORBIS_DEC LIBDVDREAD TAGLIB
@ -58,7 +58,7 @@ MAD_CMAKE_OFF= -DK3B_BUILD_MAD_DECODER_PLUGIN:BOOL=OFF
MUSEPACK_DESC= Decoder: Musepack (audio/musepack)
MUSEPACK_LIB_DEPENDS= libmpcdec.so:${PORTSDIR}/audio/musepack
MUSEPACK_CMAKE_ON= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
MUSEPACK_CMAKE_ON= -DMUSE_INCLUDE_DIR:STRING="${LOCALBASE}/include"
MUSEPACK_CMAKE_OFF= -DK3B_BUILD_MUSE_DECODER_PLUGIN:BOOL=OFF
SNDFILE_DESC= Decoder: various (audio/libsndfile)
@ -95,10 +95,4 @@ TAGLIB_CMAKE_OFF= -DK3B_ENABLE_TAGLIB:BOOL=OFF
TRANSCODE_DESC= Misc: Transcode (DVD ripping)
TRANSCODE_RUN_DEPENDS= transcode:${PORTSDIR}/multimedia/transcode
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMUSEPACK}
BROKEN= fails to detect Musepack libraries
.endif
.include <bsd.port.mk>

18
sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake Normal file
View file

@ -0,0 +1,18 @@
--- cmake/modules/FindMuse.cmake.orig 2011-01-15 20:47:29.000000000 +0000
+++ cmake/modules/FindMuse.cmake
@@ -15,13 +15,10 @@ if( MUSE_INCLUDE_DIR AND MUSE_LIBRARIES
endif( MUSE_INCLUDE_DIR AND MUSE_LIBRARIES )
include(CheckIncludeFiles)
-check_include_files(mpc/mpcdec.h HAVE_MPC_MPCDEC_H)
-check_include_files(mpcdec/mpcdec.h HAVE_MPCDEC_MPCDEC_H)
-check_include_files(musepack/musepack.h HAVE_MUSEPACK_MUSEPACK_H)
+set ( HAVE_MPC_MPCDEC_H 1 )
if( HAVE_MPC_MPCDEC_H )
- find_path( MUSE_INCLUDE_DIR mpc/mpcdec.h )
- find_library( MUSE_LIBRARIES NAMES mpcdec )
+ set( MUSE_LIBRARIES mpcdec )
set( MPC_HEADER_FILE "<mpc/mpcdec.h>" )
elseif( HAVE_MPCDEC_MPCDEC_H )
find_path( MUSE_INCLUDE_DIR mpcdec/mpcdec.h )