my @disable; # or list of drivers to disable
my @incpaths; # places to look for headers
my @libpaths; # places to look for libraries
-my $noprobe; # non-zero to disable newer probes
my $noexif; # non-zero to disable EXIF parsing of JPEGs
+my $no_gif_set_version; # disable calling EGifSetGifVersion
+my $coverage; # build for coverage testing
GetOptions("help" => \$help,
"enable=s" => \@enable,
"disable=s" => \@disable,
"incpath=s", \@incpaths,
"libpath=s" => \@libpaths,
- "noprobe" => \$noprobe,
"verbose|v" => \$VERBOSE,
"nolog" => \$NOLOG,
- "noexif" => \$noexif);
+ "noexif" => \$noexif,
+ "nogifsetversion" => \$no_gif_set_version,
+ 'coverage' => \$coverage);
if ($VERBOSE) {
print "Verbose mode\n";
gifcheck();
my $lib_cflags = '';
+my $lib_lflags = '';
my $F_LIBS = '';
my $F_OBJECT = '';
for my $frmkey (sort { $formats{$a}{order} <=> $formats{$b}{order} } keys %formats) {
my $frm = $formats{$frmkey};
push @defines, [ $frm->{def}, 1, "$frmkey available" ];
- $F_LIBS .= ' ' .$frm->{libfiles};
$F_OBJECT .= ' ' .$frm->{objfiles};
if ($frm->{cflags}) {
$lib_cflags .= ' ' .$frm->{cflags};
++$definc{$_} for map { /^-I(.*)$/ ? ($1) : () }
grep /^-I./, split ' ', $frm->{cflags};
}
+ if ($frm->{lflags}) {
+ $lib_lflags .= ' ' . $frm->{lflags};
+ }
+ else {
+ $F_LIBS .= ' ' .$frm->{libfiles};
+ }
+
}
unless ($noexif) {
regmach.o trans2.o quant.o error.o convert.o
map.o tags.o palimg.o maskimg.o img16.o rotate.o
bmp.o tga.o rgb.o color.o fills.o imgdouble.o limits.o hlines.o
- imext.o);
+ imext.o scale.o rubthru.o render.o);
$Recommends{Imager} =
{ 'Parse::RecDescent' => 0 };
my %opts=(
'NAME' => 'Imager',
'VERSION_FROM' => 'Imager.pm',
- 'LIBS' => "$LFLAGS -lm $OSLIBS $F_LIBS",
+ 'LIBS' => "$LFLAGS -lm $lib_lflags $OSLIBS $F_LIBS",
'DEFINE' => "$OSDEF $CFLAGS",
'INC' => "$lib_cflags $DFLAGS $F_INC",
'OBJECT' => join(' ', @objs, $F_OBJECT),
- clean => { FILES=>'testout meta.tmp' },
+ clean => { FILES=>'testout meta.tmp rubthru.c scale.c' },
PM => gen_PM(),
+ PREREQ_PM => { 'Test::More' => 0.47 },
);
-if ($ExtUtils::MakeMaker::VERSION > 6.06) {
+if ($coverage) {
+ if ($Config{gccversion}) {
+ push @ARGV, 'OPTIMIZE=-ftest-coverage -fprofile-arcs';
+ #$opts{dynamic_lib} = { OTHERLDFLAGS => '-ftest-coverage -fprofile-arcs' };
+ }
+ else {
+ die "Don't know the coverage C flags for your compiler\n";
+ }
+}
+
+# eval to prevent warnings about versions with _ in them
+my $MM_ver = eval $ExtUtils::MakeMaker::VERSION;
+if ($MM_ver > 6.06) {
$opts{AUTHOR} = 'Tony Cook <tony@imager.perl.org>, Arnar M. Hrafnkelsson';
$opts{ABSTRACT} = 'Perl extension for Generating 24 bit Images';
}
-if ($ExtUtils::MakeMaker::VERSION > 6.10) {
+if ($MM_ver > 6.10) {
$opts{NO_META} = 1;
}
sub MY::postamble {
my $self = shift;
my $perl = $self->{PERLRUN} ? '$(PERLRUN)' : '$(PERL)';
+ my $mani = maniread;
+
+ my @ims = grep /\.im$/, keys %$mani;
'
dyntest.$(MYEXTLIB) : dynfilt/Makefile
cd dynfilt && $(MAKE) $(PASTHRU)
$(PERLRUN) Makefile.PL
$(ECHO) "==> Your Makefile has been rebuilt - re-run your make command <=="
'.qq!
-lib/Imager/APIRef.pm : \$(C_FILES) apidocs.perl
- $perl apidocs.perl lib/Imager/APIRef.pm
+lib/Imager/APIRef.pod : \$(C_FILES) apidocs.perl
+ $perl apidocs.perl lib/Imager/APIRef.pod
-!;
+!.join('', map _im_rule($perl, $_), @ims)
+
+}
+
+sub _im_rule {
+ my ($perl, $im) = @_;
+
+ (my $c = $im) =~ s/\.im$/.c/;
+ return <<MAKE;
+
+$c: $im imtoc.perl
+ $perl imtoc.perl $im $c
+
+MAKE
}
delete $formats{'ungif'};
}
- RETR:
- if (($formats{'gif'} or $formats{'ungif'}) && !$ENV{IM_SUPPRESS_PROMPT}) {
- print <<EOFF;
-
-You have libgif or libungif installed. They are both known to have
-bugs. Imager can crash or display other strange behaviour after
-reading or writing gif images. Some of the gif tests can even fail
-since they stress some parts of the buggy code.
-
-libungif 4.1.2 and later is safe. giflib 4.1.3 needs at least one
-patch to have all the bugs fixed, see README for details.
-
-Of course it's possible your operating system distributor has patched
-all of these problems and you have nothing to worry about.
-
-Do you want to remove gif support? [Y/n]
-EOFF
- my $resp = <STDIN>;
- chomp($resp);
- if ($resp ne "n") {
- delete $formats{'gif'};
- delete $formats{'ungif'};
- return;
- }
- }
-
for my $frm (qw(gif ungif)) {
checkformat($frm) if ($MANUAL and $formats{$frm});
}
push @defines, [ IM_GIFMAJOR => $major, "Parsed giflib version" ];
push @defines, [ IM_GIFMINOR => $minor ];
+ push @defines, [ IM_NO_SET_GIF_VERSION => 1, "Disable EGifSetGifVersion" ]
+ if $no_gif_set_version;
}
-sub gd {
- my($path,$chk)=@_;
+sub grep_directory {
+ my($path, $chk)=@_;
# print "checking path $path\n";
if ( !opendir(DH,$path) ) {
print " checkformat($frm)\n" if $VERBOSE;
- my $code = $formats{$frm}{'code'};
- if ($code && !$noprobe) {
+ my $probe_array = $formats{$frm}{'code'};
+ if ($probe_array) {
print " Calling probe function\n" if $VERBOSE;
- return 1 if $code->($formats{$frm}, $frm);
+ if (ref $probe_array ne 'ARRAY') {
+ $probe_array = [ $probe_array ];
+ }
+ for my $func (@$probe_array) {
+ return 1 if $func->($formats{$frm}, $frm);
+ }
}
- my $libchk=$formats{$frm}{'libcheck'};
- my $incchk=$formats{$frm}{'inccheck'};
+ my $lib_check=$formats{$frm}{'libcheck'};
+ my $inc_check=$formats{$frm}{'inccheck'};
- my @l;
- for my $lp (@libs) {
- push(@l, gd($lp,$libchk));
+ if ($lib_check) {
+ my @l;
+ for my $lp (@libs) {
+ push(@l, grep_directory($lp,$lib_check));
+ }
+
+ my @i;
+ for my $ip (@incs) {
+ push(@i, $ip) if $inc_check->($ip,$frm);
+ }
+
+ printf("%10s: includes %s - libraries %s\n",$frm,(@i?'found':'not found'),(@l?'found':'not found'));
+ $formats{$frm}{incdir} = \@i;
+ $formats{$frm}{libdir} = \@l;
+ return 1 if scalar(@i && @l);
}
-
- my @i;
- for my $ip (@incs) {
- push(@i, $ip) if $incchk->($ip,$frm);
+ else {
+ printf("%10s: not available\n", $frm);
}
- printf("%10s: includes %s - libraries %s\n",$frm,(@i?'found':'not found'),(@l?'found':'not found'));
- $formats{$frm}{incdir} = \@i;
- $formats{$frm}{libdir} = \@l;
- return scalar(@i && @l);
+ return 0;
}
if ($^O =~ /win32/i && $Config{cc} =~ /\bcl\b/i) {
push(@incs, split /;/, $ENV{INCLUDE}) if exists $ENV{INCLUDE};
}
+ if ($Config{incpath}) {
+ push @incs, grep -d, split /\Q$Config{path_sep}/, $Config{incpath};
+ }
push @incs, grep -d,
qw(/sw/include
/usr/include/freetype2
# it can't find and it doesn't look for -L in ldflags
#@deflib{@hidden} = @hidden;
}
+ push @libs, grep -d, qw(/usr/local/lib);
$formats{'jpeg'}={
order=>'21',
def=>'HAVE_LIBPNG',
inccheck=>sub { -e catfile($_[0], 'png.h') },
libcheck=>sub { $_[0] eq "libpng$aext" or $_[0] eq "libpng.$lext" },
- libfiles=>'-lpng -lz',
+ libfiles=>$^O eq 'MSWin32' ? '-lpng -lzlib' : '-lpng -lz',
objfiles=>'png.o',
docs=>q{
Png stands for Portable Network Graphics and is intended as
This currently only works on under normal Win32 and cygwin.
DOCS
};
- $formats{'freetype2'} = {
- order=>'29',
- def=>'HAVE_FT2',
- inccheck=>sub { -e catfile($_[0], 'ft2build.h') },
- libcheck=>sub { $_[0] eq "libfreetype$aext" or $_[0] eq "libfreetype.$lext" },
- libfiles=>'-lfreetype',
- objfiles=>'freetyp2.o',
- docs=><<DOCS,
+ $formats{'freetype2'} =
+ {
+ order=>'29',
+ def=>'HAVE_FT2',
+ # we always use a probe function
+ #inccheck=>sub { -e catfile($_[0], 'ft2build.h') },
+ #libcheck=>sub { $_[0] eq "libfreetype$aext" or $_[0] eq "libfreetype.$lext" },
+ libfiles=>'-lfreetype',
+ objfiles=>'freetyp2.o',
+ docs=><<DOCS,
Freetype 2 supports both Truetype and Type 1 fonts, both of which are
scalable. It also supports a variety of other fonts.
DOCS
- code => \&freetype2_probe,
- };
+ code =>
+ [
+ \&freetype2_probe_ftconfig,
+ \&freetype2_probe_scan
+ ],
+ };
# Make fix indent
for (keys %formats) { $formats{$_}->{docs} =~ s/^\s+/ /mg; }
}
# probes for freetype2 by trying to run freetype-config
-sub freetype2_probe {
+sub freetype2_probe_ftconfig {
my ($frm, $frmkey) = @_;
is_exe('freetype-config') or return;
map "-I$_", reverse @incdirs);
}
$frm->{cflags} = $cflags;
- $frm->{libfiles} = $lflags;
+ $frm->{lflags} = $lflags;
printf "%10s: configured via freetype-config\n", $frmkey;
return 1;
}
+# attempt to probe for freetype2 by scanning directories
+# we can't use the normal scan since we need to find the directory
+# containing most of the includes
+sub freetype2_probe_scan {
+ my ($frm, $frmkey) = @_;
+
+ my $found_inc;
+ my $found_inc2;
+ INCS:
+ for my $inc (@incs) {
+ my $path = File::Spec->catfile($inc, 'ft2build.h');
+ -e $path or next;
+
+ # try to find what it's including
+ my $ftheader;
+ open FT2BUILD, "< $path"
+ or next;
+ while (<FT2BUILD>) {
+ if (m!^\s*\#\s*include\s+<([\w/.]+)>!
+ || m!^\s*\#\s*include\s+"([\w/.]+)"!) {
+ $ftheader = $1;
+ last;
+ }
+ }
+ close FT2BUILD;
+ $ftheader
+ or next;
+ # non-Unix installs put this directly under the same directory in
+ # theory
+ if (-e File::Spec->catfile($inc, $ftheader)) {
+ $found_inc = $inc;
+ last INCS;
+ }
+ for my $subdir (qw/freetype2 freetype/) {
+ $path = File::Spec->catfile($inc, $subdir, 'fterrors.h');
+ -e $path and next;
+
+ $found_inc = $inc;
+ $found_inc2 = File::Spec->catdir($inc, $subdir);
+ last INCS;
+ }
+ }
+
+ my $found_lib;
+ LIBS:
+ for my $lib (@libs) {
+ my $a_path = File::Spec->catfile($lib, "libfreetype$aext");
+ my $l_path = File::Spec->catfile($lib, "libfreetype.$lext");
+ if (-e $a_path || -e $l_path) {
+ $found_lib = $lib;
+ last LIBS;
+ }
+ }
+
+ printf("%10s: includes %s - libraries %s\n", $frmkey,
+ ($found_inc ? 'found' : 'not found'),
+ ($found_lib ? 'found' : 'not found'));
+
+ return unless $found_inc && $found_lib;
+
+ $frm->{cflags} = _make_I($found_inc);
+ $frm->{cflags} .= " " . _make_I($found_inc2) if $found_inc2;
+ $frm->{libfiles} = "-lfreetype";
+
+ return 1;
+}
+
+sub _make_I {
+ my ($inc_dir) = @_;
+
+ $definc{$inc_dir}
+ and return '';
+
+ $inc_dir =~ / / ? qq!-I"$inc_dir"! : "-I$inc_dir";
+}
+
# probes for libpng via pkg-config
sub png_probe {
my ($frm, $frmkey) = @_;
chomp $cflags;
chomp $lflags;
$frm->{cflags} = $cflags;
- $frm->{libfiles} = $lflags;
+ $frm->{lflags} = $lflags;
printf "%10s: configured via `pkg-config $config ...`\n", $frmkey;
Add to the include search path
--libpath dir
Add to the library search path
- --noprobe
- Don't use pkg-config or freetype2-config to probe for freetype2 and libpng
EOS
exit 1;
my $version = MM->parse_version($opts->{VERSION_FROM})
or die "Could not extract version number from $opts->{VERSION_FROM}\n";
+ # we don't set this on older EU::MM and it corrupts META.yml
+ # so don't generate it
+ return unless $opts->{AUTHOR};
+
my $meta = <<YAML;
--- #YAML:1.0
name: $opts->{NAME}
$meta .= " $module: $version\n";
}
}
+ if ($opts->{PREREQ_PM}) {
+ $meta .= "requires:\n";
+ while (my ($module, $version) = each %{$opts->{PREREQ_PM}}) {
+ $meta .= " $module: $version\n";
+ }
+ }
$meta .= <<YAML;
license: perl
dynamic_config: 1
distribution_type: module
+meta-spec:
+ version: 1.3
+ url: http://module-build.sourceforge.net/META-spec-v1.3.html
generated_by: $opts->{NAME} version $version
YAML
my $save_meta;
close META;
}
}
+
projects / imager.git / blobdiff