Date: Sun, 01 Dec 2013 17:41 +0000 From: Max Brazhnikov <makc@freebsd.org> To: Sean Bruno <sbruno@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r335260 - in head/audio/clementine-player: . files Message-ID: <1587696.zcDM98VLUm@mercury.ph.man.ac.uk> In-Reply-To: <201311300354.rAU3sGQD056367@svn.freebsd.org> References: <201311300354.rAU3sGQD056367@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi Sean, On Sat, 30 Nov 2013 03:54:16 +0000Sat Nov 30 03:54:16 2013 Sean Bruno wrote: > Author: sbruno (src committer) > Date: Sat Nov 30 03:54:16 2013 > New Revision: 335260 > URL: http://svnweb.freebsd.org/changeset/ports/335260 > > Log: > Update audio/clementine-player to 1.2.0 > > This now works on 11-current > > PR: ports/178687 Was this update approved? > Added: > head/audio/clementine-player/files/patch-ext__libclementine-common__core__closure.cpp (contents, props changed) > head/audio/clementine-player/files/patch-ext__libclementine-common__core__closure.h (contents, props changed) > head/audio/clementine-player/files/patch-src__playlistparsers__plsparser.cpp (contents, props changed) > head/audio/clementine-player/files/patch-src__podcasts__podcastdownloader.h (contents, props changed) > Deleted: > head/audio/clementine-player/files/patch-ext_clementine-tagreader_CMakeLists.txt > head/audio/clementine-player/files/patch-src-devices-cddadevice.h > head/audio/clementine-player/files/patch-src-devices-cddalister.cpp > head/audio/clementine-player/files/patch-src-main.cpp > head/audio/clementine-player/files/patch-src_core_utilities.cpp > Modified: > head/audio/clementine-player/Makefile > head/audio/clementine-player/distinfo > head/audio/clementine-player/files/patch-src_CMakeLists.txt > head/audio/clementine-player/pkg-plist > > Modified: head/audio/clementine-player/Makefile > ============================================================================== > --- head/audio/clementine-player/Makefile Sat Nov 30 02:27:05 2013 (r335259) > +++ head/audio/clementine-player/Makefile Sat Nov 30 03:54:16 2013 (r335260) > @@ -1,9 +1,8 @@ > -# Created by: Veniamin Gvozdikov <vg@FreeBSD.org> > +o Created by: Veniamin Gvozdikov <vg@FreeBSD.org> > # $FreeBSD$ > > PORTNAME= clementine > -PORTVERSION= 1.1.1 > -PORTREVISION= 2 > +PORTVERSION= 1.2.0 > CATEGORIES= audio > MASTER_SITES= GOOGLE_CODE > PKGNAMESUFFIX= -player > @@ -16,9 +15,10 @@ LICENSE= GPLv3 > LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ > tag:${PORTSDIR}/audio/taglib \ > chromaprint:${PORTSDIR}/audio/chromaprint \ > - protobuf-lite:${PORTSDIR}/devel/protobuf \ > + protobuf:${PORTSDIR}/devel/protobuf \ > qjson:${PORTSDIR}/devel/qjson \ > fftw3:${PORTSDIR}/math/fftw3 > + > BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs > > # avoid clash with x11-wm/clementine > @@ -30,20 +30,24 @@ NO_STAGE= yes > USE_GL= glew > USE_QT4= dbus gui xml qmake_build uic_build moc_build rcc_build \ > linguist_build network sql opengl qtestlib corelib webkit > -USE_GCC= 4.2+ > +WITH_DEBUG= yes WITH_DEBUG shouldn't be set in Makefiles > INSTALLS_ICONS= yes > USE_GSTREAMER= gio ogg mp3 flac soup vorbis > MAKE_JOBS_UNSAFE= yes > CONFLICTS_BUILD= qt-3.* > > CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \ > - -DENABLE_IMOBILEDEVICE=OFF > + -DENABLE_IMOBILEDEVICE=OFF -DENABLE_SPARKLE=OFF \ > + -DENABLE_SOUNDMENU=OFF -DENABLE_DBUS=OFF -DENABLE_UBUNTU_ONE=OFF \ > + -DENABLE_DROPBOX=OFF -DENABLE_SKYDRIVE=OFF You have globally disabled DBus support here, which looks wrong, considering that you have added DBUS options. There's more issues with dbus in this port, see below. > OPTIONS_DEFINE= AUDIOCD BREAKPAD DEVICEKIT GIO GOOGLE_DRIVE GPOD \ > - LASTFM MTP SPOTIFY VISUALISATION WIIMOTEDEV > + LASTFM MTP SPOTIFY VISUALISATION WIIMOTEDEV \ > + USE_BUILTIN_TAGLIB MOODBAR > > AUDIOCD_DESC= Devices: Audio CD support > BREAKPAD_DESC= Crash reporting > +DBUS_DESC= Enable D-Bus support > DEVICEKIT_DESC= Devices: DeviceKit backend > GIO_DESC= Devices: GIO device backend > GOOGLE_DRIVE_DESC= Google Drive support > @@ -53,12 +57,32 @@ MTP_DESC= MTP device support > SPOTIFY_DESC= Support for Spotify service > VISUALISATION_DESC= Visualisations from projectM > WIIMOTEDEV_DESC= Wiimote support > +MOODBAR_DESC= Moodbar Support > +USE_BUILTIN_TAGLIB= Use Clementine builtin taglib support > > -OPTIONS_DEFAULT= AUDIOCD DEVICEKIT GIO GOOGLE_DRIVE LASTFM MTP SPOTIFY \ > - VISUALISATION WIIMOTEDEV > +OPTIONS_DEFAULT= AUDIOCD DEVICEKIT GIO GOOGLE_DRIVE LASTFM MTP \ > + VISUALISATION WIIMOTEDEV MOODBAR > > .include <bsd.port.options.mk> > > +.if ${PORT_OPTIONS:MDBUS} > +CMAKE_ARGS+= -DENABLE_DBUS=ON > +.else > +CMAKE_ARGS+= -DENABLE_DBUS=OFF > +.endif > + > +.if ${PORT_OPTIONS:MMOODBAR} > +CMAKE_ARGS+= -DENABLE_MOODBAR=ON > +.else > +CMAKE_ARGS+= -DENABLE_MOODBAR=OFF > +.endif > + > +.if ${PORT_OPTIONS:MUSE_BUILTIN_TAGLIB} > +CMAKE_ARGS+= -DENABLE_USE_BUILTIN_TAGLIB=ON > +.else > +CMAKE_ARGS+= -DENABLE_USE_BUILTIN_TAGLIB=OFF > +.endif What's the reason for this option? We usually try to avoid build-in dependencies. > .if ${PORT_OPTIONS:MAUDIOCD} > CMAKE_ARGS+= -DENABLE_AUDIOCD=ON > LIB_DEPENDS+= cdio:${PORTSDIR}/sysutils/libcdio > @@ -114,10 +138,10 @@ CMAKE_ARGS+= -DENABLE_LIBMTP=OFF > .endif > > .if ${PORT_OPTIONS:MSPOTIFY} > -CMAKE_ARGS+= -DENABLE_SPOTIFY=ON > +CMAKE_ARGS+= -DENABLE_SPOTIFY_BLOB=ON > LIB_DEPENDS+= qca:${PORTSDIR}/devel/qca > .else > -CMAKE_ARGS+= -DENABLE_SPOTIFY=OFF > +CMAKE_ARGS+= -DENABLE_SPOTIFY_BLOB=OFF > .endif > > .if ${PORT_OPTIONS:MVISUALISATION} > @@ -127,7 +151,8 @@ CMAKE_ARGS+= -DENABLE_VISUALISATIONS=OFF > .endif > > .if ${PORT_OPTIONS:MWIIMOTEDEV} > -CMAKE_ARGS+= -DENABLE_WIIMOTEDEV=ON > +CMAKE_ARGS+= -DENABLE_WIIMOTEDEV=ON \ > + -DENABLE_DBUS=ON You'll end up with both -DENABLE_DBUS=ON and -DENABLE_DBUS=OFF, if you try to build the port with WIIMOTEDEV, but without DBUS option. You either have to fiddle with options to avoid this, or remove DBUS option for simplicity. As far as I remember WIIMOTEDEV is not the only option that requires dbus support, please check it if you want to keep DBUS option. > Modified: head/audio/clementine-player/pkg-plist > ============================================================================== > --- head/audio/clementine-player/pkg-plist Sat Nov 30 02:27:05 2013 (r335259) > +++ head/audio/clementine-player/pkg-plist Sat Nov 30 03:54:16 2013 (r335260) <skip> > +share/clementine/projectm-presets/Rovastar - Inner Thoughts (Clouded Judgement Mix).milk > +share/clementine/projectm-presets/Che - Burning Hus.milk > +@dirrmtry share/applications share/applications is a part of mtree now, it shouldn't be in plist. Regards, Max
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1587696.zcDM98VLUm>