Index: head/audio/chromaprint/Makefile =================================================================== --- head/audio/chromaprint/Makefile (revision 430707) +++ head/audio/chromaprint/Makefile (revision 430708) @@ -1,22 +1,45 @@ # $FreeBSD$ PORTNAME= chromaprint -PORTVERSION= 1.3.1 -PORTREVISION= 1 +PORTVERSION= 1.4.2 CATEGORIES= audio -MASTER_SITES= http://bitbucket.org/acoustid/${PORTNAME}/downloads/ +MASTER_SITES= https://github.com/acoustid/${PORTNAME}/releases/download/v${PORTVERSION}/ \ + https://bitbucket.org/acoustid/${PORTNAME}/downloads/ MAINTAINER= jhale@FreeBSD.org COMMENT= AcoustID audio fingerprinting library -LICENSE= LGPL21 +LICENSE= LGPL21 MIT +LICENSE_COMB= multi +LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg -USES= cmake:outsource pathfix +USES= cmake:outsource compiler:c++11-lib pathfix USE_LDCONFIG= yes -CMAKE_ARGS= -DBUILD_EXAMPLES:BOOL=ON \ - -DWITH_AVFFT:BOOL=ON \ +CMAKE_ARGS= -DBUILD_TOOLS:BOOL=true \ + -DFFT_LIB:STRING=avfft + +OPTIONS_DEFINE= DOXYGEN TEST + +DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ + dot:graphics/graphviz +DOXYGEN_PORTDOCS= * +# PORTDOCS macro won't work if NOPORTDOCS is defined or if DOCS is disabled +DOXYGEN_IMPLIES= DOCS +.undef NOPORTDOCS + +TEST_BUILD_DEPENDS= ${NONEXISTENT}:devel/googletest:patch +TEST_CMAKE_BOOL= BUILD_TESTS +TEST_CMAKE_ON= -DGTEST_ROOT:PATH=`${MAKE} -C ${PORTSDIR}/devel/googletest -VWRKSRC` +TEST_TARGET= check + +do-build-DOXYGEN-on: + @(cd ${BUILD_WRKSRC}; ${DO_MAKE_BUILD} docs) + +do-install-DOXYGEN-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${INSTALL_WRKSRC}/doc; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include Index: head/audio/chromaprint/distinfo =================================================================== --- head/audio/chromaprint/distinfo (revision 430707) +++ head/audio/chromaprint/distinfo (revision 430708) @@ -1,2 +1,3 @@ -SHA256 (chromaprint-1.3.1.tar.gz) = 8f95a011e6fe3a75281520daa9376b7f028300e20a5be9af08ef9c851d4bb581 -SIZE (chromaprint-1.3.1.tar.gz) = 538251 +TIMESTAMP = 1483658531 +SHA256 (chromaprint-1.4.2.tar.gz) = 989609a7e841dd75b34ee793bd1d049ce99a8f0d444b3cea39d57c3e5d26b4d4 +SIZE (chromaprint-1.4.2.tar.gz) = 613367 Index: head/audio/chromaprint/files/patch-tests_CMakeLists.txt =================================================================== --- head/audio/chromaprint/files/patch-tests_CMakeLists.txt (nonexistent) +++ head/audio/chromaprint/files/patch-tests_CMakeLists.txt (revision 430708) @@ -0,0 +1,14 @@ +--- tests/CMakeLists.txt.orig 2016-12-23 11:50:27 UTC ++++ tests/CMakeLists.txt +@@ -36,6 +36,11 @@ set(SRCS + if(BUILD_TOOLS) + set(SRCS ${SRCS} ../src/audio/ffmpeg_audio_reader_test.cpp) + link_libraries(fpcalc_libs) ++ include_directories( ++ ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ++ ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ++ ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ++ ) + endif() + + add_executable(all_tests ${SRCS} $) Property changes on: head/audio/chromaprint/files/patch-tests_CMakeLists.txt ___________________________________________________________________ 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 Index: head/audio/chromaprint/pkg-plist =================================================================== --- head/audio/chromaprint/pkg-plist (revision 430707) +++ head/audio/chromaprint/pkg-plist (revision 430708) @@ -1,6 +1,6 @@ bin/fpcalc include/chromaprint.h lib/libchromaprint.so lib/libchromaprint.so.1 -lib/libchromaprint.so.1.3.0 +lib/libchromaprint.so.1.4.2 libdata/pkgconfig/libchromaprint.pc Index: head/audio/clementine-player/Makefile =================================================================== --- head/audio/clementine-player/Makefile (revision 430707) +++ head/audio/clementine-player/Makefile (revision 430708) @@ -1,208 +1,208 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= clementine PORTVERSION= 1.3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio PKGNAMESUFFIX= -player MAINTAINER= sbruno@FreeBSD.org COMMENT= Cross-platform music player based on Amarok 1.4 LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs LIB_DEPENDS= libtag.so:audio/taglib \ libchromaprint.so:audio/chromaprint \ libprotobuf.so:devel/protobuf \ libqca.so:devel/qca \ libqjson.so:devel/qjson \ libfftw3.so:math/fftw3 \ libechonest.so:audio/libechonest \ libcryptopp.so:security/cryptopp USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME}${PKGNAMESUFFIX} GH_PROJECT= Clementine USES= cmake \ compiler:c++11-lib \ desktop-file-utils \ execinfo \ gettext-tools \ pkgconfig \ sqlite USE_GL= glew CONFLICTS_BUILD= qt-3.* USE_QT4= corelib \ dbus \ gui \ imageformats \ qmake_build \ linguist_build \ moc_build \ network \ opengl \ qtestlib \ rcc_build \ sql \ uic_build \ webkit \ xml USE_GSTREAMER1= cdparanoia \ chromaprint \ faac \ faad \ flac \ lame \ mad \ neon \ shout2 \ soup \ taglib \ twolame \ vorbis INSTALLS_ICONS= yes CFLAGS+= -Wno-inconsistent-missing-override \ -Wno-unused-variable \ -Wno-unused-function CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \ -DENABLE_DBUS=ON \ -DENABLE_SPOTIFY_BLOB=OFF \ -DCRYPTOPP_LIBS=${LOCALBASE}/lib/libcryptopp.so \ -DCRYPTOPP_INCLUDEDIR=${LOCALBASE}/include/cryptopp \ -DCRYPTOPP_LIBDIR=${LOCALBASE}/lib \ -DCRYPTOPP_LDFLAGS=-lcryptopp \ -DCRYPTOPP_LIBRARIES=cryptopp \ -DCRYPTOPP_LIBRARY_DIRS=${LOCALBASE}/lib \ -DCRYPTOPP_cryptopp_INCLUDEDIR=${LOCALBASE}/include/cryptopp \ -DCRYPTOPP_cryptopp_LIBDIR=${LOCALBASE}/lib \ -DCRYPTOPP_FOUND=1 OPTIONS_DEFINE= AMAZON \ AUDIOCD \ BOX \ BREAKPAD \ DEVICEKIT \ DROPBOX \ GIO \ GOOGLE_DRIVE \ GPOD \ LASTFM \ MOODBAR \ MTP \ PULSEAUDIO \ SKYDRIVE \ VISUALISATION \ WIIMOTEDEV OPTIONS_SUB= VISUALISATION AMAZON_DESC= Amazon Drive support AUDIOCD_DESC= Devices: Audio CD support BOX_DESC= Box Drive support BREAKPAD_DESC= Crash reporting DEVICEKIT_DESC= Devices: DeviceKit backend DROPBOX_DESC= Dropbox Support GIO_DESC= Devices: GIO device backend GOOGLE_DRIVE_DESC= Google Drive support GPOD_DESC= iPod support LASTFM_DESC= Support Last.fm service (requires ruby) MOODBAR_DESC= Moodbar Support MTP_DESC= MTP device support PULSEAUDIO_DESC= Enable Pulseaudio Support SKYDRIVE_DESC= Microsoft SkyDrive Support VISUALISATION_DESC= Visualisations from projectM WIIMOTEDEV_DESC= Wiimote support OPTIONS_DEFAULT= AMAZON \ AUDIOCD \ BOX \ DEVICEKIT \ DROPBOX \ GIO \ GOOGLE_DRIVE \ GPOD \ LASTFM \ MOODBAR \ MTP \ SKYDRIVE \ VISUALISATION \ WIIMOTEDEV AMAZON_CMAKE_ON= -DENABLE_AMAZON_CLOUD_DRIVE=ON AMAZON_CMAKE_OFF= -DENABLE_AMAZON_CLOUD_DRIVE=OFF AUDIOCD_LIB_DEPENDS= libcdio.so:sysutils/libcdio AUDIOCD_CMAKE_ON= -DENABLE_AUDIOCD=ON AUDIOCD_CMAKE_OFF= -DENABLE_AUDIOCD=OFF BOX_BUILD_DEPENDS= sparsehash>=2.0.2:devel/sparsehash BOX_CMAKE_ON= -DENABLE_BOX=ON BOX_CMAKE_OFF= -DENABLE_BOX=OFF BREAKPAD_CMAKE_ON= -DENABLE_BREAKPAD=ON BREAKPAD_CMAKE_OFF= -DENABLE_BREAKPAD=OFF DEVICEKIT_CMAKE_ON= -DENABLE_DEVICEKIT=ON DEVICEKIT_CMAKE_OFF= -DENABLE_DEVICEKIT=OFF DROPBOX_BUILD_DEPENDS= sparsehash>=2.0.2:devel/sparsehash DROPBOX_CMAKE_ON= -DENABLE_DROPBOX=ON DROPBOX_CMAKE_OFF= -DENABLE_DROPBOX=OFF GIO_USE= GNOME=glib20 GIO_CMAKE_ON= -DENABLE_GIO=ON GIO_CMAKE_OFF= -DENABLE_GIO=OFF GOOGLE_DRIVE_BUILD_DEPENDS= sparsehash>=2.0.2:devel/sparsehash GOOGLE_DRIVE_CMAKE_ON= -DENABLE_GOOGLE_DRIVE=ON GOOGLE_DRIVE_CMAKE_OFF= -DENABLE_GOOGLE_DRIVE=OFF GPOD_LIB_DEPENDS= libgpod.so:audio/libgpod \ libplist.so:devel/libplist \ libusbmuxd.so:comms/libusbmuxd GPOD_CMAKE_ON= -DENABLE_LIBGPOD=ON GPOD_CMAKE_OFF= -DENABLE_LIBGPOD=OFF LASTFM_LIB_DEPENDS= liblastfm.so:audio/liblastfm LASTFM_CMAKE_ON= -DENABLE_LIBLASTFM=ON LASTFM_CMAKE_OFF= -DENABLE_LIBLASTFM=OFF MOODBAR_CMAKE_ON= -DENABLE_MOODBAR=ON MOODBAR_CMAKE_OFF= -DENABLE_MOODBAR=OFF MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp MTP_CMAKE_ON= -DENABLE_LIBMTP=ON MTP_CMAKE_OFF= -DENABLE_LIBMTP=OFF PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_ON= -DENABLE_LIBPULSE=ON PULSEAUDIO_CMAKE_OFF= -DENABLE_LIBPULSE=OFF SKYDRIVE_BUILD_DEPENDS= sparsehash>=2.0.2:devel/sparsehash SKYDRIVE_CMAKE_ON= -DENABLE_SKYDRIVE=ON SKYDRIVE_CMAKE_OFF= -DENABLE_SKYDRIVE=OFF VISUALISATION_CMAKE_ON= -DENABLE_VISUALISATIONS=ON VISUALISATION_CMAKE_OFF=-DENABLE_VISUALISATIONS=OFF WIIMOTEDEV_CMAKE_ON= -DENABLE_WIIMOTEDEV=ON WIIMOTEDEV_CMAKE_OFF= -DENABLE_WIIMOTEDEV=OFF .include .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-unknown-warning-option -Wno-undefined-var-template .endif .include Index: head/audio/clementine-player/files/patch-git_ded3126 =================================================================== --- head/audio/clementine-player/files/patch-git_ded3126 (nonexistent) +++ head/audio/clementine-player/files/patch-git_ded3126 (revision 430708) @@ -0,0 +1,34 @@ +Add compatibility with chromaprint >= 1.4 + +diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp +index 9579b62..c7ad99e 100644 +--- src/musicbrainz/chromaprinter.cpp.orig ++++ src/musicbrainz/chromaprinter.cpp +@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() { + ChromaprintContext* chromaprint = + chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT); + chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels); +- chromaprint_feed(chromaprint, reinterpret_cast(data.data()), ++ chromaprint_feed(chromaprint, reinterpret_cast(data.data()), + data.size() / 2); + chromaprint_finish(chromaprint); + +- void* fprint = nullptr; + int size = 0; ++ ++#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4 ++ u_int32_t *fprint = nullptr; ++ char *encoded = nullptr; ++#else ++ void *fprint = nullptr; ++ void *encoded = nullptr; ++#endif ++ + int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size); ++ + QByteArray fingerprint; + if (ret == 1) { +- void* encoded = nullptr; + int encoded_size = 0; + chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT, + &encoded, &encoded_size, 1); Property changes on: head/audio/clementine-player/files/patch-git_ded3126 ___________________________________________________________________ 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 Index: head/audio/libgroove/Makefile =================================================================== --- head/audio/libgroove/Makefile (revision 430707) +++ head/audio/libgroove/Makefile (revision 430708) @@ -1,31 +1,31 @@ # Created by: gahr # $FreeBSD$ PORTNAME= libgroove PORTVERSION= 4.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MAINTAINER= ports@FreeBSD.org COMMENT= Audio dispatching library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libchromaprint.so:audio/chromaprint \ libebur128.so:audio/libebur128 \ libspeexdsp.so:audio/speexdsp USE_GITHUB= yes GH_ACCOUNT= andrewrk USES= cmake:outsource USE_SDL= sdl2 USE_LDCONFIG= yes CFLAGS+= -Wno-error=deprecated-declarations # ffmpeg 3.1 PLIST_SUB+= VER1=${PORTVERSION:R:R} \ VER3=${PORTVERSION} .include Index: head/audio/libgroove/files/patch-groovefingerprinter_fingerprinter.c =================================================================== --- head/audio/libgroove/files/patch-groovefingerprinter_fingerprinter.c (nonexistent) +++ head/audio/libgroove/files/patch-groovefingerprinter_fingerprinter.c (revision 430708) @@ -0,0 +1,52 @@ +Cast to correct types for chromaprint >= 1.4 + +--- groovefingerprinter/fingerprinter.c.orig 2015-05-26 01:32:01 UTC ++++ groovefingerprinter/fingerprinter.c +@@ -64,7 +64,11 @@ static int emit_track_info(struct Groove + return -1; + } + if (!chromaprint_get_raw_fingerprint(p->chroma_ctx, ++#if CHROMAPRINT_VERSION_MAJOR > 1 || CHROMAPRINT_VERSION_MINOR >= 4 ++ (uint32_t**)&info->fingerprint, &info->fingerprint_size)) ++#else + (void**)&info->fingerprint, &info->fingerprint_size)) ++#endif + { + av_log(NULL, AV_LOG_ERROR, "unable to get fingerprint\n"); + return -1; +@@ -141,7 +145,11 @@ static void *print_thread(void *arg) { + double buffer_duration = buffer->frame_count / (double)buffer->format.sample_rate; + p->track_duration += buffer_duration; + p->album_duration += buffer_duration; ++#if CHROMAPRINT_VERSION_MAJOR > 1 || CHROMAPRINT_VERSION_MINOR >= 4 ++ if (!chromaprint_feed(p->chroma_ctx, (const int16_t*)buffer->data[0], buffer->frame_count * 2)) { ++#else + if (!chromaprint_feed(p->chroma_ctx, buffer->data[0], buffer->frame_count * 2)) { ++#endif + av_log(NULL, AV_LOG_ERROR, "unable to feed fingerprint\n"); + } + +@@ -387,7 +395,11 @@ void groove_fingerprinter_free_info(stru + + int groove_fingerprinter_encode(int32_t *fp, int size, char **encoded_fp) { + int encoded_size; ++#if CHROMAPRINT_VERSION_MAJOR > 1 || CHROMAPRINT_VERSION_MINOR >= 4 ++ int err = chromaprint_encode_fingerprint((const uint32_t*)fp, size, ++#else + int err = chromaprint_encode_fingerprint(fp, size, ++#endif + CHROMAPRINT_ALGORITHM_DEFAULT, (void*)encoded_fp, &encoded_size, 1); + return err == 1 ? 0 : -1; + } +@@ -395,7 +407,11 @@ int groove_fingerprinter_encode(int32_t + int groove_fingerprinter_decode(char *encoded_fp, int32_t **fp, int *size) { + int algorithm; + int encoded_size = strlen(encoded_fp); ++#if CHROMAPRINT_VERSION_MAJOR > 1 || CHROMAPRINT_VERSION_MINOR >= 4 ++ int err = chromaprint_decode_fingerprint(encoded_fp, encoded_size, (uint32_t**)fp, size, ++#else + int err = chromaprint_decode_fingerprint(encoded_fp, encoded_size, (void**)fp, size, ++#endif + &algorithm, 1); + return err == 1 ? 0 : -1; + } Property changes on: head/audio/libgroove/files/patch-groovefingerprinter_fingerprinter.c ___________________________________________________________________ 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 Index: head/x11/leechcraft/Makefile =================================================================== --- head/x11/leechcraft/Makefile (revision 430707) +++ head/x11/leechcraft/Makefile (revision 430708) @@ -1,419 +1,419 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= leechcraft PORTVERSION= 0.6.70 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= x11 MASTER_SITES= http://dist.leechcraft.org/LeechCraft/0.6.70/ MAINTAINER= vg@FreeBSD.org COMMENT= Cross-platform modular live environment LICENSE= BSL LICENSE_FILE= ${WRKDIR}/${DISTNAME}/LICENSE LIB_DEPENDS= libqwt6.so:x11-toolkits/qwt6 \ libpcre.so:devel/pcre \ libboost_program_options.so:devel/boost-libs #LC_REV= 1526-g7fdb92a INSTALLS_ICONS= yes USE_LDCONFIG= yes USES= cmake pkgconfig tar:xz USE_QT4= corelib declarative gui network script sql sql-sqlite3_run \ webkit xml qmake_build moc_build rcc_build uic_build \ linguisttools_build USE_XORG= x11 CMAKE_ARGS+= -DENABLE_LADS=OFF \ -DENABLE_SYNCER=OFF \ -DLEECHCRAFT_VERSION=${PORTVERSION} WRKSRC_SUBDIR= src OPTIONS_DEFINE= AGGREGATOR ANHERO ANOTIFI AUSCRIE AZOTH BITTORRENT BLASQ BLOGIQUE \ CERTMGR CPULOAD CSTP DBUSMANAGER DEADLYRICS DEVMON DOLOZHEE \ ELEEMINATOR FENET GACTS GLANCE GNOTIFI HARBINGER HISTORYHOLDER \ HOTSENSORS HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY KNOWHOW KRIGSTASK \ LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LEMON LHTR LIZNOO LMP MELLONETRAY \ MONOCLE MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \ NEWLIFE OORONEE OTLOZHU PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP \ ROSENTHAL SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER \ TABSLIST TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC \ XPROXY XTAZY OPTIONS_SUB= yes AGGREGATOR_DESC= Full-featured RSS/Atom feed reader AGGREGATOR_CMAKE_ON= -DENABLE_AGGREGATOR:BOOL=true AGGREGATOR_CMAKE_OFF= -DENABLE_AGGREGATOR:BOOL=false ANHERO_DESC= AnHero, crash handler for LeechCraft ANHERO_CMAKE_ON= -DENABLE_ANHERO:BOOL=true ANHERO_CMAKE_OFF= -DENABLE_ANHERO:BOOL=false ANOTIFI_DESC= Flexible and customizable notifications framework ANOTIFI_CMAKE_ON= -DENABLE_ADVANCEDNOTIFICATIONS:BOOL=true ANOTIFI_CMAKE_OFF= -DENABLE_ADVANCEDNOTIFICATIONS:BOOL=false AUSCRIE_DESC= Auscrie, LeechCraft auto screenshooter AUSCRIE_CMAKE_ON= -DENABLE_AUSCRIE:BOOL=true AUSCRIE_CMAKE_OFF= -DENABLE_AUSCRIE:BOOL=false AZOTH_DESC= Azoth, the modular IM client AZOTH_CMAKE_ON= -DENABLE_AZOTH:BOOL=true \ -DENABLE_AZOTH_OTROID:BOOL=true \ -DENABLE_AZOTH_VELVETBIRD:BOOL=true AZOTH_CMAKE_OFF= -DENABLE_AZOTH:BOOL=false AZOTH_LIB_DEPENDS= libQtMultimediaKit.so:multimedia/qt4-mobility \ libkqoauth.so:security/kqoauth \ libotr.so.5:security/libotr \ libpurple.so:net-im/libpurple \ libqca.so:devel/qca \ libqxmpp.so:net-im/qxmpp \ libspeex.so:audio/speex AZOTH_USES= desktop-file-utils BITTORRENT_DESC= Full-featured BitTorrent client plugin BITTORRENT_CMAKE_ON= -DENABLE_TORRENT:BOOL=true BITTORRENT_CMAKE_OFF= -DENABLE_TORRENT:BOOL=false BITTORRENT_LIB_DEPENDS= libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar BLASQ_DESC= Cloud image storage services client (like Flickr or Picasa) BLASQ_CMAKE_ON= -DENABLE_BLASQ:BOOL=true BLASQ_CMAKE_OFF= -DENABLE_BLASQ:BOOL=false BLASQ_LIB_DEPENDS= libkqoauth.so:security/kqoauth BLOGIQUE_DESC= Blogging client BLOGIQUE_CMAKE_ON= -DENABLE_BLOGIQUE:BOOL=true BLOGIQUE_CMAKE_OFF= -DENABLE_BLOGIQUE:BOOL=false CERTMGR_DESC= SSL certificates manager CERTMGR_CMAKE_ON= -DENABLE_CERTMGR:BOOL=true CERTMGR_CMAKE_OFF= -DENABLE_CERTMGR:BOOL=false CPULOAD_DESC= CPU load graph quark CPULOAD_CMAKE_ON= -DENABLE_CPULOAD:BOOL=true CPULOAD_CMAKE_OFF= -DENABLE_CPULOAD:BOOL=false CSTP_DESC= CSTP, the clean & stupid HTTP implementation CSTP_CMAKE_ON= -DENABLE_HTTP:BOOL=true CSTP_CMAKE_OFF= -DENABLE_HTTP:BOOL=false DBUSMANAGER_DESC= DBusManager provides some basic D-Bus interoperability DBUSMANAGER_CMAKE_ON= -DENABLE_DBUSMANAGER:BOOL=true DBUSMANAGER_CMAKE_OFF= -DENABLE_DBUSMANAGER:BOOL=false DEADLYRICS_DESC= Searches for song lyrics and displays them in LeechCraft DEADLYRICS_CMAKE_ON= -DENABLE_DEADLYRICS:BOOL=true DEADLYRICS_CMAKE_OFF= -DENABLE_DEADLYRICS:BOOL=false DEVMON_DESC= (BROKEN) Non-storage USB devices manager DEVMON_CMAKE_ON= -DENABLE_DEVMON:BOOL=true DEVMON_CMAKE_OFF= -DENABLE_DEVMON:BOOL=false DOLOZHEE_DESC= An issue reporting client for LeechCraft issue tracker DOLOZHEE_CMAKE_ON= -DENABLE_DOLOZHEE:BOOL=true DOLOZHEE_CMAKE_OFF= -DENABLE_DOLOZHEE:BOOL=false ELEEMINATOR_DESC= (BROKEN) Embedded LeechCraft Terminal Emulator ELEEMINATOR_CMAKE_ON= -DENABLE_ELEEMINATOR:BOOL=true ELEEMINATOR_CMAKE_OFF= -DENABLE_ELEEMINATOR:BOOL=false FENET_DESC= LeechCraft WM and compositor manager FENET_CMAKE_ON= -DENABLE_FENET:BOOL=true FENET_CMAKE_OFF= -DENABLE_FENET:BOOL=false GACTS_DESC= Allows other LeechCraft modules to register global shortcuts GACTS_CMAKE_ON= -DENABLE_GACTS:BOOL=true GACTS_CMAKE_OFF= -DENABLE_GACTS:BOOL=false GLANCE_DESC= Glance, quick thumbnailed overview of opened tabs GLANCE_CMAKE_ON= -DENABLE_GLANCE:BOOL=true GLANCE_CMAKE_OFF= -DENABLE_GLANCE:BOOL=false GNOTIFI_DESC= Notifier about new mail in a GMail inbox GNOTIFI_CMAKE_ON= -DENABLE_GMAILNOTIFIER:BOOL=true GNOTIFI_CMAKE_OFF= -DENABLE_GMAILNOTIFIER:BOOL=false HARBINGER_DESC= Build Harbinger, the collections manager HARBINGER_CMAKE_ON= -DENABLE_HARBINGER:BOOL=true HARBINGER_CMAKE_OFF= -DENABLE_HARBINGER:BOOL=false HISTORYHOLDER_DESC= HistoryHolder keeps track of stuff downloaded HISTORYHOLDER_CMAKE_ON= -DENABLE_HISTORYHOLDER:BOOL=true HISTORYHOLDER_CMAKE_OFF=-DENABLE_HISTORYHOLDER:BOOL=false HOTSENSORS_DESC= (BROKEN) Temperature sensors monitor plugin HOTSENSORS_CMAKE_ON= -DENABLE_HOTSENSORS:BOOL=true HOTSENSORS_CMAKE_OFF= -DENABLE_HOTSENSORS:BOOL=false HOTSTREAMS_DESC= Provides some cool radio streams to music players like LMP HOTSTREAMS_CMAKE_ON= -DENABLE_HOTSTREAMS:BOOL=true HOTSTREAMS_CMAKE_OFF= -DENABLE_HOTSTREAMS:BOOL=false HTTHARE_DESC= Simple HTTP server HTTHARE_CMAKE_ON= -DENABLE_HTTHARE:BOOL=true HTTHARE_CMAKE_OFF= -DENABLE_HTTHARE:BOOL=false IMGASTE_DESC= The simple image uploader data filter IMGASTE_CMAKE_ON= -DENABLE_IMGASTE:BOOL=true IMGASTE_CMAKE_OFF= -DENABLE_IMGASTE:BOOL=false KBSWITCH_DESC= Provides plugin- or tab-grained keyboard layout control KBSWITCH_CMAKE_ON= -DENABLE_KBSWITCH:BOOL=true KBSWITCH_CMAKE_OFF= -DENABLE_KBSWITCH:BOOL=false KBSWITCH_USE= xorg=xkbfile KINOTIFY_DESC= Fancy visual notifications KINOTIFY_CMAKE_ON= -DENABLE_KINOTIFY:BOOL=true KINOTIFY_CMAKE_OFF= -DENABLE_KINOTIFY:BOOL=false KNOWHOW_DESC= KnowHow, plugin for showing Tips of the Day KNOWHOW_CMAKE_ON= -DENABLE_KNOWHOW:BOOL=true KNOWHOW_CMAKE_OFF= -DENABLE_KNOWHOW:BOOL=false KRIGSTASK_DESC= The taskbar quark KRIGSTASK_CMAKE_ON= -DENABLE_KRIGSTASK:BOOL=true KRIGSTASK_CMAKE_OFF= -DENABLE_KRIGSTASK:BOOL=false KRIGSTASK_USE= xorg=xcomposite LACKMAN_DESC= Package Manager for extensions, scripts, themes etc LACKMAN_CMAKE_ON= -DENABLE_LACKMAN:BOOL=true LACKMAN_CMAKE_OFF= -DENABLE_LACKMAN:BOOL=false LASTFMSCROBBLE_DESC= Last.FM scrobbler plugin LASTFMSCROBBLE_CMAKE_ON= -DENABLE_LASTFMSCROBBLE:BOOL=true LASTFMSCROBBLE_CMAKE_OFF= -DENABLE_LASTFMSCROBBLE:BOOL=false LASTFMSCROBBLE_LIB_DEPENDS= liblastfm.so:audio/liblastfm LAUGHTY_DESC= The LeechCraft notification daemon LAUGHTY_CMAKE_ON= -DENABLE_LAUGHTY:BOOL=true LAUGHTY_CMAKE_OFF= -DENABLE_LAUGHTY:BOOL=false LAUNCHY_DESC= Allows one to launch third-party applications LAUNCHY_CMAKE_ON= -DENABLE_LAUNCHY:BOOL=true LAUNCHY_CMAKE_OFF= -DENABLE_LAUNCHY:BOOL=false LEMON_DESC= (BROKEN) Network monitor plugin LEMON_CMAKE_ON= -DENABLE_LEMON:BOOL=true LEMON_CMAKE_OFF= -DENABLE_LEMON:BOOL=false LHTR_DESC= LeechCraft HTML Text editoR component LHTR_CMAKE_ON= -DENABLE_LHTR:BOOL=true LHTR_CMAKE_OFF= -DENABLE_LHTR:BOOL=false LHTR_BUILD_DEPENDS= tidy:www/tidy-devel LIZNOO_DESC= UPower-based power manager LIZNOO_CMAKE_ON= -DENABLE_LIZNOO:BOOL=true LIZNOO_CMAKE_OFF= -DENABLE_LIZNOO:BOOL=false LMP_DESC= LeechCraft Media Player, Phonon-based audio/video player LMP_CMAKE_ON= -DENABLE_LMP:BOOL=true \ -DUSE_GSTREAMER_10:BOOL=false LMP_CMAKE_OFF= -DENABLE_LMP:BOOL=false LMP_USE= GSTREAMER=yes LMP_LIB_DEPENDS= libguess.so:textproc/libguess \ libtag.so:audio/taglib MELLONETRAY_DESC= System tray quark MELLONETRAY_CMAKE_ON= -DENABLE_MELLONETRAY:BOOL=true MELLONETRAY_CMAKE_OFF= -DENABLE_MELLONETRAY:BOOL=false MELLONETRAY_USE= xorg=xdamage MONOCLE_DESC= Monocle, the modular document viewer MONOCLE_CMAKE_ON= -DENABLE_MONOCLE:BOOL=true MONOCLE_CMAKE_OFF= -DENABLE_MONOCLE:BOOL=false MONOCLE_LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre \ libpoppler-qt4.so:graphics/poppler-qt4 MUSICZOMBIE_DESC= MusicBrainz client plugin MUSICZOMBIE_CMAKE_ON= -DENABLE_MUSICZOMBIE:BOOL=true MUSICZOMBIE_CMAKE_OFF= -DENABLE_MUSICZOMBIE:BOOL=false MUSICZOMBIE_LIB_DEPENDS=libchromaprint.so:audio/chromaprint \ libavdevice.so:multimedia/ffmpeg NACHEKU_DESC= Monitors selected directory and clipboard for downloadable entities NACHEKU_CMAKE_ON= -DENABLE_NACHEKU:BOOL=true NACHEKU_CMAKE_OFF= -DENABLE_NACHEKU:BOOL=false NETSTOREMANAGER_DESC= Supporting and managing Internet data storages like Yandex.Disk NETSTOREMANAGER_CMAKE_ON= -DENABLE_NETSTOREMANAGER:BOOL=true \ -DENABLE_NETSTOREMANAGER_INOTIFY:BOOL=false NETSTOREMANAGER_CMAKE_OFF= -DENABLE_NETSTOREMANAGER:BOOL=false NETWORKMONITOR_DESC= NetworkMonitor watches HTTP requests in NETWORKMONITOR_CMAKE_ON= -DENABLE_NETWORKMONITOR:BOOL=true NETWORKMONITOR_CMAKE_OFF= -DENABLE_NETWORKMONITOR:BOOL=false NEWLIFE_DESC= New Life imports settings from various other applications NEWLIFE_CMAKE_ON= -DENABLE_NEWLIFE:BOOL=true NEWLIFE_CMAKE_OFF= -DENABLE_NEWLIFE:BOOL=false OORONEE_DESC= Quark handling text and images droppend onto it OORONEE_CMAKE_ON= -DENABLE_OORONEE:BOOL=true OORONEE_CMAKE_OFF= -DENABLE_OORONEE:BOOL=false OTLOZHU_DESC= (BROKEN) Otlozhu, a GTD-inspired ToDo manager OTLOZHU_CMAKE_OFF= -DENABLE_OTLOZHU:BOOL=true OTLOZHU_CMAKE_OFF= -DENABLE_OTLOZHU:BOOL=false PINTAB_DESC= Provides support for pinning tabs PINTAB_CMAKE_ON= -DENABLE_PINTAB:BOOL=true PINTAB_CMAKE_OFF= -DENABLE_PINTAB:BOOL=false POGOOGLUE_DESC= Provides searching with Google to other POGOOGLUE_CMAKE_ON= -DENABLE_POGOOGLUE:BOOL=true POGOOGLUE_CMAKE_OFF= -DENABLE_POGOOGLUE:BOOL=false POLEEMERY_DESC= Build Poleemery, the personal finances manager POLEEMERY_CMAKE_ON= -DENABLE_POLEEMERY:BOOL=true POLEEMERY_CMAKE_OFF= -DENABLE_POLEEMERY:BOOL=false POPISHU_DESC= Text editor with IDE features POPISHU_CMAKE_ON= -DENABLE_POPISHU:BOOL=true POPISHU_CMAKE_OFF= -DENABLE_POPISHU:BOOL=false POPISHU_LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 POSHUKU_DESC= The full-featured web browser plugin POSHUKU_CMAKE_ON= -DENABLE_POSHUKU:BOOL=true POSHUKU_CMAKE_OFF= -DENABLE_POSHUKU:BOOL=false QROSP_DESC= Scrpting support for LeechCraft via Qross QROSP_CMAKE_ON= -DENABLE_QROSP:BOOL=true QROSP_CMAKE_OFF= -DENABLE_QROSP:BOOL=false QROSP_LIB_DEPENDS= libqrosscore.so:devel/qross ROSENTHAL_DESC= Spellchecking support ROSENTHAL_CMAKE_ON= -DENABLE_ROSENTHAL:BOOL=true ROSENTHAL_CMAKE_OFF= -DENABLE_ROSENTHAL:BOOL=false ROSENTHAL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell SB2_DESC= Sidebar for LeechCraft with combined launcher and tab switcher SB2_CMAKE_ON= -DENABLE_SB2:BOOL=true SB2_CMAKE_OFF= -DENABLE_SB2:BOOL=false SCROBLIBRE_DESC= Submissions API 1.2-compliant scrobbler for services like libre.fm SCROBLIBRE_CMAKE_ON= -DENABLE_SCROBLIBRE:BOOL=true SCROBLIBRE_CMAKE_OFF= -DENABLE_SCROBLIBRE:BOOL=false SECMAN_DESC= Security and personal data manager SECMAN_CMAKE_ON= -DENABLE_SECMAN:BOOL=true SECMAN_CMAKE_OFF= -DENABLE_SECMAN:BOOL=false #SEE AGAIN SEEKTHRU_DESC= OpenSearch support SEEKTHRU_CMAKE_ON= -DENABLE_SEEKTHRU:BOOL=true SEEKTHRU_CMAKE_OFF= -DENABLE_SEEKTHRU:BOOL=false SUMMARY_DESC= Summary plugin SUMMARY_CMAKE_ON= -DENABLE_SUMMARY:BOOL=true SUMMARY_CMAKE_OFF= -DENABLE_SUMMARY:BOOL=false SYSNOTIFY_DESC= Notifications via system libnotify daemon SYSNOTIFY_CMAKE_ON= -DENABLE_SYSNOTIFY:BOOL=true SYSNOTIFY_CMAKE_OFF= -DENABLE_SYSNOTIFY:BOOL=false TABSESSMANAGER_DESC= Tab Session Manager TABSESSMANAGER_CMAKE_ON= -DENABLE_TABSESSMANAGER:BOOL=true TABSESSMANAGER_CMAKE_OFF= -DENABLE_TABSESSMANAGER:BOOL=false TABSLIST_DESC= Quick navigation between tabs TABSLIST_CMAKE_ON= -DENABLE_TABSLIST:BOOL=true TABSLIST_CMAKE_OFF= -DENABLE_TABSLIST:BOOL=false TEXTOGROOSE_DESC= Build Text-o-Groose, script-based lyrics fetcher TEXTOGROOSE_CMAKE_ON= -DENABLE_TEXTOGROOSE:BOOL=true TEXTOGROOSE_CMAKE_OFF= -DENABLE_TEXTOGROOSE:BOOL=false TOUCHSTREAMS_DESC= VKontakte music source plugin TOUCHSTREAMS_CMAKE_ON= -DENABLE_TOUCHSTREAMS:BOOL=true TOUCHSTREAMS_CMAKE_OFF= -DENABLE_TOUCHSTREAMS:BOOL=false TPI_DESC= Task progress indicator quark TPI_CMAKE_ON= -DENABLE_TPI:BOOL=true TPI_CMAKE_OFF= -DENABLE_TPI:BOOL=false VGRABBER_DESC= Vkontakte.ru music/video grabber VGRABBER_CMAKE_ON= -DENABLE_VGRABBER:BOOL=true VGRABBER_CMAKE_OFF= -DENABLE_VGRABBER:BOOL=false VROOBY_DESC= Vrooby, removable device manager VROOBY_CMAKE_ON= -DENABLE_VROOBY:BOOL=true VROOBY_CMAKE_OFF= -DENABLE_VROOBY:BOOL=false VTYULC_DESC= Build VtyuLC, the videoplayer plugin VTYULC_CMAKE_ON= -DENABLE_VTYULC:BOOL=true VTYULC_CMAKE_OFF= -DENABLE_VTYULC:BOOL=false VTYULC_LIB_DEPENDS= libvlc.so:multimedia/vlc XPROXY_DESC= Provides advanced proxy support features XPROXY_CMAKE_ON= -DENABLE_XPROXY:BOOL=true XPROXY_CMAKE_OFF= -DENABLE_XPROXY:BOOL=false XTAZY_DESC= Fetches info about current tune and provides it to other plugins XTAZY_CMAKE_ON= -DENABLE_XTAZY:BOOL=true XTAZY_CMAKE_OFF= -DENABLE_XTAZY:BOOL=false OPTIONS_DEFAULT=AGGREGATOR ANHERO ANOTIFI AUSCRIE AZOTH BLASQ BLOGIQUE CERTMGR \ CPULOAD CSTP DBUSMANAGER DEADLYRICS DOLOZHEE FENET GACTS GLANCE GNOTIFI \ HARBINGER HISTORYHOLDER HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY \ KNOWHOW KRIGSTASK LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LHTR LIZNOO \ LMP MELLONETRAY MONOCLE MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \ NEWLIFE OORONEE PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP ROSENTHAL \ SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER TABSLIST \ TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC XPROXY XTAZY .include .if ${PORT_OPTIONS:MAZOTH} || ${PORT_OPTIONS:MDBUSMANAGER} || \ ${PORT_OPTIONS:MLAUGHTY} || ${PORT_OPTIONS:MLIZNOO} || \ ${PORT_OPTIONS:MLMP} || ${PORT_OPTIONS:MSYSNOTIFY} || \ ${PORT_OPTIONS:MVROOBY} || ${PORT_OPTIONS:MXTAZY} USE_QT4+= dbus .endif .if ${PORT_OPTIONS:MBLASQ} || ${PORT_OPTIONS:MBLOGIQUE} || \ ${PORT_OPTIONS:MLACKMAN} USE_QT4+= xmlpatterns .endif .if ${PORT_OPTIONS:MAZOTH} || ${PORT_OPTIONS:MBLASQ} || \ ${PORT_OPTIONS:MFENET} || ${PORT_OPTIONS:MHOTSTREAMS} || \ ${PORT_OPTIONS:MNETSTOREMANAGER} || ${PORT_OPTIONS:MPOSHUKU} || \ ${PORT_OPTIONS:MQROSP} || ${PORT_OPTIONS:MSB2} || \ ${PORT_OPTIONS:MTOUCHSTREAMS} LIB_DEPENDS+= libqjson.so:devel/qjson .endif .if ${PORT_OPTIONS:MELEEMINATOR} BROKEN= Eleeminator has not supported yet (not ported qtermwidget) .endif .if ${PORT_OPTIONS:MHOTSENSORS} BROKEN= Hotsensors has not supported yet (depended by lm_sensosrs) .endif .if ${PORT_OPTIONS:MDEVMON} BROKEN= Devmon has not supported yet (depended by udev) .endif .if ${PORT_OPTIONS:MLEMON} BROKEN= Lemon has not supported yet because depended by libnl .endif .if ${PORT_OPTIONS:MOTLOZHU} BROKEN= Otlozhu has not supported yet (not ported liblaretz) .endif .if ${OSVERSION} < 1000000 PORT_OPTIONS:= ${PORT_OPTIONS:O:u} PORT_OPTIONS:= ${PORT_OPTIONS:NBITTORRENT} USE_GCC= yes .endif post-install: @${FIND} -d ${STAGEDIR}${PREFIX}/include/leechcraft \ -type d -empty -exec ${RMDIR} {} \; .include Index: head/x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp =================================================================== --- head/x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp (revision 430707) +++ head/x11/leechcraft/files/patch-plugins_musiczombie_chroma.cpp (revision 430708) @@ -1,34 +1,50 @@ https://github.com/0xd34df00d/leechcraft/commit/307be1dd37059e49eca37f77ddc4806125a8f843 https://github.com/0xd34df00d/leechcraft/commit/53d56cafd3a1d299601d9f3bfd4ee051ae9121ba https://github.com/0xd34df00d/leechcraft/commit/875e3b43b7a91656f61180b2b2179137f18e6d71 +https://github.com/0xd34df00d/leechcraft/commit/14f5f8823ec7b23fdb4409f4f689e565d8995536 --- plugins/musiczombie/chroma.cpp.orig 2014-07-28 18:35:44 UTC +++ plugins/musiczombie/chroma.cpp @@ -38,7 +38,6 @@ extern "C" { #include #include -#include #include #include #include @@ -122,8 +121,8 @@ namespace MusicZombie auto remaining = maxLength * codecCtx->channels * codecCtx->sample_rate; chromaprint_start (Ctx_, codecCtx->sample_rate, codecCtx->channels); - std::shared_ptr frame (avcodec_alloc_frame (), - [] (AVFrame *frame) { avcodec_free_frame (&frame); }); + std::shared_ptr frame (av_frame_alloc (), + [] (AVFrame *frame) { av_frame_free (&frame); }); auto maxDstNbSamples = 0; uint8_t *dstData [1] = { nullptr }; @@ -140,7 +139,7 @@ namespace MusicZombie if (packet.stream_index != streamIndex) continue; - avcodec_get_frame_defaults (frame.get ()); + av_frame_unref (frame.get ()); int gotFrame = false; auto consumed = avcodec_decode_audio4 (codecCtx.get (), frame.get (), &gotFrame, &packet); +@@ -168,7 +167,13 @@ namespace MusicZombie + data = frame->data; + + auto length = std::min (remaining, frame->nb_samples * codecCtx->channels); +- if (!chromaprint_feed (Ctx_, data [0], length)) ++ if (!chromaprint_feed (Ctx_, ++#if CHROMAPRINT_VERSION_MAJOR > 1 || CHROMAPRINT_VERSION_MINOR >= 4 ++ reinterpret_cast (data [0]), ++#else ++ data [0], ++#endif ++ length)) + throw std::runtime_error ("cannot feed data"); + + bool finished = false;