Attachment #126897 for bug #170668

View | Details | Raw Unified | Return to bug 170668
Collapse All | Expand All

Lines 1-2 Link Here

(-)multimedia/qmmp/distinfo (-2 / +2 lines)
1	SHA256 (qmmp-0.6.0.tar.bz2) = 4e2c9cdfd630bb90b2c92cb3e2f95ac4239c7cf8f91c47ca4a5038dd519755fe	1	SHA256 (qmmp-0.6.3.tar.bz2) = 98f5b8121d475ead81c788ec9d5346c8da537e342c0d99eaff08586af4c92ca8
2	SIZE (qmmp-0.6.0.tar.bz2) = 772882	2	SIZE (qmmp-0.6.3.tar.bz2) = 775285

Lines 6-13 Link Here

(-)multimedia/qmmp/Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= qmmp	8	PORTNAME= qmmp
9	PORTVERSION= 0.6.0	9	PORTVERSION= 0.6.3
10	PORTREVISION= 1	10	PORTREVISION= 0
11	CATEGORIES= multimedia	11	CATEGORIES= multimedia
12	MASTER_SITES= http://qmmp.ylsoftware.com/files/ \	12	MASTER_SITES= http://qmmp.ylsoftware.com/files/ \
13	${MASTER_SITE_GOOGLE_CODE}	13	${MASTER_SITE_GOOGLE_CODE}
Lines 22-27 Link Here
22	USE_QT4= corelib gui network xml \	22	USE_QT4= corelib gui network xml \
23	qmake_build rcc_build uic_build moc_build linguist_build	23	qmake_build rcc_build uic_build moc_build linguist_build
24	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
		25	USE_PKGCONFIG= build
25		26
26	OPTIONS_DEFINE= SKINNEDUI DIR_ASSOC APIDOC PULSEAUDIO ALSA OSS OSS4 \	27	OPTIONS_DEFINE= SKINNEDUI DIR_ASSOC APIDOC PULSEAUDIO ALSA OSS OSS4 \
27	JACK NULLOUT FLAC MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD \	28	JACK NULLOUT FLAC MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD \

Lines 1-2 Link Here

(-)multimedia/qmmp-plugin-pack/distinfo (-2 / +2 lines)
1	SHA256 (qmmp-plugin-pack-0.6.0.tar.bz2) = 47fe88ef372e5407a33fdd6d0fdfdc78eab9a746aa5c570b2f489836576ae9e1	1	SHA256 (qmmp-plugin-pack-0.6.2.tar.bz2) = 8f241b94a3671a27d1d1f5d4695469760a52dcaafdc5e97f069b932ccb2ed41c
2	SIZE (qmmp-plugin-pack-0.6.0.tar.bz2) = 268941	2	SIZE (qmmp-plugin-pack-0.6.2.tar.bz2) = 121619

Line 0 Link Here

(-)multimedia/qmmp-plugin-pack/files/patch-SET_RPATH (+10 lines)
	1	--- CMakeLists.txt.orig 2012-07-23 03:56:51.000000000 +0900
	2	+++ CMakeLists.txt 2012-07-24 07:13:44.000000000 +0900
	3	@@ -3,6 +3,7 @@
	4	#freebsd include
	5	include_directories(SYSTEM /usr/include /usr/local/include)
	6
	7	+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
	8
	9	CONFIGURE_FILE(
	10	"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"




#

PORTNAME=	qmmp-plugin-pack
PORTVERSION=	0.6.2
CATEGORIES=	multimedia
MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/ \
		http://qmmp.googlecode.com/files/

USE_CMAKE=	yes
USE_QT4=	corelib gui qmake_build rcc_build moc_build linguist_build
USE_LDCONFIG=	yes
USE_PKGCONFIG=	build

OPTIONS_DEFINE=	FFAP MPG123 QSUI
OPTIONS_MULTI_PLUGINS=	FFAP MPG123 QSUI
OPTIONS_DEFAULT=	FFAP MPG123 QSUI
FFAP_DESC=		Support APE sound file
MPG123_DESC=	Support libmpg123 (MPEG v1/2 layer1/2/3)
QSUI_DESC=		Simple UI based on standard widgets set
OPTIONS_DEFINE_i386=	FFAPASM
OPTIONS_DEFAULT_i386=	FFAPASM
OPTIONS_DEFINE_x86_64=	FFAPASM
OPTIONS_DEFAULT_x86_64=	FFAPASM
FFAPASM_DESC=	Optimize FFap decoder using devel/yasm

.include <bsd.port.options.mk>



.if ${PORT_OPTIONS:MFFAP}
PLIST_SUB+=	FFAP=""
. if (${ARCH} == i386 || ${ARCH} == x86_64) && ${PORT_OPTIONS:MFFAPASM}
BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
PLUGIN_OPTIONS_CMAKE+=	-DUSE_ASM:BOOL=TRUE
. else
PLUGIN_OPTIONS_CMAKE+=	-DUSE_ASM:BOOL=FALSE
. endif
LIB_DEPENDS+=	tag:${PORTSDIR}/audio/taglib
PLUGIN_OPTIONS_CMAKE+=	-DUSE_FFAP:BOOL=TRUE

Return to bug 170668

Lines 6-12 Link Here

(-)multimedia/qmmp-plugin-pack/Makefile (-4 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= qmmp-plugin-pack	8	PORTNAME= qmmp-plugin-pack
9	PORTVERSION= 0.6.0	9	PORTVERSION= 0.6.2
10	CATEGORIES= multimedia	10	CATEGORIES= multimedia
11	MASTER_SITES= http://qmmp.ylsoftware.com/files/plugins/ \	11	MASTER_SITES= http://qmmp.ylsoftware.com/files/plugins/ \
12	http://qmmp.googlecode.com/files/	12	http://qmmp.googlecode.com/files/
Lines 23-35 Link Here
23	USE_CMAKE= yes	23	USE_CMAKE= yes
24	USE_QT4= corelib gui qmake_build rcc_build moc_build linguist_build	24	USE_QT4= corelib gui qmake_build rcc_build moc_build linguist_build
25	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
		26	USE_PKGCONFIG= build
26		27
27	OPTIONS_MULTI= PLUGINS	28	OPTIONS_DEFINE= FFAP MPG123 QSUI
28	OPTIONS_MULTI_PLUGINS= FFAP MPG123 QSUI
29	OPTIONS_DEFAULT= FFAP MPG123 QSUI	29	OPTIONS_DEFAULT= FFAP MPG123 QSUI
30	FFAP_DESC= Support APE sound file	30	FFAP_DESC= Support APE sound file
31	MPG123_DESC= Support libmpg123 (MPEG v1/2 layer1/2/3)	31	MPG123_DESC= Support libmpg123 (MPEG v1/2 layer1/2/3)
32	QSUI_DESC= Simple UI based on standard widgets set	32	QSUI_DESC= Simple UI based on standard widgets set
		33	OPTIONS_DEFINE_i386= FFAPASM
		34	OPTIONS_DEFAULT_i386= FFAPASM
		35	OPTIONS_DEFINE_x86_64= FFAPASM
		36	OPTIONS_DEFAULT_x86_64= FFAPASM
		37	FFAPASM_DESC= Optimize FFap decoder using devel/yasm
33		38
34	.include <bsd.port.options.mk>	39	.include <bsd.port.options.mk>
35		40
Lines 55-62 Link Here
55		60
56	.if ${PORT_OPTIONS:MFFAP}	61	.if ${PORT_OPTIONS:MFFAP}
57	PLIST_SUB+= FFAP=""	62	PLIST_SUB+= FFAP=""
58	. if ${ARCH} == i386 \|\| ${ARCH} == x86_64	63	. if (${ARCH} == i386 \|\| ${ARCH} == x86_64) && ${PORT_OPTIONS:MFFAPASM}
59	BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm	64	BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
		65	PLUGIN_OPTIONS_CMAKE+= -DUSE_ASM:BOOL=TRUE
		66	. else
		67	PLUGIN_OPTIONS_CMAKE+= -DUSE_ASM:BOOL=FALSE
60	. endif	68	. endif
61	LIB_DEPENDS+= tag:${PORTSDIR}/audio/taglib	69	LIB_DEPENDS+= tag:${PORTSDIR}/audio/taglib
62	PLUGIN_OPTIONS_CMAKE+= -DUSE_FFAP:BOOL=TRUE	70	PLUGIN_OPTIONS_CMAKE+= -DUSE_FFAP:BOOL=TRUE