Attachment #121130 for bug #164043

View | Details | Raw Unified | Return to bug 164043 | Differences between
Collapse All | Expand All




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

PROJECTHOST=	${PORTNAME}${PKGNAMESUFFIX}


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.2+
INSTALLS_ICONS=	yes
USE_GSTREAMER=	gio ogg mp3 flac soup vorbis
MAKE_JOBS_UNSAFE=	yes

CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"
CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \
		-DCMAKE_SKIP_RPATH:BOOL=ON

OPTIONS=	VISUALISATION "Visualisations from projectM" off \
		LASTFM "Support Last.fm service (requires ruby)" on \
		GPOD "iPod support" on \
		MTP "MTP device support" on

.include <bsd.port.pre.mk>


LIB_DEPENDS+=	lastfm.0:${PORTSDIR}/audio/liblastfm
.endif

.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>




--- 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"




--- 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"

Return to bug 164043

Lines 19-31 Link Here

(-)clementine-player/Makefile (-13 / +13 lines)
19	LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib \	19	LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib \
20	notify.4:${PORTSDIR}/devel/libnotify \	20	notify.4:${PORTSDIR}/devel/libnotify \
21	xine.1:${PORTSDIR}/multimedia/libxine \	21	xine.1:${PORTSDIR}/multimedia/libxine \
22	mtp.11:${PORTSDIR}/audio/libmtp \
23	usbmuxd.1:${PORTSDIR}/comms/usbmuxd \
24	imobiledevice.1:${PORTSDIR}/comms/libimobiledevice \
25	gpod.7:${PORTSDIR}/audio/libgpod \
26	qjson.0:${PORTSDIR}/devel/qjson	22	qjson.0:${PORTSDIR}/devel/qjson
27	BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs \	23	BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
28	chrpath:${PORTSDIR}/devel/chrpath
29		24
30	PROJECTHOST= ${PORTNAME}${PKGNAMESUFFIX}	25	PROJECTHOST= ${PORTNAME}${PKGNAMESUFFIX}
31		26
Lines 35-51 Link Here
35	USE_QT_VER= 4	30	USE_QT_VER= 4
36	QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build \	31	QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build \
37	linguist_build network sql opengl dbus qtestlib corelib	32	linguist_build network sql opengl dbus qtestlib corelib
38	USE_GCC= 4.6+	33	USE_GCC= 4.2+
39	INSTALLS_ICONS= yes	34	INSTALLS_ICONS= yes
40	USE_GSTREAMER= gio ogg mp3 flac soup vorbis	35	USE_GSTREAMER= gio ogg mp3 flac soup vorbis
41	MAKE_JOBS_UNSAFE= yes	36	MAKE_JOBS_UNSAFE= yes
42		37
43	GCC_LIBS= "${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}"	38	CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"
44	CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \
45	-DCMAKE_SKIP_RPATH:BOOL=ON
46		39
47	OPTIONS= VISUALISATION "Visualisations from projectM" off \	40	OPTIONS= VISUALISATION "Visualisations from projectM" off \
48	LASTFM "Support Last.fm service (requires ruby)" on	41	LASTFM "Support Last.fm service (requires ruby)" on \
		42	GPOD "iPod support" on \
		43	MTP "MTP device support" on
49		44
50	.include <bsd.port.pre.mk>	45	.include <bsd.port.pre.mk>
51		46
Lines 60-66 Link Here
60	LIB_DEPENDS+= lastfm.0:${PORTSDIR}/audio/liblastfm	55	LIB_DEPENDS+= lastfm.0:${PORTSDIR}/audio/liblastfm
61	.endif	56	.endif
62		57
63	post-build:	58	.if defined(WITH_GPOD)
64	${LOCALBASE}/bin/chrpath -r "${GCC_LIBS}" "${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}"	59	LIB_DEPENDS+= gpod.7:${PORTSDIR}/audio/libgpod
		60	.endif
		61
		62	.if defined(WITH_MTP)
		63	LIB_DEPENDS+= mtp.11:${PORTSDIR}/audio/libmtp
		64	.endif
65		65
66	.include <bsd.port.post.mk>	66	.include <bsd.port.post.mk>

Line 0 Link Here

(-)clementine-player/files/patch-src-devices-cddadevice.h (+15 lines)
	1	--- src/devices/cddadevice.h.orig 2012-01-11 22:39:56.000000000 -0600
	2	+++ src/devices/cddadevice.h 2012-01-11 22:40:33.000000000 -0600
	3	@@ -18,10 +18,10 @@
	4	#ifndef CDDADEVICE_H
	5	#define CDDADEVICE_H
	6
	7	-#include <cdio/cdio.h>
	8	-#include <gst/cdda/gstcddabasesrc.h>
	9	#include <QMutex>
	10
	11	+#include <cdio/cdio.h>
	12	+#include <gst/cdda/gstcddabasesrc.h>
	13	#include "connecteddevice.h"
	14	#include "core/song.h"
	15	#include "musicbrainz/musicbrainzclient.h"

Line 0 Link Here

(-)clementine-player/files/patch-src-devices-cddalister.cpp (+16 lines)
	1	--- src/devices/cddalister.cpp.orig 2012-01-11 22:39:03.000000000 -0600
	2	+++ src/devices/cddalister.cpp 2012-01-11 22:39:22.000000000 -0600
	3	@@ -15,12 +15,12 @@
	4	along with Clementine. If not, see <http://www.gnu.org/licenses/>.
	5	*/
	6
	7	-#include <cdio/cdio.h>
	8	#include <QFileInfo>
	9	#include <QMutex>
	10	#include <QThread>
	11	#include <QWaitCondition>
	12
	13	+#include <cdio/cdio.h>
	14	#include "cddalister.h"
	15	#include "core/logging.h"
	16	#include "core/song.h"