View | Details | Raw Unified | Return to bug 188347 | Differences between
and this patch

Collapse All | Expand All

(-)multimedia/qmmp/Makefile (-27 / +39 lines)
Lines 1-11 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	qmmp
3
PORTNAME=	qmmp
4
PORTVERSION=	0.7.4
4
PORTVERSION=	0.8.0
5
PORTREVISION=	2
6
CATEGORIES=	multimedia
5
CATEGORIES=	multimedia
7
MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
6
MASTER_SITES=	http://qmmp.ylsoftware.com/files/
8
		${MASTER_SITE_GOOGLE_CODE}
9
7
10
MAINTAINER=	liangtai.s16@gmail.com
8
MAINTAINER=	liangtai.s16@gmail.com
11
COMMENT=	Qt4-based multimedia player
9
COMMENT=	Qt4-based multimedia player
Lines 12-19 Link Here
12
10
13
LICENSE=	GPLv2
11
LICENSE=	GPLv2
14
12
15
USE_BZIP2=	yes
13
USES=		cmake:outsource pkgconfig tar:bzip2
16
USES=		cmake:outsource pkgconfig
17
USE_QT4=	corelib gui network xml \
14
USE_QT4=	corelib gui network xml \
18
		qmake_build rcc_build uic_build moc_build linguist_build
15
		qmake_build rcc_build uic_build moc_build linguist_build
19
USE_LDCONFIG=	yes
16
USE_LDCONFIG=	yes
Lines 23-39 Link Here
23
OPTIONS_SINGLE_MPLAYER=	MPLAYER1 MPLAYER2
20
OPTIONS_SINGLE_MPLAYER=	MPLAYER1 MPLAYER2
24
OPTIONS_DEFINE=	ALSA ANALYZER BS2B CDIO CONVERTER COPYPASTE \
21
OPTIONS_DEFINE=	ALSA ANALYZER BS2B CDIO CONVERTER COPYPASTE \
25
		COVER CROSSFADE CUE CURL DIR_ASSOC DOCS DOXYGEN ENCA FAAD \
22
		COVER CROSSFADE CUE CURL DIR_ASSOC DOCS DOXYGEN ENCA FAAD \
26
		FFMPEG FILEOPS FLAC GME HAL HOTKEY JACK KDENOTIFY \
23
		FFMPEG FILEOPS FLAC GNOMEHOTKEY GME HAL HOTKEY JACK KDENOTIFY \
27
		LADSPA LYRICS MAD MMS MODPLUG MPLAYER MPRIS MUSEPACK \
24
		LADSPA LYRICS MAD MMS MODPLUG MPLAYER MPRIS MUSEPACK NOTIFIER \
28
		NOTIFIER NULLOUT OSS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG \
25
		NULLOUT OPUS OSS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG RGSCAN \
29
		SB SCROBBLER SKINNEDUI SNDFILE SRCONV STATICON STEREO \
26
		SB SCROBBLER SID SKINNEDUI SNDFILE SRCONV STATICON STEREO \
30
		TRACKCHANGE UDISKS UDISKS2 VORBIS WAVPACK WILDMIDI
27
		TRACKCHANGE UDISKS UDISKS2 VORBIS WAVPACK WILDMIDI
31
OPTIONS_DEFAULT=	ALSA ANALYZER BS2B CDIO CONVERTER COPYPASTE COVER \
28
OPTIONS_DEFAULT=	ALSA ANALYZER BS2B CDIO CONVERTER COPYPASTE COVER \
32
		CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD \
29
		CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FLAC \
33
		FFMPEG FILEOPS FLAC GME HAL HOTKEY JACK KDENOTIFY \
30
		GNOMEHOTKEY GME HAL HOTKEY JACK KDENOTIFY LADSPA LYRICS MAD \
34
		LADSPA LYRICS MAD MMS MODPLUG MPRIS MPLAYER MPLAYER1 MUSEPACK \
31
		MMS MODPLUG MPRIS MPLAYER MPLAYER1 MUSEPACK NOTIFIER NULLOUT \
35
		NOTIFIER NULLOUT OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG \
32
		OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG RGSCAN SB SCROBBLER \
36
		SB SCROBBLER SKINNEDUI SNDFILE SRCONV STATICON STEREO \
33
		SID SKINNEDUI SNDFILE SRCONV STATICON STEREO \
37
		TRACKCHANGE UDISKS2 VORBIS WAVPACK WILDMIDI
34
		TRACKCHANGE UDISKS2 VORBIS WAVPACK WILDMIDI
38
35
39
DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
36
DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
Lines 136-149 Link Here
136
MAD_CMAKE_ON=	-DUSE_MAD:BOOL=TRUE
133
MAD_CMAKE_ON=	-DUSE_MAD:BOOL=TRUE
137
MAD_CMAKE_OFF=	-DUSE_MAD:BOOL=FALSE
134
MAD_CMAKE_OFF=	-DUSE_MAD:BOOL=FALSE
138
135
139
#OPUS_DESC=		Enable reading opusfile tags
136
OPUS_DESC=		Enable reading opusfile tags
140
#OPUS_LIB_DEPENDS=	libopusfile.so:${PORTSDIR}/audio/opusfile \
137
OPUS_LIB_DEPENDS=	libopusfile.so:${PORTSDIR}/audio/opusfile \
141
#		libtag.so:${PORTSDIR}/audio/taglib
138
		libtag.so:${PORTSDIR}/audio/taglib
142
#OPUS_CMAKE_ON=	-DUSE_OPUS:BOOL=TRUE
139
OPUS_CMAKE_ON=	-DUSE_OPUS:BOOL=TRUE
143
#OPUS_CMAKE_OFF=	-DUSE_OPUS:BOOL=FALSE
140
OPUS_CMAKE_OFF=	-DUSE_OPUS:BOOL=FALSE
144
CMAKE_ARGS+=	-DUSE_OPUS:BOOL=FALSE
145
PLIST_SUB+=	OPUS="@comment "
146
141
142
RGSCAN_DESC=	ReplayGain scanner
143
RGSCAN_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
144
RGSCAN_CMAKE_ON=	-DUSE_RGSCAN:BOOL=TRUE
145
RGSCAN_CMAKE_OFF=	-DUSE_RGSCAN:BOOL=FALSE
146
147
SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
147
SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
148
SNDFILE_CMAKE_ON=	-DUSE_SNDFILE:BOOL=TRUE
148
SNDFILE_CMAKE_ON=	-DUSE_SNDFILE:BOOL=TRUE
149
SNDFILE_CMAKE_OFF=	-DUSE_SNDFILE:BOOL=FALSE
149
SNDFILE_CMAKE_OFF=	-DUSE_SNDFILE:BOOL=FALSE
Lines 206-211 Link Here
206
SCROBBLER_CMAKE_ON=	-DUSE_SCROBBLER:BOOL=TRUE
206
SCROBBLER_CMAKE_ON=	-DUSE_SCROBBLER:BOOL=TRUE
207
SCROBBLER_CMAKE_OFF=	-DUSE_SCROBBLER:BOOL=FALSE
207
SCROBBLER_CMAKE_OFF=	-DUSE_SCROBBLER:BOOL=FALSE
208
208
209
SID_DESC=	Support sid
210
SID_LIB_DEPENDS=	libsidplayfp.so:${PORTSDIR}/audio/libsidplayfp
211
SID_CMAKE_ON=	-DUSE_SID:BOOL=TRUE
212
SID_CMAKE_OFF=	-DUSE_SID:BOOL=FALSE
213
209
STATICON_DESC=	Support to show status icon
214
STATICON_DESC=	Support to show status icon
210
STATICON_CMAKE_ON=	-DUSE_STATICON:BOOL=TRUE
215
STATICON_CMAKE_ON=	-DUSE_STATICON:BOOL=TRUE
211
STATICON_CMAKE_OFF=	-DUSE_STATICON:BOOL=FALSE
216
STATICON_CMAKE_OFF=	-DUSE_STATICON:BOOL=FALSE
Lines 226-235 Link Here
226
HAL_CMAKE_ON=	-DUSE_HAL:BOOL=TRUE
231
HAL_CMAKE_ON=	-DUSE_HAL:BOOL=TRUE
227
HAL_CMAKE_OFF=	-DUSE_HAL:BOOL=FALSE
232
HAL_CMAKE_OFF=	-DUSE_HAL:BOOL=FALSE
228
233
229
HOTKEY_DESC=	Support to set shortcut keys
234
HOTKEY_DESC=	Support global shortcut keys
230
HOTKEY_CMAKE_ON=	-DUSE_HOTKEY:BOOL=TRUE
235
HOTKEY_CMAKE_ON=	-DUSE_HOTKEY:BOOL=TRUE
231
HOTKEY_CMAKE_OFF=	-DUSE_HOTKEY:BOOL=FALSE
236
HOTKEY_CMAKE_OFF=	-DUSE_HOTKEY:BOOL=FALSE
232
237
238
GNOMEHOTKEY_DESC=	Support GNOME/Cinnamon shortcut keys
239
GNOMEHOTKEY_USE=	QT4=dbus
240
GNOMEHOTKEY_CMAKE_ON=	-DUSE_GNOMEHOTKEY:BOOL=TRUE
241
GNOMEHOTKEY_CMAKE_OFF=	-DUSE_GNOMEHOTKEY:BOOL=FALSE
242
233
FILEOPS_DESC=	Support file operation
243
FILEOPS_DESC=	Support file operation
234
FILEOPS_CMAKE_ON=	-DUSE_FILEOPS:BOOL=TRUE
244
FILEOPS_CMAKE_ON=	-DUSE_FILEOPS:BOOL=TRUE
235
FILEOPS_CMAKE_OFF=	-DUSE_FILEOPS:BOOL=FALSE
245
FILEOPS_CMAKE_OFF=	-DUSE_FILEOPS:BOOL=FALSE
Lines 274-284 Link Here
274
LDFLAGS+=	-L${LOCALBASE}/lib
284
LDFLAGS+=	-L${LOCALBASE}/lib
275
285
276
post-patch:
286
post-patch:
277
	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|' \
287
	@${GREP} -L '${LOCALBASE}/lib/oss' \
278
		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt
288
		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt | ${XARGS} \
279
	@${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_DIR}|libdata|' \
289
		${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|'
290
	@${GREP} -L 'libdata/pkgconfig' \
280
		${WRKSRC}/src/qmmp/CMakeLists.txt \
291
		${WRKSRC}/src/qmmp/CMakeLists.txt \
281
		${WRKSRC}/src/qmmpui/CMakeLists.txt
292
		${WRKSRC}/src/qmmpui/CMakeLists.txt | ${XARGS} \
293
		${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_DIR}|libdata|'
282
294
283
pre-configure:
295
pre-configure:
284
	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
296
	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
(-)multimedia/qmmp/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (qmmp-0.7.4.tar.bz2) = ba10d0595b99495587643584c9c8400e6eb987bd2e4bbb30c1060c507f44b4f2
1
SHA256 (qmmp-0.8.0.tar.bz2) = 61f44646ffd3f1d90b93607076a405160be5d9736e91c9739c80070bc5357439
2
SIZE (qmmp-0.7.4.tar.bz2) = 862966
2
SIZE (qmmp-0.8.0.tar.bz2) = 977600
(-)multimedia/qmmp/pkg-plist (+5 lines)
Lines 35-44 Link Here
35
include/qmmpui/metadataformatter.h
35
include/qmmpui/metadataformatter.h
36
include/qmmpui/playlistdownloader.h
36
include/qmmpui/playlistdownloader.h
37
include/qmmpui/playlistformat.h
37
include/qmmpui/playlistformat.h
38
include/qmmpui/playlistgroup.h
38
include/qmmpui/playlistitem.h
39
include/qmmpui/playlistitem.h
39
include/qmmpui/playlistmanager.h
40
include/qmmpui/playlistmanager.h
40
include/qmmpui/playlistmodel.h
41
include/qmmpui/playlistmodel.h
41
include/qmmpui/playlistparser.h
42
include/qmmpui/playlistparser.h
43
include/qmmpui/playlisttrack.h
42
include/qmmpui/qmmpuisettings.h
44
include/qmmpui/qmmpuisettings.h
43
include/qmmpui/templateeditor.h
45
include/qmmpui/templateeditor.h
44
include/qmmpui/uifactory.h
46
include/qmmpui/uifactory.h
Lines 65-70 Link Here
65
%%COPYPASTE%%lib/qmmp/General/libcopypaste.so
67
%%COPYPASTE%%lib/qmmp/General/libcopypaste.so
66
%%COVER%%lib/qmmp/General/libcovermanager.so
68
%%COVER%%lib/qmmp/General/libcovermanager.so
67
%%FILEOPS%%lib/qmmp/General/libfileops.so
69
%%FILEOPS%%lib/qmmp/General/libfileops.so
70
%%GNOMEHOTKEY%%lib/qmmp/General/libgnomehotkey.so
68
%%HAL%%lib/qmmp/General/libhal.so
71
%%HAL%%lib/qmmp/General/libhal.so
69
%%HOTKEY%%lib/qmmp/General/libhotkey.so
72
%%HOTKEY%%lib/qmmp/General/libhotkey.so
70
%%KDENOTIFY%%lib/qmmp/General/libkdenotify.so
73
%%KDENOTIFY%%lib/qmmp/General/libkdenotify.so
Lines 71-76 Link Here
71
%%LYRICS%%lib/qmmp/General/liblyrics.so
74
%%LYRICS%%lib/qmmp/General/liblyrics.so
72
%%MPRIS%%lib/qmmp/General/libmpris.so
75
%%MPRIS%%lib/qmmp/General/libmpris.so
73
%%NOTIFIER%%lib/qmmp/General/libnotifier.so
76
%%NOTIFIER%%lib/qmmp/General/libnotifier.so
77
%%RGSCAN%%lib/qmmp/General/librgscan.so
74
%%SCROBBLER%%lib/qmmp/General/libscrobbler.so
78
%%SCROBBLER%%lib/qmmp/General/libscrobbler.so
75
%%STATICON%%lib/qmmp/General/libstatusicon.so
79
%%STATICON%%lib/qmmp/General/libstatusicon.so
76
%%SB%%lib/qmmp/General/libstreambrowser.so
80
%%SB%%lib/qmmp/General/libstreambrowser.so
Lines 87-92 Link Here
87
%%GME%%lib/qmmp/Input/libgme.so
91
%%GME%%lib/qmmp/Input/libgme.so
88
%%MUSEPACK%%lib/qmmp/Input/libmpc.so
92
%%MUSEPACK%%lib/qmmp/Input/libmpc.so
89
%%OPUS%%lib/qmmp/Input/libopus.so
93
%%OPUS%%lib/qmmp/Input/libopus.so
94
%%SID%%lib/qmmp/Input/libsid.so
90
%%SNDFILE%%lib/qmmp/Input/libsndfile.so
95
%%SNDFILE%%lib/qmmp/Input/libsndfile.so
91
%%VORBIS%%lib/qmmp/Input/libvorbis.so
96
%%VORBIS%%lib/qmmp/Input/libvorbis.so
92
%%WAVPACK%%lib/qmmp/Input/libwavpack.so
97
%%WAVPACK%%lib/qmmp/Input/libwavpack.so
(-)multimedia/qmmp-plugin-pack/Makefile (-9 / +4 lines)
Lines 1-11 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	qmmp-plugin-pack
3
PORTNAME=	qmmp-plugin-pack
4
PORTVERSION=	0.7.4
4
PORTVERSION=	0.8.0
5
PORTREVISION=	1
6
CATEGORIES=	multimedia
5
CATEGORIES=	multimedia
7
MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/ \
6
MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/
8
		http://qmmp.googlecode.com/files/
9
7
10
MAINTAINER=	liangtai.s16@gmail.com
8
MAINTAINER=	liangtai.s16@gmail.com
11
COMMENT=	Additional plug-ins for QMMP
9
COMMENT=	Additional plug-ins for QMMP
Lines 13-22 Link Here
13
LICENSE=	GPLv2
11
LICENSE=	GPLv2
14
12
15
LIB_DEPENDS=	libqmmpui.so:${PORTSDIR}/multimedia/qmmp
13
LIB_DEPENDS=	libqmmpui.so:${PORTSDIR}/multimedia/qmmp
16
BUILD_DEPENDS=	qmmp>=0.7.0:${PORTSDIR}/multimedia/qmmp
14
BUILD_DEPENDS=	qmmp>=0.8.0:${PORTSDIR}/multimedia/qmmp
17
15
18
USE_BZIP2=	yes
16
USES=		cmake:outsource pkgconfig tar:bzip2
19
USES=		cmake:outsource pkgconfig
20
USE_QT4=	corelib gui qmake_build rcc_build moc_build linguist_build
17
USE_QT4=	corelib gui qmake_build rcc_build moc_build linguist_build
21
USE_LDCONFIG=	yes
18
USE_LDCONFIG=	yes
22
19
Lines 53-59 Link Here
53
50
54
pre-configure:
51
pre-configure:
55
	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
52
	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
56
	@${REINPLACE_CMD} -e 's/IF[(]/&USE_QSUI AND /' \
57
		${WRKSRC}/src/Ui/CMakeLists.txt
58
53
59
.include <bsd.port.mk>
54
.include <bsd.port.mk>
(-)multimedia/qmmp-plugin-pack/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (qmmp-plugin-pack-0.7.4.tar.bz2) = 6e3559519925cb488a79be078c75de5a5f3f58cb893f055b8422aa37bea32144
1
SHA256 (qmmp-plugin-pack-0.8.0.tar.bz2) = 9cde3320115d1f70d34e336d38e5cb6646a9e347b62efae5f958925eadc5d25d
2
SIZE (qmmp-plugin-pack-0.7.4.tar.bz2) = 136618
2
SIZE (qmmp-plugin-pack-0.8.0.tar.bz2) = 154739

Return to bug 188347