From owner-svn-ports-all@FreeBSD.ORG Tue Mar 4 08:37:45 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8F61440; Tue, 4 Mar 2014 08:37:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 956E6248; Tue, 4 Mar 2014 08:37:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s248bjoQ001410; Tue, 4 Mar 2014 08:37:45 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s248bjrB001408; Tue, 4 Mar 2014 08:37:45 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201403040837.s248bjrB001408@svn.freebsd.org> From: John Marino Date: Tue, 4 Mar 2014 08:37:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346999 - in head/sysutils/k3b-kde4: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Mar 2014 08:37:45 -0000 Author: marino Date: Tue Mar 4 08:37:44 2014 New Revision: 346999 URL: http://svnweb.freebsd.org/changeset/ports/346999 QAT: https://qat.redports.org/buildarchive/r346999/ Log: sysutils/k3b-kde4: Restore MUSEPACK option with DPorts fix - Revert r346996 entirely - Bypass MUSEPACK detection (hardcode it as detected) to fix that option - Bump - This was default options change Approved by: makc Added: head/sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake (contents, props changed) Modified: head/sysutils/k3b-kde4/Makefile Modified: head/sysutils/k3b-kde4/Makefile ============================================================================== --- head/sysutils/k3b-kde4/Makefile Tue Mar 4 07:38:10 2014 (r346998) +++ head/sysutils/k3b-kde4/Makefile Tue Mar 4 08:37:44 2014 (r346999) @@ -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}/sysuti 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_ 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:BO TRANSCODE_DESC= Misc: Transcode (DVD ripping) TRANSCODE_RUN_DEPENDS= transcode:${PORTSDIR}/multimedia/transcode -.include - -.if ${PORT_OPTIONS:MMUSEPACK} -BROKEN= fails to detect Musepack libraries -.endif - .include Added: head/sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake Tue Mar 4 08:37:44 2014 (r346999) @@ -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 "" ) + elseif( HAVE_MPCDEC_MPCDEC_H ) + find_path( MUSE_INCLUDE_DIR mpcdec/mpcdec.h )