mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
autotrace, bump version (#7416)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -1,72 +0,0 @@
|
||||
SUMMARY="A program to turn bitmaps into vectors"
|
||||
DESCRIPTION="AutoTrace is a program that can convert bitmaps into \
|
||||
close vectors. It tries to replicate the image as close as possible while \
|
||||
still being usable to edit manually. It is made to compete with other \
|
||||
commercial products that do the same."
|
||||
HOMEPAGE="http://autotrace.sourceforge.net"
|
||||
COPYRIGHT="2000-2002 AutoTrace contributors"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="2"
|
||||
SOURCE_URI="http://sourceforge.net/projects/autotrace/files/AutoTrace/0.31.1/autotrace-0.31.1.tar.gz/download"
|
||||
CHECKSUM_SHA256="5a1a923c3335dfd7cbcccb2bbd4cc3d68cafe7713686a2f46a1591ed8a92aff6"
|
||||
SOURCE_DIR="autotrace-0.31.1"
|
||||
PATCHES="
|
||||
autotrace-0.31.1.patchset
|
||||
autotrace-libpng.patch
|
||||
"
|
||||
|
||||
ARCHITECTURES="all"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
autotrace$secondaryArchSuffix = $portVersion
|
||||
cmd:autotrace$secondaryArchSuffix = $portVersion
|
||||
cmd:autotrace_config$secondaryArchSuffix = $portVersion
|
||||
lib:libautotrace$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libpng16$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
autotrace${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libautotrace$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES_devel="
|
||||
autotrace$secondaryArchSuffix == $portVersion base
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libpng16$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:autoconf
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoconf
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
mkdir -p $developLibDir
|
||||
|
||||
fixPkgconfig
|
||||
|
||||
prepareInstalledDevelLibs \
|
||||
libautotrace
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
102
media-gfx/autotrace/autotrace-0.40.0_20200219.recipe
Normal file
102
media-gfx/autotrace/autotrace-0.40.0_20200219.recipe
Normal file
@@ -0,0 +1,102 @@
|
||||
SUMMARY="A program to turn bitmaps into vectors"
|
||||
DESCRIPTION="AutoTrace is a program that can convert bitmaps into \
|
||||
close vectors. It tries to replicate the image as close as possible while \
|
||||
still being usable to edit manually. It is made to compete with other \
|
||||
commercial products that do the same."
|
||||
HOMEPAGE="http://autotrace.sourceforge.net"
|
||||
COPYRIGHT="2000-2020 AutoTrace contributors"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/autotrace/autotrace/archive/refs/tags/travis-20200219.65.tar.gz"
|
||||
CHECKSUM_SHA256="74ca2555aff1a968290f13602a90f836872e08d37ecaf80c5296ad223f6cd69a"
|
||||
SOURCE_DIR="autotrace-travis-20200219.65"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
commandBinDir=$binDir
|
||||
commandSuffix=$secondaryArchSuffix
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
commandSuffix=
|
||||
commandBinDir=$prefix/bin
|
||||
fi
|
||||
|
||||
libVersion="3.0.0"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
autotrace$secondaryArchSuffix = $portVersion
|
||||
cmd:autotrace$commandSuffix = $portVersion
|
||||
cmd:autotrace_config$commandSuffix = $portVersion
|
||||
lib:libautotrace$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libglib_2.0$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
lib:libMagick++_6.Q16$secondaryArchSuffix
|
||||
lib:libpng16$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
autotrace${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libautotrace$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
autotrace$secondaryArchSuffix == $portVersion base
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libglib_2.0$secondaryArchSuffix
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libintl$secondaryArchSuffix
|
||||
devel:libMagick++_6.Q16$secondaryArchSuffix
|
||||
devel:libpng16$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autopoint
|
||||
cmd:autoreconf
|
||||
cmd:find
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:intltoolize
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
defineDebugInfoPackage autotrace$secondaryArchSuffix \
|
||||
$libDir/libautotrace.so.$libVersion \
|
||||
$commandBinDir/autotrace
|
||||
|
||||
BUILD()
|
||||
{
|
||||
./autogen.sh
|
||||
runConfigure --omit-dirs binDir ./configure \
|
||||
--bindir=$commandBinDir \
|
||||
--without-pstoedit
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm -f $libDir/*.la
|
||||
|
||||
prepareInstalledDevelLib libautotrace
|
||||
fixPkgconfig
|
||||
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,58 +0,0 @@
|
||||
--- autotrace-0.31.1/input-png.c.orig 2002-10-10 22:44:14.000000000 +0200
|
||||
+++ autotrace-0.31.1/input-png.c 2013-03-22 20:20:49.835238916 +0100
|
||||
@@ -42,17 +42,17 @@
|
||||
|
||||
static void handle_warning(png_structp png, const at_string message) {
|
||||
LOG1("PNG warning: %s", message);
|
||||
- at_exception_warning((at_exception_type *)png->error_ptr,
|
||||
+ at_exception_warning((at_exception_type *)png_get_error_ptr(png),
|
||||
message);
|
||||
- /* at_exception_fatal((at_exception_type *)at_png->error_ptr,
|
||||
+ /* at_exception_fatal((at_exception_type *)png_get_error_ptr(at_png),
|
||||
"PNG warning"); */
|
||||
}
|
||||
|
||||
static void handle_error(png_structp png, const at_string message) {
|
||||
LOG1("PNG error: %s", message);
|
||||
- at_exception_fatal((at_exception_type *)png->error_ptr,
|
||||
+ at_exception_fatal((at_exception_type *)png_get_error_ptr(png),
|
||||
message);
|
||||
- /* at_exception_fatal((at_exception_type *)at_png->error_ptr,
|
||||
+ /* at_exception_fatal((at_exception_type *)png_get_error_ptr(at_png),
|
||||
"PNG error"); */
|
||||
|
||||
}
|
||||
@@ -157,8 +157,8 @@
|
||||
|
||||
png_set_strip_16(png_ptr);
|
||||
png_set_packing(png_ptr);
|
||||
- if ((png_ptr->bit_depth < 8) ||
|
||||
- (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
|
||||
+ if ((png_get_bit_depth(png_ptr, info_ptr) < 8) ||
|
||||
+ (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) ||
|
||||
(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
|
||||
png_set_expand(png_ptr);
|
||||
|
||||
@@ -184,17 +184,16 @@
|
||||
png_read_update_info(png_ptr, info_ptr);
|
||||
|
||||
|
||||
- info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
|
||||
- info_ptr->height * sizeof(png_bytep));
|
||||
+ png_set_rows(png_ptr, info_ptr, (png_bytepp)png_malloc(png_ptr,
|
||||
+ png_get_image_height(png_ptr, info_ptr) * sizeof(png_bytep)));
|
||||
#ifdef PNG_FREE_ME_SUPPORTED
|
||||
info_ptr->free_me |= PNG_FREE_ROWS;
|
||||
#endif
|
||||
- for (row = 0; row < (int)info_ptr->height; row++)
|
||||
- info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
|
||||
+ for (row = 0; row < (int)png_get_image_height(png_ptr, info_ptr); row++)
|
||||
+ png_get_rows(png_ptr, info_ptr)[row] = (png_bytep)png_malloc(png_ptr,
|
||||
png_get_rowbytes(png_ptr, info_ptr));
|
||||
|
||||
- png_read_image(png_ptr, info_ptr->row_pointers);
|
||||
- info_ptr->valid |= PNG_INFO_IDAT;
|
||||
+ png_read_image(png_ptr, png_get_rows(png_ptr, info_ptr));
|
||||
png_read_end(png_ptr, info_ptr);
|
||||
return png_get_rows(png_ptr, info_ptr);
|
||||
}
|
||||
Reference in New Issue
Block a user