Attachment 192871 Details for Bug 227500 – mous.diff

[patch] mous.diff

mous.diff (text/plain), 14.32 KB, created by Tobias Kortkamp on 2018-04-28 12:59:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2018-04-28 12:59:31 UTC

Size: 14.32 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 468522)
>+++ Makefile	(working copy)
>@@ -2,126 +2,94 @@
> # $FreeBSD$
> 
> PORTNAME=	mous
>-PORTVERSION=	1.1a
>-PORTREVISION=	6
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	2.0.1
> CATEGORIES=	audio
>-MASTER_SITES=	GHC
> 
> MAINTAINER=	shen.elf@gmail.com
> COMMENT=	Simple yet powerful audio player
> 
> LICENSE=	BSD2CLAUSE
>-LICENSE_FILE=	${WRKSRC}/COPYRIGHT
>+LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BROKEN=		fails to build: sdk/scx/Socket.hpp:188:5: invalid operands to binary expression
>-
>-USES=		cmake
>+USES=		cmake:outsource compiler:c++14-lang
> USE_LDCONFIG=	yes
> USE_GITHUB=	yes
> GH_ACCOUNT=	bsdelf
> 
>-OPTIONS_DEFINE=		ALSA ASSEMBLY FAAC FAAD FLAC LAME AO CUE MAC4DECODER \
>-			MACDECODER MPG123 NCURSES OSS QT4 SDK TAGLIB VORBIS \
>-			WAVDECODER WAVENCODER WMA
>-OPTIONS_DEFAULT=	FAAC FAAD FLAC LAME CUE MAC4DECODER \
>-			MPG123 NCURSES OSS QT4 TAGLIB VORBIS WAVDECODER \
>-			WAVENCODER
>-OPTIONS_DEFAULT_amd64=	ASSEMBLY WMA
>-OPTIONS_DEFAULT_i386=	ASSEMBLY WMA
>+CMAKE_OFF=	WITH_PLUGIN_ALSA \
>+		WITH_PLUGIN_LIBAO \
>+		DWITH_PLUGIN_COREAUDIO \
>+		WITH_PLUGIN_FAAC \
>+		WITH_PLUGIN_FAAD \
>+		WITH_PLUGIN_WMA
> 
>-OPTIONS_SUB=		yes
>+OPTIONS_DEFAULT=	CLI NCURSES LIBCUE TAGLIB FDK_AAC FLAC LAME LIBCUE MAC \
>+			MPG123 VORBIS WAV WAVPACK OSS
>+OPTIONS_GROUP=	APPLICATION GENERIC_PLUGIN CODEC_PLUGIN
> 
>-ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
>-ALSA_CMAKE_ON=		-DWithPluginAlsaRenderer=1
>-ALSA_CMAKE_OFF=		-DWithPluginAlsaRenderer=0
>+OPTIONS_GROUP_APPLICATION=	CLI NCURSES QT5
>+OPTIONS_GROUP_GENERIC_PLUGIN=	LIBCUE TAGLIB
>+OPTIONS_GROUP_CODEC_PLUGIN=	FDK_AAC FLAC LAME MAC MPG123 VORBIS WAV WAVPACK
> 
>-AO_LIB_DEPENDS=		libao.so:audio/libao
>-AO_CMAKE_ON=		-DWithPluginAoRenderer=1
>-AO_CMAKE_OFF=		-DWithPluginAoRenderer=0
>+OPTIONS_RADIO=	OUTPUT_PLUGIN
>+OPTIONS_RADIO_OUTPUT_PLUGIN=	OSS SNDIO
> 
>-ASSEMBLY_DESC=		Enable assembly optimizations
>-ASSEMBLY_BUILD_DEPENDS=	${LOCALBASE}/bin/yasm:devel/yasm
>-ASSEMBLY_CMAKE_ON=	-DWithAssembly=1
>-ASSEMBLY_CMAKE_OFF=	-DWithAssembly=0
>+OPTIONS_SUB=		yes
> 
>-CUE_LIB_DEPENDS=	libcue.so:textproc/libcue
>-CUE_CMAKE_ON=		-DWithPluginCuePack=1
>-CUE_CMAKE_OFF=		-DWithPluginCuePack=0
>+APPLICATION_DESC=	Interface support
>+CLI_DESC=		Command line interface support
>+CODEC_PLUGIN_DESC=	Codec plugins
>+FDK_AAC_DESC=		FDK AAC codec support
>+GENERIC_PLUGIN_DESC=	Generic plugins
>+LIBCUE_DESC=		CUE sheet support
>+MAC_DESC=		Monkey's Audio codec support
>+OUTPUT_PLUGIN_DESC=	Output plugins
>+TAGLIB_DESC=		TagLib support
> 
>-FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
>-FAAC_CMAKE_ON=		-DWithPluginFaacEncoder=1
>-FAAC_CMAKE_OFF=		-DWithPluginFaacEncoder=0
>+CLI_CMAKE_BOOL=		WITH_APP_CLI
> 
>-FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
>-FAAD_CMAKE_ON=		-DWithPluginFaadDecoder=1
>-FAAD_CMAKE_OFF=		-DWithPluginFaadEncoder=0
>+FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac \
>+			libmp4v2.so:multimedia/mp4v2
>+FDK_AAC_CMAKE_BOOL=	WITH_PLUGIN_FDK_AAC
> 
> FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
>-FLAC_CMAKE_ON=		-DWithPluginFlacDecoder=1
>-FLAC_CMAKE_OFF=		-DWithPluginFlacDecoder=0
>+FLAC_CMAKE_BOOL=	WITH_PLUGIN_FLAC
> 
> LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
>-LAME_CMAKE_ON=		-DWithPluginLameEncoder=1
>-LAME_CMAKE_OFF=		-DWithPluginLameEncoder=0
>+LAME_CMAKE_BOOL=	WITH_PLUGIN_LAME
> 
>-MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
>-MPG123_CMAKE_ON=	-DWithPluginMpg123Decoder=1
>-MPG123_CMAKE_OFF=	-DWithPluginMpg123Decoder=0
>+LIBCUE_LIB_DEPENDS=	libcue.so:textproc/libcue
>+LIBCUE_CMAKE_BOOL=	WITH_PLUGIN_LIBCUE
> 
>-MAC4DECODER_DESC=	Newest mac4.11 decoder (*.ape)
>-MAC4DECODER_CMAKE_ON=	-DWithPluginMac4Decoder=1
>-MAC4DECODER_CMAKE_OFF=	-DWithPluginMac4Decoder=0
>+MAC_CMAKE_BOOL=		WITH_PLUGIN_MAC
> 
>-MACDECODER_DESC=	Old mac3.99 ape decoder (*.ape)
>-MACDECODER_LIB_DEPENDS=	libmac.so:audio/mac
>-MACDECODER_CMAKE_ON=	-DWithPluginMacDecoder=1
>-MACDECODER_CMAKE_OFF=	-DWithPluginMacDecoder=0
>+MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
>+MPG123_CMAKE_BOOL=	WITH_PLUGIN_MPG123
> 
>-NCURSES_DESC=		Ncurses frontend
>-NCURSES_USES=		ncurses
>-NCURSES_CMAKE_ON=	-DWithFrontendNcurses=1
>-NCURSES_CMAKE_OFF=	-DWithFrontendNcurses=0
>+NCURSES_USE=		ncurses
>+NCURSES_CMAKE_BOOL=	WITH_APP_NCURSES
> 
>-OSS_CMAKE_ON=		-DWithPluginOssRenderer=1
>-OSS_CMAKE_OFF=		-DWithPluginOssRenderer=0
>+OSS_CMAKE_BOOL=		WITH_PLUGIN_OSS
> 
>-QT4_DESC=		QT4 frontend
>-QT4_USE=		QT4=corelib,gui,linguisttools_build
>-QT4_USE+=		QT4=qmake_build,moc_build,rcc_build,uic_build
>-QT4_CMAKE_ON=		-DWithFrontendQt=1
>-QT4_CMAKE_OFF=		-DWithFrontendQt=0
>+QT5_USE=		qt5=buildtools,core,gui,widgets,qmake_build
>+QT5_CMAKE_BOOL=		WITH_APP_QT5
> 
>-SDK_DESC=		Install SDK
>-SDK_CMAKE_ON=		-DWithHeadFiles=1
>-SDK_CMAKE_OFF=		-DWithHeadFiles=0
>+SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
>+SNDIO_CMAKE_BOOL=	WITH_PLUGIN_SNDIO
> 
>-TAGLIB_DESC=		TagLib plugin (recommended)
> TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
>-TAGLIB_CMAKE_ON=	-DWithPluginTagLibParser=1
>-TAGLIB_CMAKE_OFF=	-DWithPluginTagLibParser=0
>+TAGLIB_CMAKE_BOOL=	WITH_PLUGIN_TAGLIB
> 
>-VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
>-VORBIS_CMAKE_ON=	-DWithPluginOggDecoder=1
>-VORBIS_CMAKE_OFF=	-DWithPluginOggDecoder=0
>+VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
>+			libvorbis.so:audio/libvorbis\
>+			libvorbisenc.so:audio/libvorbis\
>+			libvorbisfile.so:audio/libvorbis
>+VORBIS_CMAKE_BOOL=	WITH_PLUGIN_OGG_VORBIS
> 
>-WAVDECODER_DESC=	Decode Wav
>-WAVDECODER_CMAKE_ON=	-DWithPluginWavDecoder=1
>-WAVDECODER_CMAKE_OFF=	-DWithPluginWavEncoder=0
>+WAV_CMAKE_BOOL=		WITH_PLUGIN_WAV
> 
>-WAVENCODER_DESC=	Encode Wav
>-WAVENCODER_CMAKE_ON=	-DWithPluginWavEncoder=1
>-WAVENCODER_CMAKE_OFF=	-DWithPluginWavEncoder=0
>+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
>+WAVPACK_CMAKE_BOOL=	WITH_PLUGIN_WAVPACK
> 
>-WMA_DESC=		WMA decoder plugin
>-WMA_CMAKE_ON=		-DWithPluginWmaDecoder=1
>-WMA_CMAKE_OFF=		-DWithPluginWmaDecoder=0
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
>-		-e 's|/usr/local|${LOCALBASE}|g' \
>-		${WRKSRC}/CMakeLists.txt
>-
>-post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mous/*
>-
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 468522)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (mous-1.1a.tar.gz) = 55826f30567a11d1c54af335b4290329b680c9e64ef9f46c0b7e3a4427414b56
>-SIZE (mous-1.1a.tar.gz) = 677884
>+SHA256 (bsdelf-mous-v2.0.1_GH0.tar.gz) = b8866049c225fab2033617908d3c3b353533bc20c274b1fa0d7c034ea1c15cef
>+SIZE (bsdelf-mous-v2.0.1_GH0.tar.gz) = 2735960
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(revision 468522)
>+++ files/patch-CMakeLists.txt	(nonexistent)
>@@ -1,20 +0,0 @@
>---- CMakeLists.txt.orig	2012-06-28 14:58:11 UTC
>-+++ CMakeLists.txt
>-@@ -306,7 +306,7 @@ if(WithFrontendQt)
>-         RUNTIME DESTINATION bin)
>-     install(
>-         CODE "file(GLOB TRANSLATION_FILES \"${PROJECT_BINARY_DIR}/*.qm\")"
>--        CODE "file(INSTALL \${TRANSLATION_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mous/qt)"
>-+        CODE "file(INSTALL \${TRANSLATION_FILES} DESTINATION %%DATADIR%%/qt)"
>-     )
>- endif()
>- 
>-@@ -321,7 +321,7 @@ install(
>- )
>- 
>- file(GLOB RESOURCE_FILES "${MOUS_SOURCE_DIR}/resource/*")
>--install(DIRECTORY ${RESOURCE_FILES} DESTINATION share/mous)
>-+install(DIRECTORY ${RESOURCE_FILES} DESTINATION %%DATADIR%%)
>- 
>- #==== Messages ====#
>- message("CMake:		" ${CMAKE_VERSION})
>
>Property changes on: files/patch-CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-contrib_ffmpeg-strip-wma_common.h
>===================================================================
>--- files/patch-contrib_ffmpeg-strip-wma_common.h	(revision 468522)
>+++ files/patch-contrib_ffmpeg-strip-wma_common.h	(nonexistent)
>@@ -1,14 +0,0 @@
>---- contrib/ffmpeg-strip-wma/common.h.orig	2012-06-28 14:58:11 UTC
>-+++ contrib/ffmpeg-strip-wma/common.h
>-@@ -1150,11 +1150,6 @@ if(256*256*256*64%(tcount+tskip_count)==
>- 
>- #define CLAMP_TO_8BIT(d) ((d > 0xff) ? 0xff : (d < 0) ? 0 : d)
>- 
>--/* avoid usage of various functions */
>--#define malloc please_use_av_malloc
>--#define free please_use_av_free
>--#define realloc please_use_av_realloc
>--
>- #define CHECKED_ALLOCZ(p, size)\
>- {\
>-     p= av_mallocz(size);\
>
>Property changes on: files/patch-contrib_ffmpeg-strip-wma_common.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-plugins_CuePack_CuePack.cpp
>===================================================================
>--- files/patch-plugins_CuePack_CuePack.cpp	(revision 468522)
>+++ files/patch-plugins_CuePack_CuePack.cpp	(nonexistent)
>@@ -1,11 +0,0 @@
>---- plugins/CuePack/CuePack.cpp.orig	2012-06-28 14:58:11 UTC
>-+++ plugins/CuePack/CuePack.cpp
>-@@ -55,7 +55,7 @@ void CuePack::DumpCue(const string& dir,
>-     string genre;
>-     int year = -1;
>- 
>--    char* data = NULL;
>-+    const char* data = NULL;
>-     Cdtext* cdt = cd_get_cdtext(cd);
>-     Rem* rem = cd_get_rem(cd);
>- 
>
>Property changes on: files/patch-plugins_CuePack_CuePack.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-plugins_CuePack_CuePack.h
>===================================================================
>--- files/patch-plugins_CuePack_CuePack.h	(revision 468522)
>+++ files/patch-plugins_CuePack_CuePack.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- plugins/CuePack/CuePack.h.orig	2012-06-28 14:58:11 UTC
>-+++ plugins/CuePack/CuePack.h
>-@@ -1,7 +1,6 @@
>- #include <plugin/IMediaPack.h>
>- extern "C" {
>--#include <libcue-1.4/libcue/libcue.h>
>--#include <libcue-1.4/libcue/cd.h>
>-+#include <libcue.h>
>- }
>- using namespace std;
>- using namespace mous;
>
>Property changes on: files/patch-plugins_CuePack_CuePack.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 468522)
>+++ pkg-descr	(working copy)
>@@ -1,3 +1,3 @@
> Mous is a simpe yet powerful audio player.
> 
>-WWW: https://github.com/0x02/mous
>+WWW: https://github.com/bsdelf/mous
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 468522)
>+++ pkg-message	(working copy)
>@@ -1,6 +1 @@
>-========================================================================
>-
>-For mous-ncurses frontend, you can check its usage
>-with 'H' after starting.
>-
>-========================================================================
>+You can check mous-ncurses usage with 'H' after starting.
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 468522)
>+++ pkg-plist	(working copy)
>@@ -1,70 +1,18 @@
>+%%CLI%%bin/mous-cli
> %%NCURSES%%bin/mous-ncurses
>-%%QT4%%bin/mous-qt
>-%%SDK%%include/mous/charset/CharsetConvInf.h
>-%%SDK%%include/mous/charset/ICharsetConv.h
>-%%SDK%%include/mous/core/IConvTask.h
>-%%SDK%%include/mous/core/IConvTaskFactory.h
>-%%SDK%%include/mous/core/IMediaLoader.h
>-%%SDK%%include/mous/core/IPlayer.h
>-%%SDK%%include/mous/core/IPluginAgent.h
>-%%SDK%%include/mous/core/IPluginManager.h
>-%%SDK%%include/mous/core/ITagParserFactory.h
>-%%SDK%%include/mous/plugin/IDecoder.h
>-%%SDK%%include/mous/plugin/IEncoder.h
>-%%SDK%%include/mous/plugin/IEventWatcher.h
>-%%SDK%%include/mous/plugin/IFilter.h
>-%%SDK%%include/mous/plugin/IMediaPack.h
>-%%SDK%%include/mous/plugin/IRenderer.h
>-%%SDK%%include/mous/plugin/ITagParser.h
>-%%SDK%%include/mous/scx/BufObj.hpp
>-%%SDK%%include/mous/scx/CharsetHelper.hpp
>-%%SDK%%include/mous/scx/CondVar.hpp
>-%%SDK%%include/mous/scx/ConfigFile.hpp
>-%%SDK%%include/mous/scx/Conv.hpp
>-%%SDK%%include/mous/scx/Dir.hpp
>-%%SDK%%include/mous/scx/Env.hpp
>-%%SDK%%include/mous/scx/FileHelper.hpp
>-%%SDK%%include/mous/scx/FileInfo.hpp
>-%%SDK%%include/mous/scx/Function.hpp
>-%%SDK%%include/mous/scx/IconvHelper.hpp
>-%%SDK%%include/mous/scx/LPVBuffer.hpp
>-%%SDK%%include/mous/scx/Mutex.hpp
>-%%SDK%%include/mous/scx/PVBuffer.hpp
>-%%SDK%%include/mous/scx/RunTimer.hpp
>-%%SDK%%include/mous/scx/SemVar.hpp
>-%%SDK%%include/mous/scx/Signal.hpp
>-%%SDK%%include/mous/scx/Singleton.hpp
>-%%SDK%%include/mous/scx/Socket.hpp
>-%%SDK%%include/mous/scx/SoftSemVar.hpp
>-%%SDK%%include/mous/scx/TaskSchedule.hpp
>-%%SDK%%include/mous/scx/Thread.hpp
>-%%SDK%%include/mous/scx/UniPinYin.hpp
>-%%SDK%%include/mous/util/AudioMode.h
>-%%SDK%%include/mous/util/ErrorCode.h
>-%%SDK%%include/mous/util/MediaItem.h
>-%%SDK%%include/mous/util/MediaTag.h
>-%%SDK%%include/mous/util/Option.h
>-%%SDK%%include/mous/util/Playlist.h
>-%%SDK%%include/mous/util/PlaylistSerializer.h
>-%%SDK%%include/mous/util/PluginDef.h
>-%%SDK%%include/mous/util/PluginHelper.h
>-%%SDK%%include/mous/util/PluginOption.h
>+%%QT5%%bin/mous-qt
> lib/libMousCore.so
>-%%ALSA%%lib/mous/libAlsaRenderer.so
>-%%AO%%lib/mous/libAoRenderer.so
>-%%CUE%%lib/mous/libCuePack.so
>-%%FAAC%%lib/mous/libFaacEncoder.so
>-%%FAAD%%lib/mous/libFaadDecoder.so
>+%%LIBCUE%%lib/mous/libCueParser.so
>+%%FDK_AAC%%lib/mous/libFdkDecoder.so
> %%FLAC%%lib/mous/libFlacDecoder.so
> %%LAME%%lib/mous/libLameEncoder.so
>-%%MAC4DECODER%%lib/mous/libMac4Decoder.so
>-%%MACDECODER%%lib/mous/libMacDecoder.so
>-%%VORBIS%%lib/mous/libOggDecoder.so
>+%%MAC%%lib/mous/libMacDecoder.so
>+%%VORBIS%%lib/mous/libVorbisDecoder.so
>+%%VORBIS%%lib/mous/libVorbisEncoder.so
> %%MPG123%%lib/mous/libMpg123Decoder.so
> %%OSS%%lib/mous/libOssRenderer.so
>+%%SNDIO%%lib/mous/libSndioOutput.so
> %%TAGLIB%%lib/mous/libTagLibParser.so
>-%%WAVDECODER%%lib/mous/libWavDecoder.so
>-%%WAVENCODER%%lib/mous/libWavEncoder.so
>-%%WMA%%lib/mous/libWmaDecoder.so
>-%%DATADIR%%/pinyin/unipy.map
>-%%QT4%%share/mous/qt/mous-qt_zh_CN.qm
>+%%WAV%%lib/mous/libWavDecoder.so
>+%%WAV%%lib/mous/libWavEncoder.so
>+%%WAVPACK%%lib/mous/libWvDecoder.so

Actions: View | Diff

Attachments on bug 227500: 192495 | 192496 | 192697 | 192698 | 192871