Bug 164043
| Summary: | [patch] audio/clementine-player remove dependency on gcc46 | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Axel Gonzalez <loox> | ||||||
| Component: | Individual Port(s) | Assignee: | Ruslan Makhmatkhanov <rm> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Only Me | ||||||||
| Priority: | Normal | ||||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Attachments: |
|
||||||||
Maintainer of audio/clementine-player,
Please note that PR ports/164043 has just been submitted.
If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.
The full text of the PR can be found at:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/164043
--
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool) The new full patch with a fix from Veniamin Gvozdikov I'm agree with it's changes. 2012/1/12 Axel Gonzalez <loox@e-shell.net>: > > The new full patch with a fix from Veniamin Gvozdikov Responsible Changed From-To: freebsd-ports-bugs->rm I will take it. State Changed From-To: feedback->open Maintainer approved. rm 2012-01-13 03:38:22 UTC
FreeBSD ports repository
Modified files:
audio/clementine-player Makefile
Added files:
audio/clementine-player/files patch-src-devices-cddadevice.h
patch-src-devices-cddalister.cpp
Log:
- let it build with stock gcc
- optionify ipod and mtp support (default on)
PR: 164043
Submitted by: Axel Gonzalez <loox at e-shell dot net>
Approved by: maintainer
Revision Changes Path
1.13 +14 -13 ports/audio/clementine-player/Makefile
1.1 +15 -0 ports/audio/clementine-player/files/patch-src-devices-cddadevice.h (new)
1.1 +16 -0 ports/audio/clementine-player/files/patch-src-devices-cddalister.cpp (new)
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, thank you! |
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) 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: How-To-Repeat: build from ports