From fa6aee1070ac104705821cbf43262892748bc882 Mon Sep 17 00:00:00 2001 From: sbruno Date: Mon, 2 Dec 2013 03:39:33 +0000 Subject: after review from makc@ Bump PORTREVISION becuase ... - Remove WITH_DEBUG - Enable DBUS for all configurations - Remove DBUS as a configuration option - Remove GOOGLE_DRIVE as a default option, google sparsehash will not build currently. - Remove share/applications from plist PR: ports/182107 --- audio/clementine-player/Makefile | 19 ++++++------------- audio/clementine-player/pkg-plist | 1 - 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile index ad73fb1e190e..cde48e8ce9ac 100644 --- a/audio/clementine-player/Makefile +++ b/audio/clementine-player/Makefile @@ -3,6 +3,7 @@ o Created by: Veniamin Gvozdikov PORTNAME= clementine PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= GOOGLE_CODE PKGNAMESUFFIX= -player @@ -30,15 +31,15 @@ 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 -WITH_DEBUG= yes 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_DEBUS=ON -DENABLE_BOX=OFF \ -DENABLE_IMOBILEDEVICE=OFF -DENABLE_SPARKLE=OFF \ - -DENABLE_SOUNDMENU=OFF -DENABLE_DBUS=OFF -DENABLE_UBUNTU_ONE=OFF \ + -DENABLE_SOUNDMENU=OFF -DENABLE_UBUNTU_ONE=OFF \ -DENABLE_DROPBOX=OFF -DENABLE_SKYDRIVE=OFF OPTIONS_DEFINE= AUDIOCD BREAKPAD DEVICEKIT GIO GOOGLE_DRIVE GPOD \ @@ -47,7 +48,6 @@ OPTIONS_DEFINE= AUDIOCD BREAKPAD DEVICEKIT GIO GOOGLE_DRIVE GPOD \ 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 @@ -60,17 +60,11 @@ 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 \ - VISUALISATION WIIMOTEDEV MOODBAR +OPTIONS_DEFAULT= AUDIOCD DEVICEKIT GIO LASTFM MTP VISUALISATION \ + WIIMOTEDEV MOODBAR .include -.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 @@ -151,8 +145,7 @@ CMAKE_ARGS+= -DENABLE_VISUALISATIONS=OFF .endif .if ${PORT_OPTIONS:MWIIMOTEDEV} -CMAKE_ARGS+= -DENABLE_WIIMOTEDEV=ON \ - -DENABLE_DBUS=ON +CMAKE_ARGS+= -DENABLE_WIIMOTEDEV=ON .else CMAKE_ARGS+= -DENABLE_WIIMOTEDEV=OFF .endif diff --git a/audio/clementine-player/pkg-plist b/audio/clementine-player/pkg-plist index 2f3560a47428..d6755c8f8e79 100644 --- a/audio/clementine-player/pkg-plist +++ b/audio/clementine-player/pkg-plist @@ -578,7 +578,6 @@ share/clementine/projectm-presets/Aderrasi - What cannot be.milk share/clementine/projectm-presets/Unchained & Rovastar - Wormhole Pillars (Hall of Shadows mi.milk share/clementine/projectm-presets/Rovastar - Inner Thoughts (Clouded Judgement Mix).milk share/clementine/projectm-presets/Che - Burning Hus.milk -@dirrmtry share/applications @dirrmtry share/icons/hicolor/64x64/apps @dirrmtry share/icons/hicolor/64x64 @dirrmtry share/icons/hicolor/scalable/apps -- cgit