[SCM] musescore/master: Drop 01-posix-method-to-count-cpus.patch, code not used
jcowgill at users.alioth.debian.org
jcowgill at users.alioth.debian.org
Mon Jul 11 10:37:19 UTC 2016
The following commit has been merged in the master branch:
commit 707486886361f8d3dd66ba83a5cb36f1e6209ba1
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Thu Jul 7 22:39:40 2016 +0200
Drop 01-posix-method-to-count-cpus.patch, code not used
diff --git a/debian/patches/01-posix-method-to-count-cpus.patch b/debian/patches/01-posix-method-to-count-cpus.patch
deleted file mode 100644
index 7aac6db..0000000
--- a/debian/patches/01-posix-method-to-count-cpus.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Use POSIX method to count CPUs
-Origin: upstream,
- https://github.com/musescore/MuseScore/commit/6f360ee2880fac0e
-Last-Update: 2016-06-19
---- a/Makefile
-+++ b/Makefile
-@@ -18,8 +18,8 @@
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- #=============================================================================
-
--REVISION = `cat mscore/revision.h`
--CPUS = $(shell grep -c processor /proc/cpuinfo)
-+REVISION := `cat mscore/revision.h`
-+CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1)
- # Avoid build errors when processor=0 (as in m68k)
- ifeq ($(CPUS), 0)
- CPUS=1
diff --git a/debian/patches/series b/debian/patches/series
index efa1009..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-01-posix-method-to-count-cpus.patch
--
musescore packaging
More information about the pkg-multimedia-commits
mailing list