parent
679ecd1e3f
commit
182567e7c0
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= innoextract
|
||||
PORTVERSION= 1.7
|
||||
PORTREVISION= 4
|
||||
PORTREVISION= 5
|
||||
CATEGORIES= archivers
|
||||
MASTER_SITES= http://constexpr.org/innoextract/files/
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
PORTNAME= tardy
|
||||
PORTVERSION= 1.28
|
||||
DISTVERSIONSUFFIX= .D001.orig
|
||||
PORTREVISION= 11
|
||||
PORTREVISION= 12
|
||||
CATEGORIES= archivers
|
||||
MASTER_SITES= SF/tardy/${PORTVERSION}/
|
||||
DISTNAME= ${PORTNAME}_${PORTVERSION}${DISTVERSIONSUFFIX}
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
PORTNAME= libkgeomap
|
||||
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= astro kde kde-applications
|
||||
|
||||
MAINTAINER= kde@FreeBSD.org
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
PORTNAME= libosmium
|
||||
PORTVERSION= 2.15.1
|
||||
DISTVERSIONPREFIX= v
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= astro geography devel
|
||||
|
||||
MAINTAINER= amdmi3@FreeBSD.org
|
||||
|
|
|
@ -16,4 +16,6 @@ LICENSE= GPLv3
|
|||
USES= perl5
|
||||
USE_PERL5= modbuild
|
||||
|
||||
NO_ARCH= yes
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -12,12 +12,11 @@ COMMENT= 3D photo-realistic sky renderer (planetarium)
|
|||
|
||||
LICENSE= GPLv2+
|
||||
|
||||
CONFLICTS_INSTALL= ${PORTNAME}-qt4-0.12.*
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= Stellarium
|
||||
|
||||
USES= cmake desktop-file-utils gettext qt:5 shared-mime-info
|
||||
USES= cmake compiler:c++11-lang desktop-file-utils gettext \
|
||||
qt:5 shared-mime-info
|
||||
USE_QT= qmake_build buildtools_build linguisttools_build \
|
||||
concurrent core gui network opengl printsupport widgets
|
||||
|
||||
|
@ -77,7 +76,8 @@ post-extract-DOCS-on:
|
|||
${WRKSRC}
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's, -Wno-unused-result,,' ${WRKSRC}/CMakeLists.txt
|
||||
@${REINPLACE_CMD} -e '/<sys\/time\.h>/s,^//,,' \
|
||||
${WRKSRC}/src/external/libindi/libs/indibase/indilogger.h
|
||||
|
||||
post-install-MORE_STARS-on:
|
||||
${INSTALL_DATA} ${DISTDIR}/stars_4_1v0_2.cat \
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= ardour
|
||||
PORTVERSION= 2.8.16
|
||||
PORTREVISION= 14
|
||||
PORTREVISION= 15
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= http://freebsd.nsu.ru/distfiles/
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= ardour5
|
||||
PORTVERSION= 5.12.0
|
||||
PORTREVISION= 9
|
||||
PORTREVISION= 10
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= https://github.com/beerml/ardour_releases/raw/master/
|
||||
# The original master side points to the latest release only:
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
PORTNAME= clementine
|
||||
DISTVERSION= 1.3.1-661
|
||||
DISTVERSIONSUFFIX= -g4ff370ce1
|
||||
PORTREVISION= 4
|
||||
PORTREVISION= 5
|
||||
CATEGORIES= audio
|
||||
PKGNAMESUFFIX= -player
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Created by: Alexander Botero-Lowry <alex@foxybanana.com>
|
||||
# $FreeBSD$
|
||||
|
||||
PORTREVISION= 19
|
||||
PORTREVISION= 20
|
||||
CATEGORIES= audio
|
||||
PKGNAMEPREFIX= cpp-
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
PORTNAME= csound
|
||||
DISTVERSION= 6.12.2-83
|
||||
DISTVERSIONSUFFIX= -gdf2edd269
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= audio lang
|
||||
|
||||
MAINTAINER= yuri@FreeBSD.org
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= faust
|
||||
DISTVERSION= 1.4.20180118
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
|
||||
PKGNAMESUFFIX= -lv2
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
PORTNAME= guitarix
|
||||
DISTVERSION= 0.38.1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/
|
||||
PKGNAMESUFFIX= -lv2
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= lollypop
|
||||
DISTVERSION= 0.9.907
|
||||
DISTVERSION= 1.0.2
|
||||
CATEGORIES= audio
|
||||
|
||||
MAINTAINER= greg@unrelenting.technology
|
||||
|
@ -24,8 +24,8 @@ USES= python:3.5+ pkgconfig gnome gettext meson shebangfix sqlite desktop-file-
|
|||
USE_GITLAB= yes
|
||||
GL_SITE= https://gitlab.gnome.org
|
||||
GL_ACCOUNT= World
|
||||
GL_COMMIT= 71a0152db4f4c6f9b20f875a7f68ce6b84c40163
|
||||
GL_TUPLE= gnumdk:lollypop-po:33ba2ebaa13081192768d007a417dc52422588b0:po/subprojects/po
|
||||
GL_COMMIT= 8e6fbe2294bbdfe3c3ee5889c2093d9274618e04
|
||||
GL_TUPLE= gnumdk:lollypop-po:fc5fd94a645b80172e63a59832d22d185ef9d202:po/subprojects/po
|
||||
USE_GNOME= glib20 gtk30 pygobject3 introspection:build intltool intlhack
|
||||
USE_GSTREAMER1= yes mpg123 ogg flac opus libav faad good speex
|
||||
USE_PYTHON= py3kplist noflavors
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
TIMESTAMP = 1545679531
|
||||
SHA256 (World-lollypop-71a0152db4f4c6f9b20f875a7f68ce6b84c40163_GL0.tar.gz) = 5ad7bddb6003aed6920b5ef0a43521f76d8f9914741a7e18700995f9d830ee25
|
||||
SIZE (World-lollypop-71a0152db4f4c6f9b20f875a7f68ce6b84c40163_GL0.tar.gz) = 418840
|
||||
SHA256 (World-lollypop-po-33ba2ebaa13081192768d007a417dc52422588b0_GL0.tar.gz) = 7c2bdf3aeb9c37b592bd42a45d3e104000d36fd6086c45ecbcade1bbb5eec791
|
||||
SIZE (World-lollypop-po-33ba2ebaa13081192768d007a417dc52422588b0_GL0.tar.gz) = 390465
|
||||
TIMESTAMP = 1553544004
|
||||
SHA256 (World-lollypop-8e6fbe2294bbdfe3c3ee5889c2093d9274618e04_GL0.tar.gz) = 601c71d30cb9d60a076e054808a8801c7232f0886c4e5766dad2c401c34ff99e
|
||||
SIZE (World-lollypop-8e6fbe2294bbdfe3c3ee5889c2093d9274618e04_GL0.tar.gz) = 371105
|
||||
SHA256 (World-lollypop-po-fc5fd94a645b80172e63a59832d22d185ef9d202_GL0.tar.gz) = 99ebb8eb206934c41c014889ef4b0102049b2fe791640204958c83b1624ad416
|
||||
SIZE (World-lollypop-po-fc5fd94a645b80172e63a59832d22d185ef9d202_GL0.tar.gz) = 467580
|
||||
|
|
|
@ -17,7 +17,6 @@ bin/lollypop-cli
|
|||
%%PYTHON_SITELIBDIR%%/lollypop/container_donation.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/container_lists.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/container_playlists.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/container_progress.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/container_scanner.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/container_views.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/controller_information.py
|
||||
|
@ -32,14 +31,23 @@ bin/lollypop-cli
|
|||
%%PYTHON_SITELIBDIR%%/lollypop/database_tracks.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/database_upgrade.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/define.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/dialog_settings.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/downloader.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/fastscroll.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/fullscreen.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/goa.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/helper_art.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/helper_overlay.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/helper_overlay_album.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/helper_overlay_decade.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/helper_overlay_genre.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/helper_overlay_playlist.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/helper_overlay_radio.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/helper_passwords.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/helper_spotify.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/helper_task.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/helper_web.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/helper_web_youtube.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/information_store.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/inhibitor.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/inotify.py
|
||||
|
@ -51,6 +59,7 @@ bin/lollypop-cli
|
|||
%%PYTHON_SITELIBDIR%%/lollypop/locales/zh_cn.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/localized.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/logger.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/menu_playlist.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/miniplayer.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/mpris.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/notification.py
|
||||
|
@ -65,18 +74,17 @@ bin/lollypop-cli
|
|||
%%PYTHON_SITELIBDIR%%/lollypop/player_radio.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/player_shuffle.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/playlists.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_album.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_albums.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_appmenu.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_artwork.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_current.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_information.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_lastfm.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_menu.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_menu_views.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_next.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_playlists.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_queue.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_playlist_edit.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_radio.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_search.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_similars.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/pop_tunein.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/progressbar.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/radios.py
|
||||
|
@ -94,36 +102,48 @@ bin/lollypop-cli
|
|||
%%PYTHON_SITELIBDIR%%/lollypop/toolbar_title.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/utils.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_album.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_albums_box.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_albums_decade_box.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_albums_genre_box.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_albums_list.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_artist.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_artist_albums.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_artist_common.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_artist_small.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_artists_rounded.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_current_albums.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_device.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_equalizer.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_flowbox.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_information.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_lyrics.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_playlist_smart.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_playlists.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_playlists_manager.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_queue.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_radios.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_search.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_settings.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/view_tracks.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_album.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_album_banner.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_album_detailed.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_album_simple.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_albums_decade.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_albums_genre.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_albums_rounded.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_artist_banner.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_artist_rounded.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_artwork.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_context.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_cover.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_device.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_equalizer.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_flowbox_rounded.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_indicator.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_loved.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_playlist.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_playlist_banner.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_playlist_rounded.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_playlist_smart.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_radio.py
|
||||
|
@ -133,19 +153,24 @@ bin/lollypop-cli
|
|||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_row_playlist.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_row_queue.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_row_track.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_settings_appearance.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_settings_behaviour.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_settings_collections.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_settings_web.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_tracks.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/widgets_utils.py
|
||||
%%PYTHON_SITELIBDIR%%/lollypop/window.py
|
||||
libexec/lollypop-sp
|
||||
share/applications/org.gnome.Lollypop.desktop
|
||||
share/dbus-1/services/org.gnome.Lollypop.SearchProvider.service
|
||||
share/gnome-shell/search-providers/lollypop-search-provider.ini
|
||||
share/gnome-shell/search-providers/org.gnome.Lollypop.SearchProvider.ini
|
||||
share/icons/hicolor/16x16/apps/org.gnome.Lollypop.png
|
||||
share/icons/hicolor/22x22/apps/org.gnome.Lollypop.png
|
||||
share/icons/hicolor/256x256/apps/org.gnome.Lollypop.png
|
||||
share/icons/hicolor/32x32/apps/org.gnome.Lollypop.png
|
||||
share/icons/hicolor/48x48/apps/org.gnome.Lollypop.png
|
||||
share/icons/hicolor/512x512/apps/org.gnome.Lollypop.png
|
||||
share/icons/hicolor/scalable/apps/org.gnome.Lollypop-equalizer-symbolic.svg
|
||||
share/icons/hicolor/scalable/apps/org.gnome.Lollypop-symbolic.svg
|
||||
share/icons/hicolor/scalable/apps/org.gnome.Lollypop.svg
|
||||
share/locale/ar/LC_MESSAGES/lollypop.mo
|
||||
|
@ -185,6 +210,7 @@ share/locale/sv/LC_MESSAGES/lollypop.mo
|
|||
share/locale/tr/LC_MESSAGES/lollypop.mo
|
||||
share/locale/uk/LC_MESSAGES/lollypop.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/lollypop.mo
|
||||
share/locale/zh_Hant/LC_MESSAGES/lollypop.mo
|
||||
%%DATADIR%%/lollypop.gresource
|
||||
share/metainfo/org.gnome.Lollypop.appdata.xml
|
||||
@dir %%PYTHON_SITELIBDIR%%/lollypop/thirdparty
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= mp3plot
|
||||
DISTVERSION= 0.6.0
|
||||
PORTREVISION= 24
|
||||
PORTREVISION= 25
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= http://p.outlyer.net/mp3plot/files/
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= mumble
|
||||
DISTVERSION= 1.3.0-rc1
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= audio
|
||||
|
||||
MAINTAINER= feld@FreeBSD.org
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= murmur
|
||||
DISTVERSION= 1.3.0-rc1
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= audio net
|
||||
|
||||
MAINTAINER= feld@FreeBSD.org
|
||||
|
|
|
@ -2,11 +2,10 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= musescore
|
||||
DISTVERSION= 3.0.2
|
||||
DISTVERSION= 3.0.5
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= http://ftp.osuosl.org/pub/musescore/releases/MuseScore-${DISTVERSION}/
|
||||
DISTNAME= MuseScore-${DISTVERSION}
|
||||
NO_WRKSUBDIR= yes
|
||||
|
||||
MAINTAINER= adridg@FreeBSD.org
|
||||
COMMENT= Free music composition & notation software
|
||||
|
@ -26,13 +25,18 @@ USE_QT= core declarative gui widgets opengl concurrent designer help network \
|
|||
scripttools svg sql printsupport testlib \
|
||||
xml xmlpatterns \
|
||||
buildtools_build linguisttools_build qmake_build uitools_build
|
||||
|
||||
# Each release gets a subdir containing the distfiles for that release,
|
||||
# so hope that scanning the parent dir finds new ones.
|
||||
PORTSCOUT= site:http://ftp.osuosl.org/pub/musescore/releases/
|
||||
NO_WRKSUBDIR= yes
|
||||
DATADIR= ${PREFIX}/share/mscore-${PORTVERSION:R}
|
||||
|
||||
ALL_TARGET= lrelease manpages all
|
||||
INSTALLS_ICONS= yes
|
||||
CMAKE_ARGS+= -DUSE_SYSTEM_FREETYPE="ON" \
|
||||
-DBUILD_PORTMIDI=OFF \
|
||||
-DBUILD_PCH=OFF
|
||||
|
||||
DATADIR= ${PREFIX}/share/mscore-${PORTVERSION:R}
|
||||
-DBUILD_PCH=OFF \
|
||||
-DDOWNLOAD_SOUNDFONT=OFF
|
||||
|
||||
# WebEngine is only available on i386/amd64; defaults to ON there.
|
||||
# If enabled on arches that don't have WebEngine, the build breaks.
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1549439898
|
||||
SHA256 (MuseScore-3.0.2.zip) = 620ba2a56d80528c6654f4f59dcfe968b5667ac49fecfd63742ceb92aad5e0b1
|
||||
SIZE (MuseScore-3.0.2.zip) = 116531283
|
||||
TIMESTAMP = 1555007204
|
||||
SHA256 (MuseScore-3.0.5.zip) = 43ee606850195d9ea37f15abefa4110cc40e53f5597f2832d8ac71f25ad4abed
|
||||
SIZE (MuseScore-3.0.5.zip) = 120255687
|
||||
|
|
|
@ -1,155 +0,0 @@
|
|||
Upstream commit to fix non-WebEngine builds.
|
||||
|
||||
https://github.com/musescore/MuseScore/commit/bb0c1a9b4940f3f6b52c0df535289ec8a3bc9e03
|
||||
|
||||
diff --git a/mscore/logindialog.h b/mscore/logindialog.h
|
||||
index 4e86ae7985..f44511d8c0 100644
|
||||
--- mscore/logindialog.h
|
||||
+++ mscore/logindialog.h
|
||||
@@ -21,6 +21,8 @@ class LoginManager;
|
||||
|
||||
//---------------------------------------------------------
|
||||
// LoginDialog
|
||||
+// Old-style login dialog in case QtWebEngine is
|
||||
+// unavailable.
|
||||
//---------------------------------------------------------
|
||||
|
||||
class LoginDialog : public QDialog, public Ui::LoginDialog
|
||||
diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
|
||||
index 80c712aea9..5bb8354992 100644
|
||||
--- mscore/musescore.cpp
|
||||
+++ mscore/musescore.cpp
|
||||
@@ -7572,12 +7572,14 @@ bool MuseScore::exportPartsPdfsToJSON(const QString& inFilePath, const QString&
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
-// getQmlEngine
|
||||
+// getPluginEngine
|
||||
//---------------------------------------------------------
|
||||
|
||||
+#ifdef SCRIPT_INTERFACE
|
||||
QmlPluginEngine* MuseScore::getPluginEngine()
|
||||
{
|
||||
if (!_qmlEngine)
|
||||
_qmlEngine = new QmlPluginEngine(this);
|
||||
return _qmlEngine;
|
||||
}
|
||||
+#endif
|
||||
diff --git a/mscore/network/loginmanager.cpp b/mscore/network/loginmanager.cpp
|
||||
index a53d7fe811..664786ccc8 100644
|
||||
--- mscore/network/loginmanager.cpp
|
||||
+++ mscore/network/loginmanager.cpp
|
||||
@@ -18,7 +18,9 @@
|
||||
#include "kQOAuth/kqoauthrequest.h"
|
||||
#include "kQOAuth/kqoauthrequest_xauth.h"
|
||||
|
||||
+#ifdef USE_WEBENGINE
|
||||
#include <QWebEngineCookieStore>
|
||||
+#endif
|
||||
|
||||
namespace Ms {
|
||||
|
||||
@@ -286,8 +288,11 @@ void LoginManager::onTryLoginError(const QString& error)
|
||||
disconnect(this, SIGNAL(getUserError(QString)), this, SLOT(onTryLoginError(QString)));
|
||||
connect(this, SIGNAL(loginSuccess()), this, SLOT(tryLogin()));
|
||||
logout();
|
||||
+#ifdef USE_WEBENGINE
|
||||
loginInteractive();
|
||||
-// mscore->showLoginDialog(); // TODO: switch depending on USE_WEBENGINE
|
||||
+#else
|
||||
+ mscore->showLoginDialog();
|
||||
+#endif
|
||||
}
|
||||
/*------- END - TRY LOGIN ROUTINES ----------------------------*/
|
||||
|
||||
@@ -295,6 +300,7 @@ void LoginManager::onTryLoginError(const QString& error)
|
||||
// loginInteractive
|
||||
//---------------------------------------------------------
|
||||
|
||||
+#ifdef USE_WEBENGINE
|
||||
void LoginManager::loginInteractive()
|
||||
{
|
||||
QWebEngineView* webView = new QWebEngineView;
|
||||
@@ -326,6 +332,7 @@ void LoginManager::loginInteractive()
|
||||
webView->load(ApiInfo::loginUrl);
|
||||
webView->show();
|
||||
}
|
||||
+#endif
|
||||
|
||||
//---------------------------------------------------------
|
||||
// login
|
||||
@@ -346,7 +353,7 @@ void LoginManager::login(QString login, QString password)
|
||||
connect(reply, &QNetworkReply::finished, this, [this, reply] {
|
||||
onReplyFinished(reply, RequestType::LOGIN);
|
||||
});
|
||||
- }
|
||||
+ }
|
||||
|
||||
//---------------------------------------------------------
|
||||
// onLoginSuccessReply
|
||||
@@ -874,6 +881,7 @@ ApiRequest ApiRequestBuilder::build() const
|
||||
// musescore.com
|
||||
//---------------------------------------------------------
|
||||
|
||||
+#ifdef USE_WEBENGINE
|
||||
void ApiWebEngineRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo& request)
|
||||
{
|
||||
const ApiInfo& apiInfo = ApiInfo::instance();
|
||||
@@ -881,4 +889,5 @@ void ApiWebEngineRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo&
|
||||
request.setHttpHeader(apiInfo.clientIdHeader, apiInfo.clientId);
|
||||
request.setHttpHeader(apiInfo.apiKeyHeader, apiInfo.apiKey);
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
diff --git a/mscore/network/loginmanager.h b/mscore/network/loginmanager.h
|
||||
index 584eeea30d..327d9fc966 100644
|
||||
--- mscore/network/loginmanager.h
|
||||
+++ mscore/network/loginmanager.h
|
||||
@@ -13,6 +13,8 @@
|
||||
#ifndef __LOGINMANAGER_H__
|
||||
#define __LOGINMANAGER_H__
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
namespace Ms {
|
||||
|
||||
//---------------------------------------------------------
|
||||
@@ -83,7 +85,9 @@ class LoginManager : public QObject
|
||||
public:
|
||||
LoginManager(QAction* uploadAudioMenuAction, QObject* parent = 0);
|
||||
void login(QString login, QString password);
|
||||
+#ifdef USE_WEBENGINE
|
||||
void loginInteractive();
|
||||
+#endif
|
||||
void upload(const QString& path, int nid, const QString& title, const QString& description, const QString& priv, const QString& license, const QString& tags, const QString& changes);
|
||||
bool hasAccessToken();
|
||||
void getUser();
|
||||
diff --git a/mscore/network/loginmanager_p.h b/mscore/network/loginmanager_p.h
|
||||
index 88228a3958..2848dde35a 100644
|
||||
--- mscore/network/loginmanager_p.h
|
||||
+++ mscore/network/loginmanager_p.h
|
||||
@@ -20,6 +20,8 @@
|
||||
#ifndef __LOGINMANAGER_P_H__
|
||||
#define __LOGINMANAGER_P_H__
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
namespace Ms {
|
||||
|
||||
//---------------------------------------------------------
|
||||
@@ -102,6 +104,7 @@ class ApiRequestBuilder
|
||||
// ApiWebEngineRequestInterceptor
|
||||
//---------------------------------------------------------
|
||||
|
||||
+#ifdef USE_WEBENGINE
|
||||
class ApiWebEngineRequestInterceptor : public QWebEngineUrlRequestInterceptor
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -109,6 +112,7 @@ class ApiWebEngineRequestInterceptor : public QWebEngineUrlRequestInterceptor
|
||||
ApiWebEngineRequestInterceptor(QObject* parent) : QWebEngineUrlRequestInterceptor(parent) {}
|
||||
void interceptRequest(QWebEngineUrlRequestInfo& info) override;
|
||||
};
|
||||
+#endif
|
||||
|
||||
//---------------------------------------------------------
|
||||
// HttpStatus
|
|
@ -196,6 +196,7 @@ share/mime/packages/musescore.xml
|
|||
%%DATADIR%%/locale/tours_fi.qm
|
||||
%%DATADIR%%/locale/tours_fil.qm
|
||||
%%DATADIR%%/locale/tours_fo.qm
|
||||
%%DATADIR%%/locale/tours_fr.qm
|
||||
%%DATADIR%%/locale/tours_ga.qm
|
||||
%%DATADIR%%/locale/tours_gd.qm
|
||||
%%DATADIR%%/locale/tours_gl.qm
|
||||
|
@ -404,6 +405,7 @@ share/mime/packages/musescore.xml
|
|||
%%DATADIR%%/templates/07-Band_and_Percussion/06-Battery_Percussion.mscx
|
||||
%%DATADIR%%/templates/07-Band_and_Percussion/07-Large_Pit_Percussion.mscx
|
||||
%%DATADIR%%/templates/07-Band_and_Percussion/08-Small_Pit_Percussion.mscx
|
||||
%%DATADIR%%/templates/07-Band_and_Percussion/09-European_Concert_Band.mscx
|
||||
%%DATADIR%%/templates/08-Orchestral/01-Classical_Orchestra.mscx
|
||||
%%DATADIR%%/templates/08-Orchestral/02-Symphony_Orchestra.mscx
|
||||
%%DATADIR%%/templates/08-Orchestral/03-String_Orchestra.mscx
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
PORTNAME= musicpd
|
||||
PORTVERSION= 0.21.7
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= audio ipv6
|
||||
MASTER_SITES= https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
|
||||
DISTNAME= mpd-${PORTVERSION}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= ncmpc
|
||||
PORTVERSION= 0.33
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= http://www.musicpd.org/download/ncmpc/0/
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= ncmpcpp
|
||||
DISTVERSION= 0.8.2
|
||||
PORTREVISION= 8
|
||||
PORTREVISION= 9
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= http://ncmpcpp.rybczak.net/stable/
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= patchage
|
||||
PORTVERSION= 0.5.0
|
||||
PORTREVISION= 16
|
||||
PORTREVISION= 17
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= http://download.drobilla.net/ \
|
||||
http://frugalware.mirrors.tds.net/pub/linux/frugalware/frugalware-current/source/xmultimedia-extra/patchage/
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= pms
|
||||
PORTVERSION= 0.42
|
||||
PORTREVISION= 11
|
||||
PORTREVISION= 12
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= SF
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@ USE_SDL= sdl2
|
|||
SVN_URL= https://svn.code.sf.net/p/protracker/code/trunk
|
||||
SVN_REV= 177
|
||||
|
||||
CFLAGS_i386+= -msse2
|
||||
LDFLAGS+= -lSDL2 -lm
|
||||
|
||||
PLIST_FILES= bin/protracker man/man1/protracker.1.gz \
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
PORTNAME= pulseeffects
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 4.5.6
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= audio
|
||||
|
||||
MAINTAINER= daniel@shafer.cc
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= tagpy
|
||||
PORTVERSION= 2013.1
|
||||
PORTREVISION= 17
|
||||
PORTREVISION= 18
|
||||
CATEGORIES= audio python
|
||||
MASTER_SITES= CHEESESHOP
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= qjackctl
|
||||
DISTVERSIONPREFIX= qjackctl_
|
||||
DISTVERSION= 0_5_6
|
||||
DISTVERSION= 0_5_7
|
||||
CATEGORIES= audio
|
||||
|
||||
MAINTAINER= yuri@FreeBSD.org
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1552445443
|
||||
SHA256 (rncbc-qjackctl-qjackctl_0_5_6_GH0.tar.gz) = 03f9a95066378518becbc57d41e10f54c288ca4b217237a7e543bf40c6a339bf
|
||||
SIZE (rncbc-qjackctl-qjackctl_0_5_6_GH0.tar.gz) = 852026
|
||||
TIMESTAMP = 1555167391
|
||||
SHA256 (rncbc-qjackctl-qjackctl_0_5_7_GH0.tar.gz) = 735688018cfb5b0f81d43c6d47f33e055554890e4a77f6cb6b5ea7043846ce48
|
||||
SIZE (rncbc-qjackctl-qjackctl_0_5_7_GH0.tar.gz) = 857892
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= qmidictl
|
||||
DISTVERSION= 0.5.3
|
||||
DISTVERSION= 0.5.4
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= SF
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1549909733
|
||||
SHA256 (qmidictl-0.5.3.tar.gz) = a42d7a2f3fc8090a4fa0a7696f532048071febac88d5ae5e10a0697cb1831551
|
||||
SIZE (qmidictl-0.5.3.tar.gz) = 195116
|
||||
TIMESTAMP = 1555167452
|
||||
SHA256 (qmidictl-0.5.4.tar.gz) = 532babf7f3bc8b60579b53e61e710b6e9f442c87aa470ded56cd74be85a84963
|
||||
SIZE (qmidictl-0.5.4.tar.gz) = 195298
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= raul
|
||||
PORTVERSION= 0.8.0
|
||||
PORTREVISION= 12
|
||||
PORTREVISION= 13
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= http://download.drobilla.net/
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
PORTNAME= sc3-plugins
|
||||
DISTVERSIONPREFIX= Version-
|
||||
DISTVERSION= 3.9.0
|
||||
PORTREVISION= 5
|
||||
PORTREVISION= 6
|
||||
CATEGORIES= audio
|
||||
|
||||
MAINTAINER= yuri@FreeBSD.org
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
PORTNAME= Sorcer
|
||||
DISTVERSIONPREFIX= release-
|
||||
DISTVERSION= 1.1.3
|
||||
PORTREVISION= 5
|
||||
PORTREVISION= 6
|
||||
CATEGORIES= audio
|
||||
PKGNAMESUFFIX= -lv2
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
PORTNAME= spotifyd
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 0.2.8
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= audio
|
||||
|
||||
MAINTAINER= tobik@FreeBSD.org
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= supercollider
|
||||
DISTVERSION= 3.9.3
|
||||
PORTREVISION= 6
|
||||
PORTREVISION= 7
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= https://github.com/supercollider/supercollider/releases/download/Version-${PORTVERSION}/
|
||||
DISTNAME= SuperCollider-${PORTVERSION}-Source-linux
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
PORTNAME= hyperfine
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 1.5.0
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= benchmarks
|
||||
|
||||
MAINTAINER= pizzamig@FreeBSD.org
|
||||
|
|
|
@ -123,6 +123,7 @@
|
|||
SUBDIR += py-orange3-single-cell
|
||||
SUBDIR += py-pyfaidx
|
||||
SUBDIR += py-pysam
|
||||
SUBDIR += py-xenaPython
|
||||
SUBDIR += pycogent
|
||||
SUBDIR += pyfasta
|
||||
SUBDIR += python-nexus
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
PORTNAME= abyss
|
||||
DISTVERSION= 2.1.5
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= biology
|
||||
MASTER_SITES= http://www.bcgsc.ca/platform/bioinfo/software/${PORTNAME}/releases/${DISTVERSION}/
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
PORTNAME= canu
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 1.8
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= biology java perl5
|
||||
|
||||
MAINTAINER= jwb@FreeBSD.org
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= dsr-pdb
|
||||
DISTVERSION= 1.0.3
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= biology
|
||||
MASTER_SITES= https://graphics.stanford.edu/~drussel/
|
||||
DISTNAME= ${PORTNAME}
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
PORTNAME= pbbam
|
||||
DISTVERSION= 0.18.0 # Test with biology/unanimity before upgrading!
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= biology
|
||||
|
||||
MAINTAINER= jwb@FreeBSD.org
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
PORTNAME= pbcopper
|
||||
DISTVERSION= 0.4.1 # Test with biology/unanimity before upgrading!
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= biology
|
||||
|
||||
MAINTAINER= jwb@FreeBSD.org
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= xenaPython
|
||||
DISTVERSION= 1.0.10
|
||||
CATEGORIES= biology python
|
||||
MASTER_SITES= CHEESESHOP
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
|
||||
MAINTAINER= yuri@FreeBSD.org
|
||||
COMMENT= API for Xena Hub to access genetic information shared through the hub
|
||||
|
||||
LICENSE= APACHE20
|
||||
|
||||
USES= python
|
||||
USE_PYTHON= distutils autoplist
|
||||
|
||||
NO_ARCH= yes
|
||||
|
||||
.include <bsd.port.mk>
|
|
@ -0,0 +1,3 @@
|
|||
TIMESTAMP = 1555087462
|
||||
SHA256 (xenaPython-1.0.10.tar.gz) = 1ace9085ef603a4099977e5319fce59251c8853327ddb59b84e8e3065cd80052
|
||||
SIZE (xenaPython-1.0.10.tar.gz) = 11062
|
|
@ -0,0 +1,9 @@
|
|||
Python API for Xena Hub.
|
||||
|
||||
Xena Hub is a Java-based server software installed on the clients' servers
|
||||
that hosts their genomic data in order to share it with others. Using this
|
||||
Python API and other browsers that are part of the UC Santa Cruz Xena project,
|
||||
it is possible to easily access a wide variety of genomic information shared by
|
||||
a large number of researchers.
|
||||
|
||||
WWW: https://github.com/ucscXena/xenaPython
|
|
@ -4,7 +4,7 @@
|
|||
PORTNAME= seqan-apps
|
||||
DISTVERSIONPREFIX= seqan-v
|
||||
DISTVERSION= 2.4.0
|
||||
PORTREVISION= 5
|
||||
PORTREVISION= 6
|
||||
CATEGORIES= biology
|
||||
|
||||
MAINTAINER= h2+fbsdports@fsfe.org
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
PORTNAME= unanimity
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 3.4.1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= biology
|
||||
|
||||
MAINTAINER= jwb@FreeBSD.org
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= FreeCAD
|
||||
DISTVERSION= 0.18
|
||||
DISTVERSION= 0.18.1
|
||||
# use these for bugfixes/snapshots
|
||||
# DISTVERSION= 0.18-16093 # git rev-list --count
|
||||
# DISTVERSIONSUFFIX= -g690774c0e
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1552747107
|
||||
SHA256 (FreeCAD-FreeCAD-0.18_GH0.tar.gz) = 7f3824097c43547c0557312c1cc179c274c28a64384ca9de1e8cf6bbef6f0a19
|
||||
SIZE (FreeCAD-FreeCAD-0.18_GH0.tar.gz) = 219932282
|
||||
TIMESTAMP = 1555086092
|
||||
SHA256 (FreeCAD-FreeCAD-0.18.1_GH0.tar.gz) = 6c0171001a2cba2795122c47959dc907da2aab4acd447f3ed929ed4f90ce5551
|
||||
SIZE (FreeCAD-FreeCAD-0.18.1_GH0.tar.gz) = 219933463
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
PORTNAME= fritzing
|
||||
PORTVERSION= 0.9.2
|
||||
DISTVERSIONSUFFIX= b
|
||||
PORTREVISION= 14
|
||||
PORTREVISION= 15
|
||||
CATEGORIES= cad
|
||||
|
||||
MAINTAINER= lenzi.sergio@gmail.com
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= kicad
|
||||
DISTVERSION= r${GIT_SRC_DATE}
|
||||
PORTREVISION= 8
|
||||
PORTREVISION= 9
|
||||
CATEGORIES= cad
|
||||
PKGNAMESUFFIX= -devel
|
||||
DIST_SUBDIR= ${PORTNAME}
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
PORTNAME= kicad
|
||||
PORTVERSION= 5.1.0
|
||||
PORTREVISION= 1
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= cad
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= librecad
|
||||
DISTVERSION= 2.2.0-rc1
|
||||
PORTREVISION= 7
|
||||
PORTREVISION= 8
|
||||
CATEGORIES= cad
|
||||
|
||||
MAINTAINER= jhale@FreeBSD.org
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= linuxcnc
|
||||
PORTVERSION= 20170708
|
||||
PORTREVISION= 12
|
||||
PORTREVISION= 13
|
||||
CATEGORIES= cad
|
||||
PKGNAMESUFFIX= -devel
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
PORTNAME= openscad
|
||||
PORTVERSION= 2019.04.04
|
||||
PORTREVISION= 1
|
||||
#PORTREVISION= 1
|
||||
CATEGORIES= cad
|
||||
PKGNAMESUFFIX= -devel
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= openscad
|
||||
PORTVERSION= 2019.03.03
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= cad
|
||||
|
||||
MAINTAINER= mr@FreeBSD.org
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
PORTNAME= librime
|
||||
PORTVERSION= 1.2.9
|
||||
DISTVERSIONPREFIX= rime-
|
||||
PORTREVISION= 15
|
||||
PORTREVISION= 16
|
||||
CATEGORIES= chinese textproc
|
||||
|
||||
MAINTAINER= lichray@gmail.com
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
PORTNAME= fldigi
|
||||
PORTVERSION= 4.1.01
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= comms hamradio
|
||||
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@ PORTNAME= gnuradio
|
|||
#MASTER_SITES= http://gnuradio.org/releases/gnuradio/
|
||||
# Temporary git version
|
||||
DISTVERSION= 3.8.g20190309
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= comms astro hamradio
|
||||
|
||||
MAINTAINER= hamradio@FreeBSD.org
|
||||
|
@ -11,6 +12,7 @@ COMMENT= Amateur Radio Software defined radio
|
|||
|
||||
LICENSE= GPLv3
|
||||
|
||||
BROKEN= fails to build with boost 1.70, see bug 236601
|
||||
BROKEN_aarch64= fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
|
||||
BROKEN_armv6= fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
|
||||
BROKEN_armv7= fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
PORTNAME= gqrx
|
||||
PORTVERSION= 2.11.5
|
||||
DISTVERSIONPREFIX= v
|
||||
PORTREVISION= 6
|
||||
PORTREVISION= 7
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= comms hamradio
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ PORTNAME= gr-osmosdr
|
|||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 0.1.4-99
|
||||
DISTVERSIONSUFFIX= -gc98be5d
|
||||
PORTREVISION= 5
|
||||
PORTREVISION= 6
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= comms hamradio
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
|
|||
LIB_DEPENDS= libpcre.so:devel/pcre
|
||||
RUN_DEPENDS= bash:shells/bash
|
||||
|
||||
USES= gmake perl5 tk shebangfix
|
||||
USES= compiler:c11 gmake perl5 tk shebangfix
|
||||
|
||||
SHEBANG_FILES= extensions/*.sh \
|
||||
gateway/*.pl gateway/*.sh \
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
PORTNAME= SoapyUHD
|
||||
DISTVERSIONPREFIX= soapy-uhd-
|
||||
DISTVERSION= 0.3.5
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= comms hamradio
|
||||
|
||||
MAINTAINER= yuri@FreeBSD.org
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= uhd
|
||||
PORTVERSION= 3.10.3.0
|
||||
PORTREVISION= 9
|
||||
PORTREVISION= 10
|
||||
CATEGORIES= comms hamradio
|
||||
MASTER_SITES= http://files.ettus.com/binaries/images/
|
||||
DISTFILES= ${IMAGE_FILE}
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
PORTNAME= osm2pgrouting
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 2.3.6
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= converters databases geography
|
||||
|
||||
MAINTAINER= lbartoletti@tuxfamily.org
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= osm2pgsql
|
||||
PORTVERSION= 0.96.0
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= converters geography
|
||||
|
||||
MAINTAINER= amdmi3@FreeBSD.org
|
||||
|
|
|
@ -980,6 +980,7 @@
|
|||
SUBDIR += rubygem-sqlite3-ruby
|
||||
SUBDIR += rubygem-state_machines-activemodel
|
||||
SUBDIR += rubygem-state_machines-activerecord
|
||||
SUBDIR += rubygem-state_machines-activerecord05
|
||||
SUBDIR += rubygem-tarantool
|
||||
SUBDIR += sequeler
|
||||
SUBDIR += sfcgal
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
PORTNAME= akonadi
|
||||
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= databases kde kde-applications
|
||||
|
||||
MAINTAINER= kde@FreeBSD.org
|
||||
|
|
|
@ -5,7 +5,7 @@ PORTNAME= clickhouse
|
|||
PORTVERSION= 18.14.18
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSIONSUFFIX= -stable
|
||||
PORTREVISION= 6
|
||||
PORTREVISION= 7
|
||||
CATEGORIES= databases
|
||||
|
||||
MAINTAINER= proler@gmail.com
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= cockroach
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 2.0.6
|
||||
DISTVERSION= 2.0.7
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= https://binaries.cockroachdb.com/
|
||||
EXTRACT_SUFX= .src.tgz
|
||||
|
@ -13,8 +13,6 @@ COMMENT= Cloud-native SQL database that survive disasters
|
|||
LICENSE= APACHE20
|
||||
LICENSE_FILE= ${WRKSRC}/src/github.com/cockroachdb/cockroach/LICENSE
|
||||
|
||||
BROKEN= fails to build
|
||||
|
||||
ONLY_FOR_ARCHS= amd64
|
||||
ONLY_FOR_ARCHS_REASON= "Only supported on amd64"
|
||||
|
||||
|
@ -38,9 +36,11 @@ post-patch:
|
|||
@${REINPLACE_CMD} -e 's|LDFLAGS: -ledit|LDFLAGS: -L${LOCALBASE}/lib -ledit|g' \
|
||||
-e 's|CPPFLAGS: -Ishim|CPPFLAGS: -I${LOCALBASE}/include -Ishim|g' \
|
||||
${WRKSRC}/src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go
|
||||
@${REINPLACE_CMD} -e 's|build -i -o|build -o|g' \
|
||||
${WRKSRC}/src/github.com/cockroachdb/cockroach/Makefile
|
||||
|
||||
do-build:
|
||||
@${SETENV} -i PATH="${PATH}" \
|
||||
@${SETENV} -i ${MAKE_ENV} \
|
||||
${MAKE_CMD} -C ${WRKSRC} buildoss
|
||||
|
||||
do-install:
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1538829109
|
||||
SHA256 (cockroach-v2.0.6.src.tgz) = fd1d966542565cbeca6c390db6b7afd98bc239e6e2a4602b3edff973be472097
|
||||
SIZE (cockroach-v2.0.6.src.tgz) = 45566359
|
||||
TIMESTAMP = 1552343259
|
||||
SHA256 (cockroach-v2.0.7.src.tgz) = 0aa42e8a87d0b915d6e7a9df39e3bb32eac250c1afc25e37cc36585f3afa081a
|
||||
SIZE (cockroach-v2.0.7.src.tgz) = 45565811
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
--- src/github.com/cockroachdb/cockroach/c-deps/rocksdb/CMakeLists.txt.orig 2019-04-12 18:43:38 UTC
|
||||
+++ src/github.com/cockroachdb/cockroach/c-deps/rocksdb/CMakeLists.txt
|
||||
@@ -209,7 +209,7 @@ if(HAVE_THREAD_LOCAL)
|
||||
add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
|
||||
endif()
|
||||
|
||||
-option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON)
|
||||
+option(FAIL_ON_WARNINGS "Treat compile warnings as errors" OFF)
|
||||
if(FAIL_ON_WARNINGS)
|
||||
if(MSVC)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
|
|
@ -0,0 +1,29 @@
|
|||
--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig 2018-12-10 15:51:01 UTC
|
||||
+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go
|
||||
@@ -1986,22 +1986,22 @@ func (r *rocksDBIterator) Valid() (bool, error) {
|
||||
|
||||
func (r *rocksDBIterator) Next() {
|
||||
r.checkEngineOpen()
|
||||
- r.setState(C.DBIterNext(r.iter, false /* skip_current_key_versions */))
|
||||
+ r.setState(C.DBIterNext(r.iter, C.bool(false) /* skip_current_key_versions */))
|
||||
}
|
||||
|
||||
func (r *rocksDBIterator) Prev() {
|
||||
r.checkEngineOpen()
|
||||
- r.setState(C.DBIterPrev(r.iter, false /* skip_current_key_versions */))
|
||||
+ r.setState(C.DBIterPrev(r.iter, C.bool(false) /* skip_current_key_versions */))
|
||||
}
|
||||
|
||||
func (r *rocksDBIterator) NextKey() {
|
||||
r.checkEngineOpen()
|
||||
- r.setState(C.DBIterNext(r.iter, true /* skip_current_key_versions */))
|
||||
+ r.setState(C.DBIterNext(r.iter, C.bool(true) /* skip_current_key_versions */))
|
||||
}
|
||||
|
||||
func (r *rocksDBIterator) PrevKey() {
|
||||
r.checkEngineOpen()
|
||||
- r.setState(C.DBIterPrev(r.iter, true /* skip_current_key_versions */))
|
||||
+ r.setState(C.DBIterPrev(r.iter, C.bool(true) /* skip_current_key_versions */))
|
||||
}
|
||||
|
||||
func (r *rocksDBIterator) Key() MVCCKey {
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= couchdb2
|
||||
DISTVERSION= 2.3.1
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= APACHE/couchdb/source/${DISTVERSION}
|
||||
DISTNAME= apache-couchdb-${DISTVERSION}
|
||||
|
|
|
@ -2,8 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= foundationdb
|
||||
PORTVERSION= 6.0.18
|
||||
PORTREVISION= 0
|
||||
PORTVERSION= 6.1.1
|
||||
CATEGORIES= databases
|
||||
|
||||
MAINTAINER= vanilla@FreeBSD.org
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1547178154
|
||||
SHA256 (apple-foundationdb-6.0.18_GH0.tar.gz) = d8d0604ccd306e4d52b2a36def27e95504ee7f38a60e75ae16828bdc88ba54a8
|
||||
SIZE (apple-foundationdb-6.0.18_GH0.tar.gz) = 4615666
|
||||
TIMESTAMP = 1554904793
|
||||
SHA256 (apple-foundationdb-6.1.1_GH0.tar.gz) = 20c35b342138e16711d113beb21a32b507ca21ae36f5d701cfa043c82ed67b74
|
||||
SIZE (apple-foundationdb-6.1.1_GH0.tar.gz) = 4873842
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
--- FDBLibTLS/local.mk.orig 2018-09-11 01:21:54 UTC
|
||||
--- FDBLibTLS/local.mk.orig 2019-04-09 00:11:05 UTC
|
||||
+++ FDBLibTLS/local.mk
|
||||
@@ -23,6 +23,6 @@
|
||||
FDBLibTLS_BUILD_SOURCES +=
|
||||
|
||||
|
||||
-FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) -Iflow -Ifdbrpc -DUSE_UCONTEXT
|
||||
+FDBLibTLS_CFLAGS := -fPIC -I$(BOOSTDIR)/include -Ifdbrpc -Iflow -DUSE_UCONTEXT
|
||||
-FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) -I. -DUSE_UCONTEXT
|
||||
+FDBLibTLS_CFLAGS := -fPIC -I$(BOOSTDIR)/include -I. -DUSE_UCONTEXT
|
||||
|
||||
lib/libFDBLibTLS.a: bin/coverage.FDBLibTLS.xml
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- Makefile.orig 2019-01-09 22:28:32 UTC
|
||||
--- Makefile.orig 2019-04-09 00:11:05 UTC
|
||||
+++ Makefile
|
||||
@@ -6,6 +6,8 @@ TOPDIR := $(shell pwd)
|
||||
@@ -11,6 +11,8 @@ TOPDIR := $(shell pwd)
|
||||
|
||||
ifeq ($(ARCH),x86_64)
|
||||
ARCH := x64
|
||||
|
@ -9,19 +9,7 @@
|
|||
else
|
||||
$(error Not prepared to compile on $(ARCH))
|
||||
endif
|
||||
@@ -15,11 +17,7 @@ ifeq ($(MONO),)
|
||||
MONO := /usr/bin/mono
|
||||
endif
|
||||
|
||||
-DMCS := $(shell which dmcs)
|
||||
MCS := $(shell which mcs)
|
||||
-ifneq ($(DMCS),)
|
||||
- MCS := $(DMCS)
|
||||
-endif
|
||||
ifeq ($(MCS),)
|
||||
MCS := /usr/bin/dmcs
|
||||
endif
|
||||
@@ -45,6 +43,15 @@ ifeq ($(PLATFORM),Linux)
|
||||
@@ -50,6 +52,15 @@ ifeq ($(PLATFORM),Linux)
|
||||
DLEXT := so
|
||||
java_DLEXT := so
|
||||
TARGET_LIBC_VERSION ?= 2.11
|
||||
|
@ -37,16 +25,16 @@
|
|||
else ifeq ($(PLATFORM),Darwin)
|
||||
PLATFORM := osx
|
||||
|
||||
@@ -108,7 +115,7 @@ STATIC_LIBS :=
|
||||
@@ -120,7 +131,7 @@ STATIC_LIBS :=
|
||||
VPATH += $(addprefix :,$(filter-out lib,$(patsubst -L%,%,$(filter -L%,$(LDFLAGS)))))
|
||||
|
||||
CS_PROJECTS := flow/actorcompiler flow/coveragetool fdbclient/vexillographer
|
||||
-CPP_PROJECTS := flow fdbrpc fdbclient fdbbackup fdbserver fdbcli bindings/c bindings/java fdbmonitor bindings/flow/tester bindings/flow FDBLibTLS
|
||||
-CPP_PROJECTS := flow fdbrpc fdbclient fdbbackup fdbserver fdbcli bindings/c bindings/java fdbmonitor bindings/flow/tester bindings/flow
|
||||
+CPP_PROJECTS := flow fdbrpc fdbclient fdbbackup fdbserver fdbcli bindings/c fdbmonitor bindings/flow/tester bindings/flow
|
||||
OTHER_PROJECTS := bindings/python bindings/ruby bindings/go
|
||||
|
||||
CS_MK_GENERATED := $(CS_PROJECTS:=/generated.mk)
|
||||
@@ -117,7 +124,7 @@ CPP_MK_GENERATED := $(CPP_PROJECTS:=/generated.mk)
|
||||
ifndef TLS_DISABLED
|
||||
CPP_PROJECTS += FDBLibTLS
|
||||
endif
|
||||
@@ -132,7 +143,7 @@ CPP_MK_GENERATED := $(CPP_PROJECTS:=/generated.mk)
|
||||
MK_GENERATED := $(CS_MK_GENERATED) $(CPP_MK_GENERATED)
|
||||
|
||||
# build/valgrind.mk needs to be included before any _MK_GENERATED (which in turn includes local.mk)
|
||||
|
@ -55,7 +43,7 @@
|
|||
|
||||
ALL_MAKEFILES := Makefile $(MK_INCLUDE) $(patsubst %/generated.mk,%/local.mk,$(MK_GENERATED))
|
||||
|
||||
@@ -127,7 +134,7 @@ TARGETS =
|
||||
@@ -142,7 +153,7 @@ TARGETS =
|
||||
|
||||
default: fdbserver fdbbackup fdbcli fdb_c fdb_python fdb_python_sdist
|
||||
|
||||
|
@ -64,7 +52,7 @@
|
|||
|
||||
# These are always defined and ready to use. Any target that uses them and needs them up to date
|
||||
# should depend on versions.target
|
||||
@@ -149,11 +156,11 @@ Makefiles: $(MK_GENERATED)
|
||||
@@ -164,11 +175,11 @@ Makefiles: $(MK_GENERATED)
|
||||
|
||||
$(CS_MK_GENERATED): build/csprojtom4.py build/csproj.mk Makefile
|
||||
@echo "Creating $@"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- fdbbackup/local.mk.orig 2018-09-11 01:21:54 UTC
|
||||
--- fdbbackup/local.mk.orig 2019-04-09 00:11:05 UTC
|
||||
+++ fdbbackup/local.mk
|
||||
@@ -35,6 +35,8 @@ ifeq ($(PLATFORM),linux)
|
||||
@@ -34,6 +34,8 @@ ifeq ($(PLATFORM),linux)
|
||||
# fdbbackup_STATIC_LIBS += -ltcmalloc -lunwind -lprofiler
|
||||
else ifeq ($(PLATFORM),osx)
|
||||
fdbbackup_LDFLAGS += -lc++
|
||||
|
|
|
@ -1,16 +1,7 @@
|
|||
--- fdbcli/local.mk.orig 2018-09-11 01:21:54 UTC
|
||||
--- fdbcli/local.mk.orig 2019-04-09 00:11:05 UTC
|
||||
+++ fdbcli/local.mk
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
fdbcli_CFLAGS := $(fdbclient_CFLAGS)
|
||||
fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS)
|
||||
-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl $(FDB_TLS_LIB)
|
||||
+fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB)
|
||||
fdbcli_STATIC_LIBS := $(TLS_LIBS)
|
||||
|
||||
fdbcli_GENERATED_SOURCES += versions.h
|
||||
@@ -32,6 +32,8 @@ ifeq ($(PLATFORM),linux)
|
||||
fdbcli_LIBS += -lpthread -lrt
|
||||
@@ -31,9 +31,11 @@ ifeq ($(PLATFORM),linux)
|
||||
fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl
|
||||
else ifeq ($(PLATFORM),osx)
|
||||
fdbcli_LDFLAGS += -lc++
|
||||
+else ifeq ($(PLATFORM),freebsd)
|
||||
|
@ -18,3 +9,7 @@
|
|||
endif
|
||||
|
||||
test_fdbcli_status: fdbcli
|
||||
- python scripts/test_status.py
|
||||
+ $(PYTHON) scripts/test_status.py
|
||||
|
||||
bin/fdbcli.debug: bin/fdbcli
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- fdbclient/BlobStore.h.orig 2019-02-23 13:23:11 UTC
|
||||
+++ fdbclient/BlobStore.h
|
||||
@@ -36,7 +36,7 @@ class BlobStoreEndpoint : public ReferenceCounted<Blob
|
||||
struct Stats {
|
||||
Stats() : requests_successful(0), requests_failed(0), bytes_sent(0) {}
|
||||
Stats operator-(const Stats &rhs);
|
||||
- void clear() { memset(this, sizeof(*this), 0); }
|
||||
+ void clear() { memset(this, 0, sizeof(*this)); }
|
||||
json_spirit::mObject getJSON();
|
||||
|
||||
int64_t requests_successful;
|
|
@ -1,6 +1,6 @@
|
|||
--- fdbmonitor/fdbmonitor.cpp.orig 2019-01-09 22:28:32 UTC
|
||||
--- fdbmonitor/fdbmonitor.cpp.orig 2019-04-09 00:11:05 UTC
|
||||
+++ fdbmonitor/fdbmonitor.cpp
|
||||
@@ -35,6 +35,10 @@
|
||||
@@ -37,6 +37,10 @@
|
||||
#include <linux/limits.h>
|
||||
#endif
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
|||
#ifdef __APPLE__
|
||||
#include <sys/event.h>
|
||||
#include <mach/mach.h>
|
||||
@@ -72,7 +76,7 @@
|
||||
@@ -77,7 +81,7 @@
|
||||
|
||||
#ifdef __linux__
|
||||
typedef fd_set* fdb_fd_set;
|
||||
|
@ -20,7 +20,7 @@
|
|||
typedef int fdb_fd_set;
|
||||
#endif
|
||||
|
||||
@@ -83,7 +87,7 @@ void monitor_fd( fdb_fd_set list, int fd, int* maxfd,
|
||||
@@ -88,7 +92,7 @@ void monitor_fd( fdb_fd_set list, int fd, int* maxfd,
|
||||
FD_SET( fd, list );
|
||||
if ( fd > *maxfd )
|
||||
*maxfd = fd;
|
||||
|
@ -29,7 +29,7 @@
|
|||
/* ignore maxfd */
|
||||
struct kevent ev;
|
||||
EV_SET( &ev, fd, EVFILT_READ, EV_ADD, 0, 0, cmd );
|
||||
@@ -94,7 +98,7 @@ void monitor_fd( fdb_fd_set list, int fd, int* maxfd,
|
||||
@@ -99,7 +103,7 @@ void monitor_fd( fdb_fd_set list, int fd, int* maxfd,
|
||||
void unmonitor_fd( fdb_fd_set list, int fd ) {
|
||||
#ifdef __linux__
|
||||
FD_CLR( fd, list );
|
||||
|
@ -38,7 +38,7 @@
|
|||
struct kevent ev;
|
||||
EV_SET( &ev, fd, EVFILT_READ, EV_DELETE, 0, 0, NULL );
|
||||
kevent( list, &ev, 1, NULL, 0, NULL ); // FIXME: check?
|
||||
@@ -188,7 +192,7 @@ const char* get_value_multi(const CSimpleIni& ini, con
|
||||
@@ -193,7 +197,7 @@ const char* get_value_multi(const CSimpleIni& ini, con
|
||||
}
|
||||
|
||||
double timer() {
|
||||
|
@ -47,7 +47,7 @@
|
|||
struct timespec ts;
|
||||
clock_gettime(CLOCK_MONOTONIC, &ts);
|
||||
return double(ts.tv_sec) + (ts.tv_nsec * 1e-9);
|
||||
@@ -824,7 +828,7 @@ void read_child_output( Command* cmd, int pipe_idx, fd
|
||||
@@ -912,7 +916,7 @@ void read_child_output( Command* cmd, int pipe_idx, fd
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -56,16 +56,16 @@
|
|||
void watch_conf_dir( int kq, int* confd_fd, std::string confdir ) {
|
||||
struct kevent ev;
|
||||
std::string original = confdir;
|
||||
@@ -841,7 +845,7 @@ void watch_conf_dir( int kq, int* confd_fd, std::strin
|
||||
@@ -929,7 +933,7 @@ void watch_conf_dir( int kq, int* confd_fd, std::strin
|
||||
std::string child = confdir;
|
||||
|
||||
/* Find the nearest existing ancestor */
|
||||
- while( (*confd_fd = open( confdir.c_str(), O_EVTONLY )) < 0 && errno == ENOENT ) {
|
||||
+ while( (*confd_fd = open( confdir.c_str(), O_RDONLY )) < 0 && errno == ENOENT ) {
|
||||
child = confdir;
|
||||
confdir = parentDirectory(confdir);
|
||||
confdir = parentDirectory(confdir, false);
|
||||
}
|
||||
@@ -878,7 +882,7 @@ void watch_conf_file( int kq, int* conff_fd, const cha
|
||||
@@ -966,7 +970,7 @@ void watch_conf_file( int kq, int* conff_fd, const cha
|
||||
}
|
||||
|
||||
/* Open and watch */
|
||||
|
@ -74,16 +74,16 @@
|
|||
if ( *conff_fd >= 0 ) {
|
||||
EV_SET( &ev, *conff_fd, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_WRITE | NOTE_ATTRIB, 0, NULL );
|
||||
kevent( kq, &ev, 1, NULL, 0, NULL );
|
||||
@@ -985,7 +989,7 @@ std::unordered_map<int, std::unordered_set<std::string
|
||||
@@ -1170,7 +1174,7 @@ int main(int argc, char** argv) {
|
||||
// testPathOps(); return -1;
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
std::string lockfile = "/var/run/fdbmonitor.pid";
|
||||
- std::string _confpath = "/etc/foundationdb/foundationdb.conf";
|
||||
+ std::string _confpath = std::string(PREFIX) + "/etc/foundationdb/foundationdb.conf";
|
||||
|
||||
std::vector<const char *> additional_watch_paths;
|
||||
|
||||
@@ -1067,7 +1071,7 @@ int main(int argc, char** argv) {
|
||||
@@ -1252,7 +1256,7 @@ int main(int argc, char** argv) {
|
||||
/* only linux needs this, but... */
|
||||
int maxfd = 0;
|
||||
|
||||
|
@ -92,7 +92,7 @@
|
|||
fd_set rfds;
|
||||
watched_fds = &rfds;
|
||||
|
||||
@@ -1082,12 +1086,12 @@ int main(int argc, char** argv) {
|
||||
@@ -1267,12 +1271,12 @@ int main(int argc, char** argv) {
|
||||
CSimpleIniA* ini = NULL;
|
||||
|
||||
if (daemonize) {
|
||||
|
@ -107,7 +107,7 @@
|
|||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
log_err("daemon", errno, "Unable to daemonize");
|
||||
@@ -1140,12 +1144,12 @@ int main(int argc, char** argv) {
|
||||
@@ -1325,12 +1329,12 @@ int main(int argc, char** argv) {
|
||||
snprintf(pid_buf, sizeof(pid_buf), "%d\n", getpid());
|
||||
ssize_t ign = write(lockfile_fd, pid_buf, strlen(pid_buf));
|
||||
|
||||
|
@ -122,7 +122,7 @@
|
|||
int kq = kqueue();
|
||||
if ( kq < 0 ) {
|
||||
log_err( "kqueue", errno, "Unable to create kqueue" );
|
||||
@@ -1176,7 +1180,7 @@ int main(int argc, char** argv) {
|
||||
@@ -1361,7 +1365,7 @@ int main(int argc, char** argv) {
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -131,7 +131,7 @@
|
|||
signal(SIGCHLD, child_handler);
|
||||
#endif
|
||||
|
||||
@@ -1190,11 +1194,11 @@ int main(int argc, char** argv) {
|
||||
@@ -1375,11 +1379,11 @@ int main(int argc, char** argv) {
|
||||
/* normal will be restored in our main loop in the call to
|
||||
pselect, but none blocks all signals while processing events */
|
||||
sigprocmask(SIG_SETMASK, &full_mask, &normal_mask);
|
||||
|
@ -145,7 +145,7 @@
|
|||
struct stat st_buf;
|
||||
struct timespec mtimespec;
|
||||
|
||||
@@ -1253,7 +1257,7 @@ int main(int argc, char** argv) {
|
||||
@@ -1438,7 +1442,7 @@ int main(int argc, char** argv) {
|
||||
|
||||
load_conf(confpath.c_str(), uid, gid, &normal_mask, &rfds, &maxfd);
|
||||
reload_additional_watches = false;
|
||||
|
@ -154,7 +154,7 @@
|
|||
load_conf( confpath.c_str(), uid, gid, &normal_mask, watched_fds, &maxfd );
|
||||
watch_conf_file( kq, &conff_fd, confpath.c_str() );
|
||||
watch_conf_dir( kq, &confd_fd, confdir );
|
||||
@@ -1291,7 +1295,7 @@ int main(int argc, char** argv) {
|
||||
@@ -1476,7 +1480,7 @@ int main(int argc, char** argv) {
|
||||
if(nfds == 0) {
|
||||
reload = true;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- fdbrpc/AsyncFileCached.actor.cpp.orig 2018-05-30 22:33:28 UTC
|
||||
--- fdbrpc/AsyncFileCached.actor.cpp.orig 2019-04-09 00:11:05 UTC
|
||||
+++ fdbrpc/AsyncFileCached.actor.cpp
|
||||
@@ -31,7 +31,7 @@ EvictablePage::~EvictablePage() {
|
||||
if (pageCache->pageSize == 4096)
|
||||
|
@ -9,3 +9,12 @@
|
|||
}
|
||||
if (index > -1) {
|
||||
pageCache->pages[index] = pageCache->pages.back();
|
||||
@@ -155,7 +155,7 @@ void AsyncFileCached::releaseZeroCopy( void* data, int
|
||||
if (length == 4096)
|
||||
FastAllocator<4096>::release(data);
|
||||
else
|
||||
- aligned_free(data);
|
||||
+ free(data);
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
--- fdbrpc/IAsyncFile.actor.cpp.orig 2019-01-09 22:28:32 UTC
|
||||
--- fdbrpc/IAsyncFile.actor.cpp.orig 2019-04-09 00:11:05 UTC
|
||||
+++ fdbrpc/IAsyncFile.actor.cpp
|
||||
@@ -42,7 +42,7 @@ ACTOR static Future<Void> zeroRangeHelper( Reference<I
|
||||
Void _ = wait( yield() );
|
||||
@@ -43,7 +43,7 @@ ACTOR static Future<Void> zeroRangeHelper( Reference<I
|
||||
wait( yield() );
|
||||
}
|
||||
|
||||
- aligned_free(zeros);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- fdbrpc/local.mk.orig 2018-04-19 02:55:50 UTC
|
||||
--- fdbrpc/local.mk.orig 2019-04-09 00:11:05 UTC
|
||||
+++ fdbrpc/local.mk
|
||||
@@ -20,10 +20,11 @@
|
||||
|
||||
|
@ -7,9 +7,9 @@
|
|||
-fdbrpc_BUILD_SOURCES += fdbrpc/libeio/eio.c
|
||||
+#fdbrpc_BUILD_SOURCES += fdbrpc/libeio/eio.c
|
||||
|
||||
-fdbrpc_CFLAGS := -I$(BOOSTDIR) -I. -Ifdbrpc -Ifdbrpc/libeio -DUSE_UCONTEXT
|
||||
-fdbrpc_CFLAGS := -I$(BOOSTDIR) -I. -Ifdbrpc/libeio -DUSE_UCONTEXT
|
||||
-fdbrpc_LDFLAGS :=
|
||||
+fdbrpc_CFLAGS := -I$(BOOSTDIR)/include -I. -Ifdbrpc -Ifdbrpc/libeio -DUSE_UCONTEXT
|
||||
+fdbrpc_CFLAGS := -I$(BOOSTDIR)/include -I. -DUSE_UCONTEXT
|
||||
+fdbrpc_LDFLAGS := -L$(BOOSTDIR)/lib
|
||||
+fdbrpc_LIBS := -lm -lc++ -lpthread -leio -lboost_system
|
||||
|
||||
|
|
|
@ -1,37 +1,29 @@
|
|||
--- fdbserver/fdbserver.actor.cpp.orig 2019-01-09 22:28:32 UTC
|
||||
--- fdbserver/fdbserver.actor.cpp.orig 2019-04-09 00:11:05 UTC
|
||||
+++ fdbserver/fdbserver.actor.cpp
|
||||
@@ -60,7 +60,7 @@
|
||||
#define BOOST_DATE_TIME_NO_LIB
|
||||
#include <boost/interprocess/managed_shared_memory.hpp>
|
||||
#include "versions.h"
|
||||
#endif
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
#include <execinfo.h>
|
||||
#include <signal.h>
|
||||
#ifdef ALLOC_INSTRUMENTATION
|
||||
@@ -73,6 +73,7 @@
|
||||
#endif
|
||||
|
||||
#include "flow/SimpleOpt.h"
|
||||
+#include <fstream>
|
||||
|
||||
enum {
|
||||
OPT_CONNFILE, OPT_SEEDCONNFILE, OPT_SEEDCONNSTRING, OPT_ROLE, OPT_LISTEN, OPT_PUBLICADDR, OPT_DATAFOLDER, OPT_LOGFOLDER, OPT_PARENTPID, OPT_NEWCONSOLE, OPT_NOBOX, OPT_TESTFILE, OPT_RESTARTING, OPT_RANDOMSEED, OPT_KEY, OPT_MEMLIMIT, OPT_STORAGEMEMLIMIT, OPT_MACHINEID, OPT_DCID, OPT_MACHINE_CLASS, OPT_BUGGIFY, OPT_VERSION, OPT_CRASHONERROR, OPT_HELP, OPT_NETWORKIMPL, OPT_NOBUFSTDOUT, OPT_BUFSTDOUTERR, OPT_TRACECLOCK, OPT_NUMTESTERS, OPT_DEVHELP, OPT_ROLLSIZE, OPT_MAXLOGS, OPT_MAXLOGSSIZE, OPT_KNOB, OPT_TESTSERVERS, OPT_TEST_ON_SERVERS, OPT_METRICSCONNFILE, OPT_METRICSPREFIX,
|
||||
@@ -353,7 +354,7 @@ class WorldReadablePermissions { (public)
|
||||
@@ -288,7 +288,7 @@ class WorldReadablePermissions { (public)
|
||||
throw platform_error();
|
||||
}
|
||||
permission.set_permissions( &sa );
|
||||
-#elif (defined(__linux__) || defined(__APPLE__))
|
||||
+#elif (defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__))
|
||||
+#elif (defined(__linux__) || defined(__APPLE__)) || defined(__FreeBSD__)
|
||||
// There is nothing to do here, since the default permissions are fine
|
||||
#else
|
||||
#error Port me!
|
||||
@@ -363,7 +364,7 @@ class WorldReadablePermissions { (public)
|
||||
@@ -298,7 +298,7 @@ class WorldReadablePermissions { (public)
|
||||
virtual ~WorldReadablePermissions() {
|
||||
#ifdef _WIN32
|
||||
LocalFree( sa.lpSecurityDescriptor );
|
||||
-#elif (defined(__linux__) || defined(__APPLE__))
|
||||
+#elif (defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__))
|
||||
+#elif (defined(__linux__) || defined(__APPLE__)) || defined(__FreeBSD__)
|
||||
// There is nothing to do here, since the default permissions are fine
|
||||
#else
|
||||
#error Port me!
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- fdbserver/local.mk.orig 2018-09-11 01:21:54 UTC
|
||||
--- fdbserver/local.mk.orig 2019-04-09 00:11:05 UTC
|
||||
+++ fdbserver/local.mk
|
||||
@@ -35,6 +35,8 @@ ifeq ($(PLATFORM),linux)
|
||||
@@ -34,6 +34,8 @@ ifeq ($(PLATFORM),linux)
|
||||
# fdbserver_STATIC_LIBS += -ltcmalloc -lunwind -lprofiler
|
||||
else ifeq ($(PLATFORM),osx)
|
||||
fdbserver_LDFLAGS += -lc++
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- fdbserver/worker.actor.cpp.orig 2019-01-09 22:28:32 UTC
|
||||
--- fdbserver/worker.actor.cpp.orig 2019-04-09 00:11:05 UTC
|
||||
+++ fdbserver/worker.actor.cpp
|
||||
@@ -39,7 +39,7 @@
|
||||
@@ -41,7 +41,7 @@
|
||||
#include "fdbclient/ClientWorkerInterface.h"
|
||||
#include "flow/Profiler.h"
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
#ifdef USE_GPERFTOOLS
|
||||
#include "gperftools/profiler.h"
|
||||
#endif
|
||||
@@ -272,7 +272,7 @@ ACTOR Future<Void> registrationClient( Reference<Async
|
||||
@@ -373,7 +373,7 @@ ACTOR Future<Void> registrationClient(
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
|||
//A set of threads that should be profiled
|
||||
std::set<std::thread::id> profiledThreads;
|
||||
|
||||
@@ -284,7 +284,7 @@ int filter_in_thread(void *arg) {
|
||||
@@ -385,7 +385,7 @@ int filter_in_thread(void *arg) {
|
||||
|
||||
//Enables the calling thread to be profiled
|
||||
void registerThreadForProfiling() {
|
||||
|
@ -27,7 +27,7 @@
|
|||
//Not sure if this is actually needed, but a call to backtrace was advised here:
|
||||
//http://groups.google.com/group/google-perftools/browse_thread/thread/0dfd74532e038eb8/2686d9f24ac4365f?pli=1
|
||||
profiledThreads.insert(std::this_thread::get_id());
|
||||
@@ -298,7 +298,7 @@ void registerThreadForProfiling() {
|
||||
@@ -399,7 +399,7 @@ void registerThreadForProfiling() {
|
||||
void updateCpuProfiler(ProfilerRequest req) {
|
||||
switch (req.type) {
|
||||
case ProfilerRequest::Type::GPROF:
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- flow/Deque.h.orig 2019-01-09 22:28:32 UTC
|
||||
--- flow/Deque.h.orig 2019-04-09 00:11:05 UTC
|
||||
+++ flow/Deque.h
|
||||
@@ -166,7 +166,7 @@ class Deque { (private)
|
||||
@@ -168,7 +168,7 @@ class Deque { (private)
|
||||
new (&newArr[i - begin]) T(std::move(arr[i&mask]));
|
||||
arr[i&mask].~T();
|
||||
}
|
||||
|
@ -9,7 +9,7 @@
|
|||
arr = newArr;
|
||||
end -= begin;
|
||||
begin = 0;
|
||||
@@ -177,8 +177,8 @@ class Deque { (private)
|
||||
@@ -179,7 +179,7 @@ class Deque { (private)
|
||||
for (int i = begin; i != end; i++)
|
||||
arr[i&mask].~T();
|
||||
if(arr)
|
||||
|
@ -18,6 +18,3 @@
|
|||
}
|
||||
};
|
||||
|
||||
-#endif
|
||||
\ No newline at end of file
|
||||
+#endif
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- flow/FastAlloc.cpp.orig 2018-04-22 14:45:22 UTC
|
||||
--- flow/FastAlloc.cpp.orig 2019-04-09 00:11:05 UTC
|
||||
+++ flow/FastAlloc.cpp
|
||||
@@ -51,6 +51,9 @@
|
||||
@@ -53,6 +53,9 @@
|
||||
#elif defined(__APPLE__)
|
||||
#pragma message "init_priority is not supported on this platform; will this be a problem?"
|
||||
#define INIT_SEG
|
||||
|
|
|
@ -1,11 +1,33 @@
|
|||
--- flow/Net2.actor.cpp.orig 2019-01-09 22:28:32 UTC
|
||||
--- flow/Net2.actor.cpp.orig 2019-04-09 00:11:05 UTC
|
||||
+++ flow/Net2.actor.cpp
|
||||
@@ -56,7 +56,7 @@ uint64_t compatibleProtocolVersionMask = 0xfffffffffff
|
||||
uint64_t minValidProtocolVersion = 0x0FDB00A200060001LL;
|
||||
|
||||
@@ -62,7 +62,7 @@ const uint64_t minValidProtocolVersion = 0x0FDB0
|
||||
// This assert is intended to help prevent incrementing the leftmost digits accidentally. It will probably need to change when we reach version 10.
|
||||
static_assert(currentProtocolVersion < 0x0FDB00B100000000LL, "Unexpected protocol version");
|
||||
|
||||
-#if defined(__linux__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
#include <execinfo.h>
|
||||
|
||||
volatile double net2liveness = 0;
|
||||
@@ -437,6 +437,12 @@ class Connection : public IConnection, ReferenceCounte
|
||||
}
|
||||
};
|
||||
|
||||
+#if BOOST_VERSION >= 107000
|
||||
+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
|
||||
+#else
|
||||
+#define GET_IO_SERVICE(s) ((s).get_io_service())
|
||||
+#endif
|
||||
+
|
||||
class Listener : public IListener, ReferenceCounted<Listener> {
|
||||
NetworkAddress listenAddress;
|
||||
tcp::acceptor acceptor;
|
||||
@@ -459,7 +465,7 @@ class Listener : public IListener, ReferenceCounted<Li
|
||||
|
||||
private:
|
||||
ACTOR static Future<Reference<IConnection>> doAccept( Listener* self ) {
|
||||
- state Reference<Connection> conn( new Connection( self->acceptor.get_io_service() ) );
|
||||
+ state Reference<Connection> conn( new Connection( GET_IO_SERVICE(self->acceptor) ) );
|
||||
state tcp::acceptor::endpoint_type peer_endpoint;
|
||||
try {
|
||||
BindPromise p("N2_AcceptError", UID());
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- flow/Platform.cpp.orig 2019-01-09 22:28:32 UTC
|
||||
--- flow/Platform.cpp.orig 2019-04-09 00:11:05 UTC
|
||||
+++ flow/Platform.cpp
|
||||
@@ -71,6 +71,7 @@
|
||||
@@ -72,6 +72,7 @@
|
||||
|
||||
#include <dirent.h>
|
||||
#include <sys/time.h>
|
||||
|
@ -8,7 +8,7 @@
|
|||
#include <sys/mman.h>
|
||||
#include <unistd.h>
|
||||
#include <ftw.h>
|
||||
@@ -119,7 +120,13 @@
|
||||
@@ -122,7 +123,13 @@
|
||||
#include <IOKit/IOBSD.h>
|
||||
#endif
|
||||
|
||||
|
@ -22,7 +22,7 @@
|
|||
|
||||
std::string removeWhitespace(const std::string &t)
|
||||
{
|
||||
@@ -198,7 +205,7 @@ double getProcessorTimeThread() {
|
||||
@@ -201,7 +208,7 @@ double getProcessorTimeThread() {
|
||||
throw platform_error();
|
||||
}
|
||||
return FiletimeAsInt64(ftKernel) / double(1e7) + FiletimeAsInt64(ftUser) / double(1e7);
|
||||
|
@ -31,7 +31,7 @@
|
|||
return getProcessorTimeGeneric(RUSAGE_THREAD);
|
||||
#elif defined(__APPLE__)
|
||||
/* No RUSAGE_THREAD so we use the lower level interface */
|
||||
@@ -266,6 +273,14 @@ uint64_t getResidentMemoryUsage() {
|
||||
@@ -269,6 +276,14 @@ uint64_t getResidentMemoryUsage() {
|
||||
throw platform_error();
|
||||
}
|
||||
return info.resident_size;
|
||||
|
@ -41,12 +41,12 @@
|
|||
+ if (getrusage(RUSAGE_SELF | RUSAGE_THREAD, &rusage) == 0) {
|
||||
+ return rusage.ru_maxrss;
|
||||
+ }
|
||||
+
|
||||
+
|
||||
+ return 0;
|
||||
#else
|
||||
#warning getMemoryUsage unimplemented on this platform
|
||||
return 0;
|
||||
@@ -304,7 +319,7 @@ uint64_t getMemoryUsage() {
|
||||
@@ -307,7 +322,7 @@ uint64_t getMemoryUsage() {
|
||||
}
|
||||
return info.virtual_size;
|
||||
#else
|
||||
|
@ -55,7 +55,7 @@
|
|||
return 0;
|
||||
#endif
|
||||
}
|
||||
@@ -427,6 +442,24 @@ void getMachineRAMInfo(MachineRAMInfo& memInfo) {
|
||||
@@ -430,6 +445,24 @@ void getMachineRAMInfo(MachineRAMInfo& memInfo) {
|
||||
memInfo.total = pagesize * (vm_stat.free_count + vm_stat.active_count + vm_stat.inactive_count + vm_stat.wire_count);
|
||||
memInfo.available = pagesize * vm_stat.free_count;
|
||||
memInfo.committed = memInfo.total - memInfo.available;
|
||||
|
@ -80,7 +80,7 @@
|
|||
#else
|
||||
#warning getMachineRAMInfo unimplemented on this platform
|
||||
#endif
|
||||
@@ -451,7 +484,7 @@ Error systemErrorCodeToError() {
|
||||
@@ -454,7 +487,7 @@ Error systemErrorCodeToError() {
|
||||
void getDiskBytes(std::string const& directory, int64_t& free, int64_t& total) {
|
||||
INJECT_FAULT( platform_error, "getDiskBytes" );
|
||||
#if defined(__unixish__)
|
||||
|
@ -89,29 +89,20 @@
|
|||
struct statvfs buf;
|
||||
if (statvfs(directory.c_str(), &buf)) {
|
||||
Error e = systemErrorCodeToError();
|
||||
@@ -497,7 +530,7 @@ void getDiskBytes(std::string const& directory, int64_
|
||||
#endif
|
||||
}
|
||||
|
||||
-#ifdef __unixish__
|
||||
+#if defined(__linux__) || defined(__APPLE__)
|
||||
const char* getInterfaceName(uint32_t _ip) {
|
||||
INJECT_FAULT( platform_error, "getInterfaceName" );
|
||||
static char iname[20];
|
||||
@@ -744,6 +777,30 @@ dev_t getDeviceId(std::string path) {
|
||||
@@ -753,6 +786,30 @@ dev_t getDeviceId(std::string path) {
|
||||
|
||||
#endif
|
||||
|
||||
+#ifdef __FreeBSD__
|
||||
+void getNetworkTraffic(uint32_t ip, uint64_t& bytesSent, uint64_t& bytesReceived,
|
||||
+ uint64_t& outSegs, uint64_t& retransSegs) {
|
||||
+void getNetworkTraffic(const IPAddress &ip, uint64_t& bytesSent, uint64_t& bytesReceived, uint64_t& outSegs,
|
||||
+ uint64_t& retransSegs) {
|
||||
+ bytesReceived = 0;
|
||||
+ bytesSent = 0;
|
||||
+ outSegs = 0;
|
||||
+ retransSegs = 0;
|
||||
+}
|
||||
+
|
||||
+void getMachineLoad(uint64_t& idleTime, uint64_t& totalTime) {
|
||||
+void getMachineLoad(uint64_t& idleTime, uint64_t& totalTime, bool logDetails) {
|
||||
+ idleTime = 0;
|
||||
+ totalTime = 0;
|
||||
+}
|
||||
|
@ -127,9 +118,9 @@
|
|||
+#endif
|
||||
+
|
||||
#ifdef __APPLE__
|
||||
void getNetworkTraffic(uint32_t ip, uint64_t& bytesSent, uint64_t& bytesReceived,
|
||||
uint64_t& outSegs, uint64_t& retransSegs) {
|
||||
@@ -1268,7 +1325,7 @@ struct OffsetTimer {
|
||||
void getNetworkTraffic(const IPAddress& ip, uint64_t& bytesSent, uint64_t& bytesReceived, uint64_t& outSegs,
|
||||
uint64_t& retransSegs) {
|
||||
@@ -1277,7 +1334,7 @@ struct OffsetTimer {
|
||||
return offset + count * secondsPerCount;
|
||||
}
|
||||
};
|
||||
|
@ -138,7 +129,7 @@
|
|||
#define DOUBLETIME(ts) (double(ts.tv_sec) + (ts.tv_nsec * 1e-9))
|
||||
#ifndef CLOCK_MONOTONIC_RAW
|
||||
#define CLOCK_MONOTONIC_RAW 4 // Confirmed safe to do with glibc >= 2.11 and kernel >= 2.6.28. No promises with older glibc. Older kernel definitely breaks it.
|
||||
@@ -1333,7 +1390,7 @@ double timer() {
|
||||
@@ -1342,7 +1399,7 @@ double timer() {
|
||||
GetSystemTimeAsFileTime(&fileTime);
|
||||
static_assert( sizeof(fileTime) == sizeof(uint64_t), "FILETIME size wrong" );
|
||||
return (*(uint64_t*)&fileTime - FILETIME_C_EPOCH) * 100e-9;
|
||||
|
@ -147,7 +138,7 @@
|
|||
struct timespec ts;
|
||||
clock_gettime(CLOCK_REALTIME, &ts);
|
||||
return double(ts.tv_sec) + (ts.tv_nsec * 1e-9);
|
||||
@@ -1353,7 +1410,7 @@ uint64_t timer_int() {
|
||||
@@ -1362,7 +1419,7 @@ uint64_t timer_int() {
|
||||
GetSystemTimeAsFileTime(&fileTime);
|
||||
static_assert( sizeof(fileTime) == sizeof(uint64_t), "FILETIME size wrong" );
|
||||
return (*(uint64_t*)&fileTime - FILETIME_C_EPOCH);
|
||||
|
@ -156,16 +147,26 @@
|
|||
struct timespec ts;
|
||||
clock_gettime(CLOCK_REALTIME, &ts);
|
||||
return uint64_t(ts.tv_sec) * 1e9 + ts.tv_nsec;
|
||||
@@ -1502,7 +1559,7 @@ static void *allocateInternal(size_t length, bool larg
|
||||
@@ -1412,7 +1469,7 @@ void setMemoryQuota( size_t limit ) {
|
||||
}
|
||||
if (!AssignProcessToJobObject( job, GetCurrentProcess() ))
|
||||
TraceEvent(SevWarn, "FailedToSetMemoryLimit").GetLastError();
|
||||
-#elif defined(__linux__)
|
||||
+#elif defined(__linux__) || defined(__FreeBSD__)
|
||||
struct rlimit rlim;
|
||||
if (getrlimit(RLIMIT_AS, &rlim)) {
|
||||
TraceEvent(SevError, "GetMemoryLimit").GetLastError();
|
||||
@@ -1515,7 +1572,8 @@ static void *allocateInternal(size_t length, bool larg
|
||||
flags |= MAP_HUGETLB;
|
||||
|
||||
return mmap(NULL, length, PROT_READ|PROT_WRITE, flags, -1, 0);
|
||||
-#elif defined(__APPLE__)
|
||||
+#elif defined(__APPLE__) || defined(__FreeBSD__)
|
||||
+
|
||||
int flags = MAP_PRIVATE|MAP_ANON;
|
||||
|
||||
return mmap(NULL, length, PROT_READ|PROT_WRITE, flags, -1, 0);
|
||||
@@ -1576,6 +1633,11 @@ void setAffinity(int proc) {
|
||||
@@ -1589,6 +1647,11 @@ void setAffinity(int proc) {
|
||||
CPU_ZERO(&set);
|
||||
CPU_SET(proc, &set);
|
||||
sched_setaffinity(0, sizeof(cpu_set_t), &set);
|
||||
|
@ -177,7 +178,7 @@
|
|||
#endif
|
||||
}
|
||||
|
||||
@@ -1636,7 +1698,7 @@ void renameFile( std::string const& fromPath, std::str
|
||||
@@ -1649,7 +1712,7 @@ void renameFile( std::string const& fromPath, std::str
|
||||
//renamedFile();
|
||||
return;
|
||||
}
|
||||
|
@ -186,7 +187,7 @@
|
|||
if (!rename( fromPath.c_str(), toPath.c_str() )) {
|
||||
//FIXME: We cannot inject faults after renaming the file, because we could end up with two asyncFileNonDurable open for the same file
|
||||
//renamedFile();
|
||||
@@ -1759,7 +1821,7 @@ bool createDirectory( std::string const& directory ) {
|
||||
@@ -1807,7 +1870,7 @@ bool createDirectory( std::string const& directory ) {
|
||||
Error e = systemErrorCodeToError();
|
||||
TraceEvent(SevError, "CreateDirectory").detail("Directory", directory).GetLastError().error(e);
|
||||
throw e;
|
||||
|
@ -195,16 +196,16 @@
|
|||
size_t sep = 0;
|
||||
do {
|
||||
sep = directory.find_first_of('/', sep + 1);
|
||||
@@ -1804,7 +1866,7 @@ std::string abspath( std::string const& filename ) {
|
||||
@@ -1959,7 +2022,7 @@ std::string abspath( std::string const& path, bool res
|
||||
if (*x == '/')
|
||||
*x = CANONICAL_PATH_SEPARATOR;
|
||||
return nameBuffer;
|
||||
-#elif (defined(__linux__) || defined(__APPLE__))
|
||||
+#elif (defined(__linux__) || defined(__APPLE__)) || defined(__FreeBSD__)
|
||||
|
||||
char result[PATH_MAX];
|
||||
auto r = realpath( filename.c_str(), result );
|
||||
if (!r) {
|
||||
@@ -1870,7 +1932,7 @@ std::string getUserHomeDirectory() {
|
||||
// Must resolve links, so first try realpath on the whole thing
|
||||
@@ -2023,7 +2086,7 @@ std::string getUserHomeDirectory() {
|
||||
|
||||
#ifdef _WIN32
|
||||
#define FILE_ATTRIBUTE_DATA DWORD
|
||||
|
@ -213,7 +214,7 @@
|
|||
#define FILE_ATTRIBUTE_DATA mode_t
|
||||
#else
|
||||
#error Port me!
|
||||
@@ -1879,7 +1941,7 @@ std::string getUserHomeDirectory() {
|
||||
@@ -2032,7 +2095,7 @@ std::string getUserHomeDirectory() {
|
||||
bool acceptFile( FILE_ATTRIBUTE_DATA fileAttributes, std::string name, std::string extension ) {
|
||||
#ifdef _WIN32
|
||||
return !(fileAttributes & FILE_ATTRIBUTE_DIRECTORY) && StringRef(name).endsWith(extension);
|
||||
|
@ -222,7 +223,7 @@
|
|||
return S_ISREG(fileAttributes) && StringRef(name).endsWith(extension);
|
||||
#else
|
||||
#error Port me!
|
||||
@@ -1889,7 +1951,7 @@ bool acceptFile( FILE_ATTRIBUTE_DATA fileAttributes, s
|
||||
@@ -2042,7 +2105,7 @@ bool acceptFile( FILE_ATTRIBUTE_DATA fileAttributes, s
|
||||
bool acceptDirectory( FILE_ATTRIBUTE_DATA fileAttributes, std::string name, std::string extension ) {
|
||||
#ifdef _WIN32
|
||||
return (fileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
|
||||
|
@ -231,7 +232,7 @@
|
|||
return S_ISDIR(fileAttributes);
|
||||
#else
|
||||
#error Port me!
|
||||
@@ -1925,7 +1987,7 @@ std::vector<std::string> findFiles( std::string const&
|
||||
@@ -2078,7 +2141,7 @@ std::vector<std::string> findFiles( std::string const&
|
||||
}
|
||||
FindClose(h);
|
||||
}
|
||||
|
@ -240,7 +241,7 @@
|
|||
DIR *dip;
|
||||
|
||||
if ((dip = opendir(directory.c_str())) != NULL) {
|
||||
@@ -1989,7 +2051,7 @@ void findFilesRecursively(std::string path, std::vecto
|
||||
@@ -2142,7 +2205,7 @@ void findFilesRecursively(std::string path, std::vecto
|
||||
void threadSleep( double seconds ) {
|
||||
#ifdef _WIN32
|
||||
Sleep( (DWORD)(seconds * 1e3) );
|
||||
|
@ -249,7 +250,7 @@
|
|||
struct timespec req, rem;
|
||||
|
||||
req.tv_sec = seconds;
|
||||
@@ -2027,7 +2089,7 @@ void makeTemporary( const char* filename ) {
|
||||
@@ -2180,7 +2243,7 @@ void makeTemporary( const char* filename ) {
|
||||
THREAD_HANDLE startThread(void (*func) (void *), void *arg) {
|
||||
return (void *)_beginthread(func, 0, arg);
|
||||
}
|
||||
|
@ -258,7 +259,7 @@
|
|||
THREAD_HANDLE startThread(void *(*func) (void *), void *arg) {
|
||||
pthread_t t;
|
||||
pthread_create(&t, NULL, func, arg);
|
||||
@@ -2040,7 +2102,7 @@ THREAD_HANDLE startThread(void *(*func) (void *), void
|
||||
@@ -2193,7 +2256,7 @@ THREAD_HANDLE startThread(void *(*func) (void *), void
|
||||
void waitThread(THREAD_HANDLE thread) {
|
||||
#ifdef _WIN32
|
||||
WaitForSingleObject(thread, INFINITE);
|
||||
|
@ -267,7 +268,7 @@
|
|||
pthread_join(thread, NULL);
|
||||
#else
|
||||
#error Port me!
|
||||
@@ -2082,7 +2144,7 @@ int64_t fileSize(std::string const& filename) {
|
||||
@@ -2235,7 +2298,7 @@ int64_t fileSize(std::string const& filename) {
|
||||
return 0;
|
||||
else
|
||||
return file_status.st_size;
|
||||
|
@ -276,7 +277,7 @@
|
|||
struct stat file_status;
|
||||
if(stat(filename.c_str(), &file_status) != 0)
|
||||
return 0;
|
||||
@@ -2225,6 +2287,8 @@ std::string getDefaultPluginPath( const char* plugin_n
|
||||
@@ -2378,6 +2441,8 @@ std::string getDefaultPluginPath( const char* plugin_n
|
||||
return format( "/usr/lib/foundationdb/plugins/%s.so", plugin_name );
|
||||
#elif defined(__APPLE__)
|
||||
return format( "/usr/local/foundationdb/plugins/%s.dylib", plugin_name );
|
||||
|
@ -285,7 +286,7 @@
|
|||
#else
|
||||
#error Port me!
|
||||
#endif
|
||||
@@ -2475,7 +2539,7 @@ void* getImageOffset() { return NULL; }
|
||||
@@ -2629,7 +2694,7 @@ void* getImageOffset() { return NULL; }
|
||||
#endif
|
||||
|
||||
bool isLibraryLoaded(const char* lib_path) {
|
||||
|
@ -294,7 +295,7 @@
|
|||
#error Port me!
|
||||
#endif
|
||||
|
||||
@@ -2491,7 +2555,7 @@ bool isLibraryLoaded(const char* lib_path) {
|
||||
@@ -2645,7 +2710,7 @@ bool isLibraryLoaded(const char* lib_path) {
|
||||
}
|
||||
|
||||
void* loadLibrary(const char* lib_path) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- flow/Platform.h.orig 2019-01-09 22:28:32 UTC
|
||||
--- flow/Platform.h.orig 2019-04-09 00:11:05 UTC
|
||||
+++ flow/Platform.h
|
||||
@@ -22,7 +22,7 @@
|
||||
#define FLOW_PLATFORM_H
|
||||
|
@ -9,7 +9,7 @@
|
|||
#define __unixish__ 1
|
||||
#endif
|
||||
|
||||
@@ -182,6 +182,8 @@ THREAD_HANDLE startThread(void *(func) (void *), void
|
||||
@@ -188,6 +188,8 @@ THREAD_HANDLE startThread(void *(func) (void *), void
|
||||
#if defined(_WIN32)
|
||||
#define DYNAMIC_LIB_EXT ".dll"
|
||||
#elif defined(__linux)
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
--- flow/ThreadPrimitives.h.orig 2019-01-09 22:28:32 UTC
|
||||
--- flow/ThreadPrimitives.h.orig 2019-04-09 00:11:05 UTC
|
||||
+++ flow/ThreadPrimitives.h
|
||||
@@ -25,7 +25,7 @@
|
||||
#include "Error.h"
|
||||
#include "Trace.h"
|
||||
#include "flow/Error.h"
|
||||
#include "flow/Trace.h"
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
--- flow/libs/system/src/error_code.cpp.orig 2018-09-11 01:21:54 UTC
|
||||
+++ flow/libs/system/src/error_code.cpp
|
||||
@@ -43,6 +43,7 @@ using namespace boost::system::errc;
|
||||
#endif
|
||||
//----------------------------------------------------------------------------//
|
||||
|
||||
+#if BOOST_VERSION < 106800
|
||||
namespace
|
||||
{
|
||||
#if defined(__PGI)
|
||||
@@ -434,3 +435,4 @@ namespace boost
|
||||
|
||||
} // namespace system
|
||||
} // namespace boost
|
||||
+#endif
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue