From owner-svn-ports-head@FreeBSD.ORG Tue Mar 4 08:44:54 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B20007CE; Tue, 4 Mar 2014 08:44:54 +0000 (UTC) Received: from mail.issp.ac.ru (mail.issp.ac.ru [77.236.34.3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 43CD8300; Tue, 4 Mar 2014 08:44:53 +0000 (UTC) Received: from lqc.issp.ac.ru [77.236.34.156:43213] (HELO/EHLO mercury.ph.man.ac.uk, authenticated with LOGIN) by mail.issp.ac.ru with ESMTP/inet id s248ioed053823 (using TLSv1/SSLv3, with cipher DHE-RSA-AES256-SHA (256 bits), verified NO) Tue, 4 Mar 2014 12:44:51 +0400 (MSK) From: Max Brazhnikov To: marino@freebsd.org Subject: Re: svn commit: r346996 - head/sysutils/k3b-kde4 Date: Tue, 04 Mar 2014 08:44:51 +0000 Message-ID: <1517133.r8eNV1x5WF@mercury.ph.man.ac.uk> User-Agent: KMail/4.12.3 (FreeBSD/9.2-STABLE; KDE/4.12.3; amd64; ; ) In-Reply-To: <53158900.5090208@marino.st> References: <201403040711.s247BrQp068829@svn.freebsd.org> <3019142.zKrEmfcUyo@mercury.ph.man.ac.uk> <53158900.5090208@marino.st> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="UTF-8" Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Mar 2014 08:44:54 -0000 On Tue, 04 Mar 2014 09:04:16 +0100 John Marino wrote: > On 3/4/2014 08:59, Max Brazhnikov wrote: > > On Tue, 04 Mar 2014 08:46:02 +0100 John Marino wrote: > >> On 3/4/2014 08:11, Max Brazhnikov wrote: > >>> Author: makc > >>> Date: Tue Mar 4 07:11:52 2014 > >>> New Revision: 346996 > >>> URL: http://svnweb.freebsd.org/changeset/ports/346996 > >>> QAT: https://qat.redports.org/buildarchive/r346996/ > >>> > >>> Log: > >>> sysutils/k3b-kde4: > >>> - Mark BROKEN with MUSEPACK option > >>> - Revert r346606 as unrelated to the problem. > >>> > >>> Modified: > >>> head/sysutils/k3b-kde4/Makefile > >>> > >>> Modified: head/sysutils/k3b-kde4/Makefile > >>> ============================================================================== > >>> --- head/sysutils/k3b-kde4/Makefile Tue Mar 4 06:52:19 2014 (r346995) > >>> +++ head/sysutils/k3b-kde4/Makefile Tue Mar 4 07:11:52 2014 (r346996) > >>> @@ -16,7 +16,7 @@ RUN_DEPENDS= cdrecord:${PORTSDIR}/sysuti > >>> BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools > >>> > >>> USE_BZIP2= yes > >>> -USES= cmake shared-mime-info pkgconfig > >>> +USES= cmake shared-mime-info > >>> 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 MUSEPACK SNDFILE \ > >>> +OPTIONS_DEFAULT=CDRDAO DVDPLUSRW FFMPEG FLAC MAD 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 > >>> @@ -95,4 +95,10 @@ 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 > >>> > >> > >> I didn't know this was broken on FreeBSD too. > >> Why not take the DPorts fix? > >> > >> https://raw.github.com/DragonFlyBSD/DPorts/master/sysutils/k3b-kde4/dragonfly/patch-cmake_modules_FindMuse.cmake > >> https://raw.github.com/DragonFlyBSD/DPorts/master/sysutils/k3b-kde4/Makefile.DragonFly > >> > >> The line in Makefile.DragonFly would replace the current line in Makefile. > > > > Nice! Feel free to commit the fix. > > > > Alright. > I should mention that I believe this is a problem with the library > detection. The error logs indicate that the Muse headers had illegal > characters in them, but there wasn't anything wrong with them. I > couldn't reproduce the same errors with little test programs I made. Here's the original report about the problem: http://mail.kde.org/pipermail/kde-freebsd/2013-February/014862.html It seems the problem is only with gcc42. Muse is detected properly with gcc46 and clang33. > > So I bypassed the detection, basically saying "muse is there" and k3b > built normally. So I'm not 100% sure about all this, but k3b itself > certainly seems to have no issues with the musepack headers. > > John >