Date: Thu, 12 Jan 2012 06:20:29 GMT From: Axel Gonzalez <loox@e-shell.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/164043: [patch] audio/clementine-player remove dependency on gcc46 Message-ID: <201201120620.q0C6KTZt039149@red.freebsd.org> Resent-Message-ID: <201201120630.q0C6U9Hu055753@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 164043 >Category: ports >Synopsis: [patch] audio/clementine-player remove dependency on gcc46 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jan 12 06:30:09 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Axel Gonzalez >Release: FreeBSD 9.0-RC1 >Organization: >Environment: FreeBSD moonlight 9.0-RC1 FreeBSD 9.0-RC1 #0: Fri Oct 28 22:53:45 CDT 2011 toor@moonlight:/usr/obj/usr/src/sys/LXCORE9 i386 >Description: audio/clementine-player has an unnecesary dependency on gcc46 (big port) This patches fix the code, so it can be built with gcc42 (from base) While I'm at it, make the ipod/mtp dependencies optional (not everyone has this devices) >How-To-Repeat: build from ports >Fix: Add the files to files/ and apply the patch (the patch to Makefile is also attached, to keep the tabs) cat files/patch-src-devices-cddadevice.h --- src/devices/cddadevice.h.orig 2012-01-11 22:39:56.000000000 -0600 +++ src/devices/cddadevice.h 2012-01-11 22:40:33.000000000 -0600 @@ -18,10 +18,10 @@ #ifndef CDDADEVICE_H #define CDDADEVICE_H -#include <cdio/cdio.h> -#include <gst/cdda/gstcddabasesrc.h> #include <QMutex> +#include <cdio/cdio.h> +#include <gst/cdda/gstcddabasesrc.h> #include "connecteddevice.h" #include "core/song.h" #include "musicbrainz/musicbrainzclient.h" -------------- cat files/patch-src-devices-cddalister.cpp --- src/devices/cddalister.cpp.orig 2012-01-11 22:39:03.000000000 -0600 +++ src/devices/cddalister.cpp 2012-01-11 22:39:22.000000000 -0600 @@ -15,12 +15,12 @@ along with Clementine. If not, see <http://www.gnu.org/licenses/>. */ -#include <cdio/cdio.h> #include <QFileInfo> #include <QMutex> #include <QThread> #include <QWaitCondition> +#include <cdio/cdio.h> #include "cddalister.h" #include "core/logging.h" #include "core/song.h" -------------- diff -ur clementine-player.orig/Makefile clementine-player/Makefile --- clementine-player.orig/Makefile 2012-01-11 22:36:02.000000000 -0600 +++ clementine-player/Makefile 2012-01-11 23:34:23.000000000 -0600 @@ -19,13 +19,8 @@ LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib \ notify.4:${PORTSDIR}/devel/libnotify \ xine.1:${PORTSDIR}/multimedia/libxine \ - mtp.11:${PORTSDIR}/audio/libmtp \ - usbmuxd.1:${PORTSDIR}/comms/usbmuxd \ - imobiledevice.1:${PORTSDIR}/comms/libimobiledevice \ - gpod.7:${PORTSDIR}/audio/libgpod \ qjson.0:${PORTSDIR}/devel/qjson -BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs \ - chrpath:${PORTSDIR}/devel/chrpath +BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs PROJECTHOST= ${PORTNAME}${PKGNAMESUFFIX} @@ -35,17 +30,18 @@ USE_QT_VER= 4 QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build \ linguist_build network sql opengl dbus qtestlib corelib -USE_GCC= 4.6+ +USE_GCC= 4.2+ INSTALLS_ICONS= yes USE_GSTREAMER= gio ogg mp3 flac soup vorbis MAKE_JOBS_UNSAFE= yes GCC_LIBS= "${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}" -CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \ - -DCMAKE_SKIP_RPATH:BOOL=ON +CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" OPTIONS= VISUALISATION "Visualisations from projectM" off \ - LASTFM "Support Last.fm service (requires ruby)" on + LASTFM "Support Last.fm service (requires ruby)" on \ + GPOD "iPod support" on \ + MTP "MTP device support" on .include <bsd.port.pre.mk> @@ -60,7 +56,12 @@ LIB_DEPENDS+= lastfm.0:${PORTSDIR}/audio/liblastfm .endif -post-build: - ${LOCALBASE}/bin/chrpath -r "${GCC_LIBS}" "${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}" +.if defined(WITH_GPOD) +LIB_DEPENDS+= gpod.7:${PORTSDIR}/audio/libgpod +.endif + +.if defined(WITH_MTP) +LIB_DEPENDS+= mtp.11:${PORTSDIR}/audio/libmtp +.endif .include <bsd.port.post.mk> Patch attached with submission follows: --- clementine-player.orig/Makefile 2012-01-11 22:36:02.000000000 -0600 +++ clementine-player/Makefile 2012-01-11 23:34:23.000000000 -0600 @@ -19,13 +19,8 @@ LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib \ notify.4:${PORTSDIR}/devel/libnotify \ xine.1:${PORTSDIR}/multimedia/libxine \ - mtp.11:${PORTSDIR}/audio/libmtp \ - usbmuxd.1:${PORTSDIR}/comms/usbmuxd \ - imobiledevice.1:${PORTSDIR}/comms/libimobiledevice \ - gpod.7:${PORTSDIR}/audio/libgpod \ qjson.0:${PORTSDIR}/devel/qjson -BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs \ - chrpath:${PORTSDIR}/devel/chrpath +BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs PROJECTHOST= ${PORTNAME}${PKGNAMESUFFIX} @@ -35,17 +30,18 @@ USE_QT_VER= 4 QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build \ linguist_build network sql opengl dbus qtestlib corelib -USE_GCC= 4.6+ +USE_GCC= 4.2+ INSTALLS_ICONS= yes USE_GSTREAMER= gio ogg mp3 flac soup vorbis MAKE_JOBS_UNSAFE= yes GCC_LIBS= "${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}" -CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \ - -DCMAKE_SKIP_RPATH:BOOL=ON +CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" OPTIONS= VISUALISATION "Visualisations from projectM" off \ - LASTFM "Support Last.fm service (requires ruby)" on + LASTFM "Support Last.fm service (requires ruby)" on \ + GPOD "iPod support" on \ + MTP "MTP device support" on .include <bsd.port.pre.mk> @@ -60,7 +56,12 @@ LIB_DEPENDS+= lastfm.0:${PORTSDIR}/audio/liblastfm .endif -post-build: - ${LOCALBASE}/bin/chrpath -r "${GCC_LIBS}" "${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}" +.if defined(WITH_GPOD) +LIB_DEPENDS+= gpod.7:${PORTSDIR}/audio/libgpod +.endif + +.if defined(WITH_MTP) +LIB_DEPENDS+= mtp.11:${PORTSDIR}/audio/libmtp +.endif .include <bsd.port.post.mk> Only in clementine-player/files: patch-src-devices-cddadevice.h Only in clementine-player/files: patch-src-devices-cddalister.cpp >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201120620.q0C6KTZt039149>