From owner-svn-ports-all@freebsd.org Tue Dec 22 04:07:17 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0E25A4C73E; Tue, 22 Dec 2015 04:07:16 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B62391E9E; Tue, 22 Dec 2015 04:07:16 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBM47FGk029566; Tue, 22 Dec 2015 04:07:15 GMT (envelope-from miwi@FreeBSD.org) Received: (from miwi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBM47FVF029556; Tue, 22 Dec 2015 04:07:15 GMT (envelope-from miwi@FreeBSD.org) Message-Id: <201512220407.tBM47FVF029556@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: miwi set sender to miwi@FreeBSD.org using -f From: Martin Wilke Date: Tue, 22 Dec 2015 04:07:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404205 - in head/graphics/fotoxx: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2015 04:07:17 -0000 Author: miwi Date: Tue Dec 22 04:07:14 2015 New Revision: 404205 URL: https://svnweb.freebsd.org/changeset/ports/404205 Log: - Update to 15.05 PR: 201844 Submitted by: Ports Fury Approved by: mat (mentor) Differential Revision: D4620 Added: head/graphics/fotoxx/files/patch-f.combine.cc (contents, props changed) head/graphics/fotoxx/files/patch-f.metadata.cc (contents, props changed) head/graphics/fotoxx/files/patch-fotoxx-15.05.cc (contents, props changed) Deleted: head/graphics/fotoxx/files/patch-Makefile head/graphics/fotoxx/files/patch-f.meta.cc head/graphics/fotoxx/files/patch-fotoxx-14.02.2.cc head/graphics/fotoxx/files/patch-fotoxx.h head/graphics/fotoxx/pkg-plist Modified: head/graphics/fotoxx/Makefile head/graphics/fotoxx/distinfo head/graphics/fotoxx/files/patch-f.file.cc head/graphics/fotoxx/files/patch-f.repair.cc head/graphics/fotoxx/files/patch-zfuncs.cc head/graphics/fotoxx/files/patch-zfuncs.h Modified: head/graphics/fotoxx/Makefile ============================================================================== --- head/graphics/fotoxx/Makefile Tue Dec 22 03:22:46 2015 (r404204) +++ head/graphics/fotoxx/Makefile Tue Dec 22 04:07:14 2015 (r404205) @@ -2,10 +2,11 @@ # $FreeBSD$ PORTNAME= fotoxx -PORTVERSION= 14.02.2 +PORTVERSION= 15.05 CATEGORIES= graphics -MASTER_SITES= http://www.kornelix.com/uploads/1/3/0/3/13035936/ \ - LOCAL/mandree +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 @@ -13,49 +14,35 @@ COMMENT= Application to organize and edi LICENSE= GPLv3 RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \ - ufraw-batch:${PORTSDIR}/graphics/ufraw \ + dcraw:${PORTSDIR}/graphics/dcraw \ exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool \ - dcraw:${PORTSDIR}/graphics/dcraw + ufraw-batch:${PORTSDIR}/graphics/ufraw -USES= execinfo gmake desktop-file-utils pkgconfig -USE_GNOME= gtk30 +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +USES= desktop-file-utils execinfo gmake pkgconfig +USE_GNOME= gtk30 ALL_TARGET= fotoxx -INSTALL_TARGET= install MANDIR=${PREFIX}/man/man1/ -LDFLAGS+= -O3 -g -Wall -rdynamic -lexecinfo +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: - @# drop xdg-desktop-menu calls, they fail - ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ - -e '/xdg-desktop-menu/d' \ - -e '/rm -f -R/d' \ - ${WRKSRC}/Makefile - @# replace obsolete include files - ${REINPLACE_CMD} -e 's|||' \ - ${WRKSRC}/zfuncs.h - @# fix up icon path in XDG .desktop file - ${REINPLACE_CMD} -e 's}/usr/share/fotoxx}${DATADIR}}' \ - ${WRKSRC}/desktop + @${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 post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx - -.include - -# 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 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx -.include +.include Modified: head/graphics/fotoxx/distinfo ============================================================================== --- head/graphics/fotoxx/distinfo Tue Dec 22 03:22:46 2015 (r404204) +++ head/graphics/fotoxx/distinfo Tue Dec 22 04:07:14 2015 (r404205) @@ -1,2 +1,2 @@ -SHA256 (fotoxx-14.02.2.tar.gz) = 60b6d9e8a5f19bc92b53d585cb36795d951c7a6d2d0bd1bd30ae3ca0465ed767 -SIZE (fotoxx-14.02.2.tar.gz) = 2715089 +SHA256 (fotoxx-15.05.tar.gz) = 65567adc86087a3a8acdebcb0f15ec299cf690a869129825e3d32da7e50c4604 +SIZE (fotoxx-15.05.tar.gz) = 3573278 Added: head/graphics/fotoxx/files/patch-f.combine.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/fotoxx/files/patch-f.combine.cc Tue Dec 22 04:07:14 2015 (r404205) @@ -0,0 +1,11 @@ +--- f.combine.cc.orig 2015-05-01 09:40:38 UTC ++++ f.combine.cc +@@ -6475,7 +6475,7 @@ void m_pano_PT(GtkWidget *, cchar *) + goto cleanup; + } + +- olddir = get_current_dir_name(); // save curr. directory ++ olddir = getcwd(NULL,PATH_MAX); // save curr. directory + + err = chdir(tempdir); // use /tmp/fotoxx-xxxxx + if (err) { Modified: head/graphics/fotoxx/files/patch-f.file.cc ============================================================================== --- head/graphics/fotoxx/files/patch-f.file.cc Tue Dec 22 03:22:46 2015 (r404204) +++ head/graphics/fotoxx/files/patch-f.file.cc Tue Dec 22 04:07:14 2015 (r404205) @@ -1,10 +1,10 @@ ---- ./f.file.cc.orig 2014-02-05 20:42:34.000000000 +0100 -+++ ./f.file.cc 2014-02-06 10:32:37.000000000 +0100 -@@ -23,6 +23,7 @@ +--- f.file.cc.orig 2015-05-01 09:40:38 UTC ++++ f.file.cc +@@ -74,6 +74,7 @@ #define EX extern // disable extern declarations - #include "fotoxx.h" + #include "fotoxx.h" // (variables in fotoxx.h are refs) +#include - /************************************************************************** - Fotoxx image edit - file menu functions + /**************************************************************************/ + Added: head/graphics/fotoxx/files/patch-f.metadata.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/fotoxx/files/patch-f.metadata.cc Tue Dec 22 04:07:14 2015 (r404205) @@ -0,0 +1,50 @@ +--- 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 ++ ++#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) Modified: head/graphics/fotoxx/files/patch-f.repair.cc ============================================================================== --- head/graphics/fotoxx/files/patch-f.repair.cc Tue Dec 22 03:22:46 2015 (r404204) +++ head/graphics/fotoxx/files/patch-f.repair.cc Tue Dec 22 04:07:14 2015 (r404205) @@ -1,11 +1,11 @@ ---- f.repair.cc.orig 2014-08-15 14:19:11.000000000 -0400 -+++ f.repair.cc 2014-08-15 14:20:01.000000000 -0400 -@@ -1571,7 +1571,7 @@ +--- f.repair.cc.orig 2015-05-01 09:40:38 UTC ++++ f.repair.cc +@@ -2055,7 +2055,7 @@ void m_smart_erase(GtkWidget *, const ch int smart_erase_dialog_event(zdialog *zd, const char *event) // overhauled { void smart_erase_func(int mode); - void smart_erase_blur(float radius); + int smart_erase_blur(float radius); - + float radius; int cc; Added: head/graphics/fotoxx/files/patch-fotoxx-15.05.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/fotoxx/files/patch-fotoxx-15.05.cc Tue Dec 22 04:07:14 2015 (r404205) @@ -0,0 +1,51 @@ +--- 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 ++#include + + /**************************************************************************/ + +@@ -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); Modified: head/graphics/fotoxx/files/patch-zfuncs.cc ============================================================================== --- head/graphics/fotoxx/files/patch-zfuncs.cc Tue Dec 22 03:22:46 2015 (r404204) +++ head/graphics/fotoxx/files/patch-zfuncs.cc Tue Dec 22 04:07:14 2015 (r404205) @@ -1,20 +1,18 @@ ---- ./zfuncs.cc.orig 2014-02-05 20:42:34.000000000 +0100 -+++ ./zfuncs.cc 2014-02-06 10:32:37.000000000 +0100 -@@ -854,7 +854,7 @@ - // 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. +--- zfuncs.cc.orig 2015-05-01 09:40:38 UTC ++++ zfuncs.cc +@@ -262,6 +262,7 @@ char *zstrdup(cchar *string, int addcc) --mutex zget_lock = PTHREAD_MUTEX_INITIALIZER; -+mutex_tp zget_lock = PTHREAD_MUTEX_INITIALIZER; - - int zget_locked(int ¶m) // lock and return parameter + void zmalloc_report() { -@@ -1276,7 +1276,7 @@ - namespace shell_asynch_names { - char *command[10]; - int status[10]; -- mutex mlock = PTHREAD_MUTEX_INITIALIZER; -+ mutex_tp mlock = PTHREAD_MUTEX_INITIALIZER; - } ++#ifdef __linux__ + using namespace zfuncs; + + static double ptime = 0; +@@ -282,6 +283,7 @@ void zmalloc_report() - int shell_asynch(cchar *Fcommand, ...) // v.5.5 + ptime = jobtime(); // reset some counters + Nmalloc = Nstrdup = Nfree = 0; ++#endif + + return; + } Modified: head/graphics/fotoxx/files/patch-zfuncs.h ============================================================================== --- head/graphics/fotoxx/files/patch-zfuncs.h Tue Dec 22 03:22:46 2015 (r404204) +++ head/graphics/fotoxx/files/patch-zfuncs.h Tue Dec 22 04:07:14 2015 (r404205) @@ -1,15 +1,19 @@ ---- ./zfuncs.h.orig 2014-02-05 20:42:34.000000000 +0100 -+++ ./zfuncs.h 2014-02-06 10:32:37.000000000 +0100 -@@ -22,7 +22,7 @@ +--- zfuncs.h.orig 2015-05-01 09:40:38 UTC ++++ zfuncs.h +@@ -22,17 +22,18 @@ - // zfuncs.h version v.5.8 + // zfuncs.h version v.6.1 --#include -+//#include +-#include ++//#include #include #include #include -@@ -33,6 +33,7 @@ + #include + #include +-#include ++//#include + #include #include #include #include @@ -17,21 +21,3 @@ #include #include #include -@@ -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