sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-21 12:40:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/fotocx: the port had been updated to version 24.60

Browse source 
The author had dropped the dubious idea of estimating default CPU
thread count based on number of P- and E-cores and hardcoded 12 for
the time being.  Replace with existing get_nprocs() function call.
This commit is contained in:
Alexey Dokuchaev 2024-10-05 07:05:34 +00:00
parent 25e67f2348
commit bde492d6e8
5 changed files with 35 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
graphics/fotocx/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= fotocx PORTNAME= fotocx
PORTVERSION= 24.50 PORTVERSION= 24.60
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= https://kornelix.net/downloads/downloads/ MASTER_SITES= https://kornelix.net/downloads/downloads/
DISTNAME= ${PORTNAME}-${PORTVERSION}-source DISTNAME= ${PORTNAME}-${PORTVERSION}-source

6
graphics/fotocx/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1719829647 TIMESTAMP = 1727760845
SHA256 (fotocx-24.50-source.tar.gz) = d147d082b531b367c82ff5af5c86a302f34d29f32765a599f130b8f877610cf4 SHA256 (fotocx-24.60-source.tar.gz) = fcdc45625850057ed7bb89743f5188b16c277c3341ffbee3cb54b3330e1be069
SIZE (fotocx-24.50-source.tar.gz) = 16197289 SIZE (fotocx-24.60-source.tar.gz) = 15771741

34
graphics/fotocx/files/patch-f.refine.cc
View file

@ -1,29 +1,11 @@
--- f.refine.cc.orig 2024-07-01 07:25:41 UTC --- f.refine.cc.orig 2024-10-01 05:03:10 UTC
+++ f.refine.cc +++ f.refine.cc
@@ -257,7 +257,7 @@ void m_edit_dist(GtkWidget *, ch *menu) @@ -76,7 +76,7 @@ void m_edit_hist(GtkWidget *, ch *menu)
EFedit_dist.Farea = 2; // select area usable EFedit_hist.Farea = 2; // select area usable
EFedit_dist.Fpaintedits = 1; // use with paint edits OK EFedit_hist.Fpaintedits = 1; // use with paint edits OK
EFedit_dist.Fscript = 1; // scripting supported EFedit_hist.Fscript = 1; // scripting supported
- EFedit_dist.threadfunc = thread; - EFedit_hist.threadfunc = thread;
+ EFedit_dist.threadfunc = edit_dist_names::thread; + EFedit_hist.threadfunc = edit_hist_names::thread;
if (! edit_setup(EFedit_dist)) return; // setup edit if (! edit_setup(EFedit_hist)) return; // setup edit
@@ -653,7 +653,7 @@ void m_flat_dist(GtkWidget *, ch *menu)
EFflatdist.Farea = 2; // select area usable
EFflatdist.Fpaintedits = 1; // use with paint edits OK
EFflatdist.Fscript = 1; // scripting supported
- EFflatdist.threadfunc = thread;
+ EFflatdist.threadfunc = flatdist_names::thread;
if (! edit_setup(EFflatdist)) return; // setup edit
@@ -1213,7 +1213,7 @@ void flatdist_func(int _radius, int zones[5])
EFflatdist.FprevReq = 0;
EFflatdist.Farea = 2; // select area usable
EFflatdist.Fscript = 1; // scripting supported
- EFflatdist.threadfunc = thread;
+ EFflatdist.threadfunc = flatdist_names::thread;
if (! edit_setup(EFflatdist)) return; // setup edit

24
graphics/fotocx/files/patch-fotocx.cc
View file

@ -1,4 +1,4 @@
--- fotocx.cc.orig 2024-07-01 07:25:41 UTC --- fotocx.cc.orig 2024-10-01 05:03:10 UTC
+++ fotocx.cc +++ fotocx.cc
@@ -335,7 +335,7 @@ int main(int argc, ch *argv[]) @@ -335,7 +335,7 @@ int main(int argc, ch *argv[])
// delete fotocx temp files if owner process is no longer running // delete fotocx temp files if owner process is no longer running
@ -9,20 +9,12 @@
fid = popen(buff,"r"); fid = popen(buff,"r");
if (fid) { if (fid) {
pp = fgets_trim(buff,200,fid); pp = fgets_trim(buff,200,fid);
@@ -464,13 +464,15 @@ int main(int argc, ch *argv[]) @@ -466,7 +466,7 @@ int main(int argc, ch *argv[])
// Cannot get P-core and E-core counts (methods vary by kernel release).
// Hyperthreads and E-cores have marginal value.
// get SMP thread count - NSMP = 12; // 24.60
- NSMP = 0; // assume at least 4 threads
+ NSMP = get_nprocs(); + NSMP = get_nprocs();
+#if 0 Plog(1,"SMP thread count: %d \n",NSMP);
fid = popen("lscpu | grep 'CPU(s):'","r");
if (fid) { // get locale specific name for /home/<user>/Desktop
pp = fgets(buff,200,fid); // get CPU threads supported
pclose(fid);
if (pp && strmatchN(pp,"CPU(s):",7)) NSMP = atoi(pp+8); // P-cores + E-cores
}
+#endif
if (NSMP < 1) {
Plog(1,"cannot get SMP thread count, assume 4 \n");
NSMP = 4;

31
graphics/fotocx/pkg-plist
View file

@ -1,9 +1,9 @@
bin/fotocx bin/fotocx
share/applications/fotocx.desktop share/applications/fotocx.desktop
%%DATADIR%%/data/CIE1931.jpg %%DATADIR%%/data/CIE1931.jpg
%%DATADIR%%/data/KB_shortcuts_G %%DATADIR%%/data/KB_shortcuts_H
%%DATADIR%%/data/README_G %%DATADIR%%/data/README_H
%%DATADIR%%/data/capskeys_G %%DATADIR%%/data/capskeys_H
%%DATADIR%%/data/custom_kernel/blur5 %%DATADIR%%/data/custom_kernel/blur5
%%DATADIR%%/data/custom_kernel/brighten3 %%DATADIR%%/data/custom_kernel/brighten3
%%DATADIR%%/data/custom_kernel/color lines 3 %%DATADIR%%/data/custom_kernel/color lines 3
@ -24,13 +24,14 @@ share/applications/fotocx.desktop
%%DATADIR%%/data/custom_kernel/sketch3 %%DATADIR%%/data/custom_kernel/sketch3
%%DATADIR%%/data/custom_kernel/sobel3 v+h %%DATADIR%%/data/custom_kernel/sobel3 v+h
%%DATADIR%%/data/custom_kernel/sobel5 v+h %%DATADIR%%/data/custom_kernel/sobel5 v+h
%%DATADIR%%/data/custom_menu_G %%DATADIR%%/data/custom_menu_H
%%DATADIR%%/data/custom_scripts/brightness and white point %%DATADIR%%/data/custom_scripts/brightness and white point
%%DATADIR%%/data/custom_scripts/cartoon-emboss %%DATADIR%%/data/custom_scripts/cartoon-emboss
%%DATADIR%%/data/custom_scripts/ektar film process %%DATADIR%%/data/custom_scripts/ektar film process
%%DATADIR%%/data/custom_scripts/emboss-test %%DATADIR%%/data/custom_scripts/emboss
%%DATADIR%%/data/map_regions_G %%DATADIR%%/data/custom_scripts/voodoo
%%DATADIR%%/data/meta_picklist_G %%DATADIR%%/data/map_regions_H
%%DATADIR%%/data/meta_picklist_H
%%DATADIR%%/data/palettes/Bears.gpl %%DATADIR%%/data/palettes/Bears.gpl
%%DATADIR%%/data/palettes/Bgold.gpl %%DATADIR%%/data/palettes/Bgold.gpl
%%DATADIR%%/data/palettes/Blues.gpl %%DATADIR%%/data/palettes/Blues.gpl
@ -113,8 +114,8 @@ share/applications/fotocx.desktop
%%DATADIR%%/data/patterns/wall-grey.jpg %%DATADIR%%/data/patterns/wall-grey.jpg
%%DATADIR%%/data/patterns/wet-turquoise.jpg %%DATADIR%%/data/patterns/wet-turquoise.jpg
%%DATADIR%%/data/patterns/wood.jpg %%DATADIR%%/data/patterns/wood.jpg
%%DATADIR%%/data/plugins_G %%DATADIR%%/data/plugins_H
%%DATADIR%%/data/raw_commands_G %%DATADIR%%/data/raw_commands_H
%%DATADIR%%/data/slideshow-tone.oga %%DATADIR%%/data/slideshow-tone.oga
%%DATADIR%%/data/tags_defined %%DATADIR%%/data/tags_defined
%%DATADIR%%/data/userguide %%DATADIR%%/data/userguide
@ -126,10 +127,9 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/HDR.jpg %%DATADIR%%/images/HDR.jpg
%%DATADIR%%/images/KB-shortcuts.png %%DATADIR%%/images/KB-shortcuts.png
%%DATADIR%%/images/KB-shortcuts2.png %%DATADIR%%/images/KB-shortcuts2.png
%%DATADIR%%/images/RGB-dist.png %%DATADIR%%/images/RGB-hist.png
%%DATADIR%%/images/add-meta-items.png %%DATADIR%%/images/add-meta-items.png
%%DATADIR%%/images/add-motionblur1.jpg %%DATADIR%%/images/add-motionblur1.jpg
%%DATADIR%%/images/add-motionblur2.png
%%DATADIR%%/images/add-noise.png %%DATADIR%%/images/add-noise.png
%%DATADIR%%/images/add-subfolder.png %%DATADIR%%/images/add-subfolder.png
%%DATADIR%%/images/adjust-HSL.png %%DATADIR%%/images/adjust-HSL.png
@ -138,6 +138,8 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/album-replace-file.png %%DATADIR%%/images/album-replace-file.png
%%DATADIR%%/images/alien-colors1.png %%DATADIR%%/images/alien-colors1.png
%%DATADIR%%/images/alien-colors2.png %%DATADIR%%/images/alien-colors2.png
%%DATADIR%%/images/amplify-contrast.png
%%DATADIR%%/images/amplify-contrast2.jpg
%%DATADIR%%/images/anti-alias.png %%DATADIR%%/images/anti-alias.png
%%DATADIR%%/images/area-blend.png %%DATADIR%%/images/area-blend.png
%%DATADIR%%/images/area-blend2.jpg %%DATADIR%%/images/area-blend2.jpg
@ -187,7 +189,7 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/crop-buttons.png %%DATADIR%%/images/crop-buttons.png
%%DATADIR%%/images/crop.png %%DATADIR%%/images/crop.png
%%DATADIR%%/images/custom-kernel.png %%DATADIR%%/images/custom-kernel.png
%%DATADIR%%/images/custom-menu.jpg %%DATADIR%%/images/custom-menu.png
%%DATADIR%%/images/custom-widgets.png %%DATADIR%%/images/custom-widgets.png
%%DATADIR%%/images/custom.png %%DATADIR%%/images/custom.png
%%DATADIR%%/images/dark-bright-pixels.png %%DATADIR%%/images/dark-bright-pixels.png
@ -204,7 +206,7 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/draw-text.jpg %%DATADIR%%/images/draw-text.jpg
%%DATADIR%%/images/edit-any-metadata.png %%DATADIR%%/images/edit-any-metadata.png
%%DATADIR%%/images/edit-bookmarks.png %%DATADIR%%/images/edit-bookmarks.png
%%DATADIR%%/images/edit-dist.png %%DATADIR%%/images/edit-hist.png
%%DATADIR%%/images/edit-meta.jpg %%DATADIR%%/images/edit-meta.jpg
%%DATADIR%%/images/edit.png %%DATADIR%%/images/edit.png
%%DATADIR%%/images/effects.png %%DATADIR%%/images/effects.png
@ -223,7 +225,6 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/first-index.png %%DATADIR%%/images/first-index.png
%%DATADIR%%/images/fix-motion-blur.png %%DATADIR%%/images/fix-motion-blur.png
%%DATADIR%%/images/fix-motion-blur1.jpg %%DATADIR%%/images/fix-motion-blur1.jpg
%%DATADIR%%/images/flatten-histogram2.png
%%DATADIR%%/images/flatten-photo1.png %%DATADIR%%/images/flatten-photo1.png
%%DATADIR%%/images/flatten-photo2.jpg %%DATADIR%%/images/flatten-photo2.jpg
%%DATADIR%%/images/flatten-photo3.jpg %%DATADIR%%/images/flatten-photo3.jpg
@ -241,8 +242,6 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/gallery.png %%DATADIR%%/images/gallery.png
%%DATADIR%%/images/global-retx.png %%DATADIR%%/images/global-retx.png
%%DATADIR%%/images/global-retx2.png %%DATADIR%%/images/global-retx2.png
%%DATADIR%%/images/gradients.png
%%DATADIR%%/images/gradients2.jpg
%%DATADIR%%/images/greenball.png %%DATADIR%%/images/greenball.png
%%DATADIR%%/images/grid-lines.png %%DATADIR%%/images/grid-lines.png
%%DATADIR%%/images/help.png %%DATADIR%%/images/help.png