code format

This commit is contained in:
Jerome Duval
2018-09-14 10:14:48 +02:00
parent 02921cdbb1
commit 9bdfc7fd9e
4 changed files with 75 additions and 78 deletions

View File

@@ -11,14 +11,13 @@ LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://github.com/scottdraves/flam3/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="afcd4af13897740e34f6ae1f3061bbfbda9c1dd5df3ecc9f57141c985d35d19d"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
if [ "$effectiveTargetArchitecture" = x86_gcc2 ];then
PATCHES="flam3-$portVersion.patchset"
fi
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
flam3$secondaryArchSuffix = $portVersion
cmd:flam3_animate$secondaryArchSuffix
@@ -52,13 +51,13 @@ BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:awk
cmd:autoconf
cmd:awk
cmd:gcc$secondaryArchSuffix
cmd:git
cmd:libtoolize$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
@@ -80,4 +79,3 @@ INSTALL()
packageEntries devel \
$developDir
}

View File

@@ -34,8 +34,8 @@ BUILD_REQUIRES="
haiku_devel
"
BUILD_PREREQUIRES="
cmd:make
cmd:gcc
cmd:make
cmd:qmake >= 5
"

View File

@@ -19,6 +19,23 @@ PATCHES="imagemagick-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
GLOBAL_WRITABLE_FILES="
settings/ImageMagick-6/coder.xml keep-old
settings/ImageMagick-6/colors.xml keep-old
settings/ImageMagick-6/delegates.xml keep-old
settings/ImageMagick-6/log.xml keep-old
settings/ImageMagick-6/magic.xml keep-old
settings/ImageMagick-6/mime.xml keep-old
settings/ImageMagick-6/policy.xml keep-old
settings/ImageMagick-6/quantization-table.xml keep-old
settings/ImageMagick-6/thresholds.xml keep-old
settings/ImageMagick-6/type-dejavu.xml keep-old
settings/ImageMagick-6/type-ghostscript.xml keep-old
settings/ImageMagick-6/type-windows.xml keep-old
settings/ImageMagick-6/type-apple.xml keep-old
settings/ImageMagick-6/type.xml keep-old
"
PROVIDES="
imagemagick$secondaryArchSuffix = $portVersion
cmd:animate$secondaryArchSuffix
@@ -81,7 +98,6 @@ BUILD_REQUIRES="
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
@@ -94,23 +110,6 @@ BUILD_PREREQUIRES="
cmd:sed
"
GLOBAL_WRITABLE_FILES="
settings/ImageMagick-6/coder.xml keep-old
settings/ImageMagick-6/colors.xml keep-old
settings/ImageMagick-6/delegates.xml keep-old
settings/ImageMagick-6/log.xml keep-old
settings/ImageMagick-6/magic.xml keep-old
settings/ImageMagick-6/mime.xml keep-old
settings/ImageMagick-6/policy.xml keep-old
settings/ImageMagick-6/quantization-table.xml keep-old
settings/ImageMagick-6/thresholds.xml keep-old
settings/ImageMagick-6/type-dejavu.xml keep-old
settings/ImageMagick-6/type-ghostscript.xml keep-old
settings/ImageMagick-6/type-windows.xml keep-old
settings/ImageMagick-6/type-apple.xml keep-old
settings/ImageMagick-6/type.xml keep-old
"
BUILD()
{
export LDFLAGS="-lnetwork"

View File

@@ -19,6 +19,24 @@ PATCHES="imagemagick-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
GLOBAL_WRITABLE_FILES="
settings/ImageMagick-7/coder.xml keep-old
settings/ImageMagick-7/colors.xml keep-old
settings/ImageMagick-7/delegates.xml keep-old
settings/ImageMagick-7/log.xml keep-old
settings/ImageMagick-7/magic.xml keep-old
settings/ImageMagick-7/mime.xml keep-old
settings/ImageMagick-7/policy.xml keep-old
settings/ImageMagick-7/quantization-table.xml keep-old
settings/ImageMagick-7/thresholds.xml keep-old
settings/ImageMagick-7/type-dejavu.xml keep-old
settings/ImageMagick-7/type-ghostscript.xml keep-old
settings/ImageMagick-7/type-windows.xml keep-old
settings/ImageMagick-7/type-apple.xml keep-old
settings/ImageMagick-7/type.xml keep-old
settings/ImageMagick-7/type-urw-base35.xml keep-old
"
libMagickVersion="4.0.0"
libMagickCoreVersion="5.0.0"
libMagickWandVersion="5.0.0"
@@ -78,6 +96,40 @@ REQUIRES_devel="
imagemagick7$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libbz2$secondaryArchSuffix
# devel:libdjvulibre$secondaryArchSuffix
# devel:libfftw3$secondaryArchSuffix
# devel:libfontconfig$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
# devel:libilmimf$secondaryArchSuffix #openexr
# devel:libjbig2dec$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
# devel:liblcms2$secondaryArchSuffix
devel:libltdl$secondaryArchSuffix
# devel:liblzma$secondaryArchSuffix
# devel:libopenjp2$secondaryArchSuffix
# devel:libpango_1.0$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libwebp$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:perl
cmd:pkg_config$secondaryArchSuffix
cmd:sed
"
defineDebugInfoPackage imagemagick7$secondaryArchSuffix \
$binDir/animate \
$binDir/compare \
@@ -96,58 +148,6 @@ defineDebugInfoPackage imagemagick7$secondaryArchSuffix \
$libDir/libMagickCore-7.Q16HDRI.so.$libMagickCoreVersion \
$libDir/libMagickWand-7.Q16HDRI.so.$libMagickWandVersion
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libbz2$secondaryArchSuffix
# devel:liblcms2$secondaryArchSuffix
# devel:libdjvulibre$secondaryArchSuffix
# devel:libfftw3$secondaryArchSuffix
# devel:libfontconfig$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
# devel:libilmimf$secondaryArchSuffix #openexr
# devel:libjbig2dec$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libltdl$secondaryArchSuffix
# devel:liblzma$secondaryArchSuffix
# devel:libopenjp2$secondaryArchSuffix
# devel:libpango_1.0$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libwebp$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:perl
cmd:pkg_config$secondaryArchSuffix
cmd:sed
"
GLOBAL_WRITABLE_FILES="
settings/ImageMagick-7/coder.xml keep-old
settings/ImageMagick-7/colors.xml keep-old
settings/ImageMagick-7/delegates.xml keep-old
settings/ImageMagick-7/log.xml keep-old
settings/ImageMagick-7/magic.xml keep-old
settings/ImageMagick-7/mime.xml keep-old
settings/ImageMagick-7/policy.xml keep-old
settings/ImageMagick-7/quantization-table.xml keep-old
settings/ImageMagick-7/thresholds.xml keep-old
settings/ImageMagick-7/type-dejavu.xml keep-old
settings/ImageMagick-7/type-ghostscript.xml keep-old
settings/ImageMagick-7/type-windows.xml keep-old
settings/ImageMagick-7/type-apple.xml keep-old
settings/ImageMagick-7/type.xml keep-old
settings/ImageMagick-7/type-urw-base35.xml keep-old
"
BUILD()
{
export LDFLAGS="-lnetwork"