From 89b07f6e3c5472c423ffcf02d2804d6e959f9674 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 3 Aug 2018 15:05:34 +0200 Subject: [PATCH] media-libs: code style. --- media-libs/agar/agar-1.5.0.recipe | 2 - media-libs/dumb/dumb-0.9.3.recipe | 15 +++---- media-libs/esdl/esdl-1.3.1.recipe | 8 ++-- .../fontconfig/fontconfig-2.11.1.recipe | 42 +++++++++---------- .../fontconfig/fontconfig-2.11.95.recipe | 42 +++++++++---------- .../fontconfig/fontconfig-2.12.6.recipe | 10 ++--- media-libs/freeimage/freeimage-3.17.0.recipe | 4 +- media-libs/glew/glew-2.1.0.recipe | 1 - .../gst_plugins_base-1.14.0.recipe | 2 + media-libs/jbig2dec/jbig2dec-0.14.recipe | 1 + media-libs/jgmod/jgmod-0.99.recipe | 2 +- media-libs/lensfun/lensfun-0.3.2.recipe | 17 ++++---- media-libs/libaacs/libaacs-0.9.0.recipe | 7 +++- media-libs/libao/libao-1.2.2.recipe | 2 +- media-libs/libbluray/libbluray1-0.9.3.recipe | 1 + media-libs/libepoxy/libepoxy-1.4.3.recipe | 1 - .../libopenshot_audio-0.1.5.recipe | 3 +- .../libopenshot/libopenshot-0.1.9.recipe | 3 +- media-libs/libraqm/libraqm-0.3.0.recipe | 1 - media-libs/openjpeg/openjpeg-2.2.0.recipe | 3 +- media-libs/openjpeg/openjpeg-2.3.0.recipe | 3 +- media-libs/plib/plib-1.8.5.recipe | 11 +++-- media-libs/portaudio/portaudio-19.recipe | 4 +- media-libs/sdl_gfx/sdl_gfx-2.0.26.recipe | 5 +-- media-libs/vigra/vigra-1.10.0.recipe | 34 +++++++-------- 25 files changed, 104 insertions(+), 120 deletions(-) diff --git a/media-libs/agar/agar-1.5.0.recipe b/media-libs/agar/agar-1.5.0.recipe index 20ea99912..b643dcf6e 100644 --- a/media-libs/agar/agar-1.5.0.recipe +++ b/media-libs/agar/agar-1.5.0.recipe @@ -16,7 +16,6 @@ PROVIDES=" agar$secondaryArchSuffix = $portVersion cmd:agar$secondaryArchSuffix " - REQUIRES=" haiku$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix @@ -38,7 +37,6 @@ BUILD_REQUIRES=" devel:libsdl$secondaryArchSuffix devel:libsndfile$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:awk cmd:gcc$secondaryArchSuffix diff --git a/media-libs/dumb/dumb-0.9.3.recipe b/media-libs/dumb/dumb-0.9.3.recipe index d6b53df74..f40f2c400 100644 --- a/media-libs/dumb/dumb-0.9.3.recipe +++ b/media-libs/dumb/dumb-0.9.3.recipe @@ -1,13 +1,13 @@ SUMMARY="A Dynamic Universal Music Library" DESCRIPTION="DUMB is an IT, XM, S3M and MOD player library" HOMEPAGE="http://dumb.sourceforge.net/" -LICENSE="DUMB-0.9.3" COPYRIGHT="2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere" +LICENSE="DUMB-0.9.3" +REVISION="2" SOURCE_URI="http://downloads.sourceforge.net/project/dumb/dumb/$portVersion/dumb-$portVersion.tar.gz" CHECKSUM_SHA256="8d44fbc9e57f3bac9f761c3b12ce102d47d717f0dd846657fb988e0bb5d1ea33" SOURCE_URI_2="http://prdownloads.sourceforge.net/dumb/dumb-$portVersion-autotools.tar.gz" CHECKSUM_SHA256_2="9e3fa1e0932e00e31f2314cefb3ea0343ee4f850b6a8e6a6a9627a35b2dc0dbd" -REVISION="2" ARCHITECTURES="x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -20,6 +20,10 @@ PROVIDES=" cmd:dumbout$secondaryArchSuffix = $portVersion cmd:dumbplay$secondaryArchSuffix = $portVersion " +REQUIRES=" + haiku$secondaryArchSuffix + lib:liballeg$secondaryArchSuffix + " PROVIDES_devel=" dumb${secondaryArchSuffix}_devel = $portVersion @@ -28,12 +32,6 @@ PROVIDES_devel=" devel:libaldmb$secondaryArchSuffix = $portVersion devel:libaldmb_0.9.3$secondaryArchSuffix = 0.9.3 compat >= 0.9 " - -REQUIRES=" - haiku$secondaryArchSuffix - lib:liballeg$secondaryArchSuffix - " - REQUIRES_devel=" dumb$secondaryArchSuffix == $portVersion base " @@ -42,7 +40,6 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:liballeg$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix diff --git a/media-libs/esdl/esdl-1.3.1.recipe b/media-libs/esdl/esdl-1.3.1.recipe index 4b59efa4b..c9266988a 100644 --- a/media-libs/esdl/esdl-1.3.1.recipe +++ b/media-libs/esdl/esdl-1.3.1.recipe @@ -1,15 +1,15 @@ SUMMARY="Erlang bindings for SDL" DESCRIPTION="Allows to use SDL (and OpenGL) with the Erlang programming \ language." -LICENSE="BSD (3-clause)" -REVISION="1" -ARCHITECTURES="?x86_gcc2" HOMEPAGE="https://sourceforge.net/projects/esdl/" COPYRIGHT="Dan Gundmundsson, and other parties" - +LICENSE="BSD (3-clause)" +REVISION="1" SOURCE_URI="http://sourceforge.net/projects/esdl/files/esdl/esdl-$portVersion/esdl-$portVersion.src.tgz" CHECKSUM_SHA256="01789310d6fd9a4149fc9ddb16fa97ed2c03bbb2d52aa174561800934269aa38" +ARCHITECTURES="?x86_gcc2" + PROVIDES=" esdl = $portVersion " diff --git a/media-libs/fontconfig/fontconfig-2.11.1.recipe b/media-libs/fontconfig/fontconfig-2.11.1.recipe index 721e185e3..2158c404e 100644 --- a/media-libs/fontconfig/fontconfig-2.11.1.recipe +++ b/media-libs/fontconfig/fontconfig-2.11.1.recipe @@ -3,9 +3,6 @@ DESCRIPTION=" Fontconfig is a library for font customization and configuration. " HOMEPAGE="http://www.freedesktop.org/wiki/Software/fontconfig" -SOURCE_URI="http://www.freedesktop.org/software/fontconfig/release/fontconfig-$portVersion.tar.bz2" -CHECKSUM_SHA256="dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99" -LICENSE="MIT" COPYRIGHT="2000-2005, 2006-2007 Keith Packard 2005 Patrick Lam 2009 Roozbeh Pournader @@ -13,11 +10,20 @@ COPYRIGHT="2000-2005, 2006-2007 Keith Packard 2008 Danilo Segan 2012 Google, Inc. " +LICENSE="MIT" REVISION="3" +SOURCE_URI="http://www.freedesktop.org/software/fontconfig/release/fontconfig-$portVersion.tar.bz2" +CHECKSUM_SHA256="dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99" +PATCHES="fontconfig-2.11.1.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" +GLOBAL_WRITABLE_FILES=" + settings/fonts/conf.d directory keep-old + settings/fonts/fonts.conf auto-merge + " + PROVIDES=" fontconfig$secondaryArchSuffix = $portVersion compat >= 2 cmd:fc_cache$secondaryArchSuffix @@ -30,7 +36,6 @@ PROVIDES=" cmd:fc_validate$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix = 1.8.0 compat >= 1 " - REQUIRES=" haiku$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix @@ -40,6 +45,16 @@ REQUIRES=" lib:libbz2$secondaryArchSuffix " +PROVIDES_devel=" + fontconfig${secondaryArchSuffix}_devel = $portVersion compat >= 2.1 + devel:libfontconfig$secondaryArchSuffix = 1.8.0 compat >= 1 + " +REQUIRES_devel=" + fontconfig$secondaryArchSuffix == $portVersion base + devel:libfreetype$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + " + BUILD_REQUIRES=" devel:libfreetype$secondaryArchSuffix devel:libxml2$secondaryArchSuffix @@ -47,7 +62,6 @@ BUILD_REQUIRES=" devel:libpng$secondaryArchSuffix devel:libbz2$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:libtool @@ -61,13 +75,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -PATCHES="fontconfig-2.11.1.patchset" - -GLOBAL_WRITABLE_FILES=" - settings/fonts/conf.d directory keep-old - settings/fonts/fonts.conf auto-merge - " - BUILD() { mkdir -p `finddir B_USER_CACHE_DIRECTORY` @@ -120,14 +127,3 @@ INSTALL() $manDir \ $docDir } - -PROVIDES_devel=" - fontconfig${secondaryArchSuffix}_devel = $portVersion compat >= 2.1 - devel:libfontconfig$secondaryArchSuffix = 1.8.0 compat >= 1 - " - -REQUIRES_devel=" - fontconfig$secondaryArchSuffix == $portVersion base - devel:libfreetype$secondaryArchSuffix - devel:libxml2$secondaryArchSuffix - " diff --git a/media-libs/fontconfig/fontconfig-2.11.95.recipe b/media-libs/fontconfig/fontconfig-2.11.95.recipe index d74a87d25..836942482 100644 --- a/media-libs/fontconfig/fontconfig-2.11.95.recipe +++ b/media-libs/fontconfig/fontconfig-2.11.95.recipe @@ -3,9 +3,6 @@ DESCRIPTION=" Fontconfig is a library for font customization and configuration. " HOMEPAGE="http://www.freedesktop.org/wiki/Software/fontconfig" -SOURCE_URI="http://www.freedesktop.org/software/fontconfig/release/fontconfig-$portVersion.tar.bz2" -CHECKSUM_SHA256="7b165eee7aa22dcc1557db56f58d905b6a14b32f9701c79427452474375b4c89" -LICENSE="MIT" COPYRIGHT="2000-2005, 2006-2007 Keith Packard 2005 Patrick Lam 2009 Roozbeh Pournader @@ -13,11 +10,20 @@ COPYRIGHT="2000-2005, 2006-2007 Keith Packard 2008 Danilo Segan 2012 Google, Inc. " +LICENSE="MIT" REVISION="1" +SOURCE_URI="http://www.freedesktop.org/software/fontconfig/release/fontconfig-$portVersion.tar.bz2" +CHECKSUM_SHA256="7b165eee7aa22dcc1557db56f58d905b6a14b32f9701c79427452474375b4c89" +PATCHES="fontconfig-2.11.1.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" +GLOBAL_WRITABLE_FILES=" + settings/fonts/conf.d directory keep-old + settings/fonts/fonts.conf auto-merge + " + PROVIDES=" fontconfig$secondaryArchSuffix = $portVersion compat >= 2 cmd:fc_cache$secondaryArchSuffix @@ -30,7 +36,6 @@ PROVIDES=" cmd:fc_validate$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix = 1.9.1 compat >= 1 " - REQUIRES=" haiku$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix @@ -40,6 +45,16 @@ REQUIRES=" lib:libbz2$secondaryArchSuffix " +PROVIDES_devel=" + fontconfig${secondaryArchSuffix}_devel = $portVersion compat >= 2.1 + devel:libfontconfig$secondaryArchSuffix = 1.9.1 compat >= 1 + " +REQUIRES_devel=" + fontconfig$secondaryArchSuffix == $portVersion base + devel:libfreetype$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + " + BUILD_REQUIRES=" devel:libfreetype$secondaryArchSuffix devel:libxml2$secondaryArchSuffix @@ -47,7 +62,6 @@ BUILD_REQUIRES=" devel:libpng$secondaryArchSuffix devel:libbz2$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:libtool @@ -62,13 +76,6 @@ BUILD_PREREQUIRES=" cmd:python " -PATCHES="fontconfig-2.11.1.patchset" - -GLOBAL_WRITABLE_FILES=" - settings/fonts/conf.d directory keep-old - settings/fonts/fonts.conf auto-merge - " - BUILD() { mkdir -p `finddir B_USER_CACHE_DIRECTORY` @@ -121,14 +128,3 @@ INSTALL() $manDir \ $docDir } - -PROVIDES_devel=" - fontconfig${secondaryArchSuffix}_devel = $portVersion compat >= 2.1 - devel:libfontconfig$secondaryArchSuffix = 1.9.1 compat >= 1 - " - -REQUIRES_devel=" - fontconfig$secondaryArchSuffix == $portVersion base - devel:libfreetype$secondaryArchSuffix - devel:libxml2$secondaryArchSuffix - " diff --git a/media-libs/fontconfig/fontconfig-2.12.6.recipe b/media-libs/fontconfig/fontconfig-2.12.6.recipe index 7a092f682..3b25f6c04 100644 --- a/media-libs/fontconfig/fontconfig-2.12.6.recipe +++ b/media-libs/fontconfig/fontconfig-2.12.6.recipe @@ -16,6 +16,11 @@ PATCHES="fontconfig-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" +GLOBAL_WRITABLE_FILES=" + settings/fonts/conf.d directory keep-old + settings/fonts/fonts.conf auto-merge + " + PROVIDES=" fontconfig$secondaryArchSuffix = $portVersion compat >= 2 cmd:fc_cache$secondaryArchSuffix @@ -67,11 +72,6 @@ BUILD_PREREQUIRES=" cmd:python " -GLOBAL_WRITABLE_FILES=" - settings/fonts/conf.d directory keep-old - settings/fonts/fonts.conf auto-merge - " - BUILD() { mkdir -p `finddir B_USER_CACHE_DIRECTORY` diff --git a/media-libs/freeimage/freeimage-3.17.0.recipe b/media-libs/freeimage/freeimage-3.17.0.recipe index 9724726f9..026688c27 100644 --- a/media-libs/freeimage/freeimage-3.17.0.recipe +++ b/media-libs/freeimage/freeimage-3.17.0.recipe @@ -6,11 +6,11 @@ HOMEPAGE="http://freeimage.sourceforge.net" COPYRIGHT="2003-2010 FreeImage Project" LICENSE="GNU GPL v2 GNU GPL v3" -SOURCE_URI="http://downloads.sourceforge.net/freeimage/FreeImage3170.zip" REVISION="1" +SOURCE_URI="http://downloads.sourceforge.net/freeimage/FreeImage3170.zip" CHECKSUM_SHA256="fbfc65e39b3d4e2cb108c4ffa8c41fd02c07d4d436c594fff8dab1a6d5297f89" -PATCHES="freeimage-$portVersion.patchset" SOURCE_DIR="FreeImage" +PATCHES="freeimage-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" diff --git a/media-libs/glew/glew-2.1.0.recipe b/media-libs/glew/glew-2.1.0.recipe index 1fdc84296..238eb7110 100644 --- a/media-libs/glew/glew-2.1.0.recipe +++ b/media-libs/glew/glew-2.1.0.recipe @@ -18,7 +18,6 @@ PATCHES="glew-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" - PROVIDES=" glew$secondaryArchSuffix = $portVersion cmd:glewinfo = $portVersion diff --git a/media-libs/gst_plugins_base/gst_plugins_base-1.14.0.recipe b/media-libs/gst_plugins_base/gst_plugins_base-1.14.0.recipe index 3176784cc..80f4e7065 100644 --- a/media-libs/gst_plugins_base/gst_plugins_base-1.14.0.recipe +++ b/media-libs/gst_plugins_base/gst_plugins_base-1.14.0.recipe @@ -51,6 +51,7 @@ REQUIRES=" SUPPLEMENTS=" gstreamer$secondaryArchSuffix " + PROVIDES_devel=" gst_plugins_base${secondaryArchSuffix}_devel = $portVersion devel:libgstallocators_1.0$secondaryArchSuffix = 0.1400.0 compat >= 0 @@ -69,6 +70,7 @@ REQUIRES_devel=" gst_plugins_base$secondaryArchSuffix == $portVersion base haiku$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libfreetype$secondaryArchSuffix diff --git a/media-libs/jbig2dec/jbig2dec-0.14.recipe b/media-libs/jbig2dec/jbig2dec-0.14.recipe index 65cab0880..534e13479 100644 --- a/media-libs/jbig2dec/jbig2dec-0.14.recipe +++ b/media-libs/jbig2dec/jbig2dec-0.14.recipe @@ -32,6 +32,7 @@ PROVIDES_devel=" REQUIRES_devel=" jbig2dec$secondaryArchSuffix == $portVersion " + BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:libtoolize$secondaryArchSuffix diff --git a/media-libs/jgmod/jgmod-0.99.recipe b/media-libs/jgmod/jgmod-0.99.recipe index fdaf2aad7..8b8b92fc3 100644 --- a/media-libs/jgmod/jgmod-0.99.recipe +++ b/media-libs/jgmod/jgmod-0.99.recipe @@ -9,8 +9,8 @@ LICENSE="JGMOD" REVISION="2" SOURCE_URI="http://guan.is-a-geek.com/jgmod/jgmod.zip" CHECKSUM_SHA256="5d34c446904ddf2c6e3ee2272e6d4a9e6b1b4e59701237c5f4c961999623c77a" -SOURCE_DIR="jgmod" SOURCE_FILENAME="jgmod-$portVersion.zip" +SOURCE_DIR="jgmod" ARCHITECTURES="x86_gcc2" diff --git a/media-libs/lensfun/lensfun-0.3.2.recipe b/media-libs/lensfun/lensfun-0.3.2.recipe index 9527b1c24..48f1c6ab4 100644 --- a/media-libs/lensfun/lensfun-0.3.2.recipe +++ b/media-libs/lensfun/lensfun-0.3.2.recipe @@ -16,6 +16,7 @@ LICENSE="GNU LGPL v3" REVISION="3" SOURCE_URI="http://sourceforge.net/projects/lensfun/files/$portVersion/lensfun-$portVersion.tar.gz" CHECKSUM_SHA256="ae8bcad46614ca47f5bda65b00af4a257a9564a61725df9c74cb260da544d331" + ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" @@ -23,13 +24,6 @@ PROVIDES=" lensfun$secondaryArchSuffix = $portVersion compat >= 0.2 lib:liblensfun$secondaryArchSuffix = $portVersion compat >= 0 " -PROVIDES_devel=" - lensfun${secondaryArchSuffix}_devel = $portVersion compat >= 0.2 - cmd:g_lensfun_update_data$secondaryArchSuffix - cmd:lensfun_add_adapter$secondaryArchSuffix - cmd:lensfun_update_data$secondaryArchSuffix - devel:liblensfun$secondaryArchSuffix = $portVersion compat >= 0 - " REQUIRES=" haiku$secondaryArchSuffix lib:libpng16$secondaryArchSuffix @@ -37,6 +31,14 @@ REQUIRES=" lib:libz$secondaryArchSuffix lib:libglib_2.0${secondaryArchSuffix} " + +PROVIDES_devel=" + lensfun${secondaryArchSuffix}_devel = $portVersion compat >= 0.2 + cmd:g_lensfun_update_data$secondaryArchSuffix + cmd:lensfun_add_adapter$secondaryArchSuffix + cmd:lensfun_update_data$secondaryArchSuffix + devel:liblensfun$secondaryArchSuffix = $portVersion compat >= 0 + " REQUIRES_devel=" lensfun$secondaryArchSuffix == $portVersion base haiku$secondaryArchSuffix @@ -45,6 +47,7 @@ REQUIRES_devel=" lib:libpng16$secondaryArchSuffix lib:libz$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libpng16$secondaryArchSuffix diff --git a/media-libs/libaacs/libaacs-0.9.0.recipe b/media-libs/libaacs/libaacs-0.9.0.recipe index 6d7f34187..50276bceb 100644 --- a/media-libs/libaacs/libaacs-0.9.0.recipe +++ b/media-libs/libaacs/libaacs-0.9.0.recipe @@ -2,8 +2,6 @@ SUMMARY="Open implementation of AACS" DESCRIPTION="libaacs is an open implementation of the Advanced Access Content \ System (AACS) specification." HOMEPAGE="https://www.videolan.org/developers/libaacs.html" -SOURCE_URI="https://download.videolan.org/pub/videolan/libaacs/$portVersion/libaacs-$portVersion.tar.bz2" -CHECKSUM_SHA256="47e0bdc9c9f0f6146ed7b4cc78ed1527a04a537012cf540cf5211e06a248bace" COPYRIGHT=" 2009-2013 npzacs 2010 gates @@ -15,6 +13,9 @@ COPYRIGHT=" " LICENSE="GNU LGPL v2.1" REVISION="1" +SOURCE_URI="https://download.videolan.org/pub/videolan/libaacs/$portVersion/libaacs-$portVersion.tar.bz2" +CHECKSUM_SHA256="47e0bdc9c9f0f6146ed7b4cc78ed1527a04a537012cf540cf5211e06a248bace" + ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -28,6 +29,7 @@ REQUIRES=" lib:libgcrypt$secondaryArchSuffix lib:libgpg_error$secondaryArchSuffix " + PROVIDES_devel=" libaacs${secondaryArchSuffix}_devel = $portVersion compat >= 0 devel:libaacs$secondaryArchSuffix = 0.6.0 compat >= 0 @@ -35,6 +37,7 @@ PROVIDES_devel=" REQUIRES_devel=" libaacs$secondaryArchSuffix == $portVersion base " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libgcrypt$secondaryArchSuffix diff --git a/media-libs/libao/libao-1.2.2.recipe b/media-libs/libao/libao-1.2.2.recipe index b7bfc5072..7c3184746 100644 --- a/media-libs/libao/libao-1.2.2.recipe +++ b/media-libs/libao/libao-1.2.2.recipe @@ -20,8 +20,8 @@ COPYRIGHT="1999 Aaron Holtzman LICENSE="GNU GPL v2" REVISION="2" SOURCE_URI="http://github.com/xiph/libao/archive/$portVersion.tar.gz" -SOURCE_FILENAME="libao-$portVersion.tar.gz" CHECKSUM_SHA256="df8a6d0e238feeccb26a783e778716fb41a801536fe7b6fce068e313c0e2bf4d" +SOURCE_FILENAME="libao-$portVersion.tar.gz" PATCHES="libao-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/media-libs/libbluray/libbluray1-0.9.3.recipe b/media-libs/libbluray/libbluray1-0.9.3.recipe index 8bc180676..e3a027bc5 100644 --- a/media-libs/libbluray/libbluray1-0.9.3.recipe +++ b/media-libs/libbluray/libbluray1-0.9.3.recipe @@ -39,6 +39,7 @@ REQUIRES_devel=" CONFLICTS_devel=" libbluray${secondaryArchSuffix}_devel " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libfontconfig$secondaryArchSuffix diff --git a/media-libs/libepoxy/libepoxy-1.4.3.recipe b/media-libs/libepoxy/libepoxy-1.4.3.recipe index 25babd922..a5490ce3d 100644 --- a/media-libs/libepoxy/libepoxy-1.4.3.recipe +++ b/media-libs/libepoxy/libepoxy-1.4.3.recipe @@ -81,4 +81,3 @@ TEST() { cd _build && ninja test } - diff --git a/media-libs/libopenshot-audio/libopenshot_audio-0.1.5.recipe b/media-libs/libopenshot-audio/libopenshot_audio-0.1.5.recipe index 7e4cd964a..41c532154 100644 --- a/media-libs/libopenshot-audio/libopenshot_audio-0.1.5.recipe +++ b/media-libs/libopenshot-audio/libopenshot_audio-0.1.5.recipe @@ -7,8 +7,8 @@ COPYRIGHT="2008-2016 OpenShot Studios, LLC" LICENSE="GNU LGPL v3" REVISION="1" SOURCE_URI="https://github.com/OpenShot/libopenshot-audio/archive/v$portVersion.tar.gz" -SOURCE_FILENAME="libopenshot-audio-$portVersion.tar.gz" CHECKSUM_SHA256="366151ea971fa7d0734777068d40b333a3df83ca33233dc2cd630aeed40d2071" +SOURCE_FILENAME="libopenshot-audio-$portVersion.tar.gz" SOURCE_DIR="libopenshot-audio-$portVersion" PATCHES="libopenshot_audio-$portVersion.patchset" @@ -72,4 +72,3 @@ INSTALL() $developDir \ $manDir } - diff --git a/media-libs/libopenshot/libopenshot-0.1.9.recipe b/media-libs/libopenshot/libopenshot-0.1.9.recipe index 22ef1f441..c8f8a68fd 100644 --- a/media-libs/libopenshot/libopenshot-0.1.9.recipe +++ b/media-libs/libopenshot/libopenshot-0.1.9.recipe @@ -8,8 +8,8 @@ COPYRIGHT="2008-2017 OpenShot Studios, LLC" LICENSE="GNU LGPL v3" REVISION="3" SOURCE_URI="https://github.com/OpenShot/libopenshot/archive/v$portVersion.tar.gz" -SOURCE_FILENAME="libopenshot-$portVersion.tar.gz" CHECKSUM_SHA256="2547969818092d77a1c742e27cf416b34b4d326abf6b089fc10b921f4a4141ec" +SOURCE_FILENAME="libopenshot-$portVersion.tar.gz" PATCHES="libopenshot-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -107,4 +107,3 @@ TEST() { make $jobArgs test } - diff --git a/media-libs/libraqm/libraqm-0.3.0.recipe b/media-libs/libraqm/libraqm-0.3.0.recipe index 2d5d6f231..f73c03bdd 100644 --- a/media-libs/libraqm/libraqm-0.3.0.recipe +++ b/media-libs/libraqm/libraqm-0.3.0.recipe @@ -43,7 +43,6 @@ BUILD_REQUIRES=" devel:libglib_2.0$secondaryArchSuffix devel:libharfbuzz$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf diff --git a/media-libs/openjpeg/openjpeg-2.2.0.recipe b/media-libs/openjpeg/openjpeg-2.2.0.recipe index 49dea3375..0ae3b713d 100644 --- a/media-libs/openjpeg/openjpeg-2.2.0.recipe +++ b/media-libs/openjpeg/openjpeg-2.2.0.recipe @@ -21,8 +21,8 @@ Universite catholique de Louvain (UCL), Belgium LICENSE="BSD (2-clause)" REVISION="1" SOURCE_URI="http://github.com/uclouvain/openjpeg/archive/v$portVersion.tar.gz" -SOURCE_FILENAME="openjpeg-$portVersion.tar.gz" CHECKSUM_SHA256="6fddbce5a618e910e03ad00d66e7fcd09cc6ee307ce69932666d54c73b7c6e7b" +SOURCE_FILENAME="openjpeg-$portVersion.tar.gz" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -57,7 +57,6 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix devel:liblcms2$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:cmake cmd:make diff --git a/media-libs/openjpeg/openjpeg-2.3.0.recipe b/media-libs/openjpeg/openjpeg-2.3.0.recipe index 4fc96575e..22af087a5 100644 --- a/media-libs/openjpeg/openjpeg-2.3.0.recipe +++ b/media-libs/openjpeg/openjpeg-2.3.0.recipe @@ -21,8 +21,8 @@ Universite catholique de Louvain (UCL), Belgium LICENSE="BSD (2-clause)" REVISION="1" SOURCE_URI="https://github.com/uclouvain/openjpeg/archive/v$portVersion.tar.gz" -SOURCE_FILENAME="openjpeg-$portVersion.tar.gz" CHECKSUM_SHA256="3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a" +SOURCE_FILENAME="openjpeg-$portVersion.tar.gz" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" @@ -57,7 +57,6 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix devel:liblcms2$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:cmake cmd:make diff --git a/media-libs/plib/plib-1.8.5.recipe b/media-libs/plib/plib-1.8.5.recipe index 17350bc79..b4bdaf14d 100644 --- a/media-libs/plib/plib-1.8.5.recipe +++ b/media-libs/plib/plib-1.8.5.recipe @@ -6,16 +6,16 @@ What's more, it's all available on line - and completely free. Each library comp independent of the others - so if you want to use SDL, GTK, GLUT, or FLTK instead of PLIB's 'PW' \ windowing library, you can." HOMEPAGE="http://plib.sourceforge.net/" -REVISION="1" -LICENSE="GNU LGPL v2.1" COPYRIGHT="1999-2005 Steve J. Baker" -ARCHITECTURES="x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - +LICENSE="GNU LGPL v2.1" +REVISION="1" SOURCE_URI="http://plib.sourceforge.net/dist/plib-$portVersion.tar.gz" CHECKSUM_SHA256="485b22bf6fdc0da067e34ead5e26f002b76326f6371e2ae006415dea6a380a32" PATCHES="plib-$portVersion.patchset" +ARCHITECTURES="x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + PROVIDES=" plib$secondaryArchSuffix = $portVersion devel:libplibfnt$secondaryArchSuffix @@ -37,7 +37,6 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libGL$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf diff --git a/media-libs/portaudio/portaudio-19.recipe b/media-libs/portaudio/portaudio-19.recipe index 094af1b19..218518c00 100644 --- a/media-libs/portaudio/portaudio-19.recipe +++ b/media-libs/portaudio/portaudio-19.recipe @@ -8,6 +8,7 @@ REVISION="2" SOURCE_URI="http://portaudio.com/archives/pa_stable_v19_20111121.tgz" CHECKSUM_SHA256="9c26d1330d506496789edafe55b0386f20d83c4aa2c0e3f81fbeb0f114ab1b99" SOURCE_DIR="portaudio" +PATCHES="portaudio-19.patchset" ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" @@ -50,9 +51,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -SOURCE_DIR="portaudio" -PATCHES="portaudio-19.patchset" - BUILD() { # clean up diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.26.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.26.recipe index cee85c0a6..6c724b4a2 100644 --- a/media-libs/sdl_gfx/sdl_gfx-2.0.26.recipe +++ b/media-libs/sdl_gfx/sdl_gfx-2.0.26.recipe @@ -5,8 +5,8 @@ basic drawing routines such as lines, circles or polygons and SDL_rotozoom \ which implemented a interpolating rotozoomer for SDL_surfaces. " HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/" -LICENSE="Zlib" COPYRIGHT="1999-2012 A. Schiffler" +LICENSE="Zlib" REVISION="2" SOURCE_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-$portVersion.tar.gz" CHECKSUM_SHA256="7ceb4ffb6fc63ffba5f1290572db43d74386cd0781c123bc912da50d34945446" @@ -19,7 +19,6 @@ PROVIDES=" sdl_gfx$secondaryArchSuffix = $portVersion compat >= 2 lib:libSDL_gfx$secondaryArchSuffix = 16.9.1 compat >= 15 " - REQUIRES=" haiku$secondaryArchSuffix lib:libsdl_1.2$secondaryArchSuffix @@ -31,7 +30,6 @@ PROVIDES_devel=" devel:sdl_gfx$secondaryArchSuffix = 16.9.1 compat >= 15 devel:libSDL_gfx$secondaryArchSuffix = 16.9.1 compat >= 15 " - REQUIRES_devel=" sdl_gfx$secondaryArchSuffix == $portVersion base " @@ -40,7 +38,6 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libsdl_1.2$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf diff --git a/media-libs/vigra/vigra-1.10.0.recipe b/media-libs/vigra/vigra-1.10.0.recipe index 071c74dc0..dd75b51c5 100644 --- a/media-libs/vigra/vigra-1.10.0.recipe +++ b/media-libs/vigra/vigra-1.10.0.recipe @@ -3,19 +3,18 @@ DESCRIPTION=" C++ computer vision library with emphasize on customizable algorithms \ and data structures. " -LICENSE="MIT" -COPYRIGHT="1998-2013 by Ullrich Koethe" HOMEPAGE="http://ukoethe.github.io/vigra/" -SOURCE_URI="https://github.com/ukoethe/vigra/archive/Version-1-10-0.tar.gz" -SOURCE_FILENAME="$portName-$portVersion.tar.gz" -CHECKSUM_SHA256="406f6fcbcea2e92f681a7b844487c29049d338f5b2b25f8145e67bcb518c7ef8" +COPYRIGHT="1998-2013 by Ullrich Koethe" +LICENSE="MIT" REVISION="6" +SOURCE_URI="https://github.com/ukoethe/vigra/archive/Version-1-10-0.tar.gz" +CHECKSUM_SHA256="406f6fcbcea2e92f681a7b844487c29049d338f5b2b25f8145e67bcb518c7ef8" +SOURCE_FILENAME="$portName-$portVersion.tar.gz" +SOURCE_DIR="vigra-Version-1-10-0" ARCHITECTURES="x86 ?x86_gcc2 ?x86_64" SECONDARY_ARCHITECTURES="?x86 ?x86_gcc2" -SOURCE_DIR="vigra-Version-1-10-0" - PROVIDES=" vigra$secondaryArchSuffix = $portVersion lib:libvigraimpex$secondaryArchSuffix = 5.1.10.0 compat >= 5 @@ -33,6 +32,17 @@ REQUIRES=" lib:libfftw$secondaryArchSuffix lib:libz$secondaryArchSuffix " + +PROVIDES_devel=" + vigra${secondaryArchSuffix}_devel = $portVersion + cmd:vigra_config$secondaryArchSuffix + devel:libvigraimpex$secondaryArchSuffix = 5.1.10.0 compat >= 5 + " +REQUIRES_devel=" + vigra$secondaryArchSuffix == $portVersion base + cmd:python # vigra-config is python script + " + BUILD_REQUIRES=" devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix @@ -96,13 +106,3 @@ TEST() cd build make test } - -PROVIDES_devel=" - vigra${secondaryArchSuffix}_devel = $portVersion - cmd:vigra_config$secondaryArchSuffix - devel:libvigraimpex$secondaryArchSuffix = 5.1.10.0 compat >= 5 - " -REQUIRES_devel=" - vigra$secondaryArchSuffix == $portVersion base - cmd:python # vigra-config is python script - "