parent
e2e0d3cbe7
commit
d9dcc10009
|
@ -127,6 +127,7 @@
|
|||
SUBDIR += swe
|
||||
SUBDIR += tclgeomap
|
||||
SUBDIR += tkgeomap
|
||||
SUBDIR += viking
|
||||
SUBDIR += wcslib
|
||||
SUBDIR += weather
|
||||
SUBDIR += wmglobe
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= astrometry
|
||||
PORTVERSION= 0.93
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= astro
|
||||
MASTER_SITES= http://astrometry.net/downloads/
|
||||
DISTNAME= ${PORTNAME}.net-${PORTVERSION}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
CELESTIA_UI= gtk
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
MASTERDIR= ${.CURDIR}/../celestia
|
||||
|
||||
.include "${MASTERDIR}/Makefile"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= celestia
|
||||
PORTVERSION= 1.6.1
|
||||
PORTREVISION= 13
|
||||
PORTREVISION= 14
|
||||
CATEGORIES= astro
|
||||
MASTER_SITES= SF/${PORTNAME}/Celestia-source/${PORTVERSION}
|
||||
PKGNAMESUFFIX= -${CELESTIA_UI}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
PORTNAME= gnuastro
|
||||
PORTVERSION= 0.20
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= astro
|
||||
MASTER_SITES= GNU
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= nightfall
|
||||
PORTVERSION= 1.92
|
||||
PORTREVISION= 4
|
||||
PORTREVISION= 5
|
||||
CATEGORIES= astro education
|
||||
MASTER_SITES= http://www.la-samhna.de/nightfall/
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= openuniverse
|
||||
DISTVERSION= 1.0beta3
|
||||
PORTREVISION= 13
|
||||
PORTREVISION= 14
|
||||
CATEGORIES= astro
|
||||
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0beta3
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= Astro-FITS-CFITSIO
|
||||
PORTVERSION= 1.17
|
||||
PORTVERSION= 1.18
|
||||
CATEGORIES= astro perl5
|
||||
MASTER_SITES= CPAN
|
||||
PKGNAMEPREFIX= p5-
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1682354624
|
||||
SHA256 (Astro-FITS-CFITSIO-1.17.tar.gz) = 1444338b390e7bcdff33879ec8d0562869462ecb52fe8f2b5fd84315f358005d
|
||||
SIZE (Astro-FITS-CFITSIO-1.17.tar.gz) = 356509
|
||||
TIMESTAMP = 1690688344
|
||||
SHA256 (Astro-FITS-CFITSIO-1.18.tar.gz) = 27459dbfc8cde27d3435802af41f095b7e8201255a54fcad03db52a17c5fac9c
|
||||
SIZE (Astro-FITS-CFITSIO-1.18.tar.gz) = 356735
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= metar
|
||||
PORTVERSION= 1.10.0
|
||||
PORTVERSION= 1.11.0
|
||||
CATEGORIES= astro python
|
||||
MASTER_SITES= PYPI
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1685162094
|
||||
SHA256 (metar-1.10.0.tar.gz) = 3c43f65fc86b52fb592e0e5ed8034636eabc9f9a1c6930a2de406aab6ba96f0e
|
||||
SIZE (metar-1.10.0.tar.gz) = 213693
|
||||
TIMESTAMP = 1689398819
|
||||
SHA256 (metar-1.11.0.tar.gz) = 0e40e86eb03fdfafef71b14d74349e88e208bd4dc15e8734b3afcf129125378b
|
||||
SIZE (metar-1.11.0.tar.gz) = 213777
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= qmapshack
|
||||
PORTVERSION= 1.16.1
|
||||
PORTREVISION= 9
|
||||
PORTREVISION= 10
|
||||
DISTVERSIONPREFIX= V_
|
||||
CATEGORIES= astro
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= siril
|
||||
DISTVERSION= 1.0.6
|
||||
PORTREVISION= 6
|
||||
PORTREVISION= 7
|
||||
CATEGORIES= astro graphics
|
||||
MASTER_SITES= https://free-astro.org/download/
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= sunclock
|
||||
PORTVERSION= 3.57
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= astro x11-clocks
|
||||
MASTER_SITES= DEBIAN
|
||||
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
|
||||
|
|
|
@ -0,0 +1,88 @@
|
|||
PORTNAME= viking
|
||||
PORTVERSION= 1.10
|
||||
CATEGORIES= astro
|
||||
MASTER_SITES= SF/${PORTNAME}/
|
||||
|
||||
MAINTAINER= lantw44@gmail.com
|
||||
COMMENT= Program to manage GPS data (tracks, waypoints, etc.)
|
||||
WWW= https://sourceforge.net/p/viking/wikiallura/Main_Page/
|
||||
|
||||
LICENSE= GPLv2+
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
BUILD_DEPENDS= itstool:textproc/itstool \
|
||||
${LOCALBASE}/share/aclocal/yelp.m4:textproc/yelp-tools \
|
||||
${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
|
||||
LIB_DEPENDS= libcurl.so:ftp/curl \
|
||||
libexpat.so:textproc/expat2 \
|
||||
libgeoclue-2.so:net/geoclue \
|
||||
libharfbuzz.so:print/harfbuzz \
|
||||
libjson-glib-1.0.so:devel/json-glib \
|
||||
libnettle.so:security/nettle \
|
||||
liboauth.so:net/liboauth \
|
||||
libzip.so:archivers/libzip
|
||||
RUN_DEPENDS= gpsbabel:astro/gpsbabel
|
||||
|
||||
USES= compiler:c++11-lib desktop-file-utils gettext gmake gnome \
|
||||
iconv localbase perl5 pkgconfig tar:bzip2 xorg
|
||||
USE_XORG= x11
|
||||
USE_GNOME= cairo gdkpixbuf2 gtk30 intlhack
|
||||
USE_PERL5= run
|
||||
GNU_CONFIGURE= yes
|
||||
|
||||
PORTDOCS= AUTHORS ChangeLog NEWS README.md
|
||||
|
||||
OPTIONS_DEFINE= DOCS GEOCACHES NLS GEOTAG GPSD MAPNIK MBTILES
|
||||
OPTIONS_DEFAULT= GEOTAG GPSD JOSM MAPNIK MBTILES
|
||||
|
||||
OPTIONS_MULTI= EDITOR
|
||||
OPTIONS_MULTI_EDITOR= JOSM MERKAATOR
|
||||
|
||||
EDITOR_DESC= OpenStreetMap editor
|
||||
GEOCACHES_DESC= GeoCaches Acquire support
|
||||
GEOTAG_DESC= Geotag support
|
||||
GPSD_DESC= Realtime GPS tracking
|
||||
MAPNIK_DESC= Mapnik support
|
||||
MBTILES_DESC= MBTiles support
|
||||
JOSM_DESC= Edit OpenStreetMap via JOSM
|
||||
MERKAATOR_DESC= Edit OpenStreetMap via Merkaartor
|
||||
|
||||
OPTIONS_SUB= yes
|
||||
|
||||
GEOCACHES_CONFIGURE_ENABLE= geocaches
|
||||
GEOCACHES_SUB_FILES= pkg-message
|
||||
|
||||
NLS_CONFIGURE_ENABLE= nls
|
||||
|
||||
GEOTAG_LIB_DEPENDS= libgexiv2.so:graphics/gexiv2
|
||||
GEOTAG_CONFIGURE_ENABLE=geotag
|
||||
|
||||
GPSD_LIB_DEPENDS= libgps.so:astro/gpsd
|
||||
GPSD_CONFIGURE_ENABLE= realtime-gps-tracking
|
||||
|
||||
MAPNIK_LIB_DEPENDS= libmapnik.so:graphics/mapnik
|
||||
MAPNIK_CONFIGURE_ENV= ac_cv_lib_icuuc_main=no # indirect
|
||||
MAPNIK_CONFIGURE_ENABLE= mapnik
|
||||
MAPNIK_CPPFLAGS= -I${LOCALBASE}/include/mapnik
|
||||
|
||||
MBTILES_USES= sqlite
|
||||
MBTILES_CONFIGURE_ENABLE= mbtiles
|
||||
|
||||
JOSM_RUN_DEPENDS= josm:astro/josm
|
||||
MERKAATOR_RUN_DEPENDS= merkaartor:astro/merkaartor
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e '/as_fn_error.*libicuuc/d' ${WRKSRC}/configure
|
||||
@${REINPLACE_CMD} -e '/^AM_CFLAGS/s| -g | |' ${WRKSRC}/src/Makefile.in
|
||||
@${REINPLACE_CMD} -e 's|Science;|Education;Science;|' \
|
||||
${WRKSRC}/src/viking.desktop.in
|
||||
|
||||
post-install:
|
||||
${LN} -sf ../icons/hicolor/48x48/apps/${PORTNAME}.png \
|
||||
${STAGEDIR}${PREFIX}/share/pixmaps/
|
||||
|
||||
post-install-DOCS-on:
|
||||
@${MKDIR} ${STAGEDIR}${DOCSDIR}
|
||||
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
|
||||
|
||||
.include <bsd.port.mk>
|
|
@ -0,0 +1,3 @@
|
|||
TIMESTAMP = 1690759184
|
||||
SHA256 (viking-1.10.tar.bz2) = 9455c895f98bc13de24bd6b234cd0f1d5ecdc1b068b4cbc6eb6644f6126e45ac
|
||||
SIZE (viking-1.10.tar.bz2) = 5035598
|
|
@ -0,0 +1,13 @@
|
|||
[
|
||||
{ type: install
|
||||
message: <<EOM
|
||||
Viking has been installed.
|
||||
|
||||
When you wish to use GeoCaches Acquire Option, please make an account at
|
||||
|
||||
http://www.geocaching.com/
|
||||
|
||||
Have fun!
|
||||
EOM
|
||||
}
|
||||
]
|
|
@ -0,0 +1,6 @@
|
|||
Viking is a free/open source program to manage GPS data.
|
||||
|
||||
You can import and plot tracks, routes and waypoints, show OpenStreetMap,
|
||||
Terraserver, Bing Aerial and other maps in it, download geocaches for
|
||||
an area on the map, make new tracks and waypoints, geotag images,
|
||||
see real-time GPS position, etc.
|
|
@ -0,0 +1,95 @@
|
|||
bin/viking
|
||||
man/man1/viking.1.gz
|
||||
share/applications/viking.desktop
|
||||
%%PORTDOCS%%share/help/C/viking/attribution.xml
|
||||
%%PORTDOCS%%share/help/C/viking/commandline.xml
|
||||
%%PORTDOCS%%share/help/C/viking/dem_layer.xml
|
||||
%%PORTDOCS%%share/help/C/viking/edit_view_menus.xml
|
||||
%%PORTDOCS%%share/help/C/viking/figures/Aggregate_heatmap.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/Aggregate_statistics.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/Aggregate_statistics_years.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/DEM_Example.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/DEM_file_info_dialog.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/Goto_Main_Window.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/LayersTracksList.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/LayersTracksStatistics.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/Maps_download_region_dialog.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/Panel_Stats_Tab.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/Track_elevation_graph.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/Track_properties.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/Track_statistics.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/Track_time_splits.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/Trackpoint_edit_dialog.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/Viking-OSM-CycleMap-ManyTracks.jpg
|
||||
%%PORTDOCS%%share/help/C/viking/figures/Viking-TAC.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/WaypointProperties.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/WaypointsList.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/addtr_18.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/addwp_18.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/customize_toolbar_dialog.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/demdl_18.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/edtr_18.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/edwp_18.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/geomove_18.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/geozoom_18.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/map_tile_info_dialog.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/mapdl_18.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/mover_22.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/properties_degree.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/properties_units.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/route_finder_18.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/ruler_18.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/select_18.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/showpic_18.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/trw_statusbar.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/vik_new_route_18.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/zoom_18.png
|
||||
%%PORTDOCS%%share/help/C/viking/figures/zoom_status_popup.png
|
||||
%%PORTDOCS%%share/help/C/viking/geoclue_layer.xml
|
||||
%%PORTDOCS%%share/help/C/viking/georef_layer.xml
|
||||
%%PORTDOCS%%share/help/C/viking/index.docbook
|
||||
%%PORTDOCS%%share/help/C/viking/legal.xml
|
||||
%%PORTDOCS%%share/help/C/viking/mapnik_rendering_layer.xml
|
||||
%%PORTDOCS%%share/help/C/viking/recommends.xml
|
||||
share/icons/hicolor/48x48/apps/viking.png
|
||||
%%NLS%%share/locale/ast/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/ca/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/cs/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/da/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/de/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/el/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/en_GB/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/es/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/eu/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/fi/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/fr/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/he/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/hu/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/id/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/it/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/ja/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/jv/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/ko/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/ku/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/lt/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/lv/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/nb/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/nl/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/pl/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/pt_BR/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/ru/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/sk/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/sl/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/sv/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/tr/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/uk/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/zh_CN/LC_MESSAGES/viking.mo
|
||||
%%NLS%%share/locale/zh_TW/LC_MESSAGES/viking.mo
|
||||
share/pixmaps/viking.png
|
||||
%%DATADIR%%/datasources.xml
|
||||
%%DATADIR%%/external_tools.xml
|
||||
%%DATADIR%%/goto_tools.xml
|
||||
%%DATADIR%%/latlontz.txt
|
||||
%%DATADIR%%/maps.xml
|
||||
%%DATADIR%%/routing.xml
|
||||
%%DATADIR%%/unreachable_tiles.txt
|
|
@ -1,5 +1,6 @@
|
|||
PORTNAME= xephem
|
||||
PORTVERSION= 4.1.0
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= astro
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
PORTNAME= xplanet
|
||||
PORTVERSION= 1.3.1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= astro geography
|
||||
MASTER_SITES= SF
|
||||
|
||||
|
|
|
@ -16,6 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
|
|||
LIB_DEPENDS= libpng.so:graphics/png
|
||||
|
||||
USES= compiler:c++0x gmake libtool localbase tar:xz
|
||||
USE_CXXSTD= c++11
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= deadbeef
|
||||
PORTVERSION= 0.7.2
|
||||
PORTREVISION= 24
|
||||
PORTREVISION= 25
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= SF/${PORTNAME}/
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= denemo
|
||||
PORTVERSION= 2.0.6
|
||||
PORTREVISION= 17
|
||||
PORTREVISION= 18
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= GNU
|
||||
|
||||
|
@ -19,7 +19,10 @@ LIB_DEPENDS= libaubio.so:audio/aubio \
|
|||
libsndfile.so:audio/libsndfile \
|
||||
libportaudio.so:audio/portaudio \
|
||||
librubberband.so:audio/rubberband \
|
||||
libguile.so:lang/guile1 \
|
||||
libharfbuzz.so:print/harfbuzz \
|
||||
libfontconfig.so:x11-fonts/fontconfig \
|
||||
libfreetype.so:print/freetype2 \
|
||||
libsamplerate.so:audio/libsamplerate \
|
||||
libfftw3.so:math/fftw3
|
||||
RUN_DEPENDS= xdg-open:devel/xdg-utils
|
||||
|
||||
|
@ -27,8 +30,8 @@ EXTRACT_BEFORE_ARGS=\
|
|||
-s '!\(/Clarinet in B\).*\(\.denemo\)$$!\1b\2!p' -xf
|
||||
|
||||
USES= bison:alias compiler:c++11-lang desktop-file-utils gettext gmake \
|
||||
gnome localbase:ldflags pkgconfig
|
||||
USE_GNOME= intltool librsvg2 libxml2
|
||||
gnome guile:1.8 localbase:ldflags pkgconfig
|
||||
USE_GNOME= cairo intltool librsvg2 libxml2
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --enable-jack \
|
||||
--disable-alsa \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= enscribe
|
||||
PORTVERSION= 0.1.0
|
||||
PORTREVISION= 11
|
||||
PORTREVISION= 12
|
||||
CATEGORIES= audio graphics
|
||||
MASTER_SITES= http://www.coppercloudmusic.com/enscribe/
|
||||
|
||||
|
|
|
@ -1,34 +1,36 @@
|
|||
PORTNAME= id3mtag
|
||||
PORTVERSION= 0.80
|
||||
DISTVERSION= 0.81
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= https://github.com/squell/id3/releases/download/${PORTVERSION}/
|
||||
DISTNAME= id3-${PORTVERSION}
|
||||
|
||||
MAINTAINER= squell@alumina.nl
|
||||
MAINTAINER= info@squell.net
|
||||
COMMENT= Mass tagging utility for audio files
|
||||
WWW= https://squell.github.io/id3
|
||||
|
||||
LICENSE= BSD2CLAUSE
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
USES= iconv
|
||||
|
||||
MAKEFILE= makefile
|
||||
ALL_TARGET= build
|
||||
|
||||
PLIST_FILES= bin/id3 man/man1/id3.1.gz
|
||||
PORTDOCS= README CHANGES
|
||||
|
||||
OPTIONS_DEFINE= DOCS BASH
|
||||
BASH_DESC= Support for bash auto-completion
|
||||
BASH_PLIST_FILES= share/bash-completion/completions/id3
|
||||
|
||||
USES= iconv
|
||||
|
||||
CFLAGS+= -I${ICONV_INCLUDE_PATH}
|
||||
LDFLAGS+= -L${ICONV_PREFIX}/lib ${ICONV_LIB}
|
||||
|
||||
PLIST_FILES= bin/id3 \
|
||||
etc/bash_completion.d/id3mtag-completion.bash \
|
||||
man/man1/id3.1.gz
|
||||
PORTDOCS= CHANGES README
|
||||
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/id3 ${STAGEDIR}${PREFIX}/bin
|
||||
${INSTALL_MAN} ${WRKSRC}/id3.man ${STAGEDIR}${MANPREFIX}/man/man1/id3.1
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
|
||||
${INSTALL_DATA} ${WRKSRC}/bash/complete ${STAGEDIR}${PREFIX}/etc/bash_completion.d/id3mtag-completion.bash
|
||||
|
||||
post-install-DOCS-on:
|
||||
${MKDIR} ${STAGEDIR}${DOCSDIR}
|
||||
|
@ -36,8 +38,4 @@ post-install-DOCS-on:
|
|||
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
|
||||
.endfor
|
||||
|
||||
post-install-BASH-on:
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
|
||||
${INSTALL_DATA} ${WRKSRC}/bash/complete ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -1,2 +1,3 @@
|
|||
SHA256 (id3-0.80.tar.gz) = aa61735c5806ed77b71de1408a78371d04add8c8c9b1532a055949081e5a35e2
|
||||
SIZE (id3-0.80.tar.gz) = 78289
|
||||
TIMESTAMP = 1690757919
|
||||
SHA256 (id3-0.81.tar.gz) = 5eda41e277e67492bfe0116d24962c24c47ead56a925a00f05f724bcc7687b0c
|
||||
SIZE (id3-0.81.tar.gz) = 79932
|
||||
|
|
|
@ -1,113 +1,137 @@
|
|||
PORTNAME= mumble
|
||||
PORTVERSION= 1.3.3
|
||||
PORTREVISION= 10
|
||||
DISTVERSION= 1.5.517
|
||||
CATEGORIES= audio
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
MAINTAINER= vvd@FreeBSD.org
|
||||
COMMENT= Voice chat software primarily intended for use while gaming
|
||||
WWW= http://mumble.sourceforge.net/
|
||||
WWW= https://www.mumble.info/
|
||||
|
||||
LICENSE= BSD3CLAUSE
|
||||
LICENSE_FILE= ${WRKSRC}/LICENSE
|
||||
|
||||
LIB_DEPENDS+= libspeex.so:audio/speex \
|
||||
BUILD_DEPENDS= boost-libs>0:devel/boost-libs \
|
||||
${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json
|
||||
LIB_DEPENDS= libsndfile.so:audio/libsndfile \
|
||||
libopus.so:audio/opus \
|
||||
libspeexdsp.so:audio/speexdsp \
|
||||
libsndfile.so:audio/libsndfile \
|
||||
libboost_iostreams.so:devel/boost-libs \
|
||||
libprotoc.so:devel/protobuf \
|
||||
libopus.so:audio/opus
|
||||
libpcre2-8.so:devel/pcre2 \
|
||||
libPocoXML.so:devel/poco \
|
||||
libPocoZip.so:devel/poco \
|
||||
libprotobuf.so:devel/protobuf \
|
||||
libexpat.so:textproc/expat2
|
||||
|
||||
USES= compiler:c++11-lang cpe desktop-file-utils gl gmake gnome pkgconfig python:build qmake qt:5 ssl xorg
|
||||
BROKEN_SSL= openssl30 openssl31
|
||||
BROKEN_SSL_REASON= Requires OpenSSL 3.0.0 deprecated CRYPTO_MEM_CHECK_ON
|
||||
USES= cmake compiler:c++14-lang cpe desktop-file-utils gl \
|
||||
pkgconfig python:build qmake qt:5 ssl xorg
|
||||
|
||||
PATCHVERSION= ${PORTVERSION}
|
||||
MINORVERSION= ${PORTVERSION:R}
|
||||
MAJORVERSION= ${PORTVERSION:R:R}
|
||||
PATCHVERSION= ${DISTVERSION}
|
||||
MINORVERSION= ${DISTVERSION:R}
|
||||
MAJORVERSION= ${DISTVERSION:R:R}
|
||||
|
||||
PLIST_SUB+= PATCHVERSION="${PATCHVERSION}"
|
||||
PLIST_SUB+= MINORVERSION="${MINORVERSION}"
|
||||
PLIST_SUB+= MAJORVERSION="${MAJORVERSION}"
|
||||
|
||||
USE_CXXSTD= c++11
|
||||
USE_CXXSTD= c++14
|
||||
USE_GITHUB= yes
|
||||
GH_TUPLE= mumble-voip:mumble:${DISTVERSION} \
|
||||
mumble-voip:celt-0.7.0:5a16cda:mumble_celt_0_7/3rdparty/celt-0.7.0-src \
|
||||
mumble-voip:celt-0.11.0:e18de77:mumble_celt_0_11/3rdparty/celt-0.11.0-src \
|
||||
GH_TUPLE= mumble-voip:mumble:v${DISTVERSION} \
|
||||
Krzmbrzl:FindPythonInterpreter:bb4d3ea:mumble_FindPythonInterpreter/3rdparty/FindPythonInterpreter \
|
||||
microsoft:GSL:0f6dbc9:mumble_gsl/3rdparty/gsl \
|
||||
mumble-voip:mach_override:919148f:mumble_mach_override/3rdparty/mach-override-src \
|
||||
mumble-voip:minhook:5e338f8:mumble_minhook/3rdparty/minhook-src \
|
||||
mumble-voip:rnnoise:b30f2bb:mumble_rnnoise/3rdparty/rnnoise-src \
|
||||
mumble-voip:sbcelt:045493d:mumble_sbcelt/3rdparty/sbcelt-src \
|
||||
mumble-voip:mumble-theme:9467fe8:mumble_theme/themes/Mumble
|
||||
mumble-voip:minhook:5e338f8:mumble_minhook/3rdparty/minhook \
|
||||
mumble-voip:speexdsp:6e4634f:mumble_speexdsp/3rdparty/speexdsp \
|
||||
wolfpld:tracy:1a4f369:mumble_tracy/3rdparty/tracy
|
||||
|
||||
USE_QT= buildtools:build core gui l10n linguist:build network opengl sql sql-sqlite3:run svg widgets xml
|
||||
USE_QT= buildtools:build concurrent core gui l10n linguist:build network \
|
||||
sql sql-sqlite3:run svg widgets xml
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
USE_XORG= ice xi x11
|
||||
USE_XORG= x11 xext xi
|
||||
USE_GL= gl
|
||||
|
||||
CONFIG= bundled-celt bundled-rnnoise no-bundled-opus no-bundled-speex no-bundled-speexdsp \
|
||||
no-embed-qt-translations no-g15 no-server no-update
|
||||
CMAKE_ON= bundled-gsl client oss overlay overlay-xcompile plugins \
|
||||
translations xinput2
|
||||
CMAKE_OFF= bundled-json bundle-qt-translations bundled-speex crash-report \
|
||||
g15 server tracy update
|
||||
|
||||
QMAKE_ARGS= "CONFIG+=${CONFIG}"
|
||||
OPTIONS_DEFINE= ALSA AVAHI DBUS JACK LTO PIPEWIRE PORTAUDIO PULSEAUDIO RNNOISE
|
||||
OPTIONS_DEFAULT= DBUS LTO
|
||||
OPTIONS_RADIO= SPEECH
|
||||
OPTIONS_RADIO_SPEECH= QTSPEECH SPEECHD
|
||||
|
||||
OPTIONS_DEFINE= ALSA DBUS BONJOUR JACK PORTAUDIO PULSEAUDIO SPEECHD
|
||||
OPTIONS_DEFAULT= DBUS
|
||||
QTSPEECH_DESC= Use Qt's text-to-speech system
|
||||
RNNOISE_DESC= Use RNNoise for machine learning noise reduction
|
||||
SPEECH_DESC= Support text-to-speech
|
||||
SPEECHD_DESC= Support for Speech Dispatcher
|
||||
|
||||
ALSA_VARS_OFF= CONFIG+=no-alsa
|
||||
ALSA_CMAKE_BOOL= alsa
|
||||
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
|
||||
|
||||
DBUS_VARS_OFF= CONFIG+=no-dbus
|
||||
AVAHI_CMAKE_BOOL= zeroconf
|
||||
AVAHI_LIB_DEPENDS= libdns_sd.so:net/avahi-libdns
|
||||
|
||||
DBUS_USES= qt:5
|
||||
DBUS_USE= QT=dbus
|
||||
DBUS_CMAKE_BOOL= dbus
|
||||
|
||||
BONJOUR_DESC= Bonjour support
|
||||
BONJOUR_VARS_OFF= CONFIG+=no-bonjour
|
||||
BONJOUR_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder
|
||||
|
||||
JACK_VARS_OFF= CONFIG+=no-jackaudio
|
||||
JACK_CMAKE_BOOL= jackaudio
|
||||
JACK_LIB_DEPENDS= libjack.so:audio/jack
|
||||
|
||||
PORTAUDIO_VARS_OFF= CONFIG+=no-portaudio
|
||||
LTO_CMAKE_BOOL= lto
|
||||
|
||||
PIPEWIRE_CMAKE_BOOL= pipewire
|
||||
PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire
|
||||
|
||||
PORTAUDIO_CMAKE_BOOL= portaudio
|
||||
PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio
|
||||
|
||||
PULSEAUDIO_VARS_OFF= CONFIG+=no-pulseaudio
|
||||
PULSEAUDIO_CMAKE_BOOL= pulseaudio
|
||||
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
|
||||
|
||||
SPEECHD_DESC= Support for Speech Dispatcher
|
||||
SPEECHD_VARS_OFF= CONFIG+=no-speechd
|
||||
QTSPEECH_USES= qt:5
|
||||
QTSPEECH_USE= QT=speech
|
||||
QTSPEECH_CMAKE_BOOL= qtspeech
|
||||
|
||||
RNNOISE_CMAKE_BOOL= rnnoise
|
||||
RNNOISE_CMAKE_ON= -Dbundled-rnnoise:BOOL=off
|
||||
RNNOISE_LIB_DEPENDS= librnnoise.so:audio/rnnoise
|
||||
|
||||
SPEECHD_USES= gettext-runtime gnome
|
||||
SPEECHD_USE= GNOME=glib20
|
||||
SPEECHD_CMAKE_BOOL= speechd
|
||||
SPEECHD_LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher
|
||||
|
||||
CONFIGURE_ENV+= MUMBLE_PYTHON=${PYTHON_CMD}
|
||||
CONFIGURE_ENV+= MUMBLE_PYTHON=${PYTHON_CMD}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
# PCH is broken on GCC
|
||||
.if ${CHOSEN_COMPILER_TYPE} == gcc
|
||||
CONFIG+= no-pch
|
||||
.endif
|
||||
|
||||
MAKE_JOBS_UNSAFE=yes
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro
|
||||
@${REINPLACE_CMD} -e 's|--no-add-needed|--no-copy-dt-needed-entries|' ${WRKSRC}/qmake/compiler.pri
|
||||
@${RM} ${WRKSRC}/plugins/manual/.qmake.cache
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${STAGEDIR}${PREFIX}/bin
|
||||
${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.7.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.7.0
|
||||
${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.11.0
|
||||
${INSTALL_LIB} ${WRKSRC}/release/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION}
|
||||
${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so
|
||||
${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${MAJORVERSION}
|
||||
${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${MINORVERSION}
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/share/services
|
||||
${INSTALL_DATA} ${WRKSRC}/scripts/mumble.protocol ${STAGEDIR}${PREFIX}/share/services
|
||||
${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${STAGEDIR}${PREFIX}/share/applications
|
||||
${INSTALL_PROGRAM} ${WRKDIR}/.build/mumble ${STAGEDIR}${PREFIX}/bin
|
||||
${INSTALL_LIB} ${WRKDIR}/.build/libmumbleoverlay.x86_64.so.${MINORVERSION}.0 \
|
||||
${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION}
|
||||
${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} \
|
||||
${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so
|
||||
${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} \
|
||||
${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${MAJORVERSION}
|
||||
${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} \
|
||||
${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${MINORVERSION}
|
||||
${INSTALL_LIB} ${WRKDIR}/.build/libmumbleoverlay.x86.so.${MINORVERSION}.0 \
|
||||
${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION}
|
||||
${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} \
|
||||
${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so
|
||||
${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} \
|
||||
${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${MAJORVERSION}
|
||||
${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} \
|
||||
${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${MINORVERSION}
|
||||
${INSTALL_DATA} ${WRKDIR}/.build/auxiliary_files/info.mumble.Mumble.desktop \
|
||||
${STAGEDIR}${PREFIX}/share/applications/mumble.desktop
|
||||
${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
|
||||
${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.installer.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
|
||||
${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
|
||||
${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${STAGEDIR}${MANPREFIX}/man/man1/mumble.1
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps \
|
||||
${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
|
||||
${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg \
|
||||
${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
|
||||
${INSTALL_DATA} ${WRKSRC}/icons/mumble_256x256.png \
|
||||
${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/mumble.png
|
||||
${INSTALL_MAN} ${WRKSRC}/auxiliary_files/man_files/mumble.1 \
|
||||
${STAGEDIR}${MANPREFIX}/share/man/man1/mumble.1
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
|
|
@ -1,17 +1,15 @@
|
|||
TIMESTAMP = 1602265872
|
||||
SHA256 (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 53a555092a03af2e6025c641bb748f013e1cfa8f61899a686bed8690439f36c7
|
||||
SIZE (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 4895708
|
||||
SHA256 (mumble-voip-celt-0.7.0-5a16cda_GH0.tar.gz) = fbfdbb0767d9d67ea29270eb3e5e999eec6f7f3720a870e74776be426b10b53a
|
||||
SIZE (mumble-voip-celt-0.7.0-5a16cda_GH0.tar.gz) = 182631
|
||||
SHA256 (mumble-voip-celt-0.11.0-e18de77_GH0.tar.gz) = b522482222c40c1f05ce9b6c4d19a05e8419a7850398dbbdea5854b78eadfd4a
|
||||
SIZE (mumble-voip-celt-0.11.0-e18de77_GH0.tar.gz) = 212833
|
||||
TIMESTAMP = 1690555998
|
||||
SHA256 (mumble-voip-mumble-1.5.517-v1.5.517_GH0.tar.gz) = f7ea7c8f5267fa8f744a7622bb96ad373ee40c6458b9ce01d81d071898f6a6da
|
||||
SIZE (mumble-voip-mumble-1.5.517-v1.5.517_GH0.tar.gz) = 6120684
|
||||
SHA256 (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 8439bfe7daeb478d8e8aa09b3c111c3dc360064144d181fc5dcfef950e8eaa05
|
||||
SIZE (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 4817
|
||||
SHA256 (microsoft-GSL-0f6dbc9_GH0.tar.gz) = 63d53ed611862f90517048db57617d8264200810a1e9fbb7ff9a524747f8dab3
|
||||
SIZE (microsoft-GSL-0f6dbc9_GH0.tar.gz) = 78207
|
||||
SHA256 (mumble-voip-mach_override-919148f_GH0.tar.gz) = 81b2e705a7cce1e3a9eb440cb2bca2f14fd83db162123f44faf17f0bf45da1bd
|
||||
SIZE (mumble-voip-mach_override-919148f_GH0.tar.gz) = 66278
|
||||
SHA256 (mumble-voip-minhook-5e338f8_GH0.tar.gz) = bc675c5b9def1fcef4b58c62e6d69eaa6e76d2fed89ace681059a7648e808033
|
||||
SIZE (mumble-voip-minhook-5e338f8_GH0.tar.gz) = 27651
|
||||
SHA256 (mumble-voip-rnnoise-b30f2bb_GH0.tar.gz) = 68ce21e49a0af3d06d87d27665d9a2102c249e4e5e91f777e47139d8707aeb6d
|
||||
SIZE (mumble-voip-rnnoise-b30f2bb_GH0.tar.gz) = 171240
|
||||
SHA256 (mumble-voip-sbcelt-045493d_GH0.tar.gz) = dc9bdcc26a3642cb7ead98cb487c9a52225228fbbfa6f75906d9e479e11b862a
|
||||
SIZE (mumble-voip-sbcelt-045493d_GH0.tar.gz) = 20128
|
||||
SHA256 (mumble-voip-mumble-theme-9467fe8_GH0.tar.gz) = 4ac062686b75f8ea558a4d92df205e51c1d4c1b5676a28b656b8664fc56470db
|
||||
SIZE (mumble-voip-mumble-theme-9467fe8_GH0.tar.gz) = 378261
|
||||
SHA256 (mumble-voip-speexdsp-6e4634f_GH0.tar.gz) = f596d946feeffc66ad2f8a5886945019d79a1a45f3e9c1a1191b4faabb0e84ea
|
||||
SIZE (mumble-voip-speexdsp-6e4634f_GH0.tar.gz) = 895204
|
||||
SHA256 (wolfpld-tracy-1a4f369_GH0.tar.gz) = b1fbb7b8ec38c58addd97f9cd6d17e879ecab9bfc184751297ce2162a6b8d008
|
||||
SIZE (wolfpld-tracy-1a4f369_GH0.tar.gz) = 4633541
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
--- overlay_gl/overlay.c.orig 2019-03-13 18:38:10 UTC
|
||||
+++ overlay_gl/overlay.c
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <sys/ipc.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/socket.h>
|
||||
+#include <sys/stat.h>
|
||||
#include <sys/un.h>
|
||||
#include <sys/stat.h>
|
||||
#include <time.h>
|
|
@ -1,24 +0,0 @@
|
|||
--- qmake/builddir.pri.orig 2019-10-20 18:28:58 UTC
|
||||
+++ qmake/builddir.pri
|
||||
@@ -33,20 +33,7 @@ isEmpty(TOP_BUILDDIR) {
|
||||
TOP_BUILDDIR = $$TOP_SRCDIR
|
||||
}
|
||||
|
||||
-# If the build and source paths are equal,
|
||||
-# it's not a shadow build.
|
||||
-equals(TOP_BUILDDIR, $$TOP_SRCDIR) {
|
||||
- CONFIG(debug, debug|release) {
|
||||
- DESTDIR = $$TOP_BUILDDIR/debug
|
||||
- }
|
||||
-
|
||||
- CONFIG(release, debug|release) {
|
||||
- DESTDIR = $$TOP_BUILDDIR/release
|
||||
- }
|
||||
-} else {
|
||||
- DESTDIR = $$TOP_BUILDDIR
|
||||
-}
|
||||
-
|
||||
+DESTDIR = $$TOP_BUILDDIR/release
|
||||
OBJECTS_ROOT = $$DESTDIR/.obj
|
||||
MOC_ROOT = $$DESTDIR/.moc
|
||||
RCC_ROOT = $$DESTDIR/.qrc
|
|
@ -1,10 +0,0 @@
|
|||
--- src/mumble/CELTCodec.cpp.orig 2019-03-20 19:21:57 UTC
|
||||
+++ src/mumble/CELTCodec.cpp
|
||||
@@ -40,6 +40,7 @@ CELTCodec::CELTCodec(const QString &celt_version) {
|
||||
alternatives << QString::fromLatin1("libcelt0.so.%1").arg(celt_version);
|
||||
alternatives << QString::fromLatin1("libcelt.so.%1").arg(celt_version);
|
||||
alternatives << QString::fromLatin1("celt.so.%1").arg(celt_version);
|
||||
+ alternatives << QString::fromLatin1("libcelt-mumble.so.%1").arg(celt_version);
|
||||
#else
|
||||
int cpuinfo[4];
|
||||
__cpuid(cpuinfo, 1);
|
|
@ -1,15 +0,0 @@
|
|||
--- src/SelfSignedCertificate.cpp.orig 2023-06-10 11:50:34 UTC
|
||||
+++ src/SelfSignedCertificate.cpp
|
||||
@@ -45,10 +45,12 @@ bool SelfSignedCertificate::generate(CertificateType c
|
||||
QString commonName;
|
||||
bool isServerCert = certificateType == CertificateTypeServerCertificate;
|
||||
|
||||
+#ifdef CRYPTO_MEM_CHECK_ON
|
||||
if (CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) == -1) {
|
||||
ok = false;
|
||||
goto out;
|
||||
}
|
||||
+#endif
|
||||
|
||||
x509 = X509_new();
|
||||
if (x509 == NULL) {
|
|
@ -1,2 +1,2 @@
|
|||
Mumble is an open source, low-latency, high quality voice chat software
|
||||
primarily intended for use while gaming.
|
||||
Mumble is a free, open source, low latency, high quality voice chat
|
||||
application primarily intended for use while gaming.
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
bin/mumble
|
||||
lib/libcelt-mumble.so.0.11.0
|
||||
lib/libcelt-mumble.so.0.7.0
|
||||
lib/libmumble.so
|
||||
lib/libmumble.so.%%MAJORVERSION%%
|
||||
lib/libmumble.so.%%MINORVERSION%%
|
||||
lib/libmumble.so.%%PATCHVERSION%%
|
||||
man/man1/mumble.1.gz
|
||||
lib/libmumbleoverlay.x86_64.so
|
||||
lib/libmumbleoverlay.x86_64.so.%%MAJORVERSION%%
|
||||
lib/libmumbleoverlay.x86_64.so.%%MINORVERSION%%
|
||||
lib/libmumbleoverlay.x86_64.so.%%PATCHVERSION%%
|
||||
lib/libmumbleoverlay.x86.so
|
||||
lib/libmumbleoverlay.x86.so.%%MAJORVERSION%%
|
||||
lib/libmumbleoverlay.x86.so.%%MINORVERSION%%
|
||||
lib/libmumbleoverlay.x86.so.%%PATCHVERSION%%
|
||||
share/applications/mumble.desktop
|
||||
share/icons/hicolor/128x128/apps/mumble.png
|
||||
share/icons/hicolor/256x256/apps/mumble.png
|
||||
share/icons/hicolor/scalable/apps/mumble.svg
|
||||
share/man/man1/mumble.1.gz
|
||||
share/pixmaps/mumble.xpm
|
||||
share/services/mumble.protocol
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= ocp
|
||||
PORTVERSION= 0.2.105
|
||||
PORTVERSION= 0.2.106
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= https://stian.cubic.org/ocp/
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1684072359
|
||||
SHA256 (ocp-0.2.105.tar.xz) = 1a87b3c572679fb681a25bf158bdc1cc078018d0507965e1557610c17fcccfc5
|
||||
SIZE (ocp-0.2.105.tar.xz) = 3898208
|
||||
TIMESTAMP = 1690785269
|
||||
SHA256 (ocp-0.2.106.tar.xz) = bf11d96d4a58bbf9c344eb53cf815fc2097c63a3c2c713f7ffb134073bd84721
|
||||
SIZE (ocp-0.2.106.tar.xz) = 3985404
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
bin/ocp
|
||||
bin/ocp-curses
|
||||
lib/ocp/autoload/35-devpdisk.so
|
||||
lib/ocp/autoload/35-devpnone.so
|
||||
lib/ocp/autoload/35-devwmix.so
|
||||
lib/ocp/autoload/35-devwmixf.so
|
||||
|
@ -22,12 +21,68 @@ lib/ocp/autoload/freverb.so
|
|||
lib/ocp/autoload/ireverb.so
|
||||
lib/ocp/libocp.so
|
||||
man/man1/ocp.1.gz
|
||||
share/mime/audio/x-a2m.xml
|
||||
share/mime/audio/x-adl.xml
|
||||
share/mime/audio/x-adlib-midi.xml
|
||||
share/mime/audio/x-adtrack.xml
|
||||
share/mime/audio/x-amd.xml
|
||||
share/mime/audio/x-ams.xml
|
||||
share/mime/audio/x-as3m.xml
|
||||
share/mime/audio/x-ay.xml
|
||||
share/mime/audio/x-bam.xml
|
||||
share/mime/audio/x-bmf.xml
|
||||
share/mime/audio/x-cff.xml
|
||||
share/mime/audio/x-cmf.xml
|
||||
share/mime/audio/x-coktel.xml
|
||||
share/mime/audio/x-d00.xml
|
||||
share/mime/audio/x-dfm.xml
|
||||
share/mime/audio/x-dmf.xml
|
||||
share/mime/audio/x-dmo.xml
|
||||
share/mime/audio/x-dro.xml
|
||||
share/mime/audio/x-dtm.xml
|
||||
share/mime/audio/x-fmc.xml
|
||||
share/mime/audio/x-gbs.xml
|
||||
share/mime/audio/x-got.xml
|
||||
share/mime/audio/x-gym.xml
|
||||
share/mime/audio/x-herad.xml
|
||||
share/mime/audio/x-hes.xml
|
||||
share/mime/audio/x-hsc.xml
|
||||
share/mime/audio/x-hsp.xml
|
||||
share/mime/audio/x-hvl.xml
|
||||
share/mime/audio/x-imf.xml
|
||||
share/mime/audio/x-jbm.xml
|
||||
share/mime/audio/x-ksm.xml
|
||||
share/mime/audio/x-kss.xml
|
||||
share/mime/audio/x-lds.xml
|
||||
share/mime/audio/x-mad.xml
|
||||
share/mime/audio/x-mdl.xml
|
||||
share/mime/audio/x-mkj.xml
|
||||
share/mime/audio/x-msc.xml
|
||||
share/mime/audio/x-mtk.xml
|
||||
share/mime/audio/x-mtr.xml
|
||||
share/mime/audio/x-mus.xml
|
||||
share/mime/audio/x-nsf.xml
|
||||
share/mime/audio/x-nsfe.xml
|
||||
share/mime/audio/x-pis.xml
|
||||
share/mime/audio/x-ptm.xml
|
||||
share/mime/audio/x-rac.xml
|
||||
share/mime/audio/x-rad.xml
|
||||
share/mime/audio/x-rix.xml
|
||||
share/mime/audio/x-rol.xml
|
||||
share/mime/audio/x-sa2.xml
|
||||
share/mime/audio/x-sap.xml
|
||||
share/mime/audio/x-sop.xml
|
||||
share/mime/audio/x-spc.xml
|
||||
share/mime/audio/x-u6m.xml
|
||||
share/mime/audio/x-vgm.xml
|
||||
share/mime/audio/x-vgz.xml
|
||||
share/mime/audio/x-xad-bmf.xml
|
||||
share/mime/audio/x-xad-flash.xml
|
||||
share/mime/audio/x-xad-hybrid.xml
|
||||
share/mime/audio/x-xad-hyp.xml
|
||||
share/mime/audio/x-xad-psi.xml
|
||||
share/mime/audio/x-xad-rat.xml
|
||||
share/mime/audio/x-xsm.xml
|
||||
share/mime/audio/x-ym.xml
|
||||
share/mime/packages/opencubicplayer.xml
|
||||
%%ADPLUG%%%%DATADIR%%/data/adplug.db
|
||||
|
|
|
@ -15,12 +15,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING
|
|||
BUILD_DEPENDS= lv2>0:audio/lv2 \
|
||||
bash:shells/bash \
|
||||
gmake:devel/gmake \
|
||||
guile2>0:lang/guile2 \
|
||||
${LOCALBASE}/lib/libztoolkit.a:x11-toolkits/ztoolkit
|
||||
LIB_DEPENDS= liblo.so:audio/liblo \
|
||||
libsndfile.so:audio/libsndfile
|
||||
|
||||
USES= gnome meson pkgconfig xorg
|
||||
USES= gnome guile:2.2,3.0,build,alias meson pkgconfig xorg
|
||||
USE_GNOME= cairo glib20 librsvg2
|
||||
USE_XORG= x11
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
PORTNAME= zrythm
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 1.0.0-alpha.26.0.13
|
||||
PORTREVISION= 7
|
||||
PORTREVISION= 8
|
||||
CATEGORIES= audio
|
||||
|
||||
MAINTAINER= yuri@FreeBSD.org
|
||||
|
@ -23,7 +23,6 @@ LIB_DEPENDS= libaudec.so:audio/libaudec \
|
|||
libcurl.so:ftp/curl \
|
||||
libfftw3_threads.so:math/fftw3 \
|
||||
libfftw3f_threads.so:math/fftw3-float \
|
||||
libguile-2.2.so:lang/guile2 \
|
||||
libjack.so:audio/jack \
|
||||
libjson-glib-1.0.so:devel/json-glib \
|
||||
liblilv-0.so:audio/lilv \
|
||||
|
@ -48,7 +47,8 @@ LIB_DEPENDS= libaudec.so:audio/libaudec \
|
|||
RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
|
||||
kf5-breeze-icons>0:x11-themes/kf5-breeze-icons
|
||||
|
||||
USES= compiler:c11 desktop-file-utils gettext-tools gettext-runtime gnome libtool localbase:ldflags \
|
||||
USES= compiler:c11 desktop-file-utils gettext-tools gettext-runtime \
|
||||
guile:2.2,3.0,alias,conflicts gnome libtool localbase:ldflags \
|
||||
meson pkgconfig python:build shared-mime-info shebangfix xorg
|
||||
USE_GITHUB= yes
|
||||
USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 gtksourceview3 libxml2 pango
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= zynaddsubfx
|
||||
DISTVERSION= 3.0.6
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= audio
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
PORTNAME= ddosify
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 1.0.3
|
||||
PORTREVISION= 1
|
||||
DISTVERSION= 1.0.5
|
||||
CATEGORIES= benchmarks
|
||||
|
||||
MAINTAINER= nulldutra@proton.me
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
TIMESTAMP = 1685660449
|
||||
SHA256 (ddosify-ddosify-v1.0.3_GH0.tar.gz) = a4a95ba14fe36508c3b91e0be291956dbbcaffdb5bece7c903c14231985a0ff8
|
||||
SIZE (ddosify-ddosify-v1.0.3_GH0.tar.gz) = 1236702
|
||||
TIMESTAMP = 1690511463
|
||||
SHA256 (ddosify-ddosify-v1.0.5_GH0.tar.gz) = c042c9342d6a65d7db26295445e203d8f7c5f93a21e2151ec35b87d2cfde7b8b
|
||||
SIZE (ddosify-ddosify-v1.0.5_GH0.tar.gz) = 1236770
|
||||
SHA256 (antchfx-xmlquery-v1.3.13_GH0.tar.gz) = e882143ac161874fc3d9a91f1e19ab78271b5aa37a7d8541e728b566c405e36c
|
||||
SIZE (antchfx-xmlquery-v1.3.13_GH0.tar.gz) = 21490
|
||||
SHA256 (antchfx-xpath-v1.2.1_GH0.tar.gz) = cd9962512d4b3611b500621c1aeaf12780648845f7c976050c2bcba5c5d222c4
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
PORTNAME= glmark2
|
||||
PORTVERSION= 2023.01
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= benchmarks
|
||||
|
||||
MAINTAINER= danfe@FreeBSD.org
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= vkpeak
|
||||
DISTVERSION= 20221113
|
||||
DISTVERSION= 20230730
|
||||
CATEGORIES= benchmarks
|
||||
|
||||
MAINTAINER= jbeich@FreeBSD.org
|
||||
|
@ -15,8 +15,8 @@ LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader
|
|||
USES= cmake compiler:c++11-lib
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= nihui
|
||||
GH_TUPLE= KhronosGroup:glslang:11.9.0-19-g86ff4bca:nglslang/ncnn/glslang \
|
||||
Tencent:ncnn:20220729-72-g498ca734:ncnn/ncnn
|
||||
GH_TUPLE= KhronosGroup:glslang:12.3.1-11-g4420f9b3:nglslang/ncnn/glslang \
|
||||
Tencent:ncnn:20230517-42-gc45c01c7:ncnn/ncnn
|
||||
PLIST_FILES= bin/${PORTNAME}
|
||||
|
||||
do-install:
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
TIMESTAMP = 1668330759
|
||||
SHA256 (nihui-vkpeak-20221113_GH0.tar.gz) = 697d32e61fd56775755372b16e180e7d03e9e5b0a6a2f9364acdfcbdc1580c4f
|
||||
SIZE (nihui-vkpeak-20221113_GH0.tar.gz) = 7509
|
||||
SHA256 (KhronosGroup-glslang-11.9.0-19-g86ff4bca_GH0.tar.gz) = f7a19b57af200feeba77a5cc010fc031ba47c32287cb1438440ad32628fb798a
|
||||
SIZE (KhronosGroup-glslang-11.9.0-19-g86ff4bca_GH0.tar.gz) = 3535721
|
||||
SHA256 (Tencent-ncnn-20220729-72-g498ca734_GH0.tar.gz) = ec1971038e741dc5b89906242a27e200945959193473fadae2b4fd33a2640991
|
||||
SIZE (Tencent-ncnn-20220729-72-g498ca734_GH0.tar.gz) = 12393432
|
||||
TIMESTAMP = 1690677682
|
||||
SHA256 (nihui-vkpeak-20230730_GH0.tar.gz) = ccc403b33ffecbb6df3d48f4d873e631a9a0b036d083b04024230056ae6021d5
|
||||
SIZE (nihui-vkpeak-20230730_GH0.tar.gz) = 8079
|
||||
SHA256 (KhronosGroup-glslang-12.3.1-11-g4420f9b3_GH0.tar.gz) = 097d4c94dcd5727a037d74764c7e681642a81ff74bef88f5ceb99cb9a360ac81
|
||||
SIZE (KhronosGroup-glslang-12.3.1-11-g4420f9b3_GH0.tar.gz) = 3732506
|
||||
SHA256 (Tencent-ncnn-20230517-42-gc45c01c7_GH0.tar.gz) = d7aa1da28e254bbf971b863cef8b9042167b2d609117bb3441342f1d838c30d8
|
||||
SIZE (Tencent-ncnn-20230517-42-gc45c01c7_GH0.tar.gz) = 12623241
|
||||
|
|
|
@ -171,6 +171,7 @@
|
|||
SUBDIR += py-goatools
|
||||
SUBDIR += py-gtfparse
|
||||
SUBDIR += py-hits
|
||||
SUBDIR += py-htseq
|
||||
SUBDIR += py-libnuml
|
||||
SUBDIR += py-libsedml
|
||||
SUBDIR += py-loompy
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
PORTNAME= atac-seq
|
||||
DISTVERSION= 0.1.2
|
||||
PORTREVISION= 1
|
||||
DISTVERSION= 0.1.3
|
||||
CATEGORIES= biology python
|
||||
MASTER_SITES= # empty
|
||||
|
||||
|
@ -21,7 +20,8 @@ RUN_DEPENDS= sra-tools>0:biology/sra-tools \
|
|||
${PYTHON_PKGNAMEPREFIX}macs2>0:biology/py-macs2@${PY_FLAVOR} \
|
||||
fasda>0:biology/fasda \
|
||||
peak-classifier>0:biology/peak-classifier \
|
||||
webbrowser>0:www/webbrowser
|
||||
webbrowser>0:www/webbrowser \
|
||||
curl>0:ftp/curl
|
||||
|
||||
USES= metaport python
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
TIMESTAMP = 1673549889
|
||||
TIMESTAMP = 1690554875
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= ncbi-toolkit
|
||||
DISTVERSION= 2017.01.06 # containing BLAST v2.2.27 (? is this true)
|
||||
PORTREVISION= 7
|
||||
PORTREVISION= 8
|
||||
CATEGORIES= biology
|
||||
MASTER_SITES= ftp://ftp.ncbi.nlm.nih.gov/toolbox/ncbi_tools/old/${PORTVERSION:S/.//g}/
|
||||
DISTNAME= ncbi
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= protomol
|
||||
PORTVERSION= 2.0.3
|
||||
PORTREVISION= 14
|
||||
PORTREVISION= 15
|
||||
CATEGORIES= biology
|
||||
MASTER_SITES= SF/${PORTNAME}/ProtoMol/${PORTVERSION}
|
||||
DISTFILES= ${DISTNAME}-tar.gz
|
||||
|
|
|
@ -17,4 +17,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.6.0:www/py-requests@${PY_FLAVOR}
|
|||
USES= python
|
||||
USE_PYTHON= distutils autoplist
|
||||
|
||||
NO_ARCH= yes
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -0,0 +1,30 @@
|
|||
PORTNAME= HTSeq
|
||||
DISTVERSION= 2.0.3
|
||||
CATEGORIES= biology python
|
||||
MASTER_SITES= PYPI
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
|
||||
MAINTAINER= jwb@FreeBSD.org
|
||||
COMMENT= Python library to facilitate programmatic analysis of sequence data
|
||||
WWW= https://pypi.python.org/project/htseq/
|
||||
|
||||
LICENSE= GPLv3
|
||||
LICENSE_FILE= ${WRKSRC}/LICENSE
|
||||
|
||||
BUILD_DEPENDS= ${PYNUMPY} \
|
||||
${PYTHON_PKGNAMEPREFIX}pysam>0:biology/py-pysam@${PY_FLAVOR}
|
||||
RUN_DEPENDS= ${PYNUMPY} \
|
||||
${PYTHON_PKGNAMEPREFIX}pysam>0:biology/py-pysam@${PY_FLAVOR} \
|
||||
${PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib@${PY_FLAVOR}
|
||||
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>1.5.0:science/py-scipy@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}pandas>=1.1.0:math/py-pandas@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4:math/py-matplotlib@${PY_FLAVOR}
|
||||
|
||||
USES= python
|
||||
USE_PYTHON= autoplist cython distutils pytest
|
||||
|
||||
post-stage:
|
||||
${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/HTSeq/_StepVector.cpython-39.so
|
||||
${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/HTSeq/_HTSeq.cpython-39.so
|
||||
|
||||
.include <bsd.port.mk>
|
|
@ -0,0 +1,3 @@
|
|||
TIMESTAMP = 1690498174
|
||||
SHA256 (HTSeq-2.0.3.tar.gz) = c7e7eb29bdc44e80d2d68e3599fa8a8f1d9d6475624dcf1b9644285a8a9c0fac
|
||||
SIZE (HTSeq-2.0.3.tar.gz) = 394178
|
|
@ -0,0 +1,4 @@
|
|||
HTSeq is a Python library to facilitate programmatic analysis of data
|
||||
from high-throughput sequencing (HTS) experiments. A popular component
|
||||
of HTSeq is htseq-count, a script to quantify gene expression in bulk
|
||||
and single-cell RNA-Seq and similar experiments.
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= orange3-bioinformatics
|
||||
DISTVERSION= 4.3.1
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= biology python
|
||||
MASTER_SITES= PYPI
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
|
@ -19,7 +19,7 @@ RUN_DEPENDS= orange3>0:misc/orange3 \
|
|||
${PYTHON_PKGNAMEPREFIX}point-annotator>=2.0:math/py-point-annotator@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}pyclipper>=1.2.0:math/py-pyclipper@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}requests-cache>0:www/py-requests-cache@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}requests-cache0>0:www/py-requests-cache0@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}resdk>0:biology/py-resdk@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}scipy>=1.5.0:science/py-scipy@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}serverfiles>0:misc/py-serverfiles@${PY_FLAVOR}
|
||||
|
|
|
@ -27,6 +27,8 @@ USE_GITHUB= yes
|
|||
GH_ACCOUNT= biolab
|
||||
USE_PYTHON= distutils autoplist
|
||||
|
||||
NO_ARCH= yes
|
||||
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
DOCS_BUILD_DEPENDS= gmake:devel/gmake \
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
PORTNAME= rna-seq
|
||||
DISTVERSION= 0.1.2
|
||||
PORTREVISION= 1
|
||||
DISTVERSION= 0.1.4
|
||||
CATEGORIES= biology python
|
||||
MASTER_SITES= # empty
|
||||
|
||||
|
@ -18,9 +17,11 @@ RUN_DEPENDS= sra-tools>0:biology/sra-tools \
|
|||
gffread>0:biology/gffread \
|
||||
kallisto>0:biology/kallisto \
|
||||
hisat2>0:biology/hisat2 \
|
||||
rna-STAR>0:biology/star \
|
||||
samtools>0:biology/samtools \
|
||||
fasda>0:biology/fasda \
|
||||
webbrowser>0:www/webbrowser
|
||||
webbrowser>0:www/webbrowser \
|
||||
curl>0:ftp/curl
|
||||
|
||||
USES= metaport python
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
TIMESTAMP = 1673550086
|
||||
TIMESTAMP = 1690813968
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
PORTNAME= seaview
|
||||
PORTVERSION= 5.0.5
|
||||
PORTREVISION= 1
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= biology
|
||||
MASTER_SITES= ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/
|
||||
|
|
|
@ -9,6 +9,9 @@ WWW= https://github.com/vcflib/vcflib
|
|||
|
||||
LICENSE= MIT
|
||||
|
||||
NOT_FOR_ARCHS= armv6 armv7
|
||||
NOT_FOR_ARCHS_REASON= requires OpenMP which is not supported
|
||||
|
||||
BUILD_DEPENDS= pybind11>0:devel/pybind11
|
||||
LIB_DEPENDS= libhts.so:biology/htslib \
|
||||
libcurl.so:ftp/curl \
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
PORTNAME= PrusaSlicer
|
||||
DISTVERSIONPREFIX=version_
|
||||
DISTVERSION= 2.5.1
|
||||
PORTREVISION= 7
|
||||
DISTVERSION= 2.6.0
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= cad
|
||||
DIST_SUBDIR= PrusaSlicer
|
||||
|
||||
MAINTAINER= teodorsigaev@gmail.com
|
||||
COMMENT= Slicing application for 3D printers
|
||||
|
@ -14,12 +15,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
|
|||
BUILD_DEPENDS= cereal>=1.3.0.10:devel/cereal \
|
||||
cgal>=5.0.2:math/cgal \
|
||||
opencascade>=7.7.0:cad/opencascade
|
||||
|
||||
LIB_DEPENDS= libtbb.so:devel/onetbb \
|
||||
libboost_log.so:devel/boost-libs \
|
||||
libImath.so:math/Imath \
|
||||
libnlopt.so:math/nlopt \
|
||||
libqhull_r.so:math/qhull \
|
||||
libcurl.so:ftp/curl \
|
||||
libexpat.so:textproc/expat2 \
|
||||
libiconv.so:converters/libiconv \
|
||||
libopenvdb.so:misc/openvdb \
|
||||
libgmp.so:math/gmp \
|
||||
libmpfr.so:math/mpfr \
|
||||
|
@ -31,7 +35,8 @@ LIB_DEPENDS= libtbb.so:devel/onetbb \
|
|||
libfreeimage.so:graphics/freeimage \
|
||||
libfreetype.so:print/freetype2 \
|
||||
libavcodec.so:multimedia/ffmpeg \
|
||||
libharfbuzz.so:print/harfbuzz
|
||||
libharfbuzz.so:print/harfbuzz \
|
||||
libwayland-egl.so:graphics/wayland
|
||||
|
||||
USES= cmake cpe desktop-file-utils eigen:3 gettext gl pkgconfig jpeg iconv gnome xorg
|
||||
CPE_VENDOR= prusa3d
|
||||
|
@ -44,7 +49,8 @@ USE_XORG= x11
|
|||
|
||||
CMAKE_ARGS+= -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
|
||||
-DSLIC3R_GTK=3 \
|
||||
-DSLIC3R_FHS=1
|
||||
-DSLIC3R_FHS=1 \
|
||||
-DSLIC3R_PCH=OFF
|
||||
|
||||
PORTDATA= *
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1679421999
|
||||
SHA256 (prusa3d-PrusaSlicer-version_2.5.1_GH0.tar.gz) = 4fa14a4604ccf8042c3cbefe4c0a481d293e075030920799fe3f5e6247ef93ca
|
||||
SIZE (prusa3d-PrusaSlicer-version_2.5.1_GH0.tar.gz) = 48888707
|
||||
TIMESTAMP = 1690319127
|
||||
SHA256 (PrusaSlicer/prusa3d-PrusaSlicer-version_2.6.0_GH0.tar.gz) = a15f68e3b18a047c8c9a18a9d91629d2c777be1932087684cf6d2332d0888e77
|
||||
SIZE (PrusaSlicer/prusa3d-PrusaSlicer-version_2.6.0_GH0.tar.gz) = 56430180
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- CMakeLists.txt.orig 2022-09-06 07:09:19 UTC
|
||||
--- CMakeLists.txt.orig 2023-06-19 12:07:14 UTC
|
||||
+++ CMakeLists.txt
|
||||
@@ -4,6 +4,7 @@ project(PrusaSlicer)
|
||||
@@ -4,6 +4,7 @@ include(CMakeDependentOption)
|
||||
include("version.inc")
|
||||
include(GNUInstallDirs)
|
||||
include(CMakeDependentOption)
|
||||
|
@ -8,7 +8,7 @@
|
|||
|
||||
set(SLIC3R_RESOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/resources")
|
||||
file(TO_NATIVE_PATH "${SLIC3R_RESOURCES_DIR}" SLIC3R_RESOURCES_DIR_WIN)
|
||||
@@ -197,7 +198,7 @@ if (APPLE)
|
||||
@@ -207,7 +208,7 @@ endif ()
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
|
@ -17,7 +17,16 @@
|
|||
find_package(PkgConfig REQUIRED)
|
||||
|
||||
if (CMAKE_VERSION VERSION_LESS "3.1")
|
||||
@@ -597,8 +598,8 @@ elseif (SLIC3R_FHS)
|
||||
@@ -446,7 +447,7 @@ find_package(EXPAT REQUIRED)
|
||||
# no matter what.
|
||||
find_package(EXPAT REQUIRED)
|
||||
|
||||
-add_library(libexpat INTERFACE)
|
||||
+# add_library(libexpat INTERFACE)
|
||||
|
||||
if (TARGET EXPAT::EXPAT )
|
||||
target_link_libraries(libexpat INTERFACE EXPAT::EXPAT)
|
||||
@@ -627,8 +628,8 @@ elseif (SLIC3R_FHS)
|
||||
install(DIRECTORY ${SLIC3R_RESOURCES_DIR}/ DESTINATION ${SLIC3R_FHS_RESOURCES}
|
||||
PATTERN "*/udev" EXCLUDE
|
||||
)
|
||||
|
@ -28,7 +37,7 @@
|
|||
foreach(SIZE 32 128 192)
|
||||
install(FILES ${SLIC3R_RESOURCES_DIR}/icons/PrusaSlicer_${SIZE}px.png
|
||||
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME PrusaSlicer.png
|
||||
@@ -607,7 +608,8 @@ elseif (SLIC3R_FHS)
|
||||
@@ -637,7 +638,8 @@ elseif (SLIC3R_FHS)
|
||||
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME PrusaSlicer-gcodeviewer.png
|
||||
)
|
||||
endforeach()
|
||||
|
|
|
@ -1,10 +1,19 @@
|
|||
--- src/CMakeLists.txt.orig 2022-09-06 07:09:19 UTC
|
||||
--- src/CMakeLists.txt.orig 2023-06-19 12:07:14 UTC
|
||||
+++ src/CMakeLists.txt
|
||||
@@ -127,7 +127,7 @@ if (NOT WIN32 AND NOT APPLE)
|
||||
@@ -78,7 +78,7 @@ if (SLIC3R_GUI)
|
||||
|
||||
find_package(JPEG QUIET)
|
||||
find_package(TIFF QUIET)
|
||||
- find_package(NanoSVG REQUIRED)
|
||||
+ # find_package(NanoSVG REQUIRED)
|
||||
|
||||
string(REGEX MATCH "wxpng" WX_PNG_BUILTIN ${wxWidgets_LIBRARIES})
|
||||
if (PNG_FOUND AND NOT WX_PNG_BUILTIN)
|
||||
@@ -147,7 +147,7 @@ endif ()
|
||||
set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
|
||||
endif ()
|
||||
|
||||
-target_link_libraries(PrusaSlicer libslic3r cereal)
|
||||
-target_link_libraries(PrusaSlicer libslic3r libcereal)
|
||||
+target_link_libraries(PrusaSlicer libslic3r)
|
||||
|
||||
if (APPLE)
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
--- src/avrdude/arduino.c.orig 2023-07-25 13:23:52 UTC
|
||||
+++ src/avrdude/arduino.c
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "ac_cfg.h"
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1,10 +1,10 @@
|
|||
--- src/libslic3r/CMakeLists.txt.orig 2022-09-06 07:09:19 UTC
|
||||
--- src/libslic3r/CMakeLists.txt.orig 2023-06-19 12:07:14 UTC
|
||||
+++ src/libslic3r/CMakeLists.txt
|
||||
@@ -395,7 +395,6 @@ find_package(JPEG REQUIRED)
|
||||
@@ -490,7 +490,6 @@ target_link_libraries(libslic3r
|
||||
target_link_libraries(libslic3r
|
||||
libnest2d
|
||||
admesh
|
||||
- cereal
|
||||
- libcereal
|
||||
libigl
|
||||
miniz
|
||||
boost_libs
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
--- src/libslic3r/Format/SL1_SVG.cpp.orig 2023-07-21 14:55:56 UTC
|
||||
+++ src/libslic3r/Format/SL1_SVG.cpp
|
||||
@@ -6,7 +6,8 @@
|
||||
#include "libslic3r/Format/ZipperArchiveImport.hpp"
|
||||
|
||||
#define NANOSVG_IMPLEMENTATION
|
||||
-#include "nanosvg/nanosvg.h"
|
||||
+#define NANOSVGRAST_IMPLEMENTATION
|
||||
+#include "libnanosvg/nanosvgrast.h"
|
||||
|
||||
#include <limits>
|
||||
#include <cstdint>
|
|
@ -0,0 +1,20 @@
|
|||
--- src/libslic3r/GCodeSender.cpp.orig 2023-07-24 22:05:38 UTC
|
||||
+++ src/libslic3r/GCodeSender.cpp
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <boost/date_time/posix_time/posix_time.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
-#if defined(__APPLE__) || defined(__OpenBSD__)
|
||||
+#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__)
|
||||
#include <termios.h>
|
||||
#endif
|
||||
#ifdef __APPLE__
|
||||
@@ -146,7 +146,7 @@ GCodeSender::set_baud_rate(unsigned int baud_rate)
|
||||
if (ioctl(handle, TCSETS2, &ios))
|
||||
printf("Error in TCSETS2: %s\n", strerror(errno));
|
||||
|
||||
-#elif __OpenBSD__
|
||||
+#elif __OpenBSD__ || __FreeBSD__
|
||||
struct termios ios;
|
||||
::tcgetattr(handle, &ios);
|
||||
::cfsetspeed(&ios, baud_rate);
|
|
@ -0,0 +1,11 @@
|
|||
--- src/libslic3r/NSVGUtils.hpp.orig 2023-07-25 16:16:15 UTC
|
||||
+++ src/libslic3r/NSVGUtils.hpp
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "Polygon.hpp"
|
||||
#include "ExPolygon.hpp"
|
||||
-#include "nanosvg/nanosvg.h" // load SVG file
|
||||
+#include "libnanosvg/nanosvg.h" // load SVG file
|
||||
|
||||
namespace Slic3r {
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- src/libslic3r/SupportSpotsGenerator.cpp.orig 2023-07-25 08:36:31 UTC
|
||||
+++ src/libslic3r/SupportSpotsGenerator.cpp
|
||||
@@ -849,7 +849,7 @@ std::tuple<SupportPoints, PartialObjects> check_stabil
|
||||
}
|
||||
}
|
||||
}
|
||||
- auto estimate_conn_strength = [bottom_z](const SliceConnection &conn) {
|
||||
+ auto estimate_conn_strength = [bottom_z](const SliceConnection &conn) -> float {
|
||||
if (conn.area < EPSILON) { // connection is empty, does not exists. Return max strength so that it is not picked as the
|
||||
// weakest connection.
|
||||
return INFINITY;
|
|
@ -1,6 +1,6 @@
|
|||
--- src/occt_wrapper/CMakeLists.txt.orig 2022-09-06 07:09:19 UTC
|
||||
--- src/occt_wrapper/CMakeLists.txt.orig 2023-06-19 12:07:14 UTC
|
||||
+++ src/occt_wrapper/CMakeLists.txt
|
||||
@@ -19,9 +19,11 @@ include(GenerateExportHeader)
|
||||
@@ -19,9 +19,11 @@ generate_export_header(OCCTWrapper)
|
||||
|
||||
generate_export_header(OCCTWrapper)
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
|||
TKXDESTEP
|
||||
TKSTEP
|
||||
TKSTEP209
|
||||
@@ -56,5 +58,5 @@ target_link_libraries(OCCTWrapper ${OCCT_LIBS})
|
||||
@@ -58,5 +60,5 @@ include(GNUInstallDirs)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
|
||||
|
|
|
@ -1,29 +0,0 @@
|
|||
--- src/qhull/CMakeLists.txt.orig 2022-09-06 07:09:19 UTC
|
||||
+++ src/qhull/CMakeLists.txt
|
||||
@@ -14,19 +14,8 @@ find_package(Qhull 7.2 QUIET)
|
||||
|
||||
add_library(qhull INTERFACE)
|
||||
|
||||
-if(Qhull_FOUND)
|
||||
+#force use of bundled qhull#else(Qhull_FOUND)
|
||||
|
||||
-message(STATUS "Using qhull from system.")
|
||||
-if(SLIC3R_STATIC)
|
||||
- slic3r_remap_configs("Qhull::qhullcpp;Qhull::qhullstatic_r" RelWithDebInfo Release)
|
||||
- target_link_libraries(qhull INTERFACE Qhull::qhullcpp Qhull::qhullstatic_r)
|
||||
-else()
|
||||
- slic3r_remap_configs("Qhull::qhullcpp;Qhull::qhull_r" RelWithDebInfo Release)
|
||||
- target_link_libraries(qhull INTERFACE Qhull::qhullcpp Qhull::qhull_r)
|
||||
-endif()
|
||||
-
|
||||
-else(Qhull_FOUND)
|
||||
-
|
||||
project(qhull)
|
||||
cmake_minimum_required(VERSION 2.6)
|
||||
|
||||
@@ -144,4 +133,4 @@ endif(UNIX)
|
||||
target_include_directories(${qhull_STATIC} BEFORE PUBLIC ${LIBDIR}/qhull/src)
|
||||
target_link_libraries(qhull INTERFACE ${qhull_STATIC})
|
||||
|
||||
-endif()
|
||||
+#force use of bundled qhull##endif()
|
|
@ -1,11 +1,21 @@
|
|||
--- src/slic3r/CMakeLists.txt.orig 2022-09-06 07:09:19 UTC
|
||||
--- src/slic3r/CMakeLists.txt.orig 2023-06-19 12:07:14 UTC
|
||||
+++ src/slic3r/CMakeLists.txt
|
||||
@@ -260,11 +260,11 @@ add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES}
|
||||
@@ -293,7 +293,7 @@ set(SLIC3R_GUI_SOURCES
|
||||
Utils/WxFontUtils.hpp
|
||||
)
|
||||
|
||||
-find_package(NanoSVG REQUIRED)
|
||||
+# find_package(NanoSVG REQUIRED)
|
||||
|
||||
if (APPLE)
|
||||
list(APPEND SLIC3R_GUI_SOURCES
|
||||
@@ -319,11 +319,12 @@ encoding_check(libslic3r_gui)
|
||||
|
||||
encoding_check(libslic3r_gui)
|
||||
|
||||
-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
|
||||
+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi libcurl ${wxWidgets_LIBRARIES})
|
||||
-target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast)
|
||||
+# target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast)
|
||||
+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
|
||||
|
||||
if (MSVC)
|
||||
target_link_libraries(libslic3r_gui Setupapi.lib)
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
--- src/slic3r/GUI/BitmapCache.cpp.orig 2023-07-21 12:45:35 UTC
|
||||
+++ src/slic3r/GUI/BitmapCache.cpp
|
||||
@@ -15,8 +15,9 @@
|
||||
#include <wx/rawbmp.h>
|
||||
#endif /* __WXGTK2__ */
|
||||
|
||||
-#include <nanosvg/nanosvg.h>
|
||||
-#include <nanosvg/nanosvgrast.h>
|
||||
+#include <wx/display.h>
|
||||
+#include "libnanosvg/nanosvg.h"
|
||||
+#include "libnanosvg/nanosvgrast.h"
|
||||
|
||||
namespace Slic3r { namespace GUI {
|
||||
|
||||
@@ -68,7 +69,7 @@ wxBitmapBundle* BitmapCache::insert_bndl(const std::st
|
||||
wxVector<wxBitmap> bitmaps;
|
||||
|
||||
std::set<double> scales = {1.0};
|
||||
-#ifndef __linux__
|
||||
+#if !defined(__linux__) && !defined(__FreeBSD__)
|
||||
|
||||
#ifdef __APPLE__
|
||||
scales.emplace(m_scale);
|
||||
@@ -547,7 +548,7 @@ wxBitmapBundle BitmapCache::mksolid(size_t width_in, s
|
||||
wxVector<wxBitmap> bitmaps;
|
||||
|
||||
std::set<double> scales = { 1.0 };
|
||||
-#ifndef __linux__
|
||||
+#if !defined(__linux__) && !defined(__FreeBSD__)
|
||||
|
||||
#ifdef __APPLE__
|
||||
scales.emplace(m_scale);
|
|
@ -0,0 +1,56 @@
|
|||
--- src/slic3r/GUI/ConfigWizard.cpp.orig 2023-07-21 14:05:27 UTC
|
||||
+++ src/slic3r/GUI/ConfigWizard.cpp
|
||||
@@ -60,7 +60,7 @@
|
||||
#include "slic3r/GUI/I18N.hpp"
|
||||
#include "slic3r/Config/Version.hpp"
|
||||
|
||||
-#if defined(__linux__) && defined(__WXGTK3__)
|
||||
+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(__WXGTK3__)
|
||||
#define wxLinux_gtk3 true
|
||||
#else
|
||||
#define wxLinux_gtk3 false
|
||||
@@ -583,7 +583,7 @@ void PageWelcome::set_run_reason(ConfigWizard::RunReas
|
||||
const bool data_empty = run_reason == ConfigWizard::RR_DATA_EMPTY;
|
||||
welcome_text->Show(data_empty);
|
||||
cbox_reset->Show(!data_empty);
|
||||
-#if defined(__linux__) && defined(SLIC3R_DESKTOP_INTEGRATION)
|
||||
+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SLIC3R_DESKTOP_INTEGRATION)
|
||||
if (!DesktopIntegrationDialog::is_integrated())
|
||||
cbox_integrate->Show(true);
|
||||
else
|
||||
@@ -1474,7 +1474,7 @@ PageDownloader::PageDownloader(ConfigWizard* parent)
|
||||
" The model will be downloaded into folder you choose bellow."
|
||||
), SLIC3R_APP_NAME));
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
append_text(wxString::Format(_L(
|
||||
"On Linux systems the process of registration also creates desktop integration files for this version of application."
|
||||
)));
|
||||
@@ -1535,7 +1535,7 @@ bool DownloaderUtils::Worker::perform_register(const s
|
||||
}
|
||||
//key_full = "\"C:\\Program Files\\Prusa3D\\PrusaSlicer\\prusa-slicer-console.exe\" \"%1\"";
|
||||
key_full = key_string;
|
||||
-#elif __APPLE__
|
||||
+#elif defined(__APPLE__) || defined(__FreeBSD__)
|
||||
// Apple registers for custom url in info.plist thus it has to be already registered since build.
|
||||
// The url will always trigger opening of prusaslicer and we have to check that user has allowed it. (GUI_App::MacOpenURL is the triggered method)
|
||||
#else
|
||||
@@ -1554,7 +1554,7 @@ void DownloaderUtils::Worker::deregister()
|
||||
return;
|
||||
}
|
||||
key_full = key_string;
|
||||
-#elif __APPLE__
|
||||
+#elif defined(__APPLE__) || defined(__FreeBSD__)
|
||||
// TODO
|
||||
#else
|
||||
BOOST_LOG_TRIVIAL(debug) << "DesktopIntegrationDialog::undo_downloader_registration";
|
||||
@@ -3106,7 +3106,7 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_c
|
||||
if ((check_unsaved_preset_changes = install_bundles.size() > 0))
|
||||
header = _L_PLURAL("A new vendor was installed and one of its printers will be activated", "New vendors were installed and one of theirs printers will be activated", install_bundles.size());
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
// Desktop integration on Linux
|
||||
BOOST_LOG_TRIVIAL(debug) << "ConfigWizard::priv::apply_config integrate_desktop" << page_welcome->integrate_desktop() << " perform_registration_linux " << page_downloader->m_downloader->get_perform_registration_linux();
|
||||
if (page_welcome->integrate_desktop())
|
|
@ -0,0 +1,20 @@
|
|||
--- src/slic3r/GUI/ConfigWizard.hpp.orig 2023-07-25 09:21:21 UTC
|
||||
+++ src/slic3r/GUI/ConfigWizard.hpp
|
||||
@@ -22,7 +22,7 @@ namespace DownloaderUtils {
|
||||
wxWindow* m_parent{ nullptr };
|
||||
wxTextCtrl* m_input_path{ nullptr };
|
||||
bool downloader_checked{ false };
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
bool perform_registration_linux{ false };
|
||||
#endif // __linux__
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace DownloaderUtils {
|
||||
|
||||
bool on_finish();
|
||||
bool perform_register(const std::string& path_override = {});
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
bool get_perform_registration_linux() { return perform_registration_linux; }
|
||||
#endif // __linux__
|
||||
};
|
|
@ -0,0 +1,8 @@
|
|||
--- src/slic3r/GUI/DesktopIntegrationDialog.cpp.orig 2023-07-25 09:24:17 UTC
|
||||
+++ src/slic3r/GUI/DesktopIntegrationDialog.cpp
|
||||
@@ -1,4 +1,4 @@
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
#include "DesktopIntegrationDialog.hpp"
|
||||
#include "GUI_App.hpp"
|
||||
#include "GUI.hpp"
|
|
@ -0,0 +1,15 @@
|
|||
--- src/slic3r/GUI/DesktopIntegrationDialog.hpp.orig 2023-07-25 09:25:50 UTC
|
||||
+++ src/slic3r/GUI/DesktopIntegrationDialog.hpp
|
||||
@@ -1,4 +1,4 @@
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
#ifndef slic3r_DesktopIntegrationDialog_hpp_
|
||||
#define slic3r_DesktopIntegrationDialog_hpp_
|
||||
|
||||
@@ -42,4 +42,4 @@ class DesktopIntegrationDialog : public wxDialog (priv
|
||||
} // namespace Slic3r
|
||||
|
||||
#endif // slic3r_DesktopIntegrationDialog_hpp_
|
||||
-#endif // __linux__
|
||||
\ No newline at end of file
|
||||
+#endif // __linux__
|
|
@ -0,0 +1,11 @@
|
|||
--- src/slic3r/GUI/ExtraRenderers.cpp.orig 2023-07-25 09:27:23 UTC
|
||||
+++ src/slic3r/GUI/ExtraRenderers.cpp
|
||||
@@ -327,7 +327,7 @@ wxWindow* BitmapChoiceRenderer::CreateEditorCtrl(wxWin
|
||||
c_editor->SetSelection(atoi(data.GetText().c_str()));
|
||||
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
c_editor->Bind(wxEVT_COMBOBOX, [this](wxCommandEvent& evt) {
|
||||
// to avoid event propagation to other sidebar items
|
||||
evt.StopPropagation();
|
|
@ -0,0 +1,11 @@
|
|||
--- src/slic3r/GUI/Field.cpp.orig 2023-07-25 09:29:18 UTC
|
||||
+++ src/slic3r/GUI/Field.cpp
|
||||
@@ -199,7 +199,7 @@ static wxString na_value(bool for_spin_ctrl = false)
|
||||
|
||||
static wxString na_value(bool for_spin_ctrl = false)
|
||||
{
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
if (for_spin_ctrl)
|
||||
return "";
|
||||
#endif
|
|
@ -0,0 +1,11 @@
|
|||
--- src/slic3r/GUI/GLCanvas3D.cpp.orig 2023-07-25 09:31:07 UTC
|
||||
+++ src/slic3r/GUI/GLCanvas3D.cpp
|
||||
@@ -97,7 +97,7 @@ float RetinaHelper::get_scale_factor() { return float(
|
||||
#endif // __WXGTK3__
|
||||
|
||||
// Fixed the collision between BuildVolume::Type::Convex and macro Convex defined inside /usr/include/X11/X.h that is included by WxWidgets 3.0.
|
||||
-#if defined(__linux__) && defined(Convex)
|
||||
+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(Convex)
|
||||
#undef Convex
|
||||
#endif
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
--- src/slic3r/GUI/GLTexture.cpp.orig 2023-07-25 16:08:09 UTC
|
||||
+++ src/slic3r/GUI/GLTexture.cpp
|
||||
@@ -21,8 +21,8 @@
|
||||
#define STB_DXT_IMPLEMENTATION
|
||||
#include "stb_dxt/stb_dxt.h"
|
||||
|
||||
-#include <nanosvg/nanosvg.h>
|
||||
-#include <nanosvg/nanosvgrast.h>
|
||||
+#include "libnanosvg/nanosvg.h"
|
||||
+#include "libnanosvg/nanosvgrast.h"
|
||||
|
||||
#include "libslic3r/Utils.hpp"
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
--- src/slic3r/GUI/GUI.cpp.orig 2023-07-21 15:02:36 UTC
|
||||
+++ src/slic3r/GUI/GUI.cpp
|
||||
@@ -481,7 +481,7 @@ void desktop_open_folder(const boost::filesystem::path
|
||||
const wxString widepath = path.wstring();
|
||||
const wchar_t* argv[] = { L"explorer", widepath.GetData(), nullptr };
|
||||
::wxExecute(const_cast<wchar_t**>(argv), wxEXEC_ASYNC, nullptr);
|
||||
-#elif __APPLE__
|
||||
+#elif defined(__APPLE__) || defined(__FreeBSD__)
|
||||
const char* argv[] = { "open", path.string().c_str(), nullptr };
|
||||
::wxExecute(const_cast<char**>(argv), wxEXEC_ASYNC, nullptr);
|
||||
#else
|
||||
@@ -490,7 +490,7 @@ void desktop_open_folder(const boost::filesystem::path
|
||||
#endif
|
||||
}
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
namespace {
|
||||
wxExecuteEnv get_appimage_exec_env()
|
||||
{
|
|
@ -0,0 +1,11 @@
|
|||
--- src/slic3r/GUI/GUI.hpp.orig 2023-07-21 13:10:36 UTC
|
||||
+++ src/slic3r/GUI/GUI.hpp
|
||||
@@ -84,7 +84,7 @@ void desktop_open_folder(const boost::filesystem::path
|
||||
// Ask the destop to open the directory specified by path using the default file explorer.
|
||||
void desktop_open_folder(const boost::filesystem::path& path);
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined (__FreeBSD__)
|
||||
// Calling wxExecute on Linux with proper handling of AppImage's env vars.
|
||||
// argv example: { "xdg-open", path.c_str(), nullptr }
|
||||
void desktop_execute(const char* argv[]);
|
|
@ -1,43 +1,79 @@
|
|||
--- src/slic3r/GUI/GUI_App.cpp.orig 2022-09-06 07:09:19 UTC
|
||||
--- src/slic3r/GUI/GUI_App.cpp.orig 2023-06-19 12:07:14 UTC
|
||||
+++ src/slic3r/GUI/GUI_App.cpp
|
||||
@@ -2072,21 +2072,24 @@ bool GUI_App::load_language(wxString language, bool in
|
||||
BOOST_LOG_TRIVIAL(trace) << boost::format("System language detected (user locales and such): %1%") % m_language_info_system->CanonicalName.ToUTF8().data();
|
||||
}
|
||||
}
|
||||
- {
|
||||
+ if (0) {
|
||||
// Allocating a temporary locale will switch the default wxTranslations to its internal wxTranslations instance.
|
||||
wxLocale temp_locale;
|
||||
// Set the current translation's language to default, otherwise GetBestTranslation() may not work (see the wxWidgets source code).
|
||||
- wxTranslations::Get()->SetLanguage(wxLANGUAGE_DEFAULT);
|
||||
- // Let the wxFileTranslationsLoader enumerate all translation dictionaries for PrusaSlicer
|
||||
- // and try to match them with the system specific "preferred languages".
|
||||
- // There seems to be a support for that on Windows and OSX, while on Linuxes the code just returns wxLocale::GetSystemLanguage().
|
||||
- // The last parameter gets added to the list of detected dictionaries. This is a workaround
|
||||
- // for not having the English dictionary. Let's hope wxWidgets of various versions process this call the same way.
|
||||
- wxString best_language = wxTranslations::Get()->GetBestTranslation(SLIC3R_APP_KEY, wxLANGUAGE_ENGLISH);
|
||||
- if (! best_language.IsEmpty()) {
|
||||
- m_language_info_best = wxLocale::FindLanguageInfo(best_language);
|
||||
- BOOST_LOG_TRIVIAL(trace) << boost::format("Best translation language detected (may be different from user locales): %1%") % m_language_info_best->CanonicalName.ToUTF8().data();
|
||||
- }
|
||||
+ wxTranslations *wx_trp = wxTranslations::Get();
|
||||
+ if (wx_trp) {
|
||||
+ wxTranslations::Get()->SetLanguage(wxLANGUAGE_DEFAULT);
|
||||
+ // Let the wxFileTranslationsLoader enumerate all translation dictionaries for PrusaSlicer
|
||||
+ // and try to match them with the system specific "preferred languages".
|
||||
+ // There seems to be a support for that on Windows and OSX, while on Linuxes the code just returns wxLocale::GetSystemLanguage().
|
||||
+ // The last parameter gets added to the list of detected dictionaries. This is a workaround
|
||||
+ // for not having the English dictionary. Let's hope wxWidgets of various versions process this call the same way.
|
||||
+ wxString best_language = wxTranslations::Get()->GetBestTranslation(SLIC3R_APP_KEY, wxLANGUAGE_ENGLISH);
|
||||
+ if (! best_language.IsEmpty()) {
|
||||
+ m_language_info_best = wxLocale::FindLanguageInfo(best_language);
|
||||
+ BOOST_LOG_TRIVIAL(trace) << boost::format("Best translation language detected (may be different from user locales): %1%") % m_language_info_best->CanonicalName.ToUTF8().data();
|
||||
+ }
|
||||
+ }
|
||||
#ifdef __linux__
|
||||
@@ -395,7 +395,7 @@ class SplashScreen : public wxSplashScreen (private)
|
||||
};
|
||||
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
bool static check_old_linux_datadir(const wxString& app_name) {
|
||||
// If we are on Linux and the datadir does not exist yet, look into the old
|
||||
// location where the datadir was before version 2.3. If we find it there,
|
||||
@@ -973,7 +973,7 @@ void GUI_App::init_app_config()
|
||||
// Mac : "~/Library/Application Support/Slic3r"
|
||||
|
||||
if (data_dir().empty()) {
|
||||
- #ifndef __linux__
|
||||
+ #if !defined(__linux__) && !defined(__FreeBSD__)
|
||||
set_data_dir(wxStandardPaths::Get().GetUserDataDir().ToUTF8().data());
|
||||
#else
|
||||
// Since version 2.3, config dir on Linux is in ${XDG_CONFIG_HOME}.
|
||||
@@ -1130,7 +1130,8 @@ bool GUI_App::on_init_inner()
|
||||
{
|
||||
// Set initialization of image handlers before any UI actions - See GH issue #7469
|
||||
wxInitAllImageHandlers();
|
||||
-
|
||||
+ // Silence warnings generated with wxWidgets 3.2
|
||||
+ wxSizerFlags::DisableConsistencyChecks();
|
||||
#if defined(_WIN32) && ! defined(_WIN64)
|
||||
// Win32 32bit build.
|
||||
if (wxPlatformInfo::Get().GetArchName().substr(0, 2) == "64") {
|
||||
@@ -1158,7 +1159,7 @@ bool GUI_App::on_init_inner()
|
||||
wxCHECK_MSG(wxDirExists(resources_dir), false,
|
||||
wxString::Format("Resources path does not exist or is not a directory: %s", resources_dir));
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
if (! check_old_linux_datadir(GetAppName())) {
|
||||
std::cerr << "Quitting, user chose to move their data to new location." << std::endl;
|
||||
return false;
|
||||
@@ -1263,7 +1264,7 @@ bool GUI_App::on_init_inner()
|
||||
if (!default_splashscreen_pos)
|
||||
// revert "restore_win_position" value if application wasn't crashed
|
||||
get_app_config()->set("restore_win_position", "1");
|
||||
-#ifndef __linux__
|
||||
+#if !defined(__linux__) && !defined(__FreeBSD__)
|
||||
wxYield();
|
||||
#endif
|
||||
scrn->SetText(_L("Loading configuration")+ dots);
|
||||
@@ -1411,7 +1412,7 @@ bool GUI_App::on_init_inner()
|
||||
// and wxEVT_SET_FOCUS before GUI_App::post_init is called) wasn't called before GUI_App::post_init and OpenGL wasn't initialized.
|
||||
// Since issue #9774 Where same problem occured on MacOS Ventura, we decided to have this check on MacOS as well.
|
||||
|
||||
-#if defined(__linux__) || defined(__APPLE__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)
|
||||
if (!m_post_initialized && m_opengl_initialized) {
|
||||
#else
|
||||
if (!m_post_initialized) {
|
||||
@@ -2054,7 +2055,7 @@ bool GUI_App::switch_language()
|
||||
}
|
||||
}
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || (__FreeBSD__)
|
||||
static const wxLanguageInfo* linux_get_existing_locale_language(const wxLanguageInfo* language,
|
||||
const wxLanguageInfo* system_language)
|
||||
{
|
||||
@@ -2253,7 +2254,7 @@ bool GUI_App::load_language(wxString language, bool in
|
||||
m_language_info_best = wxLocale::FindLanguageInfo(best_language);
|
||||
BOOST_LOG_TRIVIAL(trace) << boost::format("Best translation language detected (may be different from user locales): %1%") % m_language_info_best->CanonicalName.ToUTF8().data();
|
||||
}
|
||||
- #ifdef __linux__
|
||||
+ #if defined(__linux__) || defined(__FreeBSD__)
|
||||
wxString lc_all;
|
||||
if (wxGetEnv("LC_ALL", &lc_all) && ! lc_all.IsEmpty()) {
|
||||
@@ -2096,6 +2099,7 @@ bool GUI_App::load_language(wxString language, bool in
|
||||
// Best language returned by wxWidgets on Linux apparently does not respect LC_ALL.
|
||||
@@ -2262,6 +2263,7 @@ bool GUI_App::load_language(wxString language, bool in
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
@ -45,3 +81,48 @@
|
|||
}
|
||||
|
||||
const wxLanguageInfo *language_info = language.empty() ? nullptr : wxLocale::FindLanguageInfo(language);
|
||||
@@ -2306,7 +2308,7 @@ bool GUI_App::load_language(wxString language, bool in
|
||||
} else if (m_language_info_system != nullptr && language_info->CanonicalName.BeforeFirst('_') == m_language_info_system->CanonicalName.BeforeFirst('_'))
|
||||
language_info = m_language_info_system;
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
// If we can't find this locale , try to use different one for the language
|
||||
// instead of just reporting that it is impossible to switch.
|
||||
if (! wxLocale::IsAvailable(language_info->Language)) {
|
||||
@@ -2426,7 +2428,7 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
|
||||
local_menu->Append(config_id_base + ConfigMenuTakeSnapshot, _L("Take Configuration &Snapshot"), _L("Capture a configuration snapshot"));
|
||||
local_menu->Append(config_id_base + ConfigMenuUpdateConf, _L("Check for Configuration Updates"), _L("Check for configuration updates"));
|
||||
local_menu->Append(config_id_base + ConfigMenuUpdateApp, _L("Check for Application Updates"), _L("Check for new version of application"));
|
||||
-#if defined(__linux__) && defined(SLIC3R_DESKTOP_INTEGRATION)
|
||||
+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SLIC3R_DESKTOP_INTEGRATION)
|
||||
//if (DesktopIntegrationDialog::integration_possible())
|
||||
local_menu->Append(config_id_base + ConfigMenuDesktopIntegration, _L("Desktop Integration"), _L("Desktop Integration"));
|
||||
#endif //(__linux__) && defined(SLIC3R_DESKTOP_INTEGRATION)
|
||||
@@ -2473,7 +2475,7 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
|
||||
case ConfigMenuUpdateApp:
|
||||
app_version_check(true);
|
||||
break;
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
case ConfigMenuDesktopIntegration:
|
||||
show_desktop_integration_dialog();
|
||||
break;
|
||||
@@ -3090,7 +3092,7 @@ void GUI_App::show_desktop_integration_dialog()
|
||||
|
||||
void GUI_App::show_desktop_integration_dialog()
|
||||
{
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
//wxCHECK_MSG(mainframe != nullptr, false, "Internal error: Main frame not created / null");
|
||||
DesktopIntegrationDialog dialog(mainframe);
|
||||
dialog.ShowModal();
|
||||
@@ -3110,7 +3112,7 @@ void GUI_App::show_downloader_registration_dialog()
|
||||
if (msg.ShowModal() == wxID_YES) {
|
||||
auto downloader_worker = new DownloaderUtils::Worker(nullptr);
|
||||
downloader_worker->perform_register(app_config->get("url_downloader_dest"));
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
if (downloader_worker->get_perform_registration_linux())
|
||||
DesktopIntegrationDialog::perform_downloader_desktop_integration();
|
||||
#endif // __linux__
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
--- src/slic3r/GUI/GUI_Factories.cpp.orig 2023-07-21 13:55:55 UTC
|
||||
+++ src/slic3r/GUI/GUI_Factories.cpp
|
||||
@@ -1345,7 +1345,7 @@ void MenuFactory::sys_color_changed(wxMenuBar* menubar
|
||||
for (size_t id = 0; id < menubar->GetMenuCount(); id++) {
|
||||
wxMenu* menu = menubar->GetMenu(id);
|
||||
sys_color_changed_menu(menu);
|
||||
-#ifndef __linux__
|
||||
+#if !(defined(__linux__) || defined (__FreeBSD__))
|
||||
menu->SetupBitmaps();
|
||||
#ifdef _WIN32
|
||||
// but under MSW we have to update item's bachground color
|
|
@ -0,0 +1,20 @@
|
|||
--- src/slic3r/GUI/GUI_ObjectLayers.cpp.orig 2023-07-25 10:52:56 UTC
|
||||
+++ src/slic3r/GUI/GUI_ObjectLayers.cpp
|
||||
@@ -344,7 +344,7 @@ LayerRangeEditor::LayerRangeEditor( ObjectLayers* pare
|
||||
m_enter_pressed = true;
|
||||
// Workaround! Under Linux we have to use CallAfter() to avoid crash after pressing ENTER key
|
||||
// see #7531, #8055, #8408
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
wxTheApp->CallAfter([this, edit_fn]() {
|
||||
#endif
|
||||
// If LayersList wasn't updated/recreated, we can call wxEVT_KILL_FOCUS.Skip()
|
||||
@@ -359,7 +359,7 @@ LayerRangeEditor::LayerRangeEditor( ObjectLayers* pare
|
||||
SetValue(m_valid_value);
|
||||
m_call_kill_focus = true;
|
||||
}
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
});
|
||||
#endif
|
||||
}, this->GetId());
|
|
@ -0,0 +1,12 @@
|
|||
--- src/slic3r/GUI/GUI_ObjectManipulation.cpp.orig 2023-07-21 13:50:11 UTC
|
||||
+++ src/slic3r/GUI/GUI_ObjectManipulation.cpp
|
||||
@@ -490,7 +490,8 @@ void ObjectManipulation::Show(const bool show)
|
||||
const Selection& selection = wxGetApp().plater()->canvas3D()->get_selection();
|
||||
bool show_world_local_combo = wxGetApp().get_mode() != comSimple && (selection.is_single_full_instance() || selection.is_single_volume_or_modifier());
|
||||
if (selection.is_single_volume_or_modifier() && m_word_local_combo->GetCount() < 3) {
|
||||
-#ifdef __linux__
|
||||
+
|
||||
+#if defined(__linux__) || defined (__FreeBSD__)
|
||||
m_word_local_combo->Insert(coordinate_type_str(ECoordinatesType::Local), 2);
|
||||
#else
|
||||
m_word_local_combo->Insert(coordinate_type_str(ECoordinatesType::Local), wxNullBitmap, 2);
|
|
@ -0,0 +1,28 @@
|
|||
--- src/slic3r/GUI/GUI_Preview.cpp.orig 2023-07-25 10:57:11 UTC
|
||||
+++ src/slic3r/GUI/GUI_Preview.cpp
|
||||
@@ -292,7 +292,7 @@ void Preview::reload_print(bool keep_volumes)
|
||||
|
||||
void Preview::reload_print(bool keep_volumes)
|
||||
{
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
// We are getting mysterious crashes on Linux in gtk due to OpenGL context activation GH #1874 #1955.
|
||||
// So we are applying a workaround here: a delayed release of OpenGL vertex buffers.
|
||||
if (!IsShown())
|
||||
@@ -302,14 +302,14 @@ void Preview::reload_print(bool keep_volumes)
|
||||
}
|
||||
#endif /* __linux__ */
|
||||
if (
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
m_volumes_cleanup_required ||
|
||||
#endif /* __linux__ */
|
||||
!keep_volumes)
|
||||
{
|
||||
m_canvas->reset_volumes();
|
||||
m_loaded = false;
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
m_volumes_cleanup_required = false;
|
||||
#endif /* __linux__ */
|
||||
}
|
|
@ -0,0 +1,11 @@
|
|||
--- src/slic3r/GUI/GUI_Preview.hpp.orig 2023-07-25 11:01:59 UTC
|
||||
+++ src/slic3r/GUI/GUI_Preview.hpp
|
||||
@@ -85,7 +85,7 @@ class Preview : public wxPanel
|
||||
BackgroundSlicingProcess* m_process;
|
||||
GCodeProcessorResult* m_gcode_result;
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
// We are getting mysterious crashes on Linux in gtk due to OpenGL context activation GH #1874 #1955.
|
||||
// So we are applying a workaround here.
|
||||
bool m_volumes_cleanup_required { false };
|
|
@ -0,0 +1,20 @@
|
|||
--- src/slic3r/GUI/GUI_Utils.cpp.orig 2023-07-25 11:03:21 UTC
|
||||
+++ src/slic3r/GUI/GUI_Utils.cpp
|
||||
@@ -48,7 +48,7 @@ void on_window_geometry(wxTopLevelWindow *tlw, std::fu
|
||||
// cf. https://groups.google.com/forum/#!topic/wx-users/c7ntMt6piRI
|
||||
// OTOH the geometry is available very soon, so we can call the callback right away
|
||||
callback();
|
||||
-#elif defined __linux__
|
||||
+#elif defined(__linux__) || defined(__FreeBSD__)
|
||||
tlw->Bind(wxEVT_SHOW, [=](wxShowEvent &evt) {
|
||||
// On Linux, the geometry is only available after wxEVT_SHOW + CallAfter
|
||||
// cf. https://groups.google.com/forum/?pli=1#!topic/wx-users/fERSXdpVwAI
|
||||
@@ -116,7 +116,7 @@ int get_dpi_for_window(const wxWindow *window)
|
||||
if (hdc == NULL) { return DPI_DEFAULT; }
|
||||
return GetDeviceCaps(hdc, LOGPIXELSX);
|
||||
}
|
||||
-#elif defined __linux__
|
||||
+#elif defined(__linux__) || defined(__FreeBSD__)
|
||||
// TODO
|
||||
return DPI_DEFAULT;
|
||||
#elif defined __APPLE__
|
|
@ -0,0 +1,11 @@
|
|||
--- src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp.orig 2023-07-25 16:07:22 UTC
|
||||
+++ src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "libslic3r/BuildVolume.hpp"
|
||||
|
||||
#include "imgui/imgui_stdlib.h" // using std::string for inputs
|
||||
-#include "nanosvg/nanosvg.h" // load SVG file
|
||||
+#include "libnanosvg/nanosvg.h" // load SVG file
|
||||
|
||||
#include <wx/font.h>
|
||||
#include <wx/fontutil.h>
|
|
@ -0,0 +1,13 @@
|
|||
--- src/slic3r/GUI/ImGuiWrapper.cpp.orig 2023-07-25 16:14:00 UTC
|
||||
+++ src/slic3r/GUI/ImGuiWrapper.cpp
|
||||
@@ -35,8 +35,8 @@
|
||||
#include "GUI_App.hpp"
|
||||
|
||||
#include "../Utils/MacDarkMode.hpp"
|
||||
-#include <nanosvg/nanosvg.h>
|
||||
-#include <nanosvg/nanosvgrast.h>
|
||||
+#include "libnanosvg/nanosvg.h"
|
||||
+#include "libnanosvg/nanosvgrast.h"
|
||||
|
||||
// suggest location
|
||||
#include "libslic3r/ClipperUtils.hpp" // Slic3r::intersection
|
|
@ -1,4 +1,4 @@
|
|||
--- src/slic3r/GUI/InstanceCheck.cpp.orig 2022-09-06 07:09:19 UTC
|
||||
--- src/slic3r/GUI/InstanceCheck.cpp.orig 2023-06-19 12:07:14 UTC
|
||||
+++ src/slic3r/GUI/InstanceCheck.cpp
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <strsafe.h>
|
||||
|
@ -18,3 +18,12 @@
|
|||
|
||||
static bool send_message(const std::string &message_text, const std::string &version)
|
||||
{
|
||||
@@ -310,7 +310,7 @@ bool instance_check(int argc, char** argv, bool app_co
|
||||
hashed_path = std::hash<std::string>{}(boost::filesystem::system_complete(argv[0]).string());
|
||||
#else
|
||||
boost::system::error_code ec;
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
// If executed by an AppImage, start the AppImage, not the main process.
|
||||
// see https://docs.appimage.org/packaging-guide/environment-variables.html#id2
|
||||
const char *appimage_env = std::getenv("APPIMAGE");
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
--- src/slic3r/GUI/InstanceCheck.hpp.orig 2023-07-25 11:12:36 UTC
|
||||
+++ src/slic3r/GUI/InstanceCheck.hpp
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <boost/filesystem.hpp>
|
||||
|
||||
-#if __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
#include <boost/thread.hpp>
|
||||
#include <mutex>
|
||||
#include <condition_variable>
|
||||
@@ -38,7 +38,7 @@ class MainFrame;
|
||||
|
||||
class MainFrame;
|
||||
|
||||
-#if __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
#define BACKGROUND_MESSAGE_LISTENER
|
||||
#endif // __linux__
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- src/slic3r/GUI/KBShortcutsDialog.cpp.orig 2023-07-25 11:17:47 UTC
|
||||
+++ src/slic3r/GUI/KBShortcutsDialog.cpp
|
||||
@@ -54,7 +54,7 @@ KBShortcutsDialog::KBShortcutsDialog()
|
||||
main_sizer->SetSizeHints(this);
|
||||
this->CenterOnParent();
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
// workaround to correct pages layout
|
||||
book->Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, [book](wxBookCtrlEvent& e) {
|
||||
book->GetPage(e.GetSelection())->Fit();
|
|
@ -0,0 +1,20 @@
|
|||
--- src/slic3r/GUI/Mouse3DController.cpp.orig 2023-07-25 12:02:33 UTC
|
||||
+++ src/slic3r/GUI/Mouse3DController.cpp
|
||||
@@ -885,7 +885,7 @@ bool Mouse3DController::connect_device()
|
||||
|
||||
for (const DetectedDevices::value_type& device : detected_devices) {
|
||||
if (device.second.size() == 1) {
|
||||
-#if defined(__linux__)
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
hid_device* test_device = hid_open(device.first.first, device.first.second, nullptr);
|
||||
if (test_device == nullptr) {
|
||||
BOOST_LOG_TRIVIAL(error) << "3DConnexion device cannot be opened: " << device.second.front().path <<
|
||||
@@ -910,7 +910,7 @@ bool Mouse3DController::connect_device()
|
||||
std::cout << "Test device: " << std::hex << device.first.first << std::dec << "/" << std::hex << device.first.second << std::dec << " \"" << data.path << "\"";
|
||||
#endif // ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__FreeBSD__)
|
||||
hid_device* test_device = hid_open_path(data.path.c_str());
|
||||
if (test_device != nullptr) {
|
||||
path = data.path;
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue