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

Collapse All | Expand All

(-)Makefile (-89 / +59 lines)
Lines 2-127 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mous
4
PORTNAME=	mous
5
PORTVERSION=	1.1a
5
PORTVERSION=	2.0.1
6
PORTREVISION=	6
6
DISTVERSIONPREFIX= v
7
CATEGORIES=	audio
7
CATEGORIES=	audio
8
MASTER_SITES=	GHC
9
8
10
MAINTAINER=	shen.elf@gmail.com
9
MAINTAINER=	shen.elf@gmail.com
11
COMMENT=	Simple yet powerful audio player
10
COMMENT=	Simple yet powerful audio player
12
11
13
LICENSE=	BSD2CLAUSE
12
LICENSE=	BSD2CLAUSE
14
LICENSE_FILE=	${WRKSRC}/COPYRIGHT
13
LICENSE_FILE=	${WRKSRC}/LICENSE
15
14
16
BROKEN=		fails to build: sdk/scx/Socket.hpp:188:5: invalid operands to binary expression
15
USES=		cmake:outsource compiler:c++14-lang
17
16
18
USES=		cmake
19
USE_LDCONFIG=	yes
17
USE_LDCONFIG=	yes
20
USE_GITHUB=	yes
18
USE_GITHUB=	yes
21
GH_ACCOUNT=	bsdelf
19
GH_ACCOUNT=	bsdelf
22
20
23
OPTIONS_DEFINE=		ALSA ASSEMBLY FAAC FAAD FLAC LAME AO CUE MAC4DECODER \
21
OPTIONS_GROUP=	APPLICATION GENERIC_PLUGIN CODEC_PLUGIN
24
			MACDECODER MPG123 NCURSES OSS QT4 SDK TAGLIB VORBIS \
22
OPTIONS_GROUP_APPLICATION=	CLI NCURSES QT5
25
			WAVDECODER WAVENCODER WMA
23
OPTIONS_GROUP_GENERIC_PLUGIN=	LIBCUE TAGLIB
26
OPTIONS_DEFAULT=	FAAC FAAD FLAC LAME CUE MAC4DECODER \
24
OPTIONS_GROUP_CODEC_PLUGIN=	FDK_AAC FLAC LAME MAC \
27
			MPG123 NCURSES OSS QT4 TAGLIB VORBIS WAVDECODER \
25
				MPG123 VORBIS WAV WAVPACK
28
			WAVENCODER
29
OPTIONS_DEFAULT_amd64=	ASSEMBLY WMA
30
OPTIONS_DEFAULT_i386=	ASSEMBLY WMA
31
26
32
OPTIONS_SUB=		yes
27
OPTIONS_RADIO=	OUTPUT_PLUGIN
28
OPTIONS_RADIO_OUTPUT_PLUGIN=	OSS SNDIO
33
29
34
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
30
OPTIONS_DEFAULT=	CLI NCURSES \
35
ALSA_CMAKE_ON=		-DWithPluginAlsaRenderer=1
31
			LIBCUE TAGLIB \
36
ALSA_CMAKE_OFF=		-DWithPluginAlsaRenderer=0
32
			FDK_AAC FLAC LAME LIBCUE MAC \
33
			MPG123 VORBIS WAV WAVPACK \
34
			OSS
37
35
38
AO_LIB_DEPENDS=		libao.so:audio/libao
36
OPTIONS_SUB=		yes
39
AO_CMAKE_ON=		-DWithPluginAoRenderer=1
40
AO_CMAKE_OFF=		-DWithPluginAoRenderer=0
41
37
42
ASSEMBLY_DESC=		Enable assembly optimizations
38
CMAKE_OFF=	WITH_PLUGIN_ALSA \
43
ASSEMBLY_BUILD_DEPENDS=	${LOCALBASE}/bin/yasm:devel/yasm
39
			WITH_PLUGIN_LIBAO \
44
ASSEMBLY_CMAKE_ON=	-DWithAssembly=1
40
			DWITH_PLUGIN_COREAUDIO \
45
ASSEMBLY_CMAKE_OFF=	-DWithAssembly=0
41
			WITH_PLUGIN_FAAC \
42
			WITH_PLUGIN_FAAD \
43
			WITH_PLUGIN_WMA
46
44
47
CUE_LIB_DEPENDS=	libcue.so:textproc/libcue
45
CLI_DESC=		Command line interface support
48
CUE_CMAKE_ON=		-DWithPluginCuePack=1
46
CLI_CMAKE_BOOL=	WITH_APP_CLI
49
CUE_CMAKE_OFF=		-DWithPluginCuePack=0
50
47
51
FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
48
NCURSES_USE=		ncurses
52
FAAC_CMAKE_ON=		-DWithPluginFaacEncoder=1
49
NCURSES_CMAKE_BOOL=	WITH_APP_NCURSES
53
FAAC_CMAKE_OFF=		-DWithPluginFaacEncoder=0
54
50
55
FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
51
QT5_USE=			qt5=core,gui,widgets,qmake_build
56
FAAD_CMAKE_ON=		-DWithPluginFaadDecoder=1
52
QT5_CMAKE_BOOL=		WITH_APP_QT5
57
FAAD_CMAKE_OFF=		-DWithPluginFaadEncoder=0
58
53
59
FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
54
TAGLIB_DESC=		TagLib support
60
FLAC_CMAKE_ON=		-DWithPluginFlacDecoder=1
55
TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
61
FLAC_CMAKE_OFF=		-DWithPluginFlacDecoder=0
56
TAGLIB_CMAKE_BOOL=	WITH_PLUGIN_TAGLIB
62
57
63
LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
58
OSS_CMAKE_BOOL=		WITH_PLUGIN_OSS
64
LAME_CMAKE_ON=		-DWithPluginLameEncoder=1
65
LAME_CMAKE_OFF=		-DWithPluginLameEncoder=0
66
59
67
MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
60
SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
68
MPG123_CMAKE_ON=	-DWithPluginMpg123Decoder=1
61
SNDIO_CMAKE_BOOL=	WITH_PLUGIN_SNDIO
69
MPG123_CMAKE_OFF=	-DWithPluginMpg123Decoder=0
70
62
71
MAC4DECODER_DESC=	Newest mac4.11 decoder (*.ape)
63
LIBCUE_DESC=	CUE sheet support
72
MAC4DECODER_CMAKE_ON=	-DWithPluginMac4Decoder=1
64
LIBCUE_LIB_DEPENDS=	libcue.so:textproc/libcue
73
MAC4DECODER_CMAKE_OFF=	-DWithPluginMac4Decoder=0
65
LIBCUE_CMAKE_BOOL=	WITH_PLUGIN_LIBCUE
74
66
75
MACDECODER_DESC=	Old mac3.99 ape decoder (*.ape)
67
FDK_AAC_DESC=	FDK AAC codec support
76
MACDECODER_LIB_DEPENDS=	libmac.so:audio/mac
68
FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac \
77
MACDECODER_CMAKE_ON=	-DWithPluginMacDecoder=1
69
			libmp4v2.so:multimedia/mp4v2
78
MACDECODER_CMAKE_OFF=	-DWithPluginMacDecoder=0
70
FDK_AAC_CMAKE_BOOL=	WITH_PLUGIN_FDK_AAC
79
71
80
NCURSES_DESC=		Ncurses frontend
72
FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
81
NCURSES_USES=		ncurses
73
FLAC_CMAKE_BOOL=	WITH_PLUGIN_FLAC
82
NCURSES_CMAKE_ON=	-DWithFrontendNcurses=1
83
NCURSES_CMAKE_OFF=	-DWithFrontendNcurses=0
84
74
85
OSS_CMAKE_ON=		-DWithPluginOssRenderer=1
75
LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
86
OSS_CMAKE_OFF=		-DWithPluginOssRenderer=0
76
LAME_CMAKE_BOOL=	WITH_PLUGIN_LAME
87
77
88
QT4_DESC=		QT4 frontend
78
MAC_DESC=	Monkey's Audio codec support
89
QT4_USE=		QT4=corelib,gui,linguisttools_build
79
MAC_CMAKE_BOOL=	WITH_PLUGIN_MAC
90
QT4_USE+=		QT4=qmake_build,moc_build,rcc_build,uic_build
91
QT4_CMAKE_ON=		-DWithFrontendQt=1
92
QT4_CMAKE_OFF=		-DWithFrontendQt=0
93
80
94
SDK_DESC=		Install SDK
81
MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
95
SDK_CMAKE_ON=		-DWithHeadFiles=1
82
MPG123_CMAKE_BOOL=	WITH_PLUGIN_MPG123
96
SDK_CMAKE_OFF=		-DWithHeadFiles=0
97
83
98
TAGLIB_DESC=		TagLib plugin (recommended)
84
VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
99
TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
85
			libvorbis.so:audio/libvorbis\
100
TAGLIB_CMAKE_ON=	-DWithPluginTagLibParser=1
86
			libvorbisenc.so:audio/libvorbis\
101
TAGLIB_CMAKE_OFF=	-DWithPluginTagLibParser=0
87
			libvorbisfile.so:audio/libvorbis
88
VORBIS_CMAKE_BOOL=	WITH_PLUGIN_OGG_VORBIS
102
89
103
VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
90
WAV_CMAKE_BOOL=	WITH_PLUGIN_WAV
104
VORBIS_CMAKE_ON=	-DWithPluginOggDecoder=1
105
VORBIS_CMAKE_OFF=	-DWithPluginOggDecoder=0
106
91
107
WAVDECODER_DESC=	Decode Wav
92
WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
108
WAVDECODER_CMAKE_ON=	-DWithPluginWavDecoder=1
93
WAVPACK_CMAKE_BOOL=	WITH_PLUGIN_WAVPACK
109
WAVDECODER_CMAKE_OFF=	-DWithPluginWavEncoder=0
110
94
111
WAVENCODER_DESC=	Encode Wav
95
#INSTALL_TARGET=	install/strip
112
WAVENCODER_CMAKE_ON=	-DWithPluginWavEncoder=1
113
WAVENCODER_CMAKE_OFF=	-DWithPluginWavEncoder=0
114
96
115
WMA_DESC=		WMA decoder plugin
116
WMA_CMAKE_ON=		-DWithPluginWmaDecoder=1
117
WMA_CMAKE_OFF=		-DWithPluginWmaDecoder=0
118
119
post-patch:
120
	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
121
		-e 's|/usr/local|${LOCALBASE}|g' \
122
		${WRKSRC}/CMakeLists.txt
123
124
post-install:
125
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mous/*
126
127
.include <bsd.port.mk>
97
.include <bsd.port.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (mous-1.1a.tar.gz) = 55826f30567a11d1c54af335b4290329b680c9e64ef9f46c0b7e3a4427414b56
1
SHA256 (bsdelf-mous-v2.0.1_GH0.tar.gz) = b8866049c225fab2033617908d3c3b353533bc20c274b1fa0d7c034ea1c15cef
2
SIZE (mous-1.1a.tar.gz) = 677884
2
SIZE (bsdelf-mous-v2.0.1_GH0.tar.gz) = 2735960
(-)files/patch-CMakeLists.txt (-20 lines)
Lines 1-20 Link Here
1
--- CMakeLists.txt.orig	2012-06-28 14:58:11 UTC
2
+++ CMakeLists.txt
3
@@ -306,7 +306,7 @@ if(WithFrontendQt)
4
         RUNTIME DESTINATION bin)
5
     install(
6
         CODE "file(GLOB TRANSLATION_FILES \"${PROJECT_BINARY_DIR}/*.qm\")"
7
-        CODE "file(INSTALL \${TRANSLATION_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mous/qt)"
8
+        CODE "file(INSTALL \${TRANSLATION_FILES} DESTINATION %%DATADIR%%/qt)"
9
     )
10
 endif()
11
 
12
@@ -321,7 +321,7 @@ install(
13
 )
14
 
15
 file(GLOB RESOURCE_FILES "${MOUS_SOURCE_DIR}/resource/*")
16
-install(DIRECTORY ${RESOURCE_FILES} DESTINATION share/mous)
17
+install(DIRECTORY ${RESOURCE_FILES} DESTINATION %%DATADIR%%)
18
 
19
 #==== Messages ====#
20
 message("CMake:		" ${CMAKE_VERSION})
(-)files/patch-contrib_ffmpeg-strip-wma_common.h (-14 lines)
Lines 1-14 Link Here
1
--- contrib/ffmpeg-strip-wma/common.h.orig	2012-06-28 14:58:11 UTC
2
+++ contrib/ffmpeg-strip-wma/common.h
3
@@ -1150,11 +1150,6 @@ if(256*256*256*64%(tcount+tskip_count)==
4
 
5
 #define CLAMP_TO_8BIT(d) ((d > 0xff) ? 0xff : (d < 0) ? 0 : d)
6
 
7
-/* avoid usage of various functions */
8
-#define malloc please_use_av_malloc
9
-#define free please_use_av_free
10
-#define realloc please_use_av_realloc
11
-
12
 #define CHECKED_ALLOCZ(p, size)\
13
 {\
14
     p= av_mallocz(size);\
(-)files/patch-plugins_CuePack_CuePack.cpp (-11 lines)
Lines 1-11 Link Here
1
--- plugins/CuePack/CuePack.cpp.orig	2012-06-28 14:58:11 UTC
2
+++ plugins/CuePack/CuePack.cpp
3
@@ -55,7 +55,7 @@ void CuePack::DumpCue(const string& dir,
4
     string genre;
5
     int year = -1;
6
 
7
-    char* data = NULL;
8
+    const char* data = NULL;
9
     Cdtext* cdt = cd_get_cdtext(cd);
10
     Rem* rem = cd_get_rem(cd);
11
 
(-)files/patch-plugins_CuePack_CuePack.h (-11 lines)
Lines 1-11 Link Here
1
--- plugins/CuePack/CuePack.h.orig	2012-06-28 14:58:11 UTC
2
+++ plugins/CuePack/CuePack.h
3
@@ -1,7 +1,6 @@
4
 #include <plugin/IMediaPack.h>
5
 extern "C" {
6
-#include <libcue-1.4/libcue/libcue.h>
7
-#include <libcue-1.4/libcue/cd.h>
8
+#include <libcue.h>
9
 }
10
 using namespace std;
11
 using namespace mous;
(-)pkg-descr (-1 / +1 lines)
Lines 1-3 Link Here
1
Mous is a simpe yet powerful audio player.
1
Mous is a simpe yet powerful audio player.
2
2
3
WWW: https://github.com/0x02/mous
3
WWW: https://github.com/bsdelf/mous
(-)pkg-message (-1 / +1 lines)
Lines 1-6 Link Here
1
========================================================================
1
========================================================================
2
2
3
For mous-ncurses frontend, you can check its usage
3
For mous-ncurses, you can check its usage
4
with 'H' after starting.
4
with 'H' after starting.
5
5
6
========================================================================
6
========================================================================
(-)pkg-plist (-64 / +12 lines)
Lines 1-70 Link Here
1
lib/libMousCore.so
2
%%CLI%%bin/mous-cli
1
%%NCURSES%%bin/mous-ncurses
3
%%NCURSES%%bin/mous-ncurses
2
%%QT4%%bin/mous-qt
4
%%QT5%%bin/mous-qt
3
%%SDK%%include/mous/charset/CharsetConvInf.h
5
%%LIBCUE%%lib/mous/libCueParser.so
4
%%SDK%%include/mous/charset/ICharsetConv.h
6
%%FDK_AAC%%lib/mous/libFdkDecoder.so
5
%%SDK%%include/mous/core/IConvTask.h
6
%%SDK%%include/mous/core/IConvTaskFactory.h
7
%%SDK%%include/mous/core/IMediaLoader.h
8
%%SDK%%include/mous/core/IPlayer.h
9
%%SDK%%include/mous/core/IPluginAgent.h
10
%%SDK%%include/mous/core/IPluginManager.h
11
%%SDK%%include/mous/core/ITagParserFactory.h
12
%%SDK%%include/mous/plugin/IDecoder.h
13
%%SDK%%include/mous/plugin/IEncoder.h
14
%%SDK%%include/mous/plugin/IEventWatcher.h
15
%%SDK%%include/mous/plugin/IFilter.h
16
%%SDK%%include/mous/plugin/IMediaPack.h
17
%%SDK%%include/mous/plugin/IRenderer.h
18
%%SDK%%include/mous/plugin/ITagParser.h
19
%%SDK%%include/mous/scx/BufObj.hpp
20
%%SDK%%include/mous/scx/CharsetHelper.hpp
21
%%SDK%%include/mous/scx/CondVar.hpp
22
%%SDK%%include/mous/scx/ConfigFile.hpp
23
%%SDK%%include/mous/scx/Conv.hpp
24
%%SDK%%include/mous/scx/Dir.hpp
25
%%SDK%%include/mous/scx/Env.hpp
26
%%SDK%%include/mous/scx/FileHelper.hpp
27
%%SDK%%include/mous/scx/FileInfo.hpp
28
%%SDK%%include/mous/scx/Function.hpp
29
%%SDK%%include/mous/scx/IconvHelper.hpp
30
%%SDK%%include/mous/scx/LPVBuffer.hpp
31
%%SDK%%include/mous/scx/Mutex.hpp
32
%%SDK%%include/mous/scx/PVBuffer.hpp
33
%%SDK%%include/mous/scx/RunTimer.hpp
34
%%SDK%%include/mous/scx/SemVar.hpp
35
%%SDK%%include/mous/scx/Signal.hpp
36
%%SDK%%include/mous/scx/Singleton.hpp
37
%%SDK%%include/mous/scx/Socket.hpp
38
%%SDK%%include/mous/scx/SoftSemVar.hpp
39
%%SDK%%include/mous/scx/TaskSchedule.hpp
40
%%SDK%%include/mous/scx/Thread.hpp
41
%%SDK%%include/mous/scx/UniPinYin.hpp
42
%%SDK%%include/mous/util/AudioMode.h
43
%%SDK%%include/mous/util/ErrorCode.h
44
%%SDK%%include/mous/util/MediaItem.h
45
%%SDK%%include/mous/util/MediaTag.h
46
%%SDK%%include/mous/util/Option.h
47
%%SDK%%include/mous/util/Playlist.h
48
%%SDK%%include/mous/util/PlaylistSerializer.h
49
%%SDK%%include/mous/util/PluginDef.h
50
%%SDK%%include/mous/util/PluginHelper.h
51
%%SDK%%include/mous/util/PluginOption.h
52
lib/libMousCore.so
53
%%ALSA%%lib/mous/libAlsaRenderer.so
54
%%AO%%lib/mous/libAoRenderer.so
55
%%CUE%%lib/mous/libCuePack.so
56
%%FAAC%%lib/mous/libFaacEncoder.so
57
%%FAAD%%lib/mous/libFaadDecoder.so
58
%%FLAC%%lib/mous/libFlacDecoder.so
7
%%FLAC%%lib/mous/libFlacDecoder.so
59
%%LAME%%lib/mous/libLameEncoder.so
8
%%LAME%%lib/mous/libLameEncoder.so
60
%%MAC4DECODER%%lib/mous/libMac4Decoder.so
9
%%MAC%%lib/mous/libMacDecoder.so
61
%%MACDECODER%%lib/mous/libMacDecoder.so
10
%%VORBIS%%lib/mous/libVorbisDecoder.so
62
%%VORBIS%%lib/mous/libOggDecoder.so
11
%%VORBIS%%lib/mous/libVorbisEncoder.so
63
%%MPG123%%lib/mous/libMpg123Decoder.so
12
%%MPG123%%lib/mous/libMpg123Decoder.so
64
%%OSS%%lib/mous/libOssRenderer.so
13
%%OSS%%lib/mous/libOssRenderer.so
14
%%SNDIO%%lib/mous/libSndioOutput.so
65
%%TAGLIB%%lib/mous/libTagLibParser.so
15
%%TAGLIB%%lib/mous/libTagLibParser.so
66
%%WAVDECODER%%lib/mous/libWavDecoder.so
16
%%WAV%%lib/mous/libWavDecoder.so
67
%%WAVENCODER%%lib/mous/libWavEncoder.so
17
%%WAV%%lib/mous/libWavEncoder.so
68
%%WMA%%lib/mous/libWmaDecoder.so
18
%%WAVPACK%%lib/mous/libWvDecoder.so
69
%%DATADIR%%/pinyin/unipy.map
70
%%QT4%%share/mous/qt/mous-qt_zh_CN.qm

Return to bug 227500