| [proaudio] [2923] media-libs/libffado: userspace detection patch applied upstream |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2923
Author: lilrc
Date: 2015-03-22 08:25:38 +0100 (Sun, 22 Mar 2015)
Log Message:
-----------
media-libs/libffado: userspace detection patch applied upstream
Modified Paths:
--------------
trunk/overlays/proaudio/media-libs/libffado/ChangeLog
trunk/overlays/proaudio/media-libs/libffado/Manifest
trunk/overlays/proaudio/media-libs/libffado/libffado-2.2.1-r1.ebuild
trunk/overlays/proaudio/media-libs/libffado/libffado-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-detect-userspace-env.patch
Removed Paths:
-------------
trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-detect-userspace.patch
Modified: trunk/overlays/proaudio/media-libs/libffado/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/ChangeLog 2015-03-19 21:32:31 UTC (rev 2922)
+++ trunk/overlays/proaudio/media-libs/libffado/ChangeLog 2015-03-22 07:25:38 UTC (rev 2923)
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Mar 2015; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+ libffado-2.2.1-r1.ebuild, libffado-9999.ebuild,
+ -files/libffado-2.2.1-detect-userspace.patch,
+ +files/libffado-2.2.1-detect-userspace-env.patch:
+ update userspace detection patch applied upstream
+
*libffado-9999 (19 Mar 2015)
*libffado-2.2.1-r1 (19 Mar 2015)
Modified: trunk/overlays/proaudio/media-libs/libffado/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/Manifest 2015-03-19 21:32:31 UTC (rev 2922)
+++ trunk/overlays/proaudio/media-libs/libffado/Manifest 2015-03-22 07:25:38 UTC (rev 2923)
@@ -1,9 +1,9 @@
-AUX libffado-2.2.1-detect-userspace.patch 3392 SHA256 e6f538f0638a8d1091beb41393e4a2e607eccca4684a0200baf50da4731f4bd5 SHA512 237b316964c6605c43890afbef2a17539296085962161dd099edffd0296e338ec67875d365ab4b1f4e00508eddf7508975a9f97c87438a5f0527f2f900d0f21e WHIRLPOOL f8365715b145214fa24a6f054f594745835678656abf6a91e2bd46bc7621ea3a3866df25d4877b31b1fdbb3777cb72112a2945281efafa3328f03ef9af84ee91
+AUX libffado-2.2.1-detect-userspace-env.patch 3359 SHA256 cf25e2409b88a839cd613f608c07a90a8bc3a3380b1eea8f1f95e50300d8cdc4 SHA512 eefab8826173c2a49d3e0098673d5d7b57567deb081f4a9ce1ab10722905404420e04914bfe43fa014c8e53715ac9279e416254d04bf8f3cef088da6ff84d8c0 WHIRLPOOL 656aff77e8a47f64334fae3a4e4e75bcfbcd6188317295360de1556b800ff71d66e4ac9a425534e52c8e666bc80ebdf4ac7356d37b29e6b3b845cef80df605c9
AUX libffado-2.2.1-flags.patch 4064 SHA256 85c0686d252678d67da600fde931a10adb2d88243ad9fcde56b377d7dec7fdf1 SHA512 4674efbb9c70045520e7efd9789bba016fb91a6dd0b4021e2069b93c559d3f74c5c23af573da28427846aa8f5bad7952dd6e39fc4e9c6be7a9982ca60ff222a0 WHIRLPOOL fe021e45c0824df293f7bfccba143b6d4a148ea5ddb7c6847b906c7f85369d3639815798c115343818c9b8caf1d4e1be9ffe437b1e6f86f39c126272d08bce4b
AUX libffado-2.2.1-jack-detect.patch 2247 SHA256 bfe097ee811573d647e26a80c1999691fb19263d5434f18c0cd2c16827760d4c SHA512 a184ed839ffd8f13c6b2fd7b58e03e3d4b670375571ed414d741a89b288644090788a483482e73d65f1691f11b96408b512fe4a19df05edfe2599a4910cd6fa5 WHIRLPOOL 2dc7c485e1b0bea34fe20a8d411aa67d5e618d0da699ca0a5fc62838df68880dc947b6365bca56dcd9d374d970535562faa8d57b7f8fb3c87b06f2e1929a6c09
DIST libffado-2.2.1.tgz 1227685 SHA256 9f299b8ecd9885338aeae8c7f2fc10af9afb85ca4384256d485b010a128b35f6 SHA512 310741703912dd273458d0ecc4aca43af1735e15a19704e39b0c660212a34875e9c6086a325914d70d2373ff56b888acb4d925778db8cc3b9b2e8866e0a7b042 WHIRLPOOL ce03c47121a1afa85ed5120e1e77aa5d94dbf49129201a894c4523c8abd07d5d6485fbb68819ef522afd5a987416098ef6f95ab8984f62c325be735833136d22
-EBUILD libffado-2.2.1-r1.ebuild 2222 SHA256 2b555646a83b6890e5dff3fa27796be8c4568154195f25f0bb8243a1ce5a4085 SHA512 c9bd982b124856324b32fac8c7eef1241f1ec1aec8c455c5f24eb07a2afeada3682a7b11772e0a378917bb4e27e822efd217ab52627c88660f7c26e8ae056973 WHIRLPOOL 55b95baa3ffd9af5a934ae6e9c61076e5995dc44afee7fb456175e6e9889ecc4ad2bae8b879e402d4aa67bad2aa7edf3b362d32a58e023168a165762168a608d
+EBUILD libffado-2.2.1-r1.ebuild 2230 SHA256 d471852817183c1a6af13db9f32c6773083261453a51b9e220732c39c7f5c318 SHA512 8af5c1775be97cc0ef860065c94ab7f6606bb8f614e62cfa510e77beae0e0097a04eb8bb8689f5ca4ffd649662ee8735670c040ff04881da30a6655647c08c54 WHIRLPOOL 43109ebde0f7b4dc826044cf467edb979ede1498443c01c193ed3d90c9b3da28f96d1445577e998c7ae556070393041a505e6e0789338f257f36fedd93eb2338
EBUILD libffado-2.2.1.ebuild 2154 SHA256 9600223a859ff36bc43b43d3387a94ec1699235852d1ce675e832b795bfa41aa SHA512 b531cefdfb3a4f3c7ad4d664e17fb33143893b3d362f1b3957640ca820e9b3cbe9be265f082a6cd1cc9a847c24e4fcdc6dcbbf39fe5bb441904b4fd7aecc3490 WHIRLPOOL 71c088f84a13bed9274ff8e9e53c713cb9c11ce2f0c36567d07749985fa778f40f30b2dba0d353c1f0680c6c9eff59ccbcdcd4cecdb34e59ae30bf7404b1f787
-EBUILD libffado-9999.ebuild 2159 SHA256 af5280cb76f26b611d0c6384cbea5b61c207a787c05d26d38dcc2bd898615e5d SHA512 a937e393bb865898d717eaa3c51d36d4ad3e67b666127066bc39360e6a8af659a30e0ae97cebddc8b8dcb4e958165250fcf51f10d3500f15c5f306764521707a WHIRLPOOL 446b047fc98583e8f3c855b00636af1d859fd128192d919f204eca83a6d74d8f73602fdba240052569f0b09f8e3669f6ec6bf9088dad7140c3895168120a4f78
-MISC ChangeLog 5158 SHA256 be146a90a800b539fc24c7d4bbeb3264f1f1addb0e318548c6677ee817653910 SHA512 9854d8580f7f592e40705c374df3d9b719c2d98c4bb1a5c3ceb911b6eca7cff34de87c4b5f6e88e7e7f8a8359562b4c38e2d50cfb9597db62c314624deff889d WHIRLPOOL 0f2a911240d48d198ad8ddd9ffd8f45d26d24cc6057f083ba386a529d44ed2876ba26dd7a97d15804d64fc907cd6df81b288cb69be96a2e733e7e95507dcdab1
+EBUILD libffado-9999.ebuild 2100 SHA256 54d5922ed77e22505617d2bb98d307c43bc28f6e5b3a65c05564cbdc0ddbbfd0 SHA512 ab184441823a1bee6698c8beaf2861a8b6fbeb3cfcf3ecbd459f0aefc4a1022f6cd7b32fb94be5d3d5437ff61632103dd807d9fbb66110e893231da4cf7562dd WHIRLPOOL fc0e6feeecbdbab4393f8a17380a13f638b7cf8f8acab2ef201401e89f2a33936c6f02bec18a9757c932dab198e0d5224b3ed02372f957aa0c5a11db99cddb91
+MISC ChangeLog 5426 SHA256 0b57d4f3516f7fd21fb40ff5021da082148e22c67dfcb901b9f83b8abbce9fcf SHA512 30cfaf108ba5b27c54ec06cb168b0c59b92ead88b58c308053ca5409f11be5e869aa67b8b3c4f78de5898a6d1740df57fc7fc29fdbd5b2ac7cccd644a7cc8aae WHIRLPOOL 7b1300779f20513be364b86b5d96080172b2cec558747f4002a17cac873c56cb7d1fcbb511ccb0bc91fc5b4ae9d9634fe6cc2aaa5b6265b74bcde1d184a49b67
MISC metadata.xml 353 SHA256 608a4a6b28282ff02bda855731c407ccec16d907de90968b75241be123780a64 SHA512 f0399d9fbe3ffcd86066d1442c7a9dd178ac7601dea53280b6bd570bc5a839f4e63051b6bdd04d38c58a5edd6a39dac33af90b82bf46c633516d9ec3a5ee78b9 WHIRLPOOL a75323edc62d5cc245791c7d0cd56d16827d8f8778932c862684cbe59295821339ada5a3ed8a26de27a61f7f7c8ab0df8391efc4c42c608406314d9c579fad72
Added: trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-detect-userspace-env.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-detect-userspace-env.patch (rev 0)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-detect-userspace-env.patch 2015-03-22 07:25:38 UTC (rev 2923)
@@ -0,0 +1,62 @@
+# AUTHOR: Karl Linden
+# DESCRIPTION: Patch to make the build system not detect user space on request
+# STATUS: Applied upstream.
+
+Index: SConstruct
+===================================================================
+--- SConstruct (revision 2584)
++++ SConstruct (revision 2585)
+@@ -76,6 +76,7 @@
+ BoolVariable( "BUILD_STATIC_TOOLS", "Build a statically linked version of the FFADO tools.", False ),
+ EnumVariable('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'powerpc64', 'none' ), ignorecase=2),
+ BoolVariable( "ENABLE_OPTIMIZATIONS", "Enable optimizations and the use of processor specific extentions (MMX/SSE/...).", False ),
++ BoolVariable( "DETECT_USERSPACE_ENV", "Try to detect the user space environment and add necessary 32/64 bit machine flags.", True ),
+ BoolVariable( "PEDANTIC", "Enable -Werror and more pedantic options during compile.", False ),
+ BoolVariable( "CUSTOM_ENV", "Respect CC, CXX, CFLAGS, CXXFLAGS and LDFLAGS.\nOnly meant for distributors and gentoo-users who want to over-optimize their build.\n Using this is not supported by the ffado-devs!", False ),
+ ( "COMPILE_FLAGS", "Deprecated (use CFLAGS and CXXFLAGS with CUSTOM_ENV=True instead). Add additional flags to the environment.\nOnly meant for distributors and gentoo-users who want to over-optimize their build.\n Using this is not supported by the ffado-devs!" ),
+@@ -783,25 +784,26 @@
+ if '-msse2' in opt_flags:
+ env['USE_SSE2'] = 1
+
+-m32 = is_userspace_32bit(cpuinfo)
+-print 'User space is %s' % (m32 and '32-bit' or '64-bit')
+-if cpuinfo.is_powerpc:
+- if m32:
+- print "Doing a 32-bit PowerPC build for %s CPU" % cpuinfo.ppc_type
+- machineflags = { 'CXXFLAGS' : ['-m32'] }
+- else:
+- print "Doing a 64-bit PowerPC build for %s CPU" % cpuinfo.ppc_type
+- machineflags = { 'CXXFLAGS' : ['-m64'] }
+- env.MergeFlags( machineflags )
+-elif cpuinfo.is_x86:
+- if m32:
+- print "Doing a 32-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
+- machineflags = { 'CXXFLAGS' : ['-m32'] }
+- else:
+- print "Doing a 64-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
+- machineflags = { 'CXXFLAGS' : ['-m64'] }
+- needs_fPIC = True
+- env.MergeFlags( machineflags )
++if env['DETECT_USERSPACE_ENV']:
++ m32 = is_userspace_32bit(cpuinfo)
++ print 'User space is %s' % (m32 and '32-bit' or '64-bit')
++ if cpuinfo.is_powerpc:
++ if m32:
++ print "Doing a 32-bit PowerPC build for %s CPU" % cpuinfo.ppc_type
++ machineflags = { 'CXXFLAGS' : ['-m32'] }
++ else:
++ print "Doing a 64-bit PowerPC build for %s CPU" % cpuinfo.ppc_type
++ machineflags = { 'CXXFLAGS' : ['-m64'] }
++ env.MergeFlags( machineflags )
++ elif cpuinfo.is_x86:
++ if m32:
++ print "Doing a 32-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
++ machineflags = { 'CXXFLAGS' : ['-m32'] }
++ else:
++ print "Doing a 64-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
++ machineflags = { 'CXXFLAGS' : ['-m64'] }
++ needs_fPIC = True
++ env.MergeFlags( machineflags )
+ #=== End Revised CXXFLAGS =========================================
+
+
Deleted: trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-detect-userspace.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-detect-userspace.patch 2015-03-19 21:32:31 UTC (rev 2922)
+++ trunk/overlays/proaudio/media-libs/libffado/files/libffado-2.2.1-detect-userspace.patch 2015-03-22 07:25:38 UTC (rev 2923)
@@ -1,63 +0,0 @@
-# AUTHOR: Karl Linden
-# DESCRIPTION: Patch to make the build system not detect user space on request
-# STATUS: Sent upstream 19 March 2015
-# SEE: http://subversion.ffado.org/ticket/389
-
-Index: SConstruct
-===================================================================
---- SConstruct (revision 2584)
-+++ SConstruct (working copy)
-@@ -76,6 +76,7 @@
- BoolVariable( "BUILD_STATIC_TOOLS", "Build a statically linked version of the FFADO tools.", False ),
- EnumVariable('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'powerpc64', 'none' ), ignorecase=2),
- BoolVariable( "ENABLE_OPTIMIZATIONS", "Enable optimizations and the use of processor specific extentions (MMX/SSE/...).", False ),
-+ BoolVariable( "DETECT_USERSPACE", "Try to detect the user space and add necessary machine flags.", True ),
- BoolVariable( "PEDANTIC", "Enable -Werror and more pedantic options during compile.", False ),
- BoolVariable( "CUSTOM_ENV", "Respect CC, CXX, CFLAGS, CXXFLAGS and LDFLAGS.\nOnly meant for distributors and gentoo-users who want to over-optimize their build.\n Using this is not supported by the ffado-devs!", False ),
- ( "COMPILE_FLAGS", "Deprecated (use CFLAGS and CXXFLAGS with CUSTOM_ENV=True instead). Add additional flags to the environment.\nOnly meant for distributors and gentoo-users who want to over-optimize their build.\n Using this is not supported by the ffado-devs!" ),
-@@ -783,25 +784,26 @@
- if '-msse2' in opt_flags:
- env['USE_SSE2'] = 1
-
--m32 = is_userspace_32bit(cpuinfo)
--print 'User space is %s' % (m32 and '32-bit' or '64-bit')
--if cpuinfo.is_powerpc:
-- if m32:
-- print "Doing a 32-bit PowerPC build for %s CPU" % cpuinfo.ppc_type
-- machineflags = { 'CXXFLAGS' : ['-m32'] }
-- else:
-- print "Doing a 64-bit PowerPC build for %s CPU" % cpuinfo.ppc_type
-- machineflags = { 'CXXFLAGS' : ['-m64'] }
-- env.MergeFlags( machineflags )
--elif cpuinfo.is_x86:
-- if m32:
-- print "Doing a 32-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
-- machineflags = { 'CXXFLAGS' : ['-m32'] }
-- else:
-- print "Doing a 64-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
-- machineflags = { 'CXXFLAGS' : ['-m64'] }
-- needs_fPIC = True
-- env.MergeFlags( machineflags )
-+if env['DETECT_USERSPACE']:
-+ m32 = is_userspace_32bit(cpuinfo)
-+ print 'User space is %s' % (m32 and '32-bit' or '64-bit')
-+ if cpuinfo.is_powerpc:
-+ if m32:
-+ print "Doing a 32-bit PowerPC build for %s CPU" % cpuinfo.ppc_type
-+ machineflags = { 'CXXFLAGS' : ['-m32'] }
-+ else:
-+ print "Doing a 64-bit PowerPC build for %s CPU" % cpuinfo.ppc_type
-+ machineflags = { 'CXXFLAGS' : ['-m64'] }
-+ env.MergeFlags( machineflags )
-+ elif cpuinfo.is_x86:
-+ if m32:
-+ print "Doing a 32-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
-+ machineflags = { 'CXXFLAGS' : ['-m32'] }
-+ else:
-+ print "Doing a 64-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
-+ machineflags = { 'CXXFLAGS' : ['-m64'] }
-+ needs_fPIC = True
-+ env.MergeFlags( machineflags )
- #=== End Revised CXXFLAGS =========================================
-
-
Modified: trunk/overlays/proaudio/media-libs/libffado/libffado-2.2.1-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-2.2.1-r1.ebuild 2015-03-19 21:32:31 UTC (rev 2922)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-2.2.1-r1.ebuild 2015-03-22 07:25:38 UTC (rev 2923)
@@ -48,7 +48,7 @@
PATCHES=(
"${FILESDIR}"/${P}-flags.patch
"${FILESDIR}"/${P}-jack-detect.patch
- "${FILESDIR}"/${P}-detect-userspace.patch
+ "${FILESDIR}"/${P}-detect-userspace-env.patch
)
src_unpack() {
@@ -71,7 +71,7 @@
MANDIR="${EPREFIX}/usr/share/man"
UDEVDIR="$(get_udevdir)/rules.d"
CUSTOM_ENV=True
- DETECT_USERSPACE=False
+ DETECT_USERSPACE_ENV=False
$(use_scons debug DEBUG)
$(use_scons test-programs BUILD_TESTS)
# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
Modified: trunk/overlays/proaudio/media-libs/libffado/libffado-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libffado/libffado-9999.ebuild 2015-03-19 21:32:31 UTC (rev 2922)
+++ trunk/overlays/proaudio/media-libs/libffado/libffado-9999.ebuild 2015-03-22 07:25:38 UTC (rev 2923)
@@ -45,10 +45,6 @@
DOCS=( AUTHORS ChangeLog README )
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2.1-detect-userspace.patch
-)
-
src_unpack() {
if [ "${PV}" = "9999" ]; then
subversion_src_unpack
@@ -69,7 +65,7 @@
MANDIR="${EPREFIX}/usr/share/man"
UDEVDIR="$(get_udevdir)/rules.d"
CUSTOM_ENV=True
- DETECT_USERSPACE=False
+ DETECT_USERSPACE_ENV=False
$(use_scons debug DEBUG)
$(use_scons test-programs BUILD_TESTS)
# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly