Re: icedtea-web broken after removal of libxul
Thanks, Tobik. You patch in the PR is working fine. ___ freebsd-ports@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: icedtea-web broken after removal of libxul
Also: x11-toolkits/swt, x11-toolkits/swt-devel, audio/tuxguitar and science/gchemutils have still options for plugin/libxul. Except science/gchemutils these ports have no maintainer. (Btw, audio/tuxguitar is broken since long time). ___ freebsd-ports@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: icedtea-web broken after removal of libxul
I have to correct audio/tuxguitar is not broken (I don't at least the last four times I tried to install it failed, this time it succeeds. Remove the references to browser-ftp and libxul). ___ freebsd-ports@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
make[1]: cannot open Makefile for new custom port
Hi all, I'm attempting to make my first port which is attempting to literally unpack a tgz into the correct location. I'm wanting a port, as I want this to be versioned and upgradable on all my systems via pkg (as well as to handle dependencies, etc). I'm attempting to use make makeplist to create the initial pkg-plist as there are a lot of files present, and I'm getting the following error: # make makeplist ===> License BSD4CLAUSE accepted by the user ===> nebula-db-0.1 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by nebula-db-0.1 for building ===> Extracting for nebula-db-0.1 => SHA256 Checksum OK for nebula-db-0.1.tar.gz. ===> Patching for nebula-db-0.1 ===> Configuring for nebula-db-0.1 ===> Staging for nebula-db-0.1 ===> Generating temporary packing list make[1]: cannot open Makefile. make[1]: stopped in /usr/local/poudriere/ports/nebula/misc/nebula-db/work/nebula-db-0.1 *** Error code 2 Stop. make: stopped in /usr/local/poudriere/ports/nebula/misc/nebula-db I get this when I do "make stage" as well. I tried tracing what's going on in bsd.port.mk, but I have to admit that I got pretty lost. my Makefile is (using "set list" in vi in case non-printable characters matter): # $FreeBSD$$ $ PORTNAME=^Inebula-db$ DISTVERSION=^I0.1$ CATEGORIES=^Imisc$ MASTER_SITES=^Ifile:///root/jail_ports/files/$ $ MAINTAINER=^i...@hilltopgroup.com$ COMMENT=^IJail containing postgres for the nebula system$ $ LICENSE=^IBSD4CLAUSE$ $ NO_BUILD=^Iyes$ ONLY_FOR_ARCHS=^Iamd64$ ONLY_FOR_ARCHS_REASON=^Ipre-built jail on amd64$ $ NO_WRKSUBDIR=^Iyes$ $ .include $ And at that.. I'm stuck. If it would help, I can post the actual distfile on a server and provide the link, but it's a tar.gz file containing a /usr/local/jail/db directory which is just a populated jail. Thanks in advance for any help you can provide, Joseph ___ freebsd-ports@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: make[1]: cannot open Makefile for new custom port
On 2018-06-23 11:36, Joseph Ward wrote: Hi all, I'm attempting to make my first port which is attempting to literally unpack a tgz into the correct location. I'm wanting a port, as I want this to be versioned and upgradable on all my systems via pkg (as well as to handle dependencies, etc). I'm attempting to use make makeplist to create the initial pkg-plist as there are a lot of files present, and I'm getting the following error: # make makeplist ===> License BSD4CLAUSE accepted by the user ===> nebula-db-0.1 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by nebula-db-0.1 for building ===> Extracting for nebula-db-0.1 => SHA256 Checksum OK for nebula-db-0.1.tar.gz. ===> Patching for nebula-db-0.1 ===> Configuring for nebula-db-0.1 ===> Staging for nebula-db-0.1 ===> Generating temporary packing list make[1]: cannot open Makefile. make[1]: stopped in /usr/local/poudriere/ports/nebula/misc/nebula-db/work/nebula-db-0.1 *** Error code 2 Stop. make: stopped in /usr/local/poudriere/ports/nebula/misc/nebula-db I get this when I do "make stage" as well. I tried tracing what's going on in bsd.port.mk, but I have to admit that I got pretty lost. my Makefile is (using "set list" in vi in case non-printable characters matter): # $FreeBSD$$ $ PORTNAME=^Inebula-db$ DISTVERSION=^I0.1$ CATEGORIES=^Imisc$ MASTER_SITES=^Ifile:///root/jail_ports/files/$ $ MAINTAINER=^i...@hilltopgroup.com$ COMMENT=^IJail containing postgres for the nebula system$ $ LICENSE=^IBSD4CLAUSE$ $ NO_BUILD=^Iyes$ ONLY_FOR_ARCHS=^Iamd64$ ONLY_FOR_ARCHS_REASON=^Ipre-built jail on amd64$ $ NO_WRKSUBDIR=^Iyes$ $ .include $ And at that.. I'm stuck. If it would help, I can post the actual distfile on a server and provide the link, but it's a tar.gz file containing a /usr/local/jail/db directory which is just a populated jail. Thanks in advance for any help you can provide, Joseph I haven't tried such a port, but maybe you can make a dummy Makefile. (?) an idea. You would make your port, switch over to the work directory within the port, and create an empty Makefile.orig then create a Makefile that is basically like all: donothing donothing: @echo 'I am here now basically doing nothing' then create the patchfile, i think it's make makepatch. back in the top level of your port path. This will cause it to create the bogus Makefile out of nothing. Also, there are probably a few ports in the tree that only install files, does not run make, if you can track those down it would show a working example. --- Waitman Gobble ___ freebsd-ports@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
graphics/ufraw fails to compile on 11-stable
Hello, graphics/ufraw fails to compile. context: freebsd-11-stable r333924, fresh ports tree as of today (r473125). *No* ports installed. pkg delete -af was run beforehand. root@testvm:/usr/ports/graphics/ufraw # make -DBATCH install [...] cc -DHAVE_CONFIG_H -I. -I/usr/local/include -I/usr/local/include -I/usr/local/include/gtk-2.0 -I/usr/local/include/pango-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/cairo -I/usr/local/include/pixman-1 -I/usr/local/include/freetype2 -I/usr/local/include/libdrm -I/usr/local/include/libpng16 -I/usr/local/include/harfbuzz -I/usr/local/include/gdk-pixbuf-2.0 -I/usr/local/include/atk-1.0 -D_THREAD_SAFE -pthread -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include -pthread -I/usr/local/include -I/usr/local/include -I/usr/local/include/lensfun -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include -I/usr/local/include/libpng16 -DDCRAW_NOMAIN -DUFRAW_LOCALEDIR=\"/usr/local/share/locale\" -I/usr/local/include -O2 -pipe -march=haswell -fstack-protector -fno-strict-aliasing -MT dcraw_indi.o -MD -MP -MF .deps/dcraw_indi.Tpo -c -o dcraw_indi.o dcraw_indi.c dcraw.cc:8952:30: warning: use of logical '&&' with constant operand [-Wconstant-logical-operand] is_raw += (i = get4()) && 1; ^ ~ dcraw.cc:8952:30: note: use '&' for a bitwise operation is_raw += (i = get4()) && 1; ^~ & dcraw.cc:8952:30: note: remove constant to silence this warning is_raw += (i = get4()) && 1; ~^~~~ dcraw.cc:10198:30: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] strcpy (th->soft, "dcraw v"DCRAW_VERSION); ^ dcraw.cc:10723:44: warning: adding 'unsigned int' to a string does not append to the string [-Wstring-plus-int] write_ext = ".pgm\0.ppm\0.ppm\0.pam" + colors*5-5; ~^~ dcraw.cc:10723:44: note: use array indexing to silence this warning write_ext = ".pgm\0.ppm\0.ppm\0.pam" + colors*5-5; ^ &[ ] 16 warnings and 1 error generated. gmake[4]: *** [Makefile:919: dcraw.o] Error 1 gmake[4]: *** Waiting for unfinished jobs mv -f .deps/ufraw_settings.Tpo .deps/ufraw_settings.Po mv -f .deps/dcraw_api.Tpo .deps/dcraw_api.Po mv -f .deps/ufraw_lensfun.Tpo .deps/ufraw_lensfun.Po mv -f .deps/ufobject.Tpo .deps/ufobject.Po mv -f .deps/dcraw_indi.Tpo .deps/dcraw_indi.Po gmake[4]: Leaving directory '/usr/ports/graphics/ufraw/work/ufraw-6d3259a' gmake[3]: *** [Makefile:1059: all-recursive] Error 1 gmake[3]: Leaving directory '/usr/ports/graphics/ufraw/work/ufraw-6d3259a' gmake[2]: *** [Makefile:609: all] Error 2 gmake[2]: Leaving directory '/usr/ports/graphics/ufraw/work/ufraw-6d3259a' ===> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE=yes and rebuild before reporting the failure to the maintainer. *** Error code 1 Stop. make[1]: stopped in /usr/ports/graphics/ufraw *** Error code 1 Stop. make: stopped in /usr/ports/graphics/ufraw ~ root@testvm:/usr/ports/graphics/ufraw# make MAKE_JOBS_UNSAFE=yes [...] dcraw.cc:1126:19: warning: implicit conversion from 'int' to 'short' changes value from 65535 to -1 [-Wconstant-conversion] FORC3 rp[c] = CLIP(pix[c] * sraw_mul[c] >> 10); ~ ^~~~ dcraw.cc:241:32: note: expanded from macro 'CLIP' #define CLIP(x) LIM((int)(x),0,65535) ^ dcraw.cc:239:38: note: expanded from macro 'LIM' #define LIM(x,min,max) MAX(min,MIN(x,max)) ^~~ /usr/local/include/glib-2.0/glib/gmacros.h:291:42: note: expanded from macro 'MIN' #define MIN(a, b) (((a) < (b)) ? (a) : (b)) ^ /usr/local/include/glib-2.0/glib/gmacros.h:288:42: note: expanded from macro 'MAX' #define MAX(a, b) (((a) > (b)) ? (a) : (b)) ^ dcraw.cc:8952:30: warning: use of logical '&&' with constant operand [-Wconstant-logical-operand] is_raw += (i = get4()) && 1; ^ ~ dcraw.cc:8952:30: note: use '&' for a bitwise operation is_raw += (i = get4()) && 1; ^~ & dcraw.cc:8952:30: note: remove constant to silence this warning is_raw += (i = get4()) && 1; ~^~~~ dcraw.cc:10198:30: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] strcpy (th->soft, "dcraw v"DCRAW_VERSION); ^ dcraw.cc:10723:44: warning:
Re: make[1]: cannot open Makefile for new custom port
On 06/23/2018 15:08, Waitman Gobble wrote: > > On 2018-06-23 11:36, Joseph Ward wrote: > >> Hi all, >> >> I'm attempting to make my first port which is attempting to literally >> unpack a tgz into the correct location. I'm wanting a port, as I want >> this to be versioned and upgradable on all my systems via pkg (as well >> as to handle dependencies, etc). >> >> I'm attempting to use make makeplist to create the initial pkg-plist as >> there are a lot of files present, and I'm getting the following error: >> >> # make makeplist >> ===> License BSD4CLAUSE accepted by the user >> ===> nebula-db-0.1 depends on file: /usr/local/sbin/pkg - found >> ===> Fetching all distfiles required by nebula-db-0.1 for building >> ===> Extracting for nebula-db-0.1 >> => SHA256 Checksum OK for nebula-db-0.1.tar.gz. >> ===> Patching for nebula-db-0.1 >> ===> Configuring for nebula-db-0.1 >> ===> Staging for nebula-db-0.1 >> ===> Generating temporary packing list >> make[1]: cannot open Makefile. >> >> make[1]: stopped in >> /usr/local/poudriere/ports/nebula/misc/nebula-db/work/nebula-db-0.1 >> *** Error code 2 >> >> Stop. >> make: stopped in /usr/local/poudriere/ports/nebula/misc/nebula-db >> >> I get this when I do "make stage" as well. >> >> I tried tracing what's going on in bsd.port.mk, but I have to admit that >> I got pretty lost. >> >> my Makefile is (using "set list" in vi in case non-printable characters >> matter): >> >> # $FreeBSD$$ >> $ >> PORTNAME=^Inebula-db$ >> DISTVERSION=^I0.1$ >> CATEGORIES=^Imisc$ >> MASTER_SITES=^Ifile:///root/jail_ports/files/$ >> $ >> MAINTAINER=^i...@hilltopgroup.com$ >> COMMENT=^IJail containing postgres for the nebula system$ >> $ >> LICENSE=^IBSD4CLAUSE$ >> $ >> NO_BUILD=^Iyes$ >> ONLY_FOR_ARCHS=^Iamd64$ >> ONLY_FOR_ARCHS_REASON=^Ipre-built jail on amd64$ >> $ >> NO_WRKSUBDIR=^Iyes$ >> $ >> .include $ >> >> And at that.. I'm stuck. If it would help, I can post the actual >> distfile on a server and provide the link, but it's a tar.gz file >> containing a /usr/local/jail/db directory which is just a populated >> jail. >> >> Thanks in advance for any help you can provide, >> >> Joseph > > > > > I haven't tried such a port, but maybe you can make a dummy Makefile. > (?) an idea. > > You would make your port, switch over to the work directory within the > port, and create an empty Makefile.orig > > then create a Makefile that is basically like > > all: donothing > > donothing: > @echo 'I am here now basically doing nothing' > > then create the patchfile, i think it's make makepatch. back in the > top level of your port path. This will cause it to create the bogus > Makefile out of nothing. > > > > > Also, there are probably a few ports in the tree that only install > files, does not run make, if you can track those down it would show a > working example. > > > > --- > Waitman Gobble > Thank you for getting back to me! I'm not quite following though; I need another Makefile within the work directory? I didn't see anything like that in the porter's handbook; did I miss or misunderstand a section? I actually do have just such a port that I've been using as an example, net/self-service-password. It doesn't build anything (though unlike mine it does have several dependencies which do build), and when I type "make stage" for it, once the dependencies are present, there is no Makefile, or any other file in the work directory that even has make in the filename (find .|grep -i make). Thanks, Joseph ___ freebsd-ports@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: make[1]: cannot open Makefile for new custom port
On Sat, 23 Jun 2018 14:36:05 -0400 "Joseph Ward" said Hi all, I'm attempting to make my first port which is attempting to literally unpack a tgz into the correct location. I'm wanting a port, as I want this to be versioned and upgradable on all my systems via pkg (as well as to handle dependencies, etc). I'm attempting to use make makeplist to create the initial pkg-plist as there are a lot of files present, and I'm getting the following error: # make makeplist ===> License BSD4CLAUSE accepted by the user ===> nebula-db-0.1 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by nebula-db-0.1 for building ===> Extracting for nebula-db-0.1 => SHA256 Checksum OK for nebula-db-0.1.tar.gz. ===> Patching for nebula-db-0.1 ===> Configuring for nebula-db-0.1 ===> Staging for nebula-db-0.1 ===> Generating temporary packing list make[1]: cannot open Makefile. make[1]: stopped in /usr/local/poudriere/ports/nebula/misc/nebula-db/work/nebula-db-0.1 *** Error code 2 Stop. make: stopped in /usr/local/poudriere/ports/nebula/misc/nebula-db I get this when I do "make stage" as well. Greetings Joseph, I'm not sure if I follow you exactly. But if I understand you correctly; you're looking to create a pkg-plist file via make makeplist, and your port doesn't actually build anything (contains installation files?). You need a minimum of Makefile distindo pkg-descr in your port directory. for a minimum Makefile for what I understand your port to do. The following should work: # $FreeBSD$ PORTNAME= PORTVERSION= CATEGORIES= MASTER_SITES= MAINTAINER= COMMENT= LICENSE= LICENSE_FILE= (if necessary) USES= tar:txz NO_BUILD= yes .include note the key here is NO_BUILD you mention your distfile uses tar(1) and xz(1). The above example assumes the extension name is .txz ; adjust as needed. You will (of couse) need to fill all the empty fields as needed, as well as add || subtract them, as needed. Hope this helps. --Chris ___ freebsd-ports@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: make[1]: cannot open Makefile for new custom port
On 23/06/2018 19:36, Joseph Ward wrote: > I'm attempting to use make makeplist to create the initial pkg-plist as > there are a lot of files present, and I'm getting the following error: > > # make makeplist > ===> License BSD4CLAUSE accepted by the user > ===> nebula-db-0.1 depends on file: /usr/local/sbin/pkg - found > ===> Fetching all distfiles required by nebula-db-0.1 for building > ===> Extracting for nebula-db-0.1 > => SHA256 Checksum OK for nebula-db-0.1.tar.gz. > ===> Patching for nebula-db-0.1 > ===> Configuring for nebula-db-0.1 > ===> Staging for nebula-db-0.1 > ===> Generating temporary packing list > make[1]: cannot open Makefile. > > make[1]: stopped in > /usr/local/poudriere/ports/nebula/misc/nebula-db/work/nebula-db-0.1 > *** Error code 2 > > Stop. > make: stopped in /usr/local/poudriere/ports/nebula/misc/nebula-db > > > > I get this when I do "make stage" as well. > > > I tried tracing what's going on in bsd.port.mk, but I have to admit that > I got pretty lost. > > > my Makefile is (using "set list" in vi in case non-printable characters > matter): > > # $FreeBSD$$ > $ > PORTNAME=^Inebula-db$ > DISTVERSION=^I0.1$ > CATEGORIES=^Imisc$ > MASTER_SITES=^Ifile:///root/jail_ports/files/$ > $ > MAINTAINER=^i...@hilltopgroup.com$ > COMMENT=^IJail containing postgres for the nebula system$ > $ > LICENSE=^IBSD4CLAUSE$ > $ > NO_BUILD=^Iyes$ > ONLY_FOR_ARCHS=^Iamd64$ > ONLY_FOR_ARCHS_REASON=^Ipre-built jail on amd64$ > $ > NO_WRKSUBDIR=^Iyes$ > $ > .include $ > > > And at that.. I'm stuck. If it would help, I can post the actual > distfile on a server and provide the link, but it's a tar.gz file > containing a /usr/local/jail/db directory which is just a populated jail. > > Thanks in advance for any help you can provide, You haven't specified an install target in your Makefile, so the ports is going to try the default action of 'make install ...' in your extracted $WRKSRC directory. That won't work without a Makefile; hence the error you're seeing. Note that the 'install' target is used to copy the files into /staging/ -- there are historical reasons why this target is called 'install' rather than anything to do with the word staging. There's a NO_INSTALL variable you could use, analogously to NO_BUILD, to prevent the ports doing anything at all for that step. However, NO_INSTALL is usually used for meta-ports that only exist for their dependencies and that don't install any actual files, so it may not be the right answer for you. You will need to arrange for all your extracted files to end up in $STAGEDIR somehow if you want 'makeplist' to work -- a typical way of doing that is using one or more of the COPYTREE_* macros as part of the install target. This is the way that many ports which don't do any actual compilation work. See www/phpsysinfo as a nice and simple example. Cheers, Matthew signature.asc Description: OpenPGP digital signature
Re: make[1]: cannot open Makefile for new custom port
This was the problem, thank you!
I added the following lines and it worked.
do-install:
@cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}/
On 06/23/2018 17:45, Matthew Seaman wrote:
> On 23/06/2018 19:36, Joseph Ward wrote:
>> I'm attempting to use make makeplist to create the initial pkg-plist as
>> there are a lot of files present, and I'm getting the following error:
>>
>> # make makeplist
>> ===> License BSD4CLAUSE accepted by the user
>> ===> nebula-db-0.1 depends on file: /usr/local/sbin/pkg - found
>> ===> Fetching all distfiles required by nebula-db-0.1 for building
>> ===> Extracting for nebula-db-0.1
>> => SHA256 Checksum OK for nebula-db-0.1.tar.gz.
>> ===> Patching for nebula-db-0.1
>> ===> Configuring for nebula-db-0.1
>> ===> Staging for nebula-db-0.1
>> ===> Generating temporary packing list
>> make[1]: cannot open Makefile.
>>
>> make[1]: stopped in
>> /usr/local/poudriere/ports/nebula/misc/nebula-db/work/nebula-db-0.1
>> *** Error code 2
>>
>> Stop.
>> make: stopped in /usr/local/poudriere/ports/nebula/misc/nebula-db
>>
>>
>>
>> I get this when I do "make stage" as well.
>>
>>
>> I tried tracing what's going on in bsd.port.mk, but I have to admit that
>> I got pretty lost.
>>
>>
>> my Makefile is (using "set list" in vi in case non-printable characters
>> matter):
>>
>> # $FreeBSD$$
>> $
>> PORTNAME=^Inebula-db$
>> DISTVERSION=^I0.1$
>> CATEGORIES=^Imisc$
>> MASTER_SITES=^Ifile:///root/jail_ports/files/$
>> $
>> MAINTAINER=^i...@hilltopgroup.com$
>> COMMENT=^IJail containing postgres for the nebula system$
>> $
>> LICENSE=^IBSD4CLAUSE$
>> $
>> NO_BUILD=^Iyes$
>> ONLY_FOR_ARCHS=^Iamd64$
>> ONLY_FOR_ARCHS_REASON=^Ipre-built jail on amd64$
>> $
>> NO_WRKSUBDIR=^Iyes$
>> $
>> .include $
>>
>>
>> And at that.. I'm stuck. If it would help, I can post the actual
>> distfile on a server and provide the link, but it's a tar.gz file
>> containing a /usr/local/jail/db directory which is just a populated jail.
>>
>> Thanks in advance for any help you can provide,
> You haven't specified an install target in your Makefile, so the ports
> is going to try the default action of 'make install ...' in your
> extracted $WRKSRC directory. That won't work without a Makefile; hence
> the error you're seeing. Note that the 'install' target is used to copy
> the files into /staging/ -- there are historical reasons why this target
> is called 'install' rather than anything to do with the word staging.
>
> There's a NO_INSTALL variable you could use, analogously to NO_BUILD, to
> prevent the ports doing anything at all for that step.
>
> However, NO_INSTALL is usually used for meta-ports that only exist for
> their dependencies and that don't install any actual files, so it may
> not be the right answer for you.
>
> You will need to arrange for all your extracted files to end up in
> $STAGEDIR somehow if you want 'makeplist' to work -- a typical way of
> doing that is using one or more of the COPYTREE_* macros as part of the
> install target. This is the way that many ports which don't do any
> actual compilation work. See www/phpsysinfo as a nice and simple example.
>
> Cheers,
>
> Matthew
>
>
>
>
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
Re: graphics/ufraw fails to compile on 11-stable
replace the patch-dcraw.cc with
--- dcraw.cc.orig 2018-06-23 21:54:05 UTC
+++ dcraw.cc
@@ -2287,7 +2287,7 @@ void CLASS quicktake_100_load_raw()
void CLASS kodak_radc_load_raw()
{
- static const char src[] = {
+ static const signed char src[] = {
1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8,
1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8,
2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,
@@ -3017,7 +3017,10 @@ void CLASS smal_decode_segment (unsigned
diff = diff ? -diff : 0x80;
if (ftell(ifp) + 12 >= (int) seg[1][1])
diff = 0;
- raw_image[pix] = pred[pix & 1] += diff;
+ if(pix>=raw_width*raw_height)
+ derror();
+ else
+ raw_image[pix] = pred[pix & 1] += diff;
if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2;
}
maximum = 0xff;
@@ -8946,7 +8949,7 @@ void CLASS identify()
parse_fuji (get4());
if (thumb_offset > 120) {
fseek (ifp, 120, SEEK_SET);
- is_raw += (i = get4()) && 1;
+ is_raw += (i = get4()) & 1;
if (is_raw == 2 && shot_select)
parse_fuji (i);
}
@@ -10192,7 +10195,7 @@ void CLASS tiff_head (struct tiff_hdr *t
strncpy (th->desc, desc, 512);
strncpy (th->make, make, 64);
strncpy (th->model, model, 64);
- strcpy (th->soft, "dcraw v"DCRAW_VERSION);
+ strcpy (th->soft, " dcraw v " DCRAW_VERSION);
t = localtime (×tamp);
sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
and add
patch-ufraw__developer.c
--- ufraw_developer.c.orig 2018-06-23 21:40:09 UTC
+++ ufraw_developer.c
@@ -387,7 +387,7 @@ static double findExpCoeff(double b)
else a = b;
bg = a / (1 - exp(-a));
/* The limit on try is just to be sure there is no infinite loop. */
- for (try = 0; abs(bg - b) > 0.001 || try < 100; try++) {
+ for (try = 0; fabs(bg - b) > 0.001 || try < 100; try++) {
a = a + (b - bg);
bg = a / (1 - exp(-a));
}
___
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
