Index: head/audio/flacon/Makefile =================================================================== --- head/audio/flacon/Makefile (revision 448723) +++ head/audio/flacon/Makefile (revision 448724) @@ -1,33 +1,33 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= flacon -PORTVERSION= 3.0.0 +PORTVERSION= 3.1.1 DISTVERSIONPREFIX= v CATEGORIES= audio MAINTAINER= danfe@FreeBSD.org COMMENT= Graphical audio file extractor and encoder LICENSE= LGPL21 LIB_DEPENDS= libuchardet.so:textproc/uchardet USES= cmake desktop-file-utils pkgconfig USE_GITHUB= yes OPTIONS_DEFINE= QT5 QT5_DESC= Build against Qt 5 instead of Qt 4 QT5_CMAKE_ON= -DUSE_QT5:BOOL=ON QT5_CMAKE_OFF= -DUSE_QT4:BOOL=ON # :ts, would be handy here but is not available in fmake(1) QT5_USE= QT5=${_QT5_DEPS},${_QT5_BDEPS:C/,/_build&/g:%=_build} QT5_USE_OFF= QT4=${_QT4_DEPS},${_QT4_BDEPS:C/,/_build&/g:%=_build} _QT4_DEPS= corelib,gui,network _QT4_BDEPS= linguisttools,moc,qmake,rcc,uic _QT5_DEPS= core,gui,network,widgets _QT5_BDEPS= qmake,buildtools,linguisttools .include Index: head/audio/flacon/distinfo =================================================================== --- head/audio/flacon/distinfo (revision 448723) +++ head/audio/flacon/distinfo (revision 448724) @@ -1,3 +1,3 @@ -TIMESTAMP = 1497981519 -SHA256 (flacon-flacon-v3.0.0_GH0.tar.gz) = 5349fdc29c6cb173e7d40260e7ea4ba13ae39f4a144c22028fbfa132ceef5bb3 -SIZE (flacon-flacon-v3.0.0_GH0.tar.gz) = 430724 +TIMESTAMP = 1502219275 +SHA256 (flacon-flacon-v3.1.1_GH0.tar.gz) = ca5bd24ba61fc06a39e95b4b7fda188af437ad3eff666b55071895bde11bd15a +SIZE (flacon-flacon-v3.1.1_GH0.tar.gz) = 431743 Index: head/audio/flacon/files/patch-49e72de =================================================================== --- head/audio/flacon/files/patch-49e72de (nonexistent) +++ head/audio/flacon/files/patch-49e72de (revision 448724) @@ -0,0 +1,62 @@ +diff --git a/formats/format.cpp b/formats/format.cpp +index 53f7ed0..89abaf9 100644 +--- formats/format.cpp.orig ++++ formats/format.cpp +@@ -32,7 +32,14 @@ + #include + #include + +-AudioFormatList AudioFormat::mAllFormats; ++/************************************************ ++ * ++ ************************************************/ ++AudioFormatList &formatList() ++{ ++ static AudioFormatList *afl = new AudioFormatList(); ++ return *afl; ++} + + + /************************************************ +@@ -43,9 +50,9 @@ bool AudioFormat::registerFormat(const AudioFormat &f) + // Some formats can be embedded as a chunk of RIFF stream. + // So the WAV format should be last and be checked in the last turn. + if (f.ext() == "wav") +- mAllFormats.append(&f); ++ formatList().append(&f); + else +- mAllFormats.insert(0, &f); ++ formatList().insert(0, &f); + return true; + } + +@@ -71,7 +78,7 @@ AudioFormat::~AudioFormat() + ************************************************/ + const AudioFormatList &AudioFormat::allFormats() + { +- return mAllFormats; ++ return formatList(); + } + + +diff --git a/formats/format.h b/formats/format.h +index b159b7a..0f9fcb6 100644 +--- formats/format.h.orig ++++ formats/format.h +@@ -70,8 +70,6 @@ class AudioFormat + protected: + virtual bool checkMagic(const QByteArray &data) const; + +-private: +- static QList mAllFormats; + }; + + +@@ -79,6 +77,6 @@ class AudioFormat + + #define REGISTER_FORMAT(FORMAT) \ + static FORMAT static_##FORMAT##_Instance; \ +- static bool is_##FORMAT##_loaded = AudioFormat::registerFormat(static_##FORMAT##_Instance); ++ static bool is_##FORMAT##_loaded = AudioFormat::registerFormat(static_##FORMAT##_Instance); + + #endif // FORMAT_H Property changes on: head/audio/flacon/files/patch-49e72de ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property