From bb14fa08312af2fc11b7214b86fc464c7f4422fc Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 3 Aug 2018 15:02:09 +0200 Subject: [PATCH] media-video: code style. --- media-video/avidemux/avidemux-2.7.1.recipe | 1 + media-video/ffmpeg/ffmpeg-0.10.16.recipe | 17 +++++++++-------- media-video/ffmpeg/ffmpeg-3.2.4.recipe | 9 ++++----- media-video/ffmpeg/ffmpeg2-2.8.11.recipe | 8 ++++---- media-video/gnash/gnash-0.8.10.recipe | 12 +++++++----- media-video/live555/live555-2016.01.29.recipe | 2 -- media-video/live555/live555-2016.06.22.recipe | 2 -- media-video/mpv/mpv-0.28.2.recipe | 6 +++--- media-video/qmplay2/qmplay2-18.07.03.recipe | 1 + media-video/qwinff/qwinff-0.2.1.recipe | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/media-video/avidemux/avidemux-2.7.1.recipe b/media-video/avidemux/avidemux-2.7.1.recipe index 70f30f887..905127ff1 100644 --- a/media-video/avidemux/avidemux-2.7.1.recipe +++ b/media-video/avidemux/avidemux-2.7.1.recipe @@ -12,6 +12,7 @@ CHECKSUM_SHA256="3ccd784a329c8957c6741923549fdfb70f3b96d087aeb514f3d52e1cd281e99 SOURCE_DIR="avidemux_$portVersion" PATCHES="avidemux-$portVersion.patchset" ADDITIONAL_FILES="avidemux.rdef.in" + ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" diff --git a/media-video/ffmpeg/ffmpeg-0.10.16.recipe b/media-video/ffmpeg/ffmpeg-0.10.16.recipe index 74e60614a..b31339f81 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.16.recipe +++ b/media-video/ffmpeg/ffmpeg-0.10.16.recipe @@ -4,17 +4,22 @@ FFmpeg is a complete, cross-platform solution to record, convert and stream \ audio and video. It includes libavcodec - the leading audio/video codec library. " HOMEPAGE="http://www.ffmpeg.org" -LICENSE="GNU LGPL v2.1 - GNU GPL v2" COPYRIGHT="2000-2003 Fabrice Bellard 2003-2015 the FFmpeg developers" +LICENSE="GNU LGPL v2.1 + GNU GPL v2" +REVISION="1" SOURCE_URI="http://www.ffmpeg.org/releases/ffmpeg-$portVersion.tar.bz2" CHECKSUM_SHA256="e77823cbd58dfdb61f88059476070bc432d80e3821c14abcf804ef709d2f3fd1" -REVISION="1" SOURCE_DIR="ffmpeg-$portVersion" +PATCHES="ffmpeg-$portVersion.patchset" + ARCHITECTURES="x86_gcc2 !x86 !x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 !x86" -PATCHES="ffmpeg-$portVersion.patchset" + +GLOBAL_WRITABLE_FILES=" + settings/ffserver.conf + " PROVIDES=" ffmpeg$secondaryArchSuffix = $portVersion compat >= 0.10 @@ -78,10 +83,6 @@ BUILD_PREREQUIRES=" cmd:yasm " -GLOBAL_WRITABLE_FILES=" - settings/ffserver.conf - " - PATCH() { # patch hard-coded config file path diff --git a/media-video/ffmpeg/ffmpeg-3.2.4.recipe b/media-video/ffmpeg/ffmpeg-3.2.4.recipe index 0a294aede..ee1c264fb 100644 --- a/media-video/ffmpeg/ffmpeg-3.2.4.recipe +++ b/media-video/ffmpeg/ffmpeg-3.2.4.recipe @@ -15,6 +15,10 @@ PATCHES="ffmpeg-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" +GLOBAL_WRITABLE_FILES=" + settings/ffserver.conf + " + PROVIDES=" ffmpeg$secondaryArchSuffix = $portVersion compat >= 3.2 cmd:ffmpeg = $portVersion compat >= 3.2 @@ -30,7 +34,6 @@ PROVIDES=" lib:libswresample$secondaryArchSuffix = 2.3.100 compat >= 2 lib:libpostproc$secondaryArchSuffix = 54.1.100 compat >= 54 " - REQUIRES=" haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix @@ -95,10 +98,6 @@ BUILD_PREREQUIRES=" cmd:yasm " -GLOBAL_WRITABLE_FILES=" - settings/ffserver.conf - " - PATCH() { # patch hard-coded config file path diff --git a/media-video/ffmpeg/ffmpeg2-2.8.11.recipe b/media-video/ffmpeg/ffmpeg2-2.8.11.recipe index 2738977fc..839020c57 100644 --- a/media-video/ffmpeg/ffmpeg2-2.8.11.recipe +++ b/media-video/ffmpeg/ffmpeg2-2.8.11.recipe @@ -16,6 +16,10 @@ PATCHES="ffmpeg-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86" +GLOBAL_WRITABLE_FILES=" + settings/ffserver.conf + " + PROVIDES=" ffmpeg2$secondaryArchSuffix = $portVersion compat >= 2.8 lib:libavutil$secondaryArchSuffix = 54.31.100 compat >= 54 @@ -104,10 +108,6 @@ BUILD_PREREQUIRES=" cmd:yasm " -GLOBAL_WRITABLE_FILES=" - settings/ffserver.conf - " - PATCH() { # patch hard-coded config file path diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe index 7b099b5ef..b270b933a 100644 --- a/media-video/gnash/gnash-0.8.10.recipe +++ b/media-video/gnash/gnash-0.8.10.recipe @@ -14,6 +14,11 @@ PATCHES="gnash-0.8.10.patchset" ARCHITECTURES="!x86_gcc2 !x86 !x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 !x86" +GLOBAL_WRITABLE_FILES=" + settings/gnashpluginrc auto-merge + settings/gnashrc auto-merge + " + PROVIDES=" gnash$secondaryArchSuffix = $portVersion app:Gnash = $portVersion @@ -90,11 +95,6 @@ BUILD_PREREQUIRES=" cmd:grep " -GLOBAL_WRITABLE_FILES=" - settings/gnashpluginrc auto-merge - settings/gnashrc auto-merge - " - BUILD() { INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir @@ -114,11 +114,13 @@ BUILD() --libdir=$libDir make $jobArgs } + INSTALL() { make install addAppDeskbarSymlink $appsDir/Gnash Gnash } + TEST() { make check diff --git a/media-video/live555/live555-2016.01.29.recipe b/media-video/live555/live555-2016.01.29.recipe index ad706a8ab..465a6bb67 100644 --- a/media-video/live555/live555-2016.01.29.recipe +++ b/media-video/live555/live555-2016.01.29.recipe @@ -49,7 +49,6 @@ PROVIDES=" cmd:testWAVAudioStreamer cmd:vobStreamer " - REQUIRES=" haiku$secondaryArchSuffix " @@ -69,7 +68,6 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:make diff --git a/media-video/live555/live555-2016.06.22.recipe b/media-video/live555/live555-2016.06.22.recipe index 4754f8f78..bdceb19b8 100644 --- a/media-video/live555/live555-2016.06.22.recipe +++ b/media-video/live555/live555-2016.06.22.recipe @@ -49,7 +49,6 @@ PROVIDES=" cmd:testWAVAudioStreamer cmd:vobStreamer " - REQUIRES=" haiku$secondaryArchSuffix " @@ -69,7 +68,6 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:make diff --git a/media-video/mpv/mpv-0.28.2.recipe b/media-video/mpv/mpv-0.28.2.recipe index 63437bb5c..f3732d8c4 100644 --- a/media-video/mpv/mpv-0.28.2.recipe +++ b/media-video/mpv/mpv-0.28.2.recipe @@ -9,14 +9,16 @@ REVISION="1" SOURCE_URI="https://github.com/mpv-player/mpv/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="aada14e025317b5b3e8e58ffaf7902e8b6e4ec347a93d25a7c10d3579426d795" SOURCE_FILENAME="mpv-$portVersion.tar.gz" -SOURCE_FILENAME_2="waf-1.9.12" SOURCE_URI_2="https://waf.io/$SOURCE_FILENAME_2#noarchive http://www.freehackers.org/~tnagy/release/$SOURCE_FILENAME_2#noarchive" CHECKSUM_SHA256_2="66f3983fcc6dc0d17393514b2b52063702004800428327db3597754dd05c3fbc" +SOURCE_FILENAME_2="waf-1.9.12" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +GLOBAL_WRITABLE_FILES="settings/mpv/encoding-profiles.conf keep-old" + PROVIDES=" mpv$secondaryArchSuffix = $portVersion cmd:mpv$secondaryArchSuffix @@ -88,8 +90,6 @@ BUILD_PREREQUIRES=" cmd:yasm " -GLOBAL_WRITABLE_FILES="settings/mpv/encoding-profiles.conf keep-old" - BUILD() { # Do not call "python bootstrap.py" as it (only) downloads waf. diff --git a/media-video/qmplay2/qmplay2-18.07.03.recipe b/media-video/qmplay2/qmplay2-18.07.03.recipe index 5b38066f3..3e389202b 100644 --- a/media-video/qmplay2/qmplay2-18.07.03.recipe +++ b/media-video/qmplay2/qmplay2-18.07.03.recipe @@ -15,6 +15,7 @@ ADDITIONAL_FILES=" qmplay2.rdef.in MediaKit.png " + ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" diff --git a/media-video/qwinff/qwinff-0.2.1.recipe b/media-video/qwinff/qwinff-0.2.1.recipe index df58fbd35..33596c58f 100644 --- a/media-video/qwinff/qwinff-0.2.1.recipe +++ b/media-video/qwinff/qwinff-0.2.1.recipe @@ -9,8 +9,8 @@ LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://downloads.sf.net/qwinff/qwinff_$portVersion.tar.gz" CHECKSUM_SHA256="b9f230b22e56c5ebd50a2b51dc9369df5006b1e3bf7cfcee819b7745c0d9fc18" -ADDITIONAL_FILES="qwinff.rdef.in" PATCHES="qwinff-$portVersion.patchset" +ADDITIONAL_FILES="qwinff.rdef.in" ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="?x86"