From b369b0e338abbafc4dd08c38fc4bf048ab559be4 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 14 Sep 2018 12:11:45 +0200 Subject: [PATCH] code format. --- media-libs/a52dec/a52dec-0.7.4.recipe | 9 ++- media-libs/alembic/alembic-1.7.8.recipe | 4 +- media-libs/almp3/almp3-2.0.4.recipe | 40 ++++++-------- media-libs/cal3d/cal3d-0.11.0.recipe | 39 ++++++------- media-libs/fdk-aac/fdk_aac-0.1.6.recipe | 6 +- media-libs/flac/flac-1.3.2.recipe | 14 ++--- media-libs/gosu/gosu-0.8.7.2.recipe | 22 ++++---- .../gst_plugins_good-1.14.2.recipe | 4 +- media-libs/harfbuzz/harfbuzz-1.5.1.recipe | 14 ++--- media-libs/harfbuzz/harfbuzz-1.9.0.recipe | 20 +++---- media-libs/ilmbase/ilmbase-2.2.1.recipe | 9 ++- media-libs/imlib2/imlib2-1.5.1.recipe | 8 +-- media-libs/jasper/jasper1-1.900.5.recipe | 10 ++-- media-libs/lcms/lcms-2.9.recipe | 12 ++-- .../libextractor/libextractor-1.3.recipe | 16 +++--- .../libgphoto2/libgphoto2-2.5.19.recipe | 2 +- media-libs/libmpeg2/libmpeg2-0.5.1.recipe | 8 +-- .../libpagemaker/libpagemaker-0.0.4.recipe | 12 ++-- media-libs/libpng/libpng16-1.6.35.recipe | 8 +-- .../libquicktime/libquicktime-1.2.4.recipe | 55 ++++++++++--------- media-libs/libwebp/libwebp-1.0.0.recipe | 15 ++--- media-libs/opencv/opencv-3.4.1.recipe | 4 +- media-libs/opencv/opencv342-3.4.2.recipe | 4 +- media-libs/openjpeg/openjpeg-2.1.2.recipe | 7 +-- media-libs/osl/osl-1.9.5.recipe | 16 +++--- media-libs/partio/partio-1.1.0.recipe | 6 +- media-libs/pdflib/pdflib-5.0.3.recipe | 6 +- media-libs/x265/x265-2.0.recipe | 33 +++++------ media-libs/x265/x265-2.1_hg.recipe | 33 +++++------ 29 files changed, 208 insertions(+), 228 deletions(-) diff --git a/media-libs/a52dec/a52dec-0.7.4.recipe b/media-libs/a52dec/a52dec-0.7.4.recipe index c60fbb732..8dcda6e84 100644 --- a/media-libs/a52dec/a52dec-0.7.4.recipe +++ b/media-libs/a52dec/a52dec-0.7.4.recipe @@ -25,7 +25,6 @@ if [ -z "$secondaryArchSuffix" ]; then cmd:extract_a52$secondaryArchSuffix " fi - REQUIRES=" haiku$secondaryArchSuffix " @@ -42,13 +41,13 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:libtoolize$secondaryArchSuffix cmd:aclocal cmd:autoconf cmd:autoreconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make " BUILD() diff --git a/media-libs/alembic/alembic-1.7.8.recipe b/media-libs/alembic/alembic-1.7.8.recipe index a15e8b6d2..073c1d65e 100644 --- a/media-libs/alembic/alembic-1.7.8.recipe +++ b/media-libs/alembic/alembic-1.7.8.recipe @@ -24,14 +24,14 @@ COPYRIGHT="2009-2016 Sony Pictures Imageworks LICENSE="ALEMBIC" REVISION="2" SOURCE_URI="https://github.com/alembic/alembic/archive/$portVersion.tar.gz" -CHECKSUM_SHA256='119e2cbac2b862880018e756da2219171d1e9ae7aa0ef7dc7c216d678384808e' +CHECKSUM_SHA256="119e2cbac2b862880018e756da2219171d1e9ae7aa0ef7dc7c216d678384808e" SOURCE_FILENAME="alembic-$portVersion.tar.gz" PATCHES="alembic-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="x86" -commandBinDir=$binDir +commandBinDir="$binDir" if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi diff --git a/media-libs/almp3/almp3-2.0.4.recipe b/media-libs/almp3/almp3-2.0.4.recipe index a2b7eb544..ae0772805 100644 --- a/media-libs/almp3/almp3-2.0.4.recipe +++ b/media-libs/almp3/almp3-2.0.4.recipe @@ -1,47 +1,43 @@ SUMMARY="Allegro wrapper for the mpglib MP3 decoder" -DESCRIPTION='AllegroMP3 (or "almp3" for short) is a wrapper for the MP3 \ +DESCRIPTION="AllegroMP3 (or \"almp3\" for short) is a wrapper for the MP3 \ decoder in mpg123 that allows using it in Allegro. It uses an internal copy of \ -mpg123 that is optimized for the x86 platform in SIMD assembly.' +mpg123 that is optimized for the x86 platform in SIMD assembly." HOMEPAGE="http://icculus.org/~eviltypeguy/pkg/almp3/" +COPYRIGHT="2001-2005 Javier Gonzalez" +LICENSE="GNU LGPL v2.1" +REVISION="2" SOURCE_URI="http://icculus.org/~eviltypeguy/pkg/almp3/almp3-$portVersion.tar.bz2" -CHECKSUM_SHA256='149af1a5ee06b5d7d5a52152db0e35ad6de8dfdd9d281fdac52728ef5d438d70' -LICENSE='GNU LGPL v2.1' -COPYRIGHT='2001-2005 Javier Gonzalez' +CHECKSUM_SHA256="149af1a5ee06b5d7d5a52152db0e35ad6de8dfdd9d281fdac52728ef5d438d70" +SOURCE_DIR="almp3" +PATCHES="almp3-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -REVISION='2' - PROVIDES=" almp3$secondaryArchSuffix = $portVersion lib:libalmp3$secondaryArchSuffix = $portVersion " +REQUIRES=" + haiku${secondaryArchSuffix} + lib:liballeg${secondaryArchSuffix} >= 4.4 + " + PROVIDES_devel=" almp3${secondaryArchSuffix}_devel = $portVersion devel:libalmp3$secondaryArchSuffix = $portVersion " -REQUIRES=" - haiku${secondaryArchSuffix} - lib:liballeg${secondaryArchSuffix} >= 4.4 -" - +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:liballeg${secondaryArchSuffix} >= 4.4 + " BUILD_PREREQUIRES=" cmd:gcc${secondaryArchSuffix} cmd:install cmd:ld${secondaryArchSuffix} cmd:make -" - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:liballeg${secondaryArchSuffix} >= 4.4 -" - -SOURCE_DIR='almp3' - -PATCHES="almp3-$portVersion.patchset" + " BUILD() { diff --git a/media-libs/cal3d/cal3d-0.11.0.recipe b/media-libs/cal3d/cal3d-0.11.0.recipe index 1c67659cf..26589d6fc 100644 --- a/media-libs/cal3d/cal3d-0.11.0.recipe +++ b/media-libs/cal3d/cal3d-0.11.0.recipe @@ -6,13 +6,12 @@ DESCRIPTION="Cal3D is a skeletal based 3D character animation library written \ combining animations, actions and morph targets (facial expressions) \ through a \"mixer\"." HOMEPAGE="http://gna.org/projects/cal3d/" -LICENSE="GNU LGPL v3" COPYRIGHT="2001-2006 Laurent Desmecht, Loic Dachary, Bruno Heidelberger" - +LICENSE="GNU LGPL v3" +REVISION="2" SOURCE_URI="http://download.gna.org/cal3d/sources/cal3d-0.11.0.tar.gz" CHECKSUM_SHA256="fc4a6fe311004987377ec80b804a04aab44c32085fd974d275aa9d0b14144b06" - -REVISION="2" +PATCHES="cal3d-$portVersion.patchset" ARCHITECTURES="x86 x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -22,23 +21,27 @@ PROVIDES=" cal3d$secondaryArchSuffix = $portVersion cmd:cal3d_converter$secondaryArchSuffix lib:libcal3d$secondaryArchSuffix -" - + " REQUIRES=" haiku$secondaryArchSuffix -" + " + +PROVIDES_devel=" + devel:libcal3d$secondaryArchSuffix + " +REQUIRES_devel=" + cal3d$secondaryArchSuffix == $portVersion base + " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel - cmd:gawk - cmd:gcc$secondaryArchSuffix - cmd:make - cmd:libtoolize$secondaryArchSuffix cmd:aclocal cmd:autom4te -" - -PATCHES="cal3d-$portVersion.patchset" + cmd:gawk + cmd:gcc$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + " BUILD() { @@ -61,11 +64,3 @@ INSTALL() packageEntries devel $developLibDir } - -PROVIDES_devel=" - devel:libcal3d$secondaryArchSuffix -" - -REQUIRES_devel=" - cal3d$secondaryArchSuffix == $portVersion base -" diff --git a/media-libs/fdk-aac/fdk_aac-0.1.6.recipe b/media-libs/fdk-aac/fdk_aac-0.1.6.recipe index 251db5abf..36aae0bd5 100644 --- a/media-libs/fdk-aac/fdk_aac-0.1.6.recipe +++ b/media-libs/fdk-aac/fdk_aac-0.1.6.recipe @@ -1,7 +1,7 @@ SUMMARY="Fraunhofer AAC codec library" -DESCRIPTION='The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") \ +DESCRIPTION="The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") \ is software that implements the MPEG Advanced Audio Coding ("AAC") \ - encoding and decoding scheme for digital audio.' + encoding and decoding scheme for digital audio." HOMEPAGE="https://sourceforge.net/projects/opencore-amr" COPYRIGHT="1995-2012 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V." LICENSE="Fraunhofer FDK AAC Codec" @@ -32,8 +32,8 @@ PROVIDES_devel=" devel:libfdk_aac$secondaryArchSuffix = $libVersion " REQUIRES_devel=" - haiku${secondaryArchSuffix}_devel fdk_aac$secondaryArchSuffix == $portVersion base + haiku${secondaryArchSuffix}_devel " BUILD_REQUIRES=" diff --git a/media-libs/flac/flac-1.3.2.recipe b/media-libs/flac/flac-1.3.2.recipe index dc2dc4af2..b74088012 100644 --- a/media-libs/flac/flac-1.3.2.recipe +++ b/media-libs/flac/flac-1.3.2.recipe @@ -50,18 +50,18 @@ BUILD_REQUIRES=" devel:libogg$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:nasm - cmd:gcc$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix cmd:aclocal cmd:autoconf cmd:automake - cmd:ld$secondaryArchSuffix - cmd:make - cmd:gawk - cmd:perl cmd:find + cmd:gawk + cmd:gcc$secondaryArchSuffix cmd:gettext + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:nasm + cmd:perl " BUILD() diff --git a/media-libs/gosu/gosu-0.8.7.2.recipe b/media-libs/gosu/gosu-0.8.7.2.recipe index edb4a6b33..3ed0ac9f5 100644 --- a/media-libs/gosu/gosu-0.8.7.2.recipe +++ b/media-libs/gosu/gosu-0.8.7.2.recipe @@ -6,36 +6,36 @@ Gosu only provides basic building blocks: * sound samples and music in various formats * keyboard, mouse, and gamepad input " -REVISION="2" HOMEPAGE="https://www.libgosu.org/" -ARCHITECTURES="!x86_gcc2" -SECONDARY_ARCHITECTURES="!x86" +COPYRIGHT="2001-2014 Julian Raschke, Jan Lücker, and other contributors." +LICENSE="MIT" +REVISION="2" SOURCE_URI="https://github.com/jlnr/gosu/archive/v$portVersion.tar.gz" #CHECKSUM_SHA256="e24c2d75409ea6d7b8bd476540e187fe7ab06aef84844450ec1183cf3bd3f953" -LICENSE="MIT" -COPYRIGHT="2001-2014 Julian Raschke, Jan Lücker, and other contributors." + +ARCHITECTURES="!x86_gcc2" +SECONDARY_ARCHITECTURES="!x86" PROVIDES=" gosu$secondaryArchSuffix = $portVersion -" + " BUILD_REQUIRES=" devel:libfreetype$secondaryArchSuffix devel:libopenal$secondaryArchSuffix - devel:libsdl_ttf_2.0$secondaryArchSuffix + devel:libpango_1.0$secondaryArchSuffix devel:libsdl2$secondaryArchSuffix + devel:libsdl_ttf_2.0$secondaryArchSuffix devel:libsndfile$secondaryArchSuffix devel:libvorbisfile$secondaryArchSuffix - devel:libpango_1.0$secondaryArchSuffix -" - + " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:cmake >= 3.0.0 cmd:gcc$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix -" + " BUILD() { diff --git a/media-libs/gst_plugins_good/gst_plugins_good-1.14.2.recipe b/media-libs/gst_plugins_good/gst_plugins_good-1.14.2.recipe index 11b78cd55..1200c4477 100644 --- a/media-libs/gst_plugins_good/gst_plugins_good-1.14.2.recipe +++ b/media-libs/gst_plugins_good/gst_plugins_good-1.14.2.recipe @@ -35,12 +35,12 @@ REQUIRES=" lib:libintl$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libogg$secondaryArchSuffix + lib:liborc_0.4$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libsoup_2.4$secondaryArchSuffix lib:libspeex$secondaryArchSuffix lib:libsqlite3$secondaryArchSuffix lib:libtag$secondaryArchSuffix - lib:liborc_0.4$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix lib:libvpx$secondaryArchSuffix lib:libxml2$secondaryArchSuffix @@ -64,12 +64,12 @@ BUILD_REQUIRES=" devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libogg$secondaryArchSuffix + devel:liborc_0.4$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libsoup_2.4$secondaryArchSuffix devel:libspeex$secondaryArchSuffix devel:libsqlite3$secondaryArchSuffix devel:libtag$secondaryArchSuffix - devel:liborc_0.4$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix devel:libvpx$secondaryArchSuffix devel:libxml2$secondaryArchSuffix diff --git a/media-libs/harfbuzz/harfbuzz-1.5.1.recipe b/media-libs/harfbuzz/harfbuzz-1.5.1.recipe index a65a6d566..ea8db60e9 100644 --- a/media-libs/harfbuzz/harfbuzz-1.5.1.recipe +++ b/media-libs/harfbuzz/harfbuzz-1.5.1.recipe @@ -34,22 +34,22 @@ fi PROVIDES=" harfbuzz$secondaryArchSuffix = $portVersion compat >= 0.9 - lib:libharfbuzz$secondaryArchSuffix = 0.10501.0 compat >= 0 - lib:libharfbuzz_icu$secondaryArchSuffix = 0.10501.0 compat >= 0 cmd:hb_ot_shape_closure$commandSuffix cmd:hb_shape$commandSuffix + lib:libharfbuzz$secondaryArchSuffix = 0.10501.0 compat >= 0 + lib:libharfbuzz_icu$secondaryArchSuffix = 0.10501.0 compat >= 0 " REQUIRES=" haiku$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix + lib:libgraphite2$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libz$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix - lib:libgraphite2$secondaryArchSuffix " PROVIDES_devel=" @@ -65,20 +65,20 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libbz2$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix + devel:libgraphite2$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libicuuc$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libz$secondaryArchSuffix - devel:libbz2$secondaryArchSuffix - devel:libgraphite2$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal - cmd:automake cmd:autoconf + cmd:automake cmd:gcc$secondaryArchSuffix cmd:grep cmd:ld$secondaryArchSuffix diff --git a/media-libs/harfbuzz/harfbuzz-1.9.0.recipe b/media-libs/harfbuzz/harfbuzz-1.9.0.recipe index 8c85798b4..7d62e0b8a 100644 --- a/media-libs/harfbuzz/harfbuzz-1.9.0.recipe +++ b/media-libs/harfbuzz/harfbuzz-1.9.0.recipe @@ -32,29 +32,29 @@ else commandBinDir=$prefix/bin fi -libVersion=0.10900.0 +libVersion="0.10900.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" harfbuzz$secondaryArchSuffix = $portVersion compat >= 0.9 - lib:libharfbuzz$secondaryArchSuffix = $libVersionCompat - lib:libharfbuzz_icu$secondaryArchSuffix = $libVersionCompat - lib:libharfbuzz_subset$secondaryArchSuffix = $libVersionCompat cmd:hb_ot_shape_closure$commandSuffix cmd:hb_shape$commandSuffix cmd:hb_subset$commandSuffix + lib:libharfbuzz$secondaryArchSuffix = $libVersionCompat + lib:libharfbuzz_icu$secondaryArchSuffix = $libVersionCompat + lib:libharfbuzz_subset$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix + lib:libgraphite2$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libz$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix - lib:libgraphite2$secondaryArchSuffix " PROVIDES_devel=" @@ -71,20 +71,20 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libbz2$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix + devel:libgraphite2$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libicuuc$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libz$secondaryArchSuffix - devel:libbz2$secondaryArchSuffix - devel:libgraphite2$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal - cmd:automake cmd:autoconf + cmd:automake cmd:gcc$secondaryArchSuffix cmd:grep cmd:ld$secondaryArchSuffix @@ -103,7 +103,7 @@ defineDebugInfoPackage harfbuzz$secondaryArchSuffix \ "$commandBinDir"/hb-subset \ "$libDir"/libharfbuzz.so.$libVersion \ "$libDir"/libharfbuzz-icu.so.$libVersion \ - "$libDir"/libharfbuzz-subset.so.$libVersion \ + "$libDir"/libharfbuzz-subset.so.$libVersion BUILD() { diff --git a/media-libs/ilmbase/ilmbase-2.2.1.recipe b/media-libs/ilmbase/ilmbase-2.2.1.recipe index 00b1c8a53..589307027 100644 --- a/media-libs/ilmbase/ilmbase-2.2.1.recipe +++ b/media-libs/ilmbase/ilmbase-2.2.1.recipe @@ -11,7 +11,6 @@ LICENSE="BSD (3-clause)" REVISION="1" SOURCE_URI="https://download.savannah.nongnu.org/releases/openexr/ilmbase-$portVersion.tar.gz" CHECKSUM_SHA256="cac206e63be68136ef556c2b555df659f45098c159ce24804e9d5e9e0286609e" - if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then PATCHES="ilmbase-$portVersion.patchset" fi @@ -41,14 +40,14 @@ REQUIRES=" PROVIDES_devel=" ilmbase${secondaryArchSuffix}_devel = $portVersion devel:libhalf$secondaryArchSuffix = $libVersionCompat - devel:libiex_2_2$secondaryArchSuffix = $libVersionCompat - devel:libiexmath_2_2$secondaryArchSuffix = $libVersionCompat - devel:libilmthread_2_2$secondaryArchSuffix = $libVersionCompat - devel:libimath_2_2$secondaryArchSuffix = $libVersionCompat devel:libiex$secondaryArchSuffix = $libVersionCompat + devel:libiex_2_2$secondaryArchSuffix = $libVersionCompat devel:libiexmath$secondaryArchSuffix = $libVersionCompat + devel:libiexmath_2_2$secondaryArchSuffix = $libVersionCompat devel:libilmthread$secondaryArchSuffix = $libVersionCompat + devel:libilmthread_2_2$secondaryArchSuffix = $libVersionCompat devel:libimath$secondaryArchSuffix = $libVersionCompat + devel:libimath_2_2$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" ilmbase$secondaryArchSuffix == $portVersion base diff --git a/media-libs/imlib2/imlib2-1.5.1.recipe b/media-libs/imlib2/imlib2-1.5.1.recipe index f29e7c285..b6459c156 100644 --- a/media-libs/imlib2/imlib2-1.5.1.recipe +++ b/media-libs/imlib2/imlib2-1.5.1.recipe @@ -12,9 +12,9 @@ information." HOMEPAGE="https://www.enlightenment.org/" COPYRIGHT="2002-2018 Project Enlightenment" LICENSE="IMLIB2" +REVISION="1" SOURCE_URI="https://downloads.sourceforge.net/enlightenment/imlib2-$portVersion.tar.bz2" CHECKSUM_SHA256="fa4e57452b8843f4a70f70fd435c746ae2ace813250f8c65f977db5d7914baae" -REVISION="1" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -40,13 +40,14 @@ REQUIRES=" PROVIDES_devel=" imlib2${secondaryArchSuffix}_devel = $portVersion - devel:libimlib2$secondaryArchSuffix = $libVersionCompat cmd:imlib2_config$secondaryArchSuffix = $portVersion cmd:imlib2_conv$secondaryArchSuffix = $portVersion + devel:libimlib2$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - imlib2$secondaryArchSuffix == $portVersion base + haiku$secondaryArchSuffix haiku${secondaryArchSuffix}_devel + imlib2$secondaryArchSuffix == $portVersion base devel:libbz2$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libgif$secondaryArchSuffix @@ -55,7 +56,6 @@ REQUIRES_devel=" devel:libpng16$secondaryArchSuffix devel:libtiff$secondaryArchSuffix >= 5 devel:libz$secondaryArchSuffix - haiku$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix " diff --git a/media-libs/jasper/jasper1-1.900.5.recipe b/media-libs/jasper/jasper1-1.900.5.recipe index 382911264..b4714cfd7 100644 --- a/media-libs/jasper/jasper1-1.900.5.recipe +++ b/media-libs/jasper/jasper1-1.900.5.recipe @@ -55,15 +55,15 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:mkdepend - cmd:libtoolize$secondaryArchSuffix cmd:aclocal cmd:autoconf cmd:automake cmd:chmod + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:mkdepend " BUILD() diff --git a/media-libs/lcms/lcms-2.9.recipe b/media-libs/lcms/lcms-2.9.recipe index a0778dc1c..f0b93803c 100644 --- a/media-libs/lcms/lcms-2.9.recipe +++ b/media-libs/lcms/lcms-2.9.recipe @@ -16,8 +16,8 @@ SOURCE_DIR="lcms2-$portVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -commandSuffix=$secondaryArchSuffix -commandBinDir=$binDir +commandSuffix="$secondaryArchSuffix" +commandBinDir="$binDir" if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= commandBinDir=$prefix/bin @@ -25,12 +25,12 @@ fi PROVIDES=" lcms$secondaryArchSuffix = $portVersion compat >= 2 - lib:liblcms2$secondaryArchSuffix = 2.0.8 compat >= 2 cmd:jpgicc$commandSuffix cmd:linkicc$commandSuffix cmd:psicc$commandSuffix cmd:tificc$commandSuffix cmd:transicc$commandSuffix + lib:liblcms2$secondaryArchSuffix = 2.0.8 compat >= 2 " REQUIRES=" haiku$secondaryArchSuffix @@ -59,12 +59,12 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix cmd:aclocal cmd:autoconf cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix cmd:make " diff --git a/media-libs/libextractor/libextractor-1.3.recipe b/media-libs/libextractor/libextractor-1.3.recipe index 45baf7ddd..6b6a52371 100644 --- a/media-libs/libextractor/libextractor-1.3.recipe +++ b/media-libs/libextractor/libextractor-1.3.recipe @@ -32,9 +32,8 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libarchive$secondaryArchSuffix - lib:libtiff$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix lib:libavutil$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix lib:libexiv2$secondaryArchSuffix lib:libflac$secondaryArchSuffix lib:libgif$secondaryArchSuffix @@ -42,9 +41,10 @@ REQUIRES=" lib:libgstreamer$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libmagic$secondaryArchSuffix - lib:libmpeg2$secondaryArchSuffix lib:libmp4v2$secondaryArchSuffix + lib:libmpeg2$secondaryArchSuffix lib:libtidy$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -59,22 +59,22 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libcurl$secondaryArchSuffix - devel:libltdl$secondaryArchSuffix devel:libarchive$secondaryArchSuffix - devel:libtiff$secondaryArchSuffix - devel:libbz2$secondaryArchSuffix devel:libavutil$secondaryArchSuffix + devel:libbz2$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix devel:libexiv2$secondaryArchSuffix devel:libflac$secondaryArchSuffix devel:libgif$secondaryArchSuffix devel:libgsf$secondaryArchSuffix devel:libgstreamer$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix + devel:libltdl$secondaryArchSuffix devel:libmagic$secondaryArchSuffix - devel:libmpeg2$secondaryArchSuffix devel:libmp4v2$secondaryArchSuffix + devel:libmpeg2$secondaryArchSuffix devel:libtidy$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix devel:libz$secondaryArchSuffix " diff --git a/media-libs/libgphoto2/libgphoto2-2.5.19.recipe b/media-libs/libgphoto2/libgphoto2-2.5.19.recipe index 48fb00d56..5f56ffc4e 100644 --- a/media-libs/libgphoto2/libgphoto2-2.5.19.recipe +++ b/media-libs/libgphoto2/libgphoto2-2.5.19.recipe @@ -61,10 +61,10 @@ BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf cmd:automake + cmd:gcc$secondaryArchSuffix cmd:gettext$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make - cmd:gcc$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix " diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe index 164eb12c4..8b6a7569b 100644 --- a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe +++ b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe @@ -57,12 +57,12 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - cmd:gcc${secondaryArchSuffix} - cmd:ld${secondaryArchSuffix} - cmd:make - cmd:libtoolize$secondaryArchSuffix cmd:aclocal cmd:autoconf + cmd:gcc${secondaryArchSuffix} + cmd:ld${secondaryArchSuffix} + cmd:libtoolize$secondaryArchSuffix + cmd:make " BUILD() diff --git a/media-libs/libpagemaker/libpagemaker-0.0.4.recipe b/media-libs/libpagemaker/libpagemaker-0.0.4.recipe index 781376c31..f4bf482ca 100644 --- a/media-libs/libpagemaker/libpagemaker-0.0.4.recipe +++ b/media-libs/libpagemaker/libpagemaker-0.0.4.recipe @@ -15,8 +15,8 @@ CHECKSUM_SHA256="66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519 ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -commandSuffix=$secondaryArchSuffix -commandBinDir=$binDir +commandSuffix="$secondaryArchSuffix" +commandBinDir="$binDir" if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= commandBinDir=$prefix/bin @@ -24,9 +24,9 @@ fi libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + portVersionCompat="$portVersion compat >= ${portVersion%%.*}" portVers="${portVersion%.*}" - PROVIDES=" libpagemaker$secondaryArchSuffix = $portVersion compat >= 0 cmd:pmd2raw$commandSuffix = $portVersion compat >= 0 @@ -56,15 +56,15 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:libtoolize$secondaryArchSuffix cmd:aclocal + cmd:autoconf cmd:autoheader cmd:automake - cmd:autoconf + cmd:awk cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix cmd:make - cmd:awk cmd:pkg_config$secondaryArchSuffix " diff --git a/media-libs/libpng/libpng16-1.6.35.recipe b/media-libs/libpng/libpng16-1.6.35.recipe index 459c3056f..8b75976c2 100644 --- a/media-libs/libpng/libpng16-1.6.35.recipe +++ b/media-libs/libpng/libpng16-1.6.35.recipe @@ -32,22 +32,22 @@ REQUIRES=" PROVIDES_devel=" libpng16${secondaryArchSuffix}_devel = $portVersionCompat - cmd:libpng_config$secondaryArchSuffix = $portVersionCompat cmd:libpng16_config$secondaryArchSuffix = $portVersionCompat + cmd:libpng_config$secondaryArchSuffix = $portVersionCompat + cmd:png_fix_itxt$secondaryArchSuffix = $portVersionCompat cmd:pngcp$secondaryArchSuffix = $portVersionCompat cmd:pngfix$secondaryArchSuffix = $portVersionCompat - cmd:png_fix_itxt$secondaryArchSuffix = $portVersionCompat devel:libpng$secondaryArchSuffix = $libVersionCompat devel:libpng16$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - libpng16$secondaryArchSuffix == $portVersion base haiku$secondaryArchSuffix + libpng16$secondaryArchSuffix == $portVersion base lib:libz$secondaryArchSuffix " CONFLICTS_devel=" - libpng12${secondaryArchSuffix}_devel libpng${secondaryArchSuffix}_devel + libpng12${secondaryArchSuffix}_devel " BUILD_REQUIRES=" diff --git a/media-libs/libquicktime/libquicktime-1.2.4.recipe b/media-libs/libquicktime/libquicktime-1.2.4.recipe index ffe2f9b82..27b01254c 100644 --- a/media-libs/libquicktime/libquicktime-1.2.4.recipe +++ b/media-libs/libquicktime/libquicktime-1.2.4.recipe @@ -24,20 +24,19 @@ Applications can get important information about the codecs, their \ settable parameters etc. at runtime. " HOMEPAGE="http://libquicktime.sourceforge.net" -LICENSE="GNU LGPL v2.1" -REVISION="4" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -SOURCE_URI="http://sourceforge.net/projects/libquicktime/files/libquicktime/$portVersion/libquicktime-$portVersion.tar.gz" -CHECKSUM_SHA256="1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368" COPYRIGHT=" 2002 Heroine Virtual Ltd. 2002-2007 Members of the libquicktime project. " +LICENSE="GNU LGPL v2.1" +REVISION="4" +SOURCE_URI="http://sourceforge.net/projects/libquicktime/files/libquicktime/$portVersion/libquicktime-$portVersion.tar.gz" +CHECKSUM_SHA256="1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368" PATCHES="libquicktime-$portVersion.patchset" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + PROVIDES=" libquicktime$secondaryArchSuffix = $portVersion compat >= 1.2 lib:libquicktime$secondaryArchSuffix = 0.0.0 compat >= 0 @@ -57,28 +56,17 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" haiku$secondaryArchSuffix - lib:libjpeg$secondaryArchSuffix - lib:libvorbis$secondaryArchSuffix - lib:libogg$secondaryArchSuffix lib:libdv$secondaryArchSuffix - lib:libmp3lame$secondaryArchSuffix lib:libfaad$secondaryArchSuffix lib:libiconv$secondaryArchSuffix - lib:libz$secondaryArchSuffix lib:libintl$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libmp3lame$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libz$secondaryArchSuffix " -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libjpeg$secondaryArchSuffix - devel:libvorbis$secondaryArchSuffix - devel:libogg$secondaryArchSuffix - devel:libdv$secondaryArchSuffix - devel:libmp3lame$secondaryArchSuffix - devel:libfaad$secondaryArchSuffix - devel:libiconv$secondaryArchSuffix - devel:libz$secondaryArchSuffix - devel:libintl$secondaryArchSuffix - " + PROVIDES_devel=" libquicktime${secondaryArchSuffix}_devel = $portVersion compat >= 1.2 devel:libquicktime$secondaryArchSuffix = 0.0.0 compat >= 0 @@ -86,16 +74,29 @@ PROVIDES_devel=" REQUIRES_devel=" libquicktime$secondaryArchSuffix == $portVersion base " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libdv$secondaryArchSuffix + devel:libfaad$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:libintl$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libmp3lame$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " BUILD_PREREQUIRES=" cmd:aclocal - cmd:autoreconf cmd:automake + cmd:autoreconf cmd:gcc$secondaryArchSuffix + cmd:gettext cmd:ld$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config${secondaryArchSuffix} - cmd:gettext " BUILD() diff --git a/media-libs/libwebp/libwebp-1.0.0.recipe b/media-libs/libwebp/libwebp-1.0.0.recipe index 1386eacd7..a5b4ed417 100644 --- a/media-libs/libwebp/libwebp-1.0.0.recipe +++ b/media-libs/libwebp/libwebp-1.0.0.recipe @@ -34,21 +34,21 @@ done PROVIDES=" libwebp$secondaryArchSuffix = $portVersion - lib:libwebp$secondaryArchSuffix = $libwebpVersionCompat - lib:libwebpdecoder$secondaryArchSuffix = $libwebpdecoderVersionCompat - lib:libwebpdemux$secondaryArchSuffix = $libwebpdemuxVersionCompat - lib:libwebpmux$secondaryArchSuffix = $libwebpmuxVersionCompat cmd:cwebp$secondaryArchSuffix cmd:dwebp$secondaryArchSuffix cmd:gif2webp$secondaryArchSuffix cmd:img2webp$secondaryArchSuffix - cmd:webpmux$secondaryArchSuffix cmd:webpinfo$secondaryArchSuffix + cmd:webpmux$secondaryArchSuffix + lib:libwebp$secondaryArchSuffix = $libwebpVersionCompat + lib:libwebpdecoder$secondaryArchSuffix = $libwebpdecoderVersionCompat + lib:libwebpdemux$secondaryArchSuffix = $libwebpdemuxVersionCompat + lib:libwebpmux$secondaryArchSuffix = $libwebpmuxVersionCompat " REQUIRES=" haiku$secondaryArchSuffix - lib:libjpeg$secondaryArchSuffix lib:libgif$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libtiff$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -71,8 +71,8 @@ CONFLICTS_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libjpeg$secondaryArchSuffix devel:libgif$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libtiff$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -87,6 +87,7 @@ BUILD_PREREQUIRES=" #cmd:m4 cmd:make " + defineDebugInfoPackage libwebp$secondaryArchSuffix \ "$binDir"/cwebp \ "$binDir"/dwebp \ diff --git a/media-libs/opencv/opencv-3.4.1.recipe b/media-libs/opencv/opencv-3.4.1.recipe index c06f85df1..826a93a03 100644 --- a/media-libs/opencv/opencv-3.4.1.recipe +++ b/media-libs/opencv/opencv-3.4.1.recipe @@ -11,15 +11,15 @@ COPYRIGHT="2000-2016, Intel Corporation LICENSE="BSD (3-clause)" REVISION="5" SOURCE_URI="https://github.com/opencv/opencv/archive/$portVersion.tar.gz" -SOURCE_FILENAME="opencv-$portVersion.tar.gz" CHECKSUM_SHA256="f1b87684d75496a1054405ae3ee0b6573acaf3dad39eaf4f1d66fdd7e03dc852" +SOURCE_FILENAME="opencv-$portVersion.tar.gz" PATCHES="opencv-$portVersion.patchset" ARCHITECTURES="?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" # On x86_gcc2 we don't want to install the commands in bin//, but in bin/. -commandSuffix=$secondaryArchSuffix +commandSuffix="$secondaryArchSuffix" if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= fi diff --git a/media-libs/opencv/opencv342-3.4.2.recipe b/media-libs/opencv/opencv342-3.4.2.recipe index b54943098..847b68ca1 100644 --- a/media-libs/opencv/opencv342-3.4.2.recipe +++ b/media-libs/opencv/opencv342-3.4.2.recipe @@ -11,15 +11,15 @@ COPYRIGHT="2000-2016, Intel Corporation LICENSE="BSD (3-clause)" REVISION="1" SOURCE_URI="https://github.com/opencv/opencv/archive/$portVersion.tar.gz" -SOURCE_FILENAME="opencv-$portVersion.tar.gz" CHECKSUM_SHA256="81dbd5e7e9f8a4c936b94629bf4765745942a1d634ae38ec08bc57b73b28ffc5" +SOURCE_FILENAME="opencv-$portVersion.tar.gz" SOURCE_DIR="opencv-$portVersion" ARCHITECTURES="?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" # On x86_gcc2 we don't want to install the commands in bin//, but in bin/. -commandSuffix=$secondaryArchSuffix +commandSuffix="$secondaryArchSuffix" if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= fi diff --git a/media-libs/openjpeg/openjpeg-2.1.2.recipe b/media-libs/openjpeg/openjpeg-2.1.2.recipe index 5aa327de1..85d7c51fa 100644 --- a/media-libs/openjpeg/openjpeg-2.1.2.recipe +++ b/media-libs/openjpeg/openjpeg-2.1.2.recipe @@ -19,8 +19,8 @@ Universite catholique de Louvain (UCL), Belgium LICENSE="BSD (2-clause)" REVISION="3" SOURCE_URI="http://github.com/uclouvain/openjpeg/archive/v$portVersion.tar.gz" -SOURCE_FILENAME="openjpeg-$portVersion.tar.gz" CHECKSUM_SHA256="4ce77b6ef538ef090d9bde1d5eeff8b3069ab56c4906f083475517c2c023dfa7" +SOURCE_FILENAME="openjpeg-$portVersion.tar.gz" PATCHES="openjpeg-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -28,8 +28,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" openjpeg$secondaryArchSuffix = $portVersion - cmd:opj_decompress$secondaryArchSuffix = $portVersion cmd:opj_compress$secondaryArchSuffix = $portVersion + cmd:opj_decompress$secondaryArchSuffix = $portVersion cmd:opj_dump$secondaryArchSuffix = $portVersion lib:libopenjp2$secondaryArchSuffix = 7.0.2 compat >= 7 " @@ -64,11 +64,10 @@ if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then devel:liblcms2$secondaryArchSuffix " fi - BUILD_PREREQUIRES=" cmd:cmake - cmd:make cmd:gcc$secondaryArchSuffix + cmd:make " BUILD() diff --git a/media-libs/osl/osl-1.9.5.recipe b/media-libs/osl/osl-1.9.5.recipe index e6696f132..d5d82edbc 100644 --- a/media-libs/osl/osl-1.9.5.recipe +++ b/media-libs/osl/osl-1.9.5.recipe @@ -7,22 +7,22 @@ COPYRIGHT="2009-2017 Sony Pictures Imageworks Inc." LICENSE="BSD (3-clause)" REVISION="1" SOURCE_URI="$HOMEPAGE/archive/Release-$portVersion.tar.gz" -CHECKSUM_SHA256='5d9dc71f3b79714350ae94e4ad5929a7aabae40f292e7837d1749fca180eae96' +CHECKSUM_SHA256="5d9dc71f3b79714350ae94e4ad5929a7aabae40f292e7837d1749fca180eae96" SOURCE_DIR="OpenShadingLanguage-Release-$portVersion" PATCHES="osl-$portVersion.patchset" +ARCHITECTURES="!x86_gcc2 ?x86 x86_64" +SECONDARY_ARCHITECTURES="?x86" + # On x86_gcc2 we don't want to install the commands in bin//, but in bin/. -commandSuffix=$secondaryArchSuffix -commandBinDir=$binDir +commandSuffix="$secondaryArchSuffix" +commandBinDir="$binDir" if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= commandBinDir=$prefix/bin fi -ARCHITECTURES="!x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="?x86" - -libVersion=$portVersion +libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -90,8 +90,8 @@ BUILD_REQUIRES=" devel:libIlmThread_2_2$secondaryArchSuffix devel:libImath_2_2$secondaryArchSuffix devel:libLLVM_5.0$secondaryArchSuffix - devel:libpartio$secondaryArchSuffix devel:libopenimageio$secondaryArchSuffix + devel:libpartio$secondaryArchSuffix devel:libpugixml$secondaryArchSuffix devel:libz$secondaryArchSuffix " diff --git a/media-libs/partio/partio-1.1.0.recipe b/media-libs/partio/partio-1.1.0.recipe index 41144f6d7..452ad888d 100644 --- a/media-libs/partio/partio-1.1.0.recipe +++ b/media-libs/partio/partio-1.1.0.recipe @@ -16,15 +16,15 @@ COPYRIGHT="2010-2012 Disney Enterprises" LICENSE="BSD (3-clause)" REVISION="1" SOURCE_URI="https://github.com/wdas/partio/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256='133f386f076bd6958292646b6ba0e3db6d1e37bde3b8a6d1bc4b7809d693999d' +CHECKSUM_SHA256="133f386f076bd6958292646b6ba0e3db6d1e37bde3b8a6d1bc4b7809d693999d" PATCHES="partio-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" # On x86_gcc2 we don't want to install the commands in bin//, but in bin/. -commandSuffix=$secondaryArchSuffix -commandBinDir=$binDir +commandSuffix="$secondaryArchSuffix" +commandBinDir="$binDir" if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= commandBinDir=$prefix/bin diff --git a/media-libs/pdflib/pdflib-5.0.3.recipe b/media-libs/pdflib/pdflib-5.0.3.recipe index 638335da2..d74818502 100644 --- a/media-libs/pdflib/pdflib-5.0.3.recipe +++ b/media-libs/pdflib/pdflib-5.0.3.recipe @@ -22,8 +22,8 @@ ARCHITECTURES="x86_gcc2 ?x86 x86_64" PROVIDES=" pdflib = $portVersion cmd:pdflib_config = $portVersion - lib:libpdf = $portVersion devel:libpdf = $portVersion + lib:libpdf = $portVersion " REQUIRES=" haiku @@ -33,11 +33,11 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" + cmd:gcc + cmd:ld cmd:libtool cmd:libtoolize cmd:make - cmd:gcc - cmd:ld " PATCH() diff --git a/media-libs/x265/x265-2.0.recipe b/media-libs/x265/x265-2.0.recipe index 61ef0a0cd..bbe381e08 100644 --- a/media-libs/x265/x265-2.0.recipe +++ b/media-libs/x265/x265-2.0.recipe @@ -4,29 +4,36 @@ DESCRIPTION="x265 is a full-fledged video encoder for the HEVC video format \ and ITU-T H.265). HEVC is a direct successor to the earlier H.264/MPEG-4 AVC \ video compression standard, aiming to achieve the same video quality at half \ the bit rate. x265 is a free software project implementing that standard." - HOMEPAGE="http://x265.org/" -LICENSE="GNU GPL v2" COPYRIGHT="2013-2016 x265 Project" +LICENSE="GNU GPL v2" +REVISION="2" SOURCE_URI="https://bitbucket.org/multicoreware/x265/get/$portVersion.tar.bz2" CHECKSUM_SHA256="67a681ae9907002712075c0ad149f0b4f84333ebc4b37ccee6385804760d2d64" -REVISION="2" +# BitBucket sucks +SOURCE_DIR="multicoreware-x265-960c9991d0dc" +PATCHES="x265-$portVersion.patchset" + ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" -# BitBucket sucks -SOURCE_DIR='multicoreware-x265-960c9991d0dc' - PROVIDES=" x265$secondaryArchSuffix = $portVersion cmd:x265 = $portVersion lib:libx265$secondaryArchSuffix = 87 " - REQUIRES=" haiku$secondaryArchSuffix " +PROVIDES_devel=" + x265${secondaryArchSuffix}_devel = $portVersion + devel:libx265$secondaryArchSuffix = 87 + " +REQUIRES_devel=" + x265$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -37,8 +44,6 @@ BUILD_PREREQUIRES=" cmd:yasm " -PATCHES="x265-$portVersion.patchset" - BUILD() { # Can't put this in SOURCE_DIR as cmake uses a file in the root @@ -64,13 +69,3 @@ INSTALL() packageEntries devel \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - x265${secondaryArchSuffix}_devel = $portVersion - devel:libx265$secondaryArchSuffix = 87 - " -REQUIRES_devel=" - x265$secondaryArchSuffix == $portVersion base - " diff --git a/media-libs/x265/x265-2.1_hg.recipe b/media-libs/x265/x265-2.1_hg.recipe index cd50c315e..44803ab22 100644 --- a/media-libs/x265/x265-2.1_hg.recipe +++ b/media-libs/x265/x265-2.1_hg.recipe @@ -4,29 +4,36 @@ DESCRIPTION="x265 is a full-fledged video encoder for the HEVC video format \ and ITU-T H.265). HEVC is a direct successor to the earlier H.264/MPEG-4 AVC \ video compression standard, aiming to achieve the same video quality at half \ the bit rate. x265 is a free software project implementing that standard." - HOMEPAGE="http://x265.org/" -LICENSE="GNU GPL v2" COPYRIGHT="2013-2016 x265 Project" +LICENSE="GNU GPL v2" +REVISION="1" SOURCE_URI="https://bitbucket.org/multicoreware/x265/get/tip.tar.bz2" CHECKSUM_SHA256="228446ebbbcf3923f1f8b7ef29e954a36ff7689b48f83e3908cd437de1b231d1" -REVISION="1" -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86" - # BitBucket sucks SOURCE_DIR="multicoreware-x265-2737c6ff5f80" +PATCHES="x265-$portVersion.patchset" + +ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86" PROVIDES=" x265$secondaryArchSuffix = $portVersion cmd:x265 = $portVersion lib:libx265$secondaryArchSuffix = 89 " - REQUIRES=" haiku$secondaryArchSuffix " +PROVIDES_devel=" + x265${secondaryArchSuffix}_devel = $portVersion + devel:libx265$secondaryArchSuffix = 89 + " +REQUIRES_devel=" + x265$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -37,8 +44,6 @@ BUILD_PREREQUIRES=" cmd:yasm " -PATCHES="x265-$portVersion.patchset" - BUILD() { # Can't put this in SOURCE_DIR as cmake uses a file in the root @@ -64,13 +69,3 @@ INSTALL() packageEntries devel \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - x265${secondaryArchSuffix}_devel = $portVersion - devel:libx265$secondaryArchSuffix = 89 - " -REQUIRES_devel=" - x265$secondaryArchSuffix == $portVersion base - "