Attachment #159182 for bug #201844

View | Details | Raw Unified | Return to bug 201844
Collapse All | Expand All




# $FreeBSD: head/graphics/fotoxx/Makefile 376365 2015-01-05 22:36:15Z pawel $

PORTNAME=	fotoxx
PORTVERSION=	15.05
CATEGORIES=	graphics
MASTER_SITES=	GENTOO/distfiles \
		http://fossies.org/linux/misc/legacy/ \
		http://www.kornelix.com/uploads/1/3/0/3/13035936/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Application to organize and edit image collections

LICENSE=	GPLv3

RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
		dcraw:${PORTSDIR}/graphics/dcraw \
		exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool \
		ufraw-batch:${PORTSDIR}/graphics/ufraw

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GNOME=	gtk30

USES=		desktop-file-utils execinfo gmake pkgconfig
USE_GNOME=	gtk30
ALL_TARGET=	fotoxx
INSTALL_TARGET=	install MANDIR=${PREFIX}/man/man1/

PORTDOCS=	*
PORTDATA=	*
PLIST_FILES=	bin/fotoxx \
		man/man1/fotoxx.1.gz \
		share/appdata/fotoxx.appdata.xml \
		share/applications/fotoxx.desktop

OPTIONS_DEFINE=	DOCS

post-patch:
	@${REINPLACE_CMD} -e \
		's|-ggdb|| ; \
		 s|-rdynamic|-Wl,-export-dynamic| ; \
		 s|share/man|man| ; \
		 s|-lpthread|-lexecinfo|' ${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e \
		's|/usr/share/fotoxx|${DATADIR}|' ${WRKSRC}/desktop
		${WRKSRC}/zfuncs.h
	@# fix up icon path in XDG .desktop file
	${REINPLACE_CMD} -e 's}/usr/share/fotoxx}${DATADIR}}' \
		${WRKSRC}/desktop

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx

.include <bsd.port.pre.mk>

# These hacks are required because the nginx server at the primary
# master site and most of our fetch(1) versions do not get along well.
#   This code can be removed once r261263 has been merged from
# base/head into all ports-supported releases.
# We depend on cURL unless wget is in $LOCALPATH:
DISABLE_SIZE=	yes
.if exists(${LOCALBASE}/bin/wget) && !exists(${PREFIX}/bin/curl)
FETCH_CMD=		${LOCALBASE}/bin/wget -c -nc
.else
FETCH_DEPENDS=		curl:${PORTSDIR}/ftp/curl
FETCH_CMD=		${PREFIX}/bin/curl -OL0C -
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)graphics/fotoxx/distinfo (-2 / +2 lines)
1	SHA256 (fotoxx-14.02.2.tar.gz) = 60b6d9e8a5f19bc92b53d585cb36795d951c7a6d2d0bd1bd30ae3ca0465ed767	1	SHA256 (fotoxx-15.05.tar.gz) = 65567adc86087a3a8acdebcb0f15ec299cf690a869129825e3d32da7e50c4604
2	SIZE (fotoxx-14.02.2.tar.gz) = 2715089	2	SIZE (fotoxx-15.05.tar.gz) = 3573278




--- ./Makefile.orig	2014-02-05 20:42:34.000000000 +0100
+++ ./Makefile	2014-02-06 10:32:37.000000000 +0100
@@ -3,9 +3,9 @@
 FOTOXX = fotoxx-14.02.2.cc
 
 # defaults for parameters that may be pre-defined
-CXXFLAGS ?= -O2 -Wall -ggdb
-LDFLAGS ?= -rdynamic 
-PREFIX ?= /usr
+CXXFLAGS ?= -O3 -g -Wall
+LDFLAGS ?= -O3 -g -Wall -rdynamic 
+PREFIX ?= $(LOCALBASE)
 
 # target install directories
 BINDIR = $(PREFIX)/bin

Line 0 Link Here

(-)graphics/fotoxx/files/patch-f.combine.cc (+11 lines)
	1	--- f.combine.cc.orig 2015-05-01 09:40:38 UTC
	2	+++ f.combine.cc
	3	@@ -6475,7 +6475,7 @@ void m_pano_PT(GtkWidget , cchar )
	4	goto cleanup;
	5	}
	6
	7	- olddir = get_current_dir_name(); // save curr. directory
	8	+ olddir = getcwd(NULL,PATH_MAX); // save curr. directory
	9
	10	err = chdir(tempdir); // use /tmp/fotoxx-xxxxx
	11	if (err) {

Lines 1-10 Link Here

(-)graphics/fotoxx/files/patch-f.file.cc (-6 / +6 lines)
1	--- ./f.file.cc.orig 2014-02-05 20:42:34.000000000 +0100	1	--- f.file.cc.orig 2015-05-01 09:40:38 UTC
2	+++ ./f.file.cc 2014-02-06 10:32:37.000000000 +0100	2	+++ f.file.cc
3	@@ -23,6 +23,7 @@	3	@@ -74,6 +74,7 @@
4		4
5	#define EX extern // disable extern declarations	5	#define EX extern // disable extern declarations
6	#include "fotoxx.h"	6	#include "fotoxx.h" // (variables in fotoxx.h are refs)
7	+#include <sys/wait.h>	7	+#include <sys/wait.h>
8		8
9	/**************************************************************************	9	/**************************************************************************/
10	Fotoxx image edit - file menu functions	10




--- ./f.meta.cc.orig	2014-02-05 20:42:34.000000000 +0100
+++ ./f.meta.cc	2014-02-06 10:32:37.000000000 +0100
@@ -23,6 +23,7 @@
 
 #define EX extern                                                          //  enable extern declarations
 #include "fotoxx.h"
+#include <sys/wait.h>
 
 
 /**************************************************************************
@@ -5786,7 +5787,7 @@
       strcpy(sxrec.size,"null");
 
    if (! sxrec.tags) 
-      sxrec.tags = strdupz("null"tagdelimB,0,"search-index");
+      sxrec.tags = strdupz("null" tagdelimB,0,"search-index");
 
    if (! sxrec.capt) 
       sxrec.capt = strdupz("null",0,"search-index");
@@ -5993,7 +5994,7 @@
 
          if (sxrec->tags) 
             nn = fprintf(fid2,"tags: %s\n",sxrec->tags);                   //  tags rec.
-         else nn = fprintf(fid2,"tags: null"tagdelimB"\n");
+         else nn = fprintf(fid2,"tags: null" tagdelimB"\n");
          if (! nn) goto file_err;
 
          if (sxrec->capt) 
@@ -6147,7 +6148,7 @@
       strcpy(sxrec.size,"null");
 
    if (! sxrec.tags) 
-      sxrec.tags = strdupz("null"tagdelimB,0,"search-index");
+      sxrec.tags = strdupz("null" tagdelimB,0,"search-index");
    
    if (! sxrec.capt) 
       sxrec.capt = strdupz("null",0,"search-index");
@@ -6259,7 +6260,7 @@
 
    if (sxrec->tags) 
       nn = fprintf(fid,"tags: %s\n",sxrec->tags);                          //  tags rec.
-   else nn = fprintf(fid,"tags: null"tagdelimB"\n");
+   else nn = fprintf(fid,"tags: null" tagdelimB"\n");
    if (! nn) goto file_err;
 
    if (sxrec->capt) 




--- f.metadata.cc.orig	2015-05-01 09:40:38 UTC
+++ f.metadata.cc
@@ -92,6 +92,11 @@
 
 #define EX extern                                                          //  enable extern declarations
 #include "fotoxx.h"                                                        //  (variables in fotoxx.h are refs)
+#include <sys/wait.h>
+
+#ifndef ECOMM
+#define ECOMM EIO
+#endif
 
 /**************************************************************************/
 
@@ -5911,7 +5917,7 @@ int get_sxrec(sxrec_t &sxrec, cchar *fil
       strcpy(sxrec.size,"null");
 
    if (! sxrec.tags)
-      sxrec.tags = zstrdup("null"tagdelimB);
+      sxrec.tags = zstrdup("null" tagdelimB);
 
    if (! sxrec.capt)
       sxrec.capt = zstrdup("null");
@@ -6118,7 +6124,7 @@ int put_sxrec(sxrec_t *sxrec, cchar *fil
 
          if (sxrec->tags)
             nn = fprintf(fid2,"tags: %s\n",sxrec->tags);                   //  tags rec.
-         else nn = fprintf(fid2,"tags: null"tagdelimB"\n");
+         else nn = fprintf(fid2,"tags: null" tagdelimB"\n");
          if (! nn) goto file_err;
 
          if (sxrec->capt)
@@ -6270,7 +6276,7 @@ int read_sxrec_seq(sxrec_t &sxrec, int &
       strcpy(sxrec.size,"null");
 
    if (! sxrec.tags)
-      sxrec.tags = zstrdup("null"tagdelimB);
+      sxrec.tags = zstrdup("null" tagdelimB);
 
    if (! sxrec.capt)
       sxrec.capt = zstrdup("null");
@@ -6381,7 +6387,7 @@ int write_sxrec_seq(sxrec_t *sxrec, int 
 
    if (sxrec->tags)
       nn = fprintf(fid,"tags: %s\n",sxrec->tags);                          //  tags rec.
-   else nn = fprintf(fid,"tags: null"tagdelimB"\n");
+   else nn = fprintf(fid,"tags: null" tagdelimB"\n");
    if (! nn) goto file_err;
 
    if (sxrec->capt)

Lines 1-11 Link Here

(-)graphics/fotoxx/files/patch-f.repair.cc (-4 / +4 lines)
1	--- f.repair.cc.orig 2014-08-15 14:19:11.000000000 -0400	1	--- f.repair.cc.orig 2015-05-01 09:40:38 UTC
2	+++ f.repair.cc 2014-08-15 14:20:01.000000000 -0400	2	+++ f.repair.cc
3	@@ -1571,7 +1571,7 @@	3	@@ -2055,7 +2055,7 @@ void m_smart_erase(GtkWidget *, const ch
4	int smart_erase_dialog_event(zdialog zd, const char event) // overhauled	4	int smart_erase_dialog_event(zdialog zd, const char event) // overhauled
5	{	5	{
6	void smart_erase_func(int mode);	6	void smart_erase_func(int mode);
7	- void smart_erase_blur(float radius);	7	- void smart_erase_blur(float radius);
8	+ int smart_erase_blur(float radius);	8	+ int smart_erase_blur(float radius);
9		9
10	float radius;	10	float radius;
11	int cc;	11	int cc;




--- ./fotoxx-14.02.2.cc.orig	2014-02-05 20:42:34.000000000 +0100
+++ ./fotoxx-14.02.2.cc	2014-02-06 10:32:37.000000000 +0100
@@ -133,7 +133,8 @@
 
 #define EX                                                                 //  disable extern declarations
 #include "fotoxx.h"
-
+#include <sys/types.h>
+#include <sys/sysctl.h>
 
 //  fotoxx main program
 
@@ -451,7 +452,6 @@
    char           procfile[20], buff[200];
    char           KBshortsU[200], KBshortsI[200];
    char           favorites_config[200], badnews[200];
-   double         freememory, cachememory;                                 //  available memory at startup
    float          exifver = 0;
    FILE           *fid;
    struct stat    statb;
@@ -542,19 +542,12 @@
    
    snprintf(URS_filename,200,"%s/undo_nn",tempdir);                        //  /run/shm/fotoxx-nnnnnn/undo_nn
 
-   //  check free memory and suggest image size limits
-
-   parseprocfile("/proc/meminfo","MemFree:",&freememory,null);             //  get amount of free memory
-   parseprocfile("/proc/meminfo","Cached:",&cachememory,null);
-   freememory = (freememory + cachememory) / 1024;                         //  megabytes
-   printz("free memory: %.0f MB \n",freememory);
-   printz("image size limits for good performance: \n");                   //  v.13.04
-   printz("  view: %.0f megapixels \n",(freememory-100)/6);                //  F + preview, 3 bytes/pixel each
-   printz("  edit: %.0f megapixels \n",(freememory-100)/54);               //  + E0/E1/E3/ER, 12 bytes/pixel each
-
    //  miscellaneous
 
-   Nwt = get_nprocs();                                                     //  get SMP CPU count
+   //Nwt = get_nprocs();                                                     //  get SMP CPU count
+   size_t         len = sizeof(Nwt);
+   sysctlbyname("hw.ncpu",&Nwt,&len,NULL,0);
+
    if (Nwt <= 0) Nwt = 2;
    if (Nwt > max_threads) Nwt = max_threads;                               //  compile time limit
    printz("using %d threads \n",Nwt);
@@ -4321,31 +4314,6 @@
 }
 
 
-/**************************************************************************/
-
-//  popup a warning message if real memory is below specified threshold
-//  returns margin: real memory - threshold, in megabytes 
-//  (+ if enough memory, - if not)
-//  the popup message only appears if real memory < threshold
-//  the popup message goes away after a few seconds
-
-int warn_memory(int req_mb)
-{
-   double   freemem, cachemem;
-   int      act_mb, gap_mb;
-   cchar    *message = ZTX("warning: real memory %d MB < required %d MB \n"
-                           "response time may become very long \n");
-
-   parseprocfile("/proc/meminfo","MemFree:",&freemem,null);                //  get current free memory
-   parseprocfile("/proc/meminfo","Cached:",&cachemem,null);
-   act_mb = (freemem + cachemem) / 1024;                                   //  megabytes
-   gap_mb = act_mb - req_mb;
-   if (gap_mb > -10) return gap_mb;
-   zpopup_message(message,act_mb,req_mb);                                  //  deficit > 10 MB
-   return gap_mb;                                      
-}
-
-
 /**************************************************************************
       PXM pixmap functions - RGB float pixel map
       pixel RGB values may range from 0.0 to 255.99
@@ -4386,9 +4354,6 @@
       return 0;
    }
 
-   int req_mb = ww * hh * 12 / mega;                                       //  warn if memory low
-   warn_memory(req_mb);
-
    PXM *pxm = (PXM *) zmalloc(sizeof(PXM),"PXM");                          //  0.45 sec for 116 megapix image (1.4 GB)
    pxm->ww = ww;
    pxm->hh = hh;
@@ -4806,9 +4771,6 @@
 
 PXB * PXB_make(int ww, int hh)
 {
-   int req_mb = ww * hh * 3 / mega;                                        //  warn if memory low 
-   warn_memory(req_mb);
-
    PXB *pxb = (PXB *) zmalloc(sizeof(PXB),"PXB");
    strcpy(pxb->wmi,"pxbpix");
    pxb->pixbuf = gdk_pixbuf_new(GDKRGB,0,8,ww,hh);
@@ -4857,9 +4819,6 @@
 
 PXB * PXB_copy(PXB *pxb1)
 {
-   int req_mb = pxb1->ww * pxb1->hh * 3 / mega;                            //  warn if memory low
-   warn_memory(req_mb);
-
    PXB *pxb2 = (PXB *) zmalloc(sizeof(PXB),"PXB");
    strcpy(pxb2->wmi,"pxbpix");
    pxb2->pixbuf = gdk_pixbuf_copy(pxb1->pixbuf);
@@ -4876,9 +4835,6 @@
 PXB * PXB_rescale(PXB *pxb1, int ww2, int hh2)
 {
    GdkPixbuf   *pixbuf2 = 0;
-   int req_mb = ww2 * hh2 * 3 / mega;                                      //  warn if memory low
-   warn_memory(req_mb);
-   
    if (strEqu(interpolation,"tiles"))                                      //  v.13.05
       pixbuf2 = gdk_pixbuf_scale_simple(pxb1->pixbuf,ww2,hh2,GDK_INTERP_TILES);
    else if (strEqu(interpolation,"hyperbolic"))




--- fotoxx-15.05.cc.orig	2015-05-01 09:40:38 UTC
+++ fotoxx-15.05.cc
@@ -139,6 +139,8 @@
 
 #define EX                                                                 //  disable extern declarations
 #include "fotoxx.h"                                                        //  (variables in fotoxx.h are defined)
+#include <sys/types.h>
+#include <sys/sysctl.h>
 
 /**************************************************************************/
 
@@ -335,7 +337,9 @@ int initzfunc(void *)
    char     procfile[20], buff[200];
    char     KBshortsU[200], KBshortsI[200];
    char     tonefile[200], badnews[200];
+#ifdef __linux__
    double   freememory, cachememory;
+#endif
    float    exifver = 0;
    FILE     *fid;
    STATB    statb;
@@ -445,6 +449,7 @@ int initzfunc(void *)
 
    //  check free memory and suggest image size limits
 
+#ifdef __linux__
    parseprocfile("/proc/meminfo","MemFree:",&freememory,0);                //  get amount of free memory
    parseprocfile("/proc/meminfo","Cached:",&cachememory,0);
    freememory = (freememory + cachememory) / 1024;                         //  megabytes
@@ -452,6 +457,7 @@ int initzfunc(void *)
    printz("image size limits for good performance: \n");
    printz("  view: %.0f megapixels \n",(freememory-100)/6);                //  F + preview, 3 bytes/pixel each
    printz("  edit: %.0f megapixels \n",(freememory-100)/54);               //  + E0/E1/E3/ER, 12 bytes/pixel each
+#endif
 
    //  update KB shortcuts if needed
 
@@ -531,7 +537,13 @@ int initzfunc(void *)
    screenhh = gdk_screen_get_height(screen);
    printz("screen width: %d  height: %d \n",screenww,screenhh);
 
+#ifdef __linux__
    NWT = get_nprocs();                                                     //  get SMP CPU count
+#endif
+#ifdef __FreeBSD__
+   size_t	len = sizeof(NWT);
+   sysctlbyname("hw.ncpu",&NWT,&len,NULL,0);
+#endif
    if (NWT <= 0) NWT = 2;
    if (NWT > max_threads) NWT = max_threads;                               //  compile time limit
    printz("using %d threads \n",NWT);




--- ./fotoxx.h.orig	2014-02-05 20:42:34.000000000 +0100
+++ ./fotoxx.h	2014-02-06 10:32:37.000000000 +0100
@@ -339,8 +339,8 @@
 EX int         dww, dhh;                                                   //  Dpxb size in drawing window, <= Dww, Dhh
 EX int         zoomx, zoomy;                                               //  req. zoom center of window
 
-EX mutex       Fpixmap_lock;                                               //  lock for accessing PXM pixmaps
-EX mutex       preload_lock;                                               //  lock for image file preload function
+EX mutex_tp    Fpixmap_lock;                                               //  lock for accessing PXM pixmaps
+EX mutex_tp    preload_lock;                                               //  lock for image file preload function
 
 EX int         Mbutton;                                                    //  mouse button, 1/3 = left/right
 EX int         Mwxposn, Mwyposn;                                           //  mouse position, window space




--- zfuncs.cc.orig	2015-05-01 09:40:38 UTC
+++ zfuncs.cc
@@ -262,6 +262,7 @@ char *zstrdup(cchar *string, int addcc)
 //  A mutex lock is used to insure one thread at a time has access to the parameter.
 //  Many parameters can be used but there is only one mutex lock.
 
 void zmalloc_report()
+mutex_tp zget_lock = PTHREAD_MUTEX_INITIALIZER;
 
 int zget_locked(int &param)                                                //  lock and return parameter
 {
+#ifdef __linux__
    using namespace zfuncs;
 
    static double     ptime = 0;
@@ -282,6 +283,7 @@ void zmalloc_report()
+   mutex_tp mlock = PTHREAD_MUTEX_INITIALIZER;
 }
 
    ptime = jobtime();                                                      //  reset some counters
    Nmalloc = Nstrdup = Nfree = 0;
+#endif
 
    return;
 }




--- zfuncs.h.orig	2015-05-01 09:40:38 UTC
+++ zfuncs.h
@@ -22,17 +22,18 @@
 
 //     zfuncs.h   version  v.6.1
 
-#include <sys/sysinfo.h>
+//#include <sys/sysinfo.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/resource.h>
 #include <sys/file.h>
 #include <sys/utsname.h>
-#include <malloc.h>
+//#include <malloc.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>

 #include <string.h>
 #include <ctype.h>
 #include <math.h>
@@ -60,7 +61,7 @@
 
 #define  wstrerror(err) strerror(WEXITSTATUS(err))                         //  get text status for child process
 
-#define  mutex          pthread_mutex_t                                    //  abbreviations
+#define  mutex_tp       pthread_mutex_t                                    //  abbreviations
 #define  mutex_init     pthread_mutex_init
 #define  mutex_lock     pthread_mutex_lock
 #define  mutex_trylock  pthread_mutex_trylock
@@ -625,7 +626,7 @@
 {
    char        wmi[8];
    Vxstring  * vd;                                                         //  vector of xstrings
-   mutex       qmutex;                                                     //  for multi-thread access
+   mutex_tp    qmutex;                                                     //  for multi-thread access
    int         qcap;                                                       //  queue capacity
    int         qcount;                                                     //  curr. queue count
    int         ent1;                                                       //  first entry pointer




bin/fotoxx
share/applications/fotoxx.desktop
%%PORTDOCS%%%%DOCSDIR%%/README-ca
%%PORTDOCS%%%%DOCSDIR%%/README-en
%%PORTDOCS%%%%DOCSDIR%%/README-es
%%PORTDOCS%%%%DOCSDIR%%/changelog.gz
%%PORTDOCS%%%%DOCSDIR%%/copyright
%%PORTDOCS%%%%DOCSDIR%%/fotoxx-release
%%PORTDOCS%%%%DOCSDIR%%/fotoxx.man
%%PORTDOCS%%%%DOCSDIR%%/freecode
%%PORTDOCS%%%%DOCSDIR%%/translations-ca
%%PORTDOCS%%%%DOCSDIR%%/translations-en
%%PORTDOCS%%%%DOCSDIR%%/translations-es
%%DATADIR%%/data/KB-shortcuts-ca
%%DATADIR%%/data/KB-shortcuts-en
%%DATADIR%%/data/KB-shortcuts-es
%%DATADIR%%/data/edit-menus-ca
%%DATADIR%%/data/edit-menus-en
%%DATADIR%%/data/edit-menus-es
%%DATADIR%%/data/favorites/menu-config
%%DATADIR%%/data/favorites/menu-config-pixbuf-009.png
%%DATADIR%%/data/images/F-toolbar.jpg
%%DATADIR%%/data/images/G-toolbar.jpg
%%DATADIR%%/data/images/HDF-paint.jpg
%%DATADIR%%/data/images/HDR-adjust.jpg
%%DATADIR%%/data/images/KB-shortcuts.jpg
%%DATADIR%%/data/images/add-geotags.jpg
%%DATADIR%%/data/images/add-text.jpg
%%DATADIR%%/data/images/add-text2.jpg
%%DATADIR%%/data/images/anti-alias.jpg
%%DATADIR%%/data/images/auto-trim.jpg
%%DATADIR%%/data/images/batch-add-geotags.jpg
%%DATADIR%%/data/images/batch-convert.jpg
%%DATADIR%%/data/images/batch-raw-conv.jpg
%%DATADIR%%/data/images/brightness-distribution.jpg
%%DATADIR%%/data/images/brightness-ramp.jpg
%%DATADIR%%/data/images/brightness steps.jpg
%%DATADIR%%/data/images/chromatic.jpg
%%DATADIR%%/data/images/cmyk.jpg
%%DATADIR%%/data/images/collections.jpg
%%DATADIR%%/data/images/colorchart.png
%%DATADIR%%/data/images/denoise.jpg
%%DATADIR%%/data/images/dots.jpg
%%DATADIR%%/data/images/drawing.jpg
%%DATADIR%%/data/images/edit-metadata.jpg
%%DATADIR%%/data/images/edit-translation.jpg
%%DATADIR%%/data/images/favorites.jpg
%%DATADIR%%/data/images/file-save.jpg
%%DATADIR%%/data/images/flatbook.jpg
%%DATADIR%%/data/images/fotoxx.jpg
%%DATADIR%%/data/images/gallery-select.jpg
%%DATADIR%%/data/images/gammachart.png
%%DATADIR%%/data/images/geotag-groups.jpg
%%DATADIR%%/data/images/grad_blur.jpg
%%DATADIR%%/data/images/grid-lines.jpg
%%DATADIR%%/data/images/index.jpg
%%DATADIR%%/data/images/jpeg quality.jpg
%%DATADIR%%/data/images/keystone.jpg
%%DATADIR%%/data/images/leverage-edits.jpg
%%DATADIR%%/data/images/mashup.jpg
%%DATADIR%%/data/images/mashup2.jpg
%%DATADIR%%/data/images/match-colors.jpg
%%DATADIR%%/data/images/move-collections.jpg
%%DATADIR%%/data/images/paint-clone.jpg
%%DATADIR%%/data/images/paint-edits.jpg
%%DATADIR%%/data/images/pano-color.jpg
%%DATADIR%%/data/images/pano-pre-align.jpg
%%DATADIR%%/data/images/plugins.jpg
%%DATADIR%%/data/images/print.jpg
%%DATADIR%%/data/images/remove-dust.jpg
%%DATADIR%%/data/images/rename.jpg
%%DATADIR%%/data/images/resize.jpg
%%DATADIR%%/data/images/retouch-combo.jpg
%%DATADIR%%/data/images/retouch-combo2.jpg
%%DATADIR%%/data/images/revise-RGB.jpg
%%DATADIR%%/data/images/search-images-metadata.jpg
%%DATADIR%%/data/images/search-images.jpg
%%DATADIR%%/data/images/select-area.jpg
%%DATADIR%%/data/images/sharpen.jpg
%%DATADIR%%/data/images/sharpen4.jpg
%%DATADIR%%/data/images/shift-colors.jpg
%%DATADIR%%/data/images/show-RGB.jpg
%%DATADIR%%/data/images/sketch.jpg
%%DATADIR%%/data/images/slide-show.jpg
%%DATADIR%%/data/images/smart-erase.jpg
%%DATADIR%%/data/images/stack-noise.jpg
%%DATADIR%%/data/images/stack-paint.jpg
%%DATADIR%%/data/images/stuck-pixels.jpg
@comment %%DATADIR%%/data/images/synchronize.jpg
%%DATADIR%%/data/images/tabsF&G.png
%%DATADIR%%/data/images/texture.jpg
%%DATADIR%%/data/images/tone-mapping.jpg
%%DATADIR%%/data/images/trim-rotate.jpg
%%DATADIR%%/data/images/unbend.jpg
%%DATADIR%%/data/images/user-settings.jpg
%%DATADIR%%/data/images/vignette.jpg
%%DATADIR%%/data/images/warps.jpg
%%DATADIR%%/data/quickstart-ca.html
%%DATADIR%%/data/quickstart-de.html
%%DATADIR%%/data/quickstart-en.html
%%DATADIR%%/data/quickstart-es.html
%%DATADIR%%/data/quickstart-fr.html
%%DATADIR%%/data/quickstart-it.html
%%DATADIR%%/data/quickstart-pt.html
%%DATADIR%%/data/slideshow-tone.oga
%%DATADIR%%/data/tags_defined
%%DATADIR%%/data/userguide-en.html
%%DATADIR%%/data/userguide-es.html
%%DATADIR%%/data/userguide-it.html
%%DATADIR%%/icons/F-tab.png
%%DATADIR%%/icons/G-tab.png
%%DATADIR%%/icons/W-tab.png
%%DATADIR%%/icons/bottom.png
%%DATADIR%%/icons/broken.png
%%DATADIR%%/icons/cancel.png
%%DATADIR%%/icons/down+.png
%%DATADIR%%/icons/down.png
%%DATADIR%%/icons/edit-funcs/CMYK.png
%%DATADIR%%/icons/edit-funcs/HDF.png
%%DATADIR%%/icons/edit-funcs/HDR.png
%%DATADIR%%/icons/edit-funcs/RGB.png
%%DATADIR%%/icons/edit-funcs/blur.png
%%DATADIR%%/icons/edit-funcs/bright distrib.png
%%DATADIR%%/icons/edit-funcs/brigth color sat.png
%%DATADIR%%/icons/edit-funcs/brigth ramp.png
%%DATADIR%%/icons/edit-funcs/color depth.png
%%DATADIR%%/icons/edit-funcs/crop rotate.png
%%DATADIR%%/icons/edit-funcs/dots.png
%%DATADIR%%/icons/edit-funcs/drawing01.png
%%DATADIR%%/icons/edit-funcs/embossing.png
%%DATADIR%%/icons/edit-funcs/expand bright.png
%%DATADIR%%/icons/edit-funcs/fix fringes.png
%%DATADIR%%/icons/edit-funcs/fix stuck pixels.png
%%DATADIR%%/icons/edit-funcs/flatten bright.png
%%DATADIR%%/icons/edit-funcs/flip.png
%%DATADIR%%/icons/edit-funcs/gamma.png
%%DATADIR%%/icons/edit-funcs/invert.png
%%DATADIR%%/icons/edit-funcs/keystone.png
%%DATADIR%%/icons/edit-funcs/landscape.png
%%DATADIR%%/icons/edit-funcs/leverage edit.png
%%DATADIR%%/icons/edit-funcs/outlines.png
%%DATADIR%%/icons/edit-funcs/paint edits.png
%%DATADIR%%/icons/edit-funcs/paint pixels.png
%%DATADIR%%/icons/edit-funcs/painting.png
%%DATADIR%%/icons/edit-funcs/panorama.png
%%DATADIR%%/icons/edit-funcs/pencil.png
%%DATADIR%%/icons/edit-funcs/red eyes.png
%%DATADIR%%/icons/edit-funcs/reduce noise.png
%%DATADIR%%/icons/edit-funcs/remove dust.png
%%DATADIR%%/icons/edit-funcs/resize.png
%%DATADIR%%/icons/edit-funcs/sharpen.png
%%DATADIR%%/icons/edit-funcs/shiftcolors.png
%%DATADIR%%/icons/edit-funcs/smarterase.png
%%DATADIR%%/icons/edit-funcs/stacknoise.png
%%DATADIR%%/icons/edit-funcs/stackpaint.png
%%DATADIR%%/icons/edit-funcs/text.png
%%DATADIR%%/icons/edit-funcs/tiles.png
%%DATADIR%%/icons/edit-funcs/tonemapping.png
%%DATADIR%%/icons/edit-funcs/unbend.png
%%DATADIR%%/icons/edit-funcs/vert panorama.png
%%DATADIR%%/icons/edit-funcs/voodoo.png
%%DATADIR%%/icons/edit-funcs/warp affine.png
%%DATADIR%%/icons/edit-funcs/warp area.png
%%DATADIR%%/icons/edit-funcs/warp curved.png
%%DATADIR%%/icons/edit-funcs/warp linear.png
%%DATADIR%%/icons/edit-funcs/whitebalance.png
%%DATADIR%%/icons/favorites.png
%%DATADIR%%/icons/fg-color.png
%%DATADIR%%/icons/folder.png
%%DATADIR%%/icons/fotoxx.png
%%DATADIR%%/icons/goto.png
%%DATADIR%%/icons/help.png
%%DATADIR%%/icons/next.png
%%DATADIR%%/icons/open.png
%%DATADIR%%/icons/prev.png
%%DATADIR%%/icons/quit.png
%%DATADIR%%/icons/redo.png
%%DATADIR%%/icons/rotate-left.png
%%DATADIR%%/icons/rotate-right.png
%%DATADIR%%/icons/save.png
%%DATADIR%%/icons/sort.png
%%DATADIR%%/icons/sync.G.png
%%DATADIR%%/icons/top.png
%%DATADIR%%/icons/trash.png
%%DATADIR%%/icons/undo.png
%%DATADIR%%/icons/up+.png
%%DATADIR%%/icons/up.png
%%DATADIR%%/icons/warning.png
%%DATADIR%%/icons/zoom+.png
%%DATADIR%%/icons/zoom-.png
%%DATADIR%%/locales/translate-ca.po
%%DATADIR%%/locales/translate-de.po
%%DATADIR%%/locales/translate-en.po
%%DATADIR%%/locales/translate-es.po
%%DATADIR%%/locales/translate-fr.po
%%DATADIR%%/locales/translate-it.po
%%DATADIR%%/locales/translate-nl.po
%%DATADIR%%/locales/translate-pt.po
%%DATADIR%%/locales/translate-ru.po
%%DATADIR%%/locales/translate-sv.po
man/man1/fotoxx.1.gz

Return to bug 201844

Lines 2-11 Link Here

(-)graphics/fotoxx/Makefile (-37 / +24 lines)
2	# $FreeBSD: head/graphics/fotoxx/Makefile 376365 2015-01-05 22:36:15Z pawel $	2	# $FreeBSD: head/graphics/fotoxx/Makefile 376365 2015-01-05 22:36:15Z pawel $
3		3
4	PORTNAME= fotoxx	4	PORTNAME= fotoxx
5	PORTVERSION= 14.02.2	5	PORTVERSION= 15.05
6	CATEGORIES= graphics	6	CATEGORIES= graphics
7	MASTER_SITES= http://www.kornelix.com/uploads/1/3/0/3/13035936/ \	7	MASTER_SITES= GENTOO/distfiles \
8	LOCAL/mandree	8	http://fossies.org/linux/misc/legacy/ \
		9	http://www.kornelix.com/uploads/1/3/0/3/13035936/
9		10
10	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Application to organize and edit image collections	12	COMMENT= Application to organize and edit image collections
Lines 13-61 Link Here
13	LICENSE= GPLv3	14	LICENSE= GPLv3
14		15
15	RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \	16	RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \
16	ufraw-batch:${PORTSDIR}/graphics/ufraw \	17	dcraw:${PORTSDIR}/graphics/dcraw \
17	exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool \	18	exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool \
18	dcraw:${PORTSDIR}/graphics/dcraw	19	ufraw-batch:${PORTSDIR}/graphics/ufraw
19		20
20	USES= execinfo gmake desktop-file-utils pkgconfig	21	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
21	USE_GNOME= gtk30
22		22
		23	USES= desktop-file-utils execinfo gmake pkgconfig
		24	USE_GNOME= gtk30
23	ALL_TARGET= fotoxx	25	ALL_TARGET= fotoxx
24	INSTALL_TARGET= install MANDIR=${PREFIX}/man/man1/
25		26
26	LDFLAGS+= -O3 -g -Wall -rdynamic -lexecinfo	27	PORTDOCS= *
		28	PORTDATA= *
		29	PLIST_FILES= bin/fotoxx \
		30	man/man1/fotoxx.1.gz \
		31	share/appdata/fotoxx.appdata.xml \
		32	share/applications/fotoxx.desktop
27		33
28	OPTIONS_DEFINE= DOCS	34	OPTIONS_DEFINE= DOCS
29		35
30	post-patch:	36	post-patch:
31	@# drop xdg-desktop-menu calls, they fail	37	@${REINPLACE_CMD} -e \
32	${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \	38	's\|-ggdb\|\| ; \
33	-e '/xdg-desktop-menu/d' \	39	s\|-rdynamic\|-Wl,-export-dynamic\| ; \
34	-e '/rm -f -R/d' \	40	s\|share/man\|man\| ; \
35	${WRKSRC}/Makefile	41	s\|-lpthread\|-lexecinfo\|' ${WRKSRC}/Makefile
36	@# replace obsolete include files	42	@${REINPLACE_CMD} -e \
37	${REINPLACE_CMD} -e 's\|<malloc.h>\|<stdlib.h>\|' \	43	's\|/usr/share/fotoxx\|${DATADIR}\|' ${WRKSRC}/desktop
38	${WRKSRC}/zfuncs.h
39	@# fix up icon path in XDG .desktop file
40	${REINPLACE_CMD} -e 's}/usr/share/fotoxx}${DATADIR}}' \
41	${WRKSRC}/desktop
42		44
43	post-install:	45	post-install:
44	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx	46	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx
45
46	.include <bsd.port.pre.mk>
47
48	# These hacks are required because the nginx server at the primary
49	# master site and most of our fetch(1) versions do not get along well.
50	# This code can be removed once r261263 has been merged from
51	# base/head into all ports-supported releases.
52	# We depend on cURL unless wget is in $LOCALPATH:
53	DISABLE_SIZE= yes
54	.if exists(${LOCALBASE}/bin/wget) && !exists(${PREFIX}/bin/curl)
55	FETCH_CMD= ${LOCALBASE}/bin/wget -c -nc
56	.else
57	FETCH_DEPENDS= curl:${PORTSDIR}/ftp/curl
58	FETCH_CMD= ${PREFIX}/bin/curl -OL0C -
59	.endif
60		47
61	.include <bsd.port.post.mk>	48	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)graphics/fotoxx/files/patch-Makefile (-15 lines)
1	--- ./Makefile.orig 2014-02-05 20:42:34.000000000 +0100
2	+++ ./Makefile 2014-02-06 10:32:37.000000000 +0100
3	@@ -3,9 +3,9 @@
4	FOTOXX = fotoxx-14.02.2.cc
5
6	# defaults for parameters that may be pre-defined
7	-CXXFLAGS ?= -O2 -Wall -ggdb
8	-LDFLAGS ?= -rdynamic
9	-PREFIX ?= /usr
10	+CXXFLAGS ?= -O3 -g -Wall
11	+LDFLAGS ?= -O3 -g -Wall -rdynamic
12	+PREFIX ?= $(LOCALBASE)
13
14	# target install directories
15	BINDIR = $(PREFIX)/bin

Lines 1-46 Link Here

(-)graphics/fotoxx/files/patch-f.meta.cc (-46 lines)
1	--- ./f.meta.cc.orig 2014-02-05 20:42:34.000000000 +0100
2	+++ ./f.meta.cc 2014-02-06 10:32:37.000000000 +0100
3	@@ -23,6 +23,7 @@
4
5	#define EX extern // enable extern declarations
6	#include "fotoxx.h"
7	+#include <sys/wait.h>
8
9
10	/**************************************************************************
11	@@ -5786,7 +5787,7 @@
12	strcpy(sxrec.size,"null");
13
14	if (! sxrec.tags)
15	- sxrec.tags = strdupz("null"tagdelimB,0,"search-index");
16	+ sxrec.tags = strdupz("null" tagdelimB,0,"search-index");
17
18	if (! sxrec.capt)
19	sxrec.capt = strdupz("null",0,"search-index");
20	@@ -5993,7 +5994,7 @@
21
22	if (sxrec->tags)
23	nn = fprintf(fid2,"tags: %s\n",sxrec->tags); // tags rec.
24	- else nn = fprintf(fid2,"tags: null"tagdelimB"\n");
25	+ else nn = fprintf(fid2,"tags: null" tagdelimB"\n");
26	if (! nn) goto file_err;
27
28	if (sxrec->capt)
29	@@ -6147,7 +6148,7 @@
30	strcpy(sxrec.size,"null");
31
32	if (! sxrec.tags)
33	- sxrec.tags = strdupz("null"tagdelimB,0,"search-index");
34	+ sxrec.tags = strdupz("null" tagdelimB,0,"search-index");
35
36	if (! sxrec.capt)
37	sxrec.capt = strdupz("null",0,"search-index");
38	@@ -6259,7 +6260,7 @@
39
40	if (sxrec->tags)
41	nn = fprintf(fid,"tags: %s\n",sxrec->tags); // tags rec.
42	- else nn = fprintf(fid,"tags: null"tagdelimB"\n");
43	+ else nn = fprintf(fid,"tags: null" tagdelimB"\n");
44	if (! nn) goto file_err;
45
46	if (sxrec->capt)

Line 0 Link Here

(-)graphics/fotoxx/files/patch-f.metadata.cc (+50 lines)
	1	--- f.metadata.cc.orig 2015-05-01 09:40:38 UTC
	2	+++ f.metadata.cc
	3	@@ -92,6 +92,11 @@
	4
	5	#define EX extern // enable extern declarations
	6	#include "fotoxx.h" // (variables in fotoxx.h are refs)
	7	+#include <sys/wait.h>
	8	+
	9	+#ifndef ECOMM
	10	+#define ECOMM EIO
	11	+#endif
	12
	13	/**************************************************************************/
	14
	15	@@ -5911,7 +5917,7 @@ int get_sxrec(sxrec_t &sxrec, cchar *fil
	16	strcpy(sxrec.size,"null");
	17
	18	if (! sxrec.tags)
	19	- sxrec.tags = zstrdup("null"tagdelimB);
	20	+ sxrec.tags = zstrdup("null" tagdelimB);
	21
	22	if (! sxrec.capt)
	23	sxrec.capt = zstrdup("null");
	24	@@ -6118,7 +6124,7 @@ int put_sxrec(sxrec_t sxrec, cchar fil
	25
	26	if (sxrec->tags)
	27	nn = fprintf(fid2,"tags: %s\n",sxrec->tags); // tags rec.
	28	- else nn = fprintf(fid2,"tags: null"tagdelimB"\n");
	29	+ else nn = fprintf(fid2,"tags: null" tagdelimB"\n");
	30	if (! nn) goto file_err;
	31
	32	if (sxrec->capt)
	33	@@ -6270,7 +6276,7 @@ int read_sxrec_seq(sxrec_t &sxrec, int &
	34	strcpy(sxrec.size,"null");
	35
	36	if (! sxrec.tags)
	37	- sxrec.tags = zstrdup("null"tagdelimB);
	38	+ sxrec.tags = zstrdup("null" tagdelimB);
	39
	40	if (! sxrec.capt)
	41	sxrec.capt = zstrdup("null");
	42	@@ -6381,7 +6387,7 @@ int write_sxrec_seq(sxrec_t *sxrec, int
	43
	44	if (sxrec->tags)
	45	nn = fprintf(fid,"tags: %s\n",sxrec->tags); // tags rec.
	46	- else nn = fprintf(fid,"tags: null"tagdelimB"\n");
	47	+ else nn = fprintf(fid,"tags: null" tagdelimB"\n");
	48	if (! nn) goto file_err;
	49
	50	if (sxrec->capt)

Lines 1-116 Link Here

(-)graphics/fotoxx/files/patch-fotoxx-14.02.2.cc (-116 lines)
1	--- ./fotoxx-14.02.2.cc.orig 2014-02-05 20:42:34.000000000 +0100
2	+++ ./fotoxx-14.02.2.cc 2014-02-06 10:32:37.000000000 +0100
3	@@ -133,7 +133,8 @@
4
5	#define EX // disable extern declarations
6	#include "fotoxx.h"
7	-
8	+#include <sys/types.h>
9	+#include <sys/sysctl.h>
10
11	// fotoxx main program
12
13	@@ -451,7 +452,6 @@
14	char procfile[20], buff[200];
15	char KBshortsU[200], KBshortsI[200];
16	char favorites_config[200], badnews[200];
17	- double freememory, cachememory; // available memory at startup
18	float exifver = 0;
19	FILE *fid;
20	struct stat statb;
21	@@ -542,19 +542,12 @@
22
23	snprintf(URS_filename,200,"%s/undo_nn",tempdir); // /run/shm/fotoxx-nnnnnn/undo_nn
24
25	- // check free memory and suggest image size limits
26	-
27	- parseprocfile("/proc/meminfo","MemFree:",&freememory,null); // get amount of free memory
28	- parseprocfile("/proc/meminfo","Cached:",&cachememory,null);
29	- freememory = (freememory + cachememory) / 1024; // megabytes
30	- printz("free memory: %.0f MB \n",freememory);
31	- printz("image size limits for good performance: \n"); // v.13.04
32	- printz(" view: %.0f megapixels \n",(freememory-100)/6); // F + preview, 3 bytes/pixel each
33	- printz(" edit: %.0f megapixels \n",(freememory-100)/54); // + E0/E1/E3/ER, 12 bytes/pixel each
34	-
35	// miscellaneous
36
37	- Nwt = get_nprocs(); // get SMP CPU count
38	+ //Nwt = get_nprocs(); // get SMP CPU count
39	+ size_t len = sizeof(Nwt);
40	+ sysctlbyname("hw.ncpu",&Nwt,&len,NULL,0);
41	+
42	if (Nwt <= 0) Nwt = 2;
43	if (Nwt > max_threads) Nwt = max_threads; // compile time limit
44	printz("using %d threads \n",Nwt);
45	@@ -4321,31 +4314,6 @@
46	}
47
48
49	-/**************************************************************************/
50	-
51	-// popup a warning message if real memory is below specified threshold
52	-// returns margin: real memory - threshold, in megabytes
53	-// (+ if enough memory, - if not)
54	-// the popup message only appears if real memory < threshold
55	-// the popup message goes away after a few seconds
56	-
57	-int warn_memory(int req_mb)
58	-{
59	- double freemem, cachemem;
60	- int act_mb, gap_mb;
61	- cchar *message = ZTX("warning: real memory %d MB < required %d MB \n"
62	- "response time may become very long \n");
63	-
64	- parseprocfile("/proc/meminfo","MemFree:",&freemem,null); // get current free memory
65	- parseprocfile("/proc/meminfo","Cached:",&cachemem,null);
66	- act_mb = (freemem + cachemem) / 1024; // megabytes
67	- gap_mb = act_mb - req_mb;
68	- if (gap_mb > -10) return gap_mb;
69	- zpopup_message(message,act_mb,req_mb); // deficit > 10 MB
70	- return gap_mb;
71	-}
72	-
73	-
74	/**************************************************************************
75	PXM pixmap functions - RGB float pixel map
76	pixel RGB values may range from 0.0 to 255.99
77	@@ -4386,9 +4354,6 @@
78	return 0;
79	}
80
81	- int req_mb = ww * hh * 12 / mega; // warn if memory low
82	- warn_memory(req_mb);
83	-
84	PXM pxm = (PXM ) zmalloc(sizeof(PXM),"PXM"); // 0.45 sec for 116 megapix image (1.4 GB)
85	pxm->ww = ww;
86	pxm->hh = hh;
87	@@ -4806,9 +4771,6 @@
88
89	PXB * PXB_make(int ww, int hh)
90	{
91	- int req_mb = ww * hh * 3 / mega; // warn if memory low
92	- warn_memory(req_mb);
93	-
94	PXB pxb = (PXB ) zmalloc(sizeof(PXB),"PXB");
95	strcpy(pxb->wmi,"pxbpix");
96	pxb->pixbuf = gdk_pixbuf_new(GDKRGB,0,8,ww,hh);
97	@@ -4857,9 +4819,6 @@
98
99	PXB * PXB_copy(PXB *pxb1)
100	{
101	- int req_mb = pxb1->ww * pxb1->hh * 3 / mega; // warn if memory low
102	- warn_memory(req_mb);
103	-
104	PXB pxb2 = (PXB ) zmalloc(sizeof(PXB),"PXB");
105	strcpy(pxb2->wmi,"pxbpix");
106	pxb2->pixbuf = gdk_pixbuf_copy(pxb1->pixbuf);
107	@@ -4876,9 +4835,6 @@
108	PXB * PXB_rescale(PXB *pxb1, int ww2, int hh2)
109	{
110	GdkPixbuf *pixbuf2 = 0;
111	- int req_mb = ww2 * hh2 * 3 / mega; // warn if memory low
112	- warn_memory(req_mb);
113	-
114	if (strEqu(interpolation,"tiles")) // v.13.05
115	pixbuf2 = gdk_pixbuf_scale_simple(pxb1->pixbuf,ww2,hh2,GDK_INTERP_TILES);
116	else if (strEqu(interpolation,"hyperbolic"))

Line 0 Link Here

(-)graphics/fotoxx/files/patch-fotoxx-15.05.cc (+51 lines)
	1	--- fotoxx-15.05.cc.orig 2015-05-01 09:40:38 UTC
	2	+++ fotoxx-15.05.cc
	3	@@ -139,6 +139,8 @@
	4
	5	#define EX // disable extern declarations
	6	#include "fotoxx.h" // (variables in fotoxx.h are defined)
	7	+#include <sys/types.h>
	8	+#include <sys/sysctl.h>
	9
	10	/**************************************************************************/
	11
	12	@@ -335,7 +337,9 @@ int initzfunc(void *)
	13	char procfile[20], buff[200];
	14	char KBshortsU[200], KBshortsI[200];
	15	char tonefile[200], badnews[200];
	16	+#ifdef __linux__
	17	double freememory, cachememory;
	18	+#endif
	19	float exifver = 0;
	20	FILE *fid;
	21	STATB statb;
	22	@@ -445,6 +449,7 @@ int initzfunc(void *)
	23
	24	// check free memory and suggest image size limits
	25
	26	+#ifdef __linux__
	27	parseprocfile("/proc/meminfo","MemFree:",&freememory,0); // get amount of free memory
	28	parseprocfile("/proc/meminfo","Cached:",&cachememory,0);
	29	freememory = (freememory + cachememory) / 1024; // megabytes
	30	@@ -452,6 +457,7 @@ int initzfunc(void *)
	31	printz("image size limits for good performance: \n");
	32	printz(" view: %.0f megapixels \n",(freememory-100)/6); // F + preview, 3 bytes/pixel each
	33	printz(" edit: %.0f megapixels \n",(freememory-100)/54); // + E0/E1/E3/ER, 12 bytes/pixel each
	34	+#endif
	35
	36	// update KB shortcuts if needed
	37
	38	@@ -531,7 +537,13 @@ int initzfunc(void *)
	39	screenhh = gdk_screen_get_height(screen);
	40	printz("screen width: %d height: %d \n",screenww,screenhh);
	41
	42	+#ifdef __linux__
	43	NWT = get_nprocs(); // get SMP CPU count
	44	+#endif
	45	+#ifdef __FreeBSD__
	46	+ size_t len = sizeof(NWT);
	47	+ sysctlbyname("hw.ncpu",&NWT,&len,NULL,0);
	48	+#endif
	49	if (NWT <= 0) NWT = 2;
	50	if (NWT > max_threads) NWT = max_threads; // compile time limit
	51	printz("using %d threads \n",NWT);

Lines 1-13 Link Here

(-)graphics/fotoxx/files/patch-fotoxx.h (-13 lines)
1	--- ./fotoxx.h.orig 2014-02-05 20:42:34.000000000 +0100
2	+++ ./fotoxx.h 2014-02-06 10:32:37.000000000 +0100
3	@@ -339,8 +339,8 @@
4	EX int dww, dhh; // Dpxb size in drawing window, <= Dww, Dhh
5	EX int zoomx, zoomy; // req. zoom center of window
6
7	-EX mutex Fpixmap_lock; // lock for accessing PXM pixmaps
8	-EX mutex preload_lock; // lock for image file preload function
9	+EX mutex_tp Fpixmap_lock; // lock for accessing PXM pixmaps
10	+EX mutex_tp preload_lock; // lock for image file preload function
11
12	EX int Mbutton; // mouse button, 1/3 = left/right
13	EX int Mwxposn, Mwyposn; // mouse position, window space

Lines 1-20 Link Here

(-)graphics/fotoxx/files/patch-zfuncs.cc (-17 / +15 lines)
1	--- ./zfuncs.cc.orig 2014-02-05 20:42:34.000000000 +0100	1	--- zfuncs.cc.orig 2015-05-01 09:40:38 UTC
2	+++ ./zfuncs.cc 2014-02-06 10:32:37.000000000 +0100	2	+++ zfuncs.cc
3	@@ -854,7 +854,7 @@	3	@@ -262,6 +262,7 @@ char zstrdup(cchar string, int addcc)
4	// A mutex lock is used to insure one thread at a time has access to the parameter.
5	// Many parameters can be used but there is only one mutex lock.
6		4
7	-mutex zget_lock = PTHREAD_MUTEX_INITIALIZER;	5	void zmalloc_report()
8	+mutex_tp zget_lock = PTHREAD_MUTEX_INITIALIZER;
9
10	int zget_locked(int &param) // lock and return parameter
11	{	6	{
12	@@ -1276,7 +1276,7 @@	7	+#ifdef __linux__
13	namespace shell_asynch_names {	8	using namespace zfuncs;
14	char *command[10];	9
15	int status[10];	10	static double ptime = 0;
16	- mutex mlock = PTHREAD_MUTEX_INITIALIZER;	11	@@ -282,6 +283,7 @@ void zmalloc_report()
17	+ mutex_tp mlock = PTHREAD_MUTEX_INITIALIZER;
18	}
19		12
20	int shell_asynch(cchar *Fcommand, ...) // v.5.5	13	ptime = jobtime(); // reset some counters
		14	Nmalloc = Nstrdup = Nfree = 0;
		15	+#endif
		16
		17	return;
		18	}

Lines 1-15 Link Here

(-)graphics/fotoxx/files/patch-zfuncs.h (-25 / +11 lines)
1	--- ./zfuncs.h.orig 2014-02-05 20:42:34.000000000 +0100	1	--- zfuncs.h.orig 2015-05-01 09:40:38 UTC
2	+++ ./zfuncs.h 2014-02-06 10:32:37.000000000 +0100	2	+++ zfuncs.h
3	@@ -22,7 +22,7 @@	3	@@ -22,17 +22,18 @@
4		4
5	// zfuncs.h version v.5.8	5	// zfuncs.h version v.6.1
6		6
7	-#include <sys/sysinfo.h>	7	-#include <sys/sysinfo.h>
8	+//#include <sys/sysinfo.h>	8	+//#include <sys/sysinfo.h>
9	#include <sys/time.h>	9	#include <sys/time.h>
10	#include <sys/stat.h>	10	#include <sys/stat.h>
11	#include <sys/resource.h>	11	#include <sys/resource.h>
12	@@ -33,6 +33,7 @@	12	#include <sys/file.h>
		13	#include <sys/utsname.h>
		14	-#include <malloc.h>
		15	+//#include <malloc.h>
		16	#include <errno.h>
13	#include <unistd.h>	17	#include <unistd.h>
14	#include <stdlib.h>	18	#include <stdlib.h>
15	#include <stdio.h>	19	#include <stdio.h>
Lines 17-37 Link Here
17	#include <string.h>	21	#include <string.h>
18	#include <ctype.h>	22	#include <ctype.h>
19	#include <math.h>	23	#include <math.h>
20	@@ -60,7 +61,7 @@
21
22	#define wstrerror(err) strerror(WEXITSTATUS(err)) // get text status for child process
23
24	-#define mutex pthread_mutex_t // abbreviations
25	+#define mutex_tp pthread_mutex_t // abbreviations
26	#define mutex_init pthread_mutex_init
27	#define mutex_lock pthread_mutex_lock
28	#define mutex_trylock pthread_mutex_trylock
29	@@ -625,7 +626,7 @@
30	{
31	char wmi[8];
32	Vxstring * vd; // vector of xstrings
33	- mutex qmutex; // for multi-thread access
34	+ mutex_tp qmutex; // for multi-thread access
35	int qcap; // queue capacity
36	int qcount; // curr. queue count
37	int ent1; // first entry pointer

Lines 1-201 Link Here

(-)graphics/fotoxx/pkg-plist (-201 lines)
1	bin/fotoxx
2	share/applications/fotoxx.desktop
3	%%PORTDOCS%%%%DOCSDIR%%/README-ca
4	%%PORTDOCS%%%%DOCSDIR%%/README-en
5	%%PORTDOCS%%%%DOCSDIR%%/README-es
6	%%PORTDOCS%%%%DOCSDIR%%/changelog.gz
7	%%PORTDOCS%%%%DOCSDIR%%/copyright
8	%%PORTDOCS%%%%DOCSDIR%%/fotoxx-release
9	%%PORTDOCS%%%%DOCSDIR%%/fotoxx.man
10	%%PORTDOCS%%%%DOCSDIR%%/freecode
11	%%PORTDOCS%%%%DOCSDIR%%/translations-ca
12	%%PORTDOCS%%%%DOCSDIR%%/translations-en
13	%%PORTDOCS%%%%DOCSDIR%%/translations-es
14	%%DATADIR%%/data/KB-shortcuts-ca
15	%%DATADIR%%/data/KB-shortcuts-en
16	%%DATADIR%%/data/KB-shortcuts-es
17	%%DATADIR%%/data/edit-menus-ca
18	%%DATADIR%%/data/edit-menus-en
19	%%DATADIR%%/data/edit-menus-es
20	%%DATADIR%%/data/favorites/menu-config
21	%%DATADIR%%/data/favorites/menu-config-pixbuf-009.png
22	%%DATADIR%%/data/images/F-toolbar.jpg
23	%%DATADIR%%/data/images/G-toolbar.jpg
24	%%DATADIR%%/data/images/HDF-paint.jpg
25	%%DATADIR%%/data/images/HDR-adjust.jpg
26	%%DATADIR%%/data/images/KB-shortcuts.jpg
27	%%DATADIR%%/data/images/add-geotags.jpg
28	%%DATADIR%%/data/images/add-text.jpg
29	%%DATADIR%%/data/images/add-text2.jpg
30	%%DATADIR%%/data/images/anti-alias.jpg
31	%%DATADIR%%/data/images/auto-trim.jpg
32	%%DATADIR%%/data/images/batch-add-geotags.jpg
33	%%DATADIR%%/data/images/batch-convert.jpg
34	%%DATADIR%%/data/images/batch-raw-conv.jpg
35	%%DATADIR%%/data/images/brightness-distribution.jpg
36	%%DATADIR%%/data/images/brightness-ramp.jpg
37	%%DATADIR%%/data/images/brightness steps.jpg
38	%%DATADIR%%/data/images/chromatic.jpg
39	%%DATADIR%%/data/images/cmyk.jpg
40	%%DATADIR%%/data/images/collections.jpg
41	%%DATADIR%%/data/images/colorchart.png
42	%%DATADIR%%/data/images/denoise.jpg
43	%%DATADIR%%/data/images/dots.jpg
44	%%DATADIR%%/data/images/drawing.jpg
45	%%DATADIR%%/data/images/edit-metadata.jpg
46	%%DATADIR%%/data/images/edit-translation.jpg
47	%%DATADIR%%/data/images/favorites.jpg
48	%%DATADIR%%/data/images/file-save.jpg
49	%%DATADIR%%/data/images/flatbook.jpg
50	%%DATADIR%%/data/images/fotoxx.jpg
51	%%DATADIR%%/data/images/gallery-select.jpg
52	%%DATADIR%%/data/images/gammachart.png
53	%%DATADIR%%/data/images/geotag-groups.jpg
54	%%DATADIR%%/data/images/grad_blur.jpg
55	%%DATADIR%%/data/images/grid-lines.jpg
56	%%DATADIR%%/data/images/index.jpg
57	%%DATADIR%%/data/images/jpeg quality.jpg
58	%%DATADIR%%/data/images/keystone.jpg
59	%%DATADIR%%/data/images/leverage-edits.jpg
60	%%DATADIR%%/data/images/mashup.jpg
61	%%DATADIR%%/data/images/mashup2.jpg
62	%%DATADIR%%/data/images/match-colors.jpg
63	%%DATADIR%%/data/images/move-collections.jpg
64	%%DATADIR%%/data/images/paint-clone.jpg
65	%%DATADIR%%/data/images/paint-edits.jpg
66	%%DATADIR%%/data/images/pano-color.jpg
67	%%DATADIR%%/data/images/pano-pre-align.jpg
68	%%DATADIR%%/data/images/plugins.jpg
69	%%DATADIR%%/data/images/print.jpg
70	%%DATADIR%%/data/images/remove-dust.jpg
71	%%DATADIR%%/data/images/rename.jpg
72	%%DATADIR%%/data/images/resize.jpg
73	%%DATADIR%%/data/images/retouch-combo.jpg
74	%%DATADIR%%/data/images/retouch-combo2.jpg
75	%%DATADIR%%/data/images/revise-RGB.jpg
76	%%DATADIR%%/data/images/search-images-metadata.jpg
77	%%DATADIR%%/data/images/search-images.jpg
78	%%DATADIR%%/data/images/select-area.jpg
79	%%DATADIR%%/data/images/sharpen.jpg
80	%%DATADIR%%/data/images/sharpen4.jpg
81	%%DATADIR%%/data/images/shift-colors.jpg
82	%%DATADIR%%/data/images/show-RGB.jpg
83	%%DATADIR%%/data/images/sketch.jpg
84	%%DATADIR%%/data/images/slide-show.jpg
85	%%DATADIR%%/data/images/smart-erase.jpg
86	%%DATADIR%%/data/images/stack-noise.jpg
87	%%DATADIR%%/data/images/stack-paint.jpg
88	%%DATADIR%%/data/images/stuck-pixels.jpg
89	@comment %%DATADIR%%/data/images/synchronize.jpg
90	%%DATADIR%%/data/images/tabsF&G.png
91	%%DATADIR%%/data/images/texture.jpg
92	%%DATADIR%%/data/images/tone-mapping.jpg
93	%%DATADIR%%/data/images/trim-rotate.jpg
94	%%DATADIR%%/data/images/unbend.jpg
95	%%DATADIR%%/data/images/user-settings.jpg
96	%%DATADIR%%/data/images/vignette.jpg
97	%%DATADIR%%/data/images/warps.jpg
98	%%DATADIR%%/data/quickstart-ca.html
99	%%DATADIR%%/data/quickstart-de.html
100	%%DATADIR%%/data/quickstart-en.html
101	%%DATADIR%%/data/quickstart-es.html
102	%%DATADIR%%/data/quickstart-fr.html
103	%%DATADIR%%/data/quickstart-it.html
104	%%DATADIR%%/data/quickstart-pt.html
105	%%DATADIR%%/data/slideshow-tone.oga
106	%%DATADIR%%/data/tags_defined
107	%%DATADIR%%/data/userguide-en.html
108	%%DATADIR%%/data/userguide-es.html
109	%%DATADIR%%/data/userguide-it.html
110	%%DATADIR%%/icons/F-tab.png
111	%%DATADIR%%/icons/G-tab.png
112	%%DATADIR%%/icons/W-tab.png
113	%%DATADIR%%/icons/bottom.png
114	%%DATADIR%%/icons/broken.png
115	%%DATADIR%%/icons/cancel.png
116	%%DATADIR%%/icons/down+.png
117	%%DATADIR%%/icons/down.png
118	%%DATADIR%%/icons/edit-funcs/CMYK.png
119	%%DATADIR%%/icons/edit-funcs/HDF.png
120	%%DATADIR%%/icons/edit-funcs/HDR.png
121	%%DATADIR%%/icons/edit-funcs/RGB.png
122	%%DATADIR%%/icons/edit-funcs/blur.png
123	%%DATADIR%%/icons/edit-funcs/bright distrib.png
124	%%DATADIR%%/icons/edit-funcs/brigth color sat.png
125	%%DATADIR%%/icons/edit-funcs/brigth ramp.png
126	%%DATADIR%%/icons/edit-funcs/color depth.png
127	%%DATADIR%%/icons/edit-funcs/crop rotate.png
128	%%DATADIR%%/icons/edit-funcs/dots.png
129	%%DATADIR%%/icons/edit-funcs/drawing01.png
130	%%DATADIR%%/icons/edit-funcs/embossing.png
131	%%DATADIR%%/icons/edit-funcs/expand bright.png
132	%%DATADIR%%/icons/edit-funcs/fix fringes.png
133	%%DATADIR%%/icons/edit-funcs/fix stuck pixels.png
134	%%DATADIR%%/icons/edit-funcs/flatten bright.png
135	%%DATADIR%%/icons/edit-funcs/flip.png
136	%%DATADIR%%/icons/edit-funcs/gamma.png
137	%%DATADIR%%/icons/edit-funcs/invert.png
138	%%DATADIR%%/icons/edit-funcs/keystone.png
139	%%DATADIR%%/icons/edit-funcs/landscape.png
140	%%DATADIR%%/icons/edit-funcs/leverage edit.png
141	%%DATADIR%%/icons/edit-funcs/outlines.png
142	%%DATADIR%%/icons/edit-funcs/paint edits.png
143	%%DATADIR%%/icons/edit-funcs/paint pixels.png
144	%%DATADIR%%/icons/edit-funcs/painting.png
145	%%DATADIR%%/icons/edit-funcs/panorama.png
146	%%DATADIR%%/icons/edit-funcs/pencil.png
147	%%DATADIR%%/icons/edit-funcs/red eyes.png
148	%%DATADIR%%/icons/edit-funcs/reduce noise.png
149	%%DATADIR%%/icons/edit-funcs/remove dust.png
150	%%DATADIR%%/icons/edit-funcs/resize.png
151	%%DATADIR%%/icons/edit-funcs/sharpen.png
152	%%DATADIR%%/icons/edit-funcs/shiftcolors.png
153	%%DATADIR%%/icons/edit-funcs/smarterase.png
154	%%DATADIR%%/icons/edit-funcs/stacknoise.png
155	%%DATADIR%%/icons/edit-funcs/stackpaint.png
156	%%DATADIR%%/icons/edit-funcs/text.png
157	%%DATADIR%%/icons/edit-funcs/tiles.png
158	%%DATADIR%%/icons/edit-funcs/tonemapping.png
159	%%DATADIR%%/icons/edit-funcs/unbend.png
160	%%DATADIR%%/icons/edit-funcs/vert panorama.png
161	%%DATADIR%%/icons/edit-funcs/voodoo.png
162	%%DATADIR%%/icons/edit-funcs/warp affine.png
163	%%DATADIR%%/icons/edit-funcs/warp area.png
164	%%DATADIR%%/icons/edit-funcs/warp curved.png
165	%%DATADIR%%/icons/edit-funcs/warp linear.png
166	%%DATADIR%%/icons/edit-funcs/whitebalance.png
167	%%DATADIR%%/icons/favorites.png
168	%%DATADIR%%/icons/fg-color.png
169	%%DATADIR%%/icons/folder.png
170	%%DATADIR%%/icons/fotoxx.png
171	%%DATADIR%%/icons/goto.png
172	%%DATADIR%%/icons/help.png
173	%%DATADIR%%/icons/next.png
174	%%DATADIR%%/icons/open.png
175	%%DATADIR%%/icons/prev.png
176	%%DATADIR%%/icons/quit.png
177	%%DATADIR%%/icons/redo.png
178	%%DATADIR%%/icons/rotate-left.png
179	%%DATADIR%%/icons/rotate-right.png
180	%%DATADIR%%/icons/save.png
181	%%DATADIR%%/icons/sort.png
182	%%DATADIR%%/icons/sync.G.png
183	%%DATADIR%%/icons/top.png
184	%%DATADIR%%/icons/trash.png
185	%%DATADIR%%/icons/undo.png
186	%%DATADIR%%/icons/up+.png
187	%%DATADIR%%/icons/up.png
188	%%DATADIR%%/icons/warning.png
189	%%DATADIR%%/icons/zoom+.png
190	%%DATADIR%%/icons/zoom-.png
191	%%DATADIR%%/locales/translate-ca.po
192	%%DATADIR%%/locales/translate-de.po
193	%%DATADIR%%/locales/translate-en.po
194	%%DATADIR%%/locales/translate-es.po
195	%%DATADIR%%/locales/translate-fr.po
196	%%DATADIR%%/locales/translate-it.po
197	%%DATADIR%%/locales/translate-nl.po
198	%%DATADIR%%/locales/translate-pt.po
199	%%DATADIR%%/locales/translate-ru.po
200	%%DATADIR%%/locales/translate-sv.po
201	man/man1/fotoxx.1.gz