diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile index a5c223f6affd..3011d84bfc05 100644 --- a/graphics/fotoxx/Makefile +++ b/graphics/fotoxx/Makefile @@ -1,41 +1,36 @@ -PORTNAME= fotoxx -PORTVERSION= 23.82 -PORTREVISION= 1 +PORTNAME= fotocx +PORTVERSION= 24.11 CATEGORIES= graphics MASTER_SITES= https://kornelix.net/downloads/downloads/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= danfe@FreeBSD.org COMMENT= Image editing and collection management program -WWW= https://kornelix.net/fotoxx/fotoxx.html +WWW= https://kornelix.net/fotocx/fotocx.html LICENSE= GPLv3+ LIB_DEPENDS= libchamplain-gtk-0.12.so:graphics/libchamplain \ libclutter-gtk-1.0.so:graphics/clutter-gtk3 \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff RUN_DEPENDS= xdg-open:devel/xdg-utils \ exiftool:graphics/p5-Image-ExifTool \ ufraw-batch:graphics/ufraw USES= desktop-file-utils gmake gnome jpeg pkgconfig USE_GNOME= cairo glib20 gdkpixbuf2 gtk30 -ALL_TARGET= fotoxx +ALL_TARGET= ${PORTNAME} CXXFLAGS+= -Wno-register -Wno-writable-strings WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= * OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -e \ - '/#include/s,wait\.h,sys/&,' ${WRKSRC}/fotoxx.h - post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo index 98715c3b8ba0..053a90dab99c 100644 --- a/graphics/fotoxx/distinfo +++ b/graphics/fotoxx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1702722295 -SHA256 (fotoxx-23.82-source.tar.gz) = 323c34903fa4fd96b38a3f5997af970e4ed4f33200b579fdb36165f248d31eb3 -SIZE (fotoxx-23.82-source.tar.gz) = 16257916 +TIMESTAMP = 1707302474 +SHA256 (fotocx-24.11-source.tar.gz) = bc3e12a7ae2deb80ff41b14d392f15010eed93eb383dd184d605967c47a78b95 +SIZE (fotocx-24.11-source.tar.gz) = 16322678 diff --git a/graphics/fotoxx/files/patch-fotoxx.cc b/graphics/fotoxx/files/patch-fotoxx.cc index da35de45266d..dbacbec2de34 100644 --- a/graphics/fotoxx/files/patch-fotoxx.cc +++ b/graphics/fotoxx/files/patch-fotoxx.cc @@ -1,28 +1,28 @@ ---- fotoxx.cc.orig 2023-12-02 22:45:44 UTC -+++ fotoxx.cc -@@ -294,7 +294,7 @@ int main(int argc, ch *argv[]) - // delete fotoxx temp files if owner process is no longer running - +--- fotocx.cc.orig 2024-02-07 10:14:27 UTC ++++ fotocx.cc +@@ -317,7 +317,7 @@ int main(int argc, ch *argv[]) + // delete fotocx temp files if owner process is no longer running + pidlist = 0; -- snprintf(buff,200,"pidof fotoxx fotoxx.x"); // get active fotoxx PIDs 23.3 -+ snprintf(buff,200,"pgrep -d\\ fotoxx fotoxx.x"); +- snprintf(buff,200,"pidof fotocx fotocx.x"); // get active fotocx PIDs 23.3 ++ snprintf(buff,200,"pgrep -d\\ fotocx fotocx.x"); fid = popen(buff,"r"); if (fid) { - pp = fgets_trim(buff,200,fid); -@@ -432,13 +432,15 @@ int main(int argc, ch *argv[]) + pp = fgets_trim(buff,200,fid); +@@ -455,13 +455,15 @@ int main(int argc, ch *argv[]) // get SMP thread count // 23.3 -- NSMP = 0; // assume at least 4 threads +- NSMP = 0; // assume at least 4 threads + NSMP = get_nprocs(); +#if 0 fid = popen("lscpu | grep 'CPU(s):'","r"); if (fid) { pp = fgets(buff,200,fid); // get CPU threads supported pclose(fid); if (pp && strmatchN(pp,"CPU(s):",7)) NSMP = atoi(pp+8); // default: 2 per P-core + 1 per E-core } +#endif - if (NSMP < 1) { // 23.80 + if (NSMP < 1) { // 23.80 Plog(1,"cannot get SMP thread count, assume 4 \n"); NSMP = 4; diff --git a/graphics/fotoxx/pkg-plist b/graphics/fotoxx/pkg-plist index e48cf37e04e1..d53ba1556704 100644 --- a/graphics/fotoxx/pkg-plist +++ b/graphics/fotoxx/pkg-plist @@ -1,376 +1,374 @@ -bin/fotoxx -share/applications/fotoxx.desktop +bin/fotocx +share/applications/fotocx.desktop %%DATADIR%%/data/KB_shortcuts_E %%DATADIR%%/data/README %%DATADIR%%/data/colorwheel.jpg %%DATADIR%%/data/custom_kernel/blur5 %%DATADIR%%/data/custom_kernel/brighten3 %%DATADIR%%/data/custom_kernel/color lines 3 %%DATADIR%%/data/custom_kernel/color lines 5 %%DATADIR%%/data/custom_kernel/colors3 %%DATADIR%%/data/custom_kernel/darken3 %%DATADIR%%/data/custom_kernel/denoise3 %%DATADIR%%/data/custom_kernel/emboss3 %%DATADIR%%/data/custom_kernel/emboss3-B&W %%DATADIR%%/data/custom_kernel/emboss5 %%DATADIR%%/data/custom_kernel/emboss5+color %%DATADIR%%/data/custom_kernel/last-used %%DATADIR%%/data/custom_kernel/outlines3 %%DATADIR%%/data/custom_kernel/outlines5 %%DATADIR%%/data/custom_kernel/shake3 %%DATADIR%%/data/custom_kernel/sharpen3 %%DATADIR%%/data/custom_kernel/sharpen5 %%DATADIR%%/data/custom_kernel/sketch3 %%DATADIR%%/data/custom_menu %%DATADIR%%/data/custom_scripts/brightness and white point %%DATADIR%%/data/custom_scripts/cartoon-emboss %%DATADIR%%/data/custom_scripts/denoise-sharpen %%DATADIR%%/data/custom_scripts/emboss-test %%DATADIR%%/data/custom_scripts/line-drawing-emboss %%DATADIR%%/data/custom_scripts/painting-texture %%DATADIR%%/data/custom_scripts/sketch-cartoon-emboss %%DATADIR%%/data/meta_picklist_E %%DATADIR%%/data/netmap_locations %%DATADIR%%/data/palettes/Golden Heavy Body Acrylics.gpl %%DATADIR%%/data/palettes/Liquitex Heavy Body Artist colors.gpl %%DATADIR%%/data/palettes/Rembrandt Extra Fine.gpl %%DATADIR%%/data/patterns/aqua.jpg %%DATADIR%%/data/patterns/bathroom.jpg %%DATADIR%%/data/patterns/blocks.jpg %%DATADIR%%/data/patterns/brick_wall.jpg %%DATADIR%%/data/patterns/bulging.jpg %%DATADIR%%/data/patterns/burlap.jpg %%DATADIR%%/data/patterns/canvas2.jpg %%DATADIR%%/data/patterns/canvas_blue.jpg %%DATADIR%%/data/patterns/cheese.jpg %%DATADIR%%/data/patterns/confetti.jpg %%DATADIR%%/data/patterns/fluffy.jpg %%DATADIR%%/data/patterns/fuzzy-blue.jpg %%DATADIR%%/data/patterns/fuzzy-darkgrey.jpg %%DATADIR%%/data/patterns/geometry2.jpg %%DATADIR%%/data/patterns/geometry3.jpg %%DATADIR%%/data/patterns/gregre.jpg %%DATADIR%%/data/patterns/grypaws.jpg %%DATADIR%%/data/patterns/imitation_leather.jpg %%DATADIR%%/data/patterns/lawn-artificial.jpg %%DATADIR%%/data/patterns/lawn.jpg %%DATADIR%%/data/patterns/lightblue-wet.jpg %%DATADIR%%/data/patterns/linen-fine.jpg %%DATADIR%%/data/patterns/liquid-blue.jpg %%DATADIR%%/data/patterns/marble.jpg %%DATADIR%%/data/patterns/mazes.jpg %%DATADIR%%/data/patterns/notes.jpg %%DATADIR%%/data/patterns/pattern.jpg %%DATADIR%%/data/patterns/pattern_114.jpg %%DATADIR%%/data/patterns/pattern_117.jpg %%DATADIR%%/data/patterns/pattern_131.jpg %%DATADIR%%/data/patterns/pebble-light.jpg %%DATADIR%%/data/patterns/pool.jpg %%DATADIR%%/data/patterns/purple.jpg %%DATADIR%%/data/patterns/rings-green.jpg %%DATADIR%%/data/patterns/sand.jpg %%DATADIR%%/data/patterns/soft-structure_grey.jpg %%DATADIR%%/data/patterns/space.jpg %%DATADIR%%/data/patterns/stone.jpg %%DATADIR%%/data/patterns/structure_darkgreen.jpg %%DATADIR%%/data/patterns/wall-grey.jpg %%DATADIR%%/data/patterns/wet-turquoise.jpg %%DATADIR%%/data/patterns/wood.jpg %%DATADIR%%/data/plugins -%%DATADIR%%/data/popup_text %%DATADIR%%/data/raw_loader_commands %%DATADIR%%/data/slideshow-tone.oga %%DATADIR%%/data/tags_defined %%DATADIR%%/data/userguide %%DATADIR%%/data/widgets.css %%DATADIR%%/data/worldcities.txt -%%DATADIR%%/icons/fotoxx.png +%%DATADIR%%/icons/fotocx.png %%DATADIR%%/images/HDF-paint.png %%DATADIR%%/images/HDF.png %%DATADIR%%/images/HDR-adjust.png %%DATADIR%%/images/HDR.jpg %%DATADIR%%/images/KB-shortcuts.png %%DATADIR%%/images/KB-shortcuts2.png %%DATADIR%%/images/RGB-dist.png %%DATADIR%%/images/add-meta-items.png %%DATADIR%%/images/add-motionblur1.jpg %%DATADIR%%/images/add-motionblur2.png %%DATADIR%%/images/add-noise.png %%DATADIR%%/images/add-subfolder.png %%DATADIR%%/images/adjust-HSL.png %%DATADIR%%/images/adjust-RGB.png %%DATADIR%%/images/album-mass-update.png %%DATADIR%%/images/album-replace-file.png %%DATADIR%%/images/alien-colors1.png %%DATADIR%%/images/alien-colors2.png %%DATADIR%%/images/anti-alias.png %%DATADIR%%/images/area-blend.png %%DATADIR%%/images/area-blend2.jpg %%DATADIR%%/images/area-rescale.png %%DATADIR%%/images/area-rescale2.png %%DATADIR%%/images/batch-change-meta.png %%DATADIR%%/images/batch-convert.png %%DATADIR%%/images/batch-copy-move.png %%DATADIR%%/images/batch-delete-trash.png %%DATADIR%%/images/batch-geotags.png %%DATADIR%%/images/batch-move-meta.png %%DATADIR%%/images/batch-overlay.png %%DATADIR%%/images/batch-photo-date1.png %%DATADIR%%/images/batch-photo-date2.png %%DATADIR%%/images/batch-raw.png %%DATADIR%%/images/batch-rename-tags.png %%DATADIR%%/images/batch-report-meta.png %%DATADIR%%/images/batch-tags.png %%DATADIR%%/images/batch-upright.png %%DATADIR%%/images/batch.png %%DATADIR%%/images/blackball.png %%DATADIR%%/images/blank-image.png %%DATADIR%%/images/blobs.png %%DATADIR%%/images/blobs2.jpg %%DATADIR%%/images/blueball.png %%DATADIR%%/images/blur.jpg %%DATADIR%%/images/bookmarks.png %%DATADIR%%/images/brightness-steps.png %%DATADIR%%/images/brite-ramp1.png %%DATADIR%%/images/brite-ramp2.png %%DATADIR%%/images/broken.png %%DATADIR%%/images/calibrate-printer.png %%DATADIR%%/images/cartoon.png %%DATADIR%%/images/cartoon2.jpg %%DATADIR%%/images/change-alpha.png %%DATADIR%%/images/choose-captions.png %%DATADIR%%/images/chromatic.png %%DATADIR%%/images/chromaticA.png %%DATADIR%%/images/color-depth1.png %%DATADIR%%/images/color-depth2.png %%DATADIR%%/images/color-mode.png %%DATADIR%%/images/color-mode2.png %%DATADIR%%/images/color-negative.jpg %%DATADIR%%/images/combine.png %%DATADIR%%/images/copy-from-image.png %%DATADIR%%/images/copy-from-image2.jpg %%DATADIR%%/images/copy-in-image.png %%DATADIR%%/images/copy-move.png %%DATADIR%%/images/copy-paste-colors.png %%DATADIR%%/images/copy-prior-edit.png %%DATADIR%%/images/crop-buttons.png %%DATADIR%%/images/crop.png %%DATADIR%%/images/custom-kernel.png %%DATADIR%%/images/custom-widgets.png %%DATADIR%%/images/custom.png %%DATADIR%%/images/defog.png %%DATADIR%%/images/defog2.png %%DATADIR%%/images/delete-trash.png %%DATADIR%%/images/denoise.jpg %%DATADIR%%/images/devmenu.png %%DATADIR%%/images/dither1.png -%%DATADIR%%/images/dither2.png -%%DATADIR%%/images/dither3.jpg +%%DATADIR%%/images/dither2.jpg %%DATADIR%%/images/draw-box.png %%DATADIR%%/images/draw-line.png %%DATADIR%%/images/draw-oval.png %%DATADIR%%/images/draw-text.jpg %%DATADIR%%/images/drawing.png %%DATADIR%%/images/edit-any-metadata.png %%DATADIR%%/images/edit-bookmarks.png %%DATADIR%%/images/edit-dist.png %%DATADIR%%/images/edit-metadata.png %%DATADIR%%/images/edit.png %%DATADIR%%/images/effects.png %%DATADIR%%/images/emboss.png %%DATADIR%%/images/emboss2.jpg %%DATADIR%%/images/engrave.png %%DATADIR%%/images/engrave2.png %%DATADIR%%/images/escher-spiral.png %%DATADIR%%/images/escher-spiralA.png %%DATADIR%%/images/export-file-list.png %%DATADIR%%/images/export-files.png %%DATADIR%%/images/file-save-as.png %%DATADIR%%/images/file-save.png %%DATADIR%%/images/file.png %%DATADIR%%/images/find-dups.png %%DATADIR%%/images/first-index.png %%DATADIR%%/images/fix-motion-blur.png %%DATADIR%%/images/fix-motion-blur1.jpg %%DATADIR%%/images/flatten-photo1.png %%DATADIR%%/images/flatten-photo2.png %%DATADIR%%/images/flatten1.png %%DATADIR%%/images/flatten2.png %%DATADIR%%/images/folder-tree.png %%DATADIR%%/images/folder.png -%%DATADIR%%/images/fotoxx-views.jpg -%%DATADIR%%/images/fotoxx.png +%%DATADIR%%/images/fotocx-views.jpg +%%DATADIR%%/images/fotocx.png %%DATADIR%%/images/gallery-screen.png %%DATADIR%%/images/gallery-sort.png %%DATADIR%%/images/gallery-view.jpg %%DATADIR%%/images/gallery.png %%DATADIR%%/images/global-retx.png %%DATADIR%%/images/global-retx2.png %%DATADIR%%/images/gradients.png %%DATADIR%%/images/gradients2.jpg %%DATADIR%%/images/greenball.png %%DATADIR%%/images/grid-lines.png %%DATADIR%%/images/help.png %%DATADIR%%/images/image-array.jpg %%DATADIR%%/images/image-diffs.png %%DATADIR%%/images/image-locations.jpg %%DATADIR%%/images/image-management.png %%DATADIR%%/images/index-files1.png %%DATADIR%%/images/index-files2.png %%DATADIR%%/images/inside-out1.png %%DATADIR%%/images/inside-out2.png %%DATADIR%%/images/interpolation.png %%DATADIR%%/images/jpeg-artifacts.png %%DATADIR%%/images/jpeg-artifacts1.png %%DATADIR%%/images/jpeg-quality.png %%DATADIR%%/images/local-retx.png %%DATADIR%%/images/local-retx2.png %%DATADIR%%/images/localcon.png %%DATADIR%%/images/localcon2.png %%DATADIR%%/images/localcon3.jpg %%DATADIR%%/images/magnify-image.jpg %%DATADIR%%/images/make-waves1.png %%DATADIR%%/images/make-waves2.jpg %%DATADIR%%/images/manage-albums.png %%DATADIR%%/images/manage-tags.png %%DATADIR%%/images/map-click.jpg %%DATADIR%%/images/maps.png %%DATADIR%%/images/margins.png %%DATADIR%%/images/markup.jpg %%DATADIR%%/images/mashup.jpg %%DATADIR%%/images/mashup1.png %%DATADIR%%/images/mashup2.png %%DATADIR%%/images/mashup3.png %%DATADIR%%/images/mashup4.png %%DATADIR%%/images/mashup5.png %%DATADIR%%/images/mashup6.png %%DATADIR%%/images/mashup7.png %%DATADIR%%/images/match-colors.png %%DATADIR%%/images/measure-image.png %%DATADIR%%/images/menu-summary.jpg %%DATADIR%%/images/meta-view.jpg %%DATADIR%%/images/metadata.png %%DATADIR%%/images/moncolor-small.png %%DATADIR%%/images/moncolor.png %%DATADIR%%/images/mosaic1.png %%DATADIR%%/images/mosaic2.jpg %%DATADIR%%/images/netmap-locs.png %%DATADIR%%/images/nonlinear slider.png %%DATADIR%%/images/number-keys.png %%DATADIR%%/images/outboard-programs.png %%DATADIR%%/images/paint-edits.png %%DATADIR%%/images/paint-image.jpg %%DATADIR%%/images/paint-transp.png %%DATADIR%%/images/paint-transp2.png %%DATADIR%%/images/painting1.png %%DATADIR%%/images/painting2.png %%DATADIR%%/images/pano-adjust.png %%DATADIR%%/images/pano-align1.png %%DATADIR%%/images/pano-align2.jpg %%DATADIR%%/images/pattern1.png %%DATADIR%%/images/pattern2.jpg %%DATADIR%%/images/permissions.png %%DATADIR%%/images/perspective1.png %%DATADIR%%/images/perspective2.png %%DATADIR%%/images/plugins-edit.png %%DATADIR%%/images/plugins.png %%DATADIR%%/images/prev-next.png %%DATADIR%%/images/print-margins.png %%DATADIR%%/images/print-setup.png %%DATADIR%%/images/printer-cal-study.png %%DATADIR%%/images/printer-calibrate-chart.png %%DATADIR%%/images/printer-calibrate.png %%DATADIR%%/images/quit.png %%DATADIR%%/images/red-eyes1.png %%DATADIR%%/images/red-eyes2.png %%DATADIR%%/images/redball.png %%DATADIR%%/images/refine.png %%DATADIR%%/images/remove-dust.png %%DATADIR%%/images/remove-dust2.png %%DATADIR%%/images/remove-halo.png %%DATADIR%%/images/remove-halo2.png %%DATADIR%%/images/rename-folder.png %%DATADIR%%/images/rename.png %%DATADIR%%/images/repair.png %%DATADIR%%/images/rescale.png %%DATADIR%%/images/retouch.png %%DATADIR%%/images/rotate-left.png %%DATADIR%%/images/rotate-right.png %%DATADIR%%/images/rotate.png %%DATADIR%%/images/saturation.png %%DATADIR%%/images/save.png %%DATADIR%%/images/search-images-metadata.jpg %%DATADIR%%/images/search-images.jpg %%DATADIR%%/images/select-area-finish.png %%DATADIR%%/images/select-area.jpg %%DATADIR%%/images/select-image-files.jpg %%DATADIR%%/images/select.png %%DATADIR%%/images/settings.jpg %%DATADIR%%/images/sharpen.png %%DATADIR%%/images/shift-colors.png %%DATADIR%%/images/show-RGB.png %%DATADIR%%/images/sketch.jpg %%DATADIR%%/images/slide-show.jpg %%DATADIR%%/images/smart-erase.png %%DATADIR%%/images/smart-erase2.png %%DATADIR%%/images/soft-focus.png %%DATADIR%%/images/soft-focus2.png %%DATADIR%%/images/sphere.png %%DATADIR%%/images/sphere2.jpg %%DATADIR%%/images/stack-noise.png %%DATADIR%%/images/stack-noise2.png %%DATADIR%%/images/stack-paint.png %%DATADIR%%/images/stack-paint2.jpg %%DATADIR%%/images/stack-split.png %%DATADIR%%/images/stack-split2.png %%DATADIR%%/images/stack-versions.png -%%DATADIR%%/images/stretch.png %%DATADIR%%/images/texture.png %%DATADIR%%/images/texture2.png %%DATADIR%%/images/tiles2a.png %%DATADIR%%/images/tiles2b.png %%DATADIR%%/images/timeline-report.jpg %%DATADIR%%/images/tiny-planet.jpg %%DATADIR%%/images/tools.png %%DATADIR%%/images/top-panel.png %%DATADIR%%/images/twist1.png %%DATADIR%%/images/twist2.png %%DATADIR%%/images/ug-batch.png %%DATADIR%%/images/ug-combine.png %%DATADIR%%/images/ug-custom.png %%DATADIR%%/images/ug-edit.png %%DATADIR%%/images/ug-effects.png %%DATADIR%%/images/ug-file.png %%DATADIR%%/images/ug-gallery.png %%DATADIR%%/images/ug-help.png %%DATADIR%%/images/ug-maps.png %%DATADIR%%/images/ug-metadata.png %%DATADIR%%/images/ug-refine.png %%DATADIR%%/images/ug-repair.png %%DATADIR%%/images/ug-select.png %%DATADIR%%/images/ug-tools.png %%DATADIR%%/images/ug-undo-redo.png %%DATADIR%%/images/ug-warp.png %%DATADIR%%/images/ug-zoom.png %%DATADIR%%/images/unbend horz curved.png %%DATADIR%%/images/unbend horz linear.png %%DATADIR%%/images/unbend vert curved.png %%DATADIR%%/images/unbend vert linear.png %%DATADIR%%/images/unbend1.png %%DATADIR%%/images/unbend2.png %%DATADIR%%/images/undo-redo.png %%DATADIR%%/images/unwarp-closeup1.png %%DATADIR%%/images/unwarp-closeup2.png %%DATADIR%%/images/upscale+sharpen.jpg %%DATADIR%%/images/userguide.jpg %%DATADIR%%/images/view-metadata.jpg %%DATADIR%%/images/vignette.png %%DATADIR%%/images/vignette2.png %%DATADIR%%/images/vignette3.png %%DATADIR%%/images/warning.png %%DATADIR%%/images/warp.png +%%DATADIR%%/images/warp_radial.png %%DATADIR%%/images/warps4.jpg %%DATADIR%%/images/whiteball.png %%DATADIR%%/images/zoom.png -share/man/man1/fotoxx.1.gz -share/metainfo/kornelix.fotoxx.metainfo.xml +share/man/man1/fotocx.1.gz +share/metainfo/kornelix.fotocx.metainfo.xml