From bffc715646f2900b6c7e733ba8be1820f0f08c6d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 21 Sep 2018 13:43:03 +0200 Subject: [PATCH] redoflacs: bump to current git. * to get rid of the patchset. --- .../redoflacs/patches/redoflacs-0.30.patchset | 42 ------------------- ...-0.30.recipe => redoflacs-0.31~pre.recipe} | 24 +++++------ 2 files changed, 10 insertions(+), 56 deletions(-) delete mode 100644 media-sound/redoflacs/patches/redoflacs-0.30.patchset rename media-sound/redoflacs/{redoflacs-0.30.recipe => redoflacs-0.31~pre.recipe} (51%) diff --git a/media-sound/redoflacs/patches/redoflacs-0.30.patchset b/media-sound/redoflacs/patches/redoflacs-0.30.patchset deleted file mode 100644 index d53576512..000000000 --- a/media-sound/redoflacs/patches/redoflacs-0.30.patchset +++ /dev/null @@ -1,42 +0,0 @@ -From 97745ef09fe05a0c168aee9a5139c719f412433a Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Wed, 8 Oct 2014 16:21:13 +0000 -Subject: use nproc instead of /proc - - -diff --git a/redoflacs b/redoflacs -index 829406a..4c15e15 100755 ---- a/redoflacs -+++ b/redoflacs -@@ -1554,25 +1554,9 @@ _find_cores() - # Set up global variable - declare -gi jobs='2' # By default, set $jobs to '2' - declare -g jobs_display='(Default)' # Default $jobs determination -- -- # Check /proc/cpuinfo if /proc is mounted by comparing device numbers to / -- if (( $(stat -c %d '/proc') != $(stat -c %d '/') )); then -- if [[ -f '/proc/cpuinfo' ]]; then -- # /proc/cpuinfo exists, find total number of cores to use -- #-- -- # Store contents of /proc/cpuinfo into core_array -- mapfile -n0 -t cores_array < /proc/cpuinfo -- -- for i in "${cores_array[@]}"; do -- # For each line, add processor number to jobs if matched -- #-- -- [[ "${i}" == 'processor'*:' '* ]] && jobs="${i#processor*: }" -- done -- -- ((jobs++)) # +1 to $jobs since 'processor' starts at '0' -- jobs_display='(/proc/cpuinfo)' # $jobs dynamically determined -- fi -- fi -+ -+ jobs=`nproc` -+ jobs_display='(nproc)' - } - - #------------------------------------------------------------------------------- --- -1.8.3.4 - diff --git a/media-sound/redoflacs/redoflacs-0.30.recipe b/media-sound/redoflacs/redoflacs-0.31~pre.recipe similarity index 51% rename from media-sound/redoflacs/redoflacs-0.30.recipe rename to media-sound/redoflacs/redoflacs-0.31~pre.recipe index 6ec43670c..56f1bd1d2 100644 --- a/media-sound/redoflacs/redoflacs-0.30.recipe +++ b/media-sound/redoflacs/redoflacs-0.31~pre.recipe @@ -4,27 +4,23 @@ verifier, organizer, analyzer, and retagger." HOMEPAGE="https://github.com/sirjaren/redoflacs/" COPYRIGHT="2010-2014 Jaren Stangret" LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="https://github.com/sirjaren/redoflacs/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="96e6b92d6211469181da7f065510984423ee4d5a059265ffb7fc38e81ae4de3f" -SOURCE_FILENAME="redoflacs-$portVersion.tar.gz" -PATCHES="redoflacs-$portVersion.patchset" +REVISION="1" +srcGitRev="86c6f5becca0909dcb2a0cb9ed747a575d7a4735" +SOURCE_URI="https://github.com/sirjaren/redoflacs/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="ef3505d83812d8c42a3d397a85102e3cd484e8ab54ebd612a997598771ef70c3" +SOURCE_FILENAME="redoflacs-$srcGitRev.tar.gz" +SOURCE_DIR="redoflacs-$srcGitRev" ARCHITECTURES="any" PROVIDES=" redoflacs = $portVersion compat >= 0 - cmd:redoflacs$secondaryArchSuffix + cmd:redoflacs " REQUIRES=" - haiku$secondaryArchSuffix - cmd:bash$secondaryArchSuffix - cmd:flac$secondaryArchSuffix - " - -BUILD_REQUIRES=" - " -BUILD_PREREQUIRES=" + cmd:bash + cmd:flac + cmd:nproc " BUILD()