Revision: 2534
Author: gavlee
Date: 2013-03-15 14:54:13 +0100 (Fri, 15 Mar 2013)
Log Message:
-----------
media-libs/libclam: update to 1.4.0-r1, remove old ebuilds
Modified Paths:
--------------
trunk/overlays/proaudio/media-libs/libclam/ChangeLog
trunk/overlays/proaudio/media-libs/libclam/Manifest
Added Paths:
-----------
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0001-fix-creation-of-packaging-install-dir.patch
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0002-fix-compile-with-gcc-4.6.patch
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0003-honour-toolchain-environment.patch
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0004-add-libdir-option-for-multilib-strict.patch
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0005-remove-fomit-frame-pointer-cflags.patch
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0006-correct-prefix-in-.pc-files-building-modules.patch
trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0-r1.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-libs/libclam/libclam-1.3.0.ebuild
trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0.ebuild
Modified: trunk/overlays/proaudio/media-libs/libclam/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/ChangeLog 2013-03-11
18:34:11 UTC (rev 2533)
+++ trunk/overlays/proaudio/media-libs/libclam/ChangeLog 2013-03-15
13:54:13 UTC (rev 2534)
@@ -1,7 +1,22 @@
# ChangeLog for media-libs/libclam
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*libclam-1.4.0-r1 (15 Mar 2013)
+
+ 15 Mar 2013; Gavin Pryke (gavlee) <[email protected]>
+ +libclam-1.4.0-r1.ebuild,
+ +files/libclam-1.4.0/0001-fix-creation-of-packaging-install-dir.patch,
+ +files/libclam-1.4.0/0002-fix-compile-with-gcc-4.6.patch,
+ +files/libclam-1.4.0/0003-honour-toolchain-environment.patch,
+ +files/libclam-1.4.0/0004-add-libdir-option-for-multilib-strict.patch,
+ +files/libclam-1.4.0/0005-remove-fomit-frame-pointer-cflags.patch,
+ +files/libclam-1.4.0/0006-correct-prefix-in-.pc-files-building-modules.patch:
+ in addition to patch descriptions: migrate to scons-utils.eclass and EAPI=5
+ to simplify installing of examples with recursive dodoc. trim dependencies.
+ adjust USE. include doxygen html docs. remove old with bad deps on
+ dev-libs/xerces-c and media-libs/portaudio-19 because _pre is less than 19.
+
11 Mar 2013; Dominique Michel <[email protected]>
libclam-9999-r1.ebuild: Added fix for compilation failure with recent glibx
+libclam-9999_timeutc.patch: Fix preprocessor macro with recent glibc
Modified: trunk/overlays/proaudio/media-libs/libclam/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/Manifest 2013-03-11 18:34:11 UTC
(rev 2533)
+++ trunk/overlays/proaudio/media-libs/libclam/Manifest 2013-03-15 13:54:13 UTC
(rev 2534)
@@ -1,8 +1,12 @@
+AUX libclam-1.4.0/0001-fix-creation-of-packaging-install-dir.patch 1084 SHA256
7590390ff457a1a2807d4dd682d92a9da4343f98d10bb0b6167dbe23632ce686 SHA512
ad478528c2e95bf07a68d65dde55cefae4c88ff1a6a7a63511d0a7d33707af1cbb29dc034acd5d7861f2f95b5d88a10894519b803e27b3f4f424ef40ac078870
WHIRLPOOL
35fc2f91d313bee7491f05fb9286010057ee77054db71dbc7c9578881dbd82adfd555375b31e7e0ed1bf26a0cad7c2ecd814d69b2d494ecf2e12590123a16a0f
+AUX libclam-1.4.0/0002-fix-compile-with-gcc-4.6.patch 1049 SHA256
1974a4f64f10cb6dfa84a68bb80648a625432424b56edd0b0bf361a8c24234c1 SHA512
23cd6375f9b7862f9fc5a643bc390cbc13c93cfc1b0d5feeb88d50c547cc14f1d84ef8b1b441a37b90eb76ddc9730e1d7bb59ea96ecf940895a1fb33301bdd46
WHIRLPOOL
d1554c85d59b4cd84ab8b72a78ac592745ffbbf7e7ef1a5acdafa5444c37beedbec7e48106e8130425acae308af06a16d16e4ba3c2fa0c83c921128f97cd30d8
+AUX libclam-1.4.0/0003-honour-toolchain-environment.patch 1508 SHA256
6cc8f8f92526d08635e3c55d6ac5372169743dbdeaef88eda20016cbd683de14 SHA512
7bfeeba71477d312bfd9e197e9c914f70003cc3bdcddadcdd6eac48139fe0a1d9494e57e5c0ef53742547a132c329d261acd709903d36ea71bd97fd9be3afdf3
WHIRLPOOL
7f87a7ac4e713369cec6e40f25ea11ef01b0bae2ac066f0e43dba935eaff01276c6493dd7fe99ba9b9fd25f861ad185f197b2f30e2ca315244971a10afd6e26a
+AUX libclam-1.4.0/0004-add-libdir-option-for-multilib-strict.patch 5780 SHA256
1ae9d61bfc148301e3a394e7e182d7f87f669e4dc3d0b2dac71398af193a5235 SHA512
ec2aa9e725f037d374f34c2f3d036e6ae20805a1d8418171d5516ea98412f4bae65e852dea5687d647538666d0e5139b3efbc334e2ca0e038c4eaa53a2ff4e29
WHIRLPOOL
d6ff09cc7c9163383eded704db71481fe803d870be9d9fc1a0888e4f9e758897dfa7995432bd3670c6bf903ae4c91cb7120065eebcba8a3c09f9d19c250fd4f4
+AUX libclam-1.4.0/0005-remove-fomit-frame-pointer-cflags.patch 915 SHA256
e3ff670d3bbdddd2960bea6af0f6ebbb01bfaaa000291a70b83a16d3f6eee4ab SHA512
69d9df5fc0b54cff813e5f7efe6ff1d612352793d851e39f76a698f0f5ca41dda535a4ce73ec2e64a48b7c6a23d389c6b04c7805ec882893d04d240bb2bb32f0
WHIRLPOOL
2a54f10de39f7bdc3cb4f5c8651f1a4aa918e81468c4a8e0ad07ad720fbeb8408ac117fbc49ad09273d80cb173c1c97528fee0f258d94e16f0eb3dcfcca8c5cc
+AUX libclam-1.4.0/0006-correct-prefix-in-.pc-files-building-modules.patch 1208
SHA256 4ac51c36fe4cf9e314bd281a71f337bc225a1b64630ace0b3c8eba4eeb089ccf SHA512
c65095b70ce0ab410bdf66c5d742ee3783018f55687c80f73faf8b927accec13ca351fea1439c349557d23a45b1f8be3aedf328686f6cf6c66eaf9ab73135fc9
WHIRLPOOL
e91c4f64ee52bf874044f0d19a7c971243345f364f2e3af3326d28bc67e52cb739824c3ebfcf293329b4e4275a8f3d52af55c2e9fc9eaf2937653594f4ac9081
AUX libclam-9999_timeutc.patch 325 SHA256
7e5f897f429c6a9bef1769204ac0fa34179b8671b8b1a149bc0efe55d1713936 SHA512
c78a11b2584ff77a0a245e0ffb3da907ee5c0b0917a847d426a7e8bb446e9171ed60945d9113891dc491cf6b2d9a559282ba396d9b7b05ea90da65eabc74402f
WHIRLPOOL
5517ca2ba87434cbd2970a0d896ad042ddc31378eaa55612d37858c93101c2d99eddf2802aaa285b5f3f73a220b8b8adbd7bb583550e15bcdc0488c5e61fc3fe
-DIST CLAM-1.3.0.tar.gz 2404874 SHA256
c112adcbf0f08a364ba17be6f175a0582b002ffb3208621e1cfdb20d83f4d64e
DIST CLAM-1.4.0.tar.gz 2527268 SHA256
36fb156b01bb88276962763fef18cd1533cc10d64f8d7824b4623bf5d761bd4d SHA512
af1f5ed26b22dcfb09817450e286a5ce76a35a033e0457a959f91ce527b9406f492d2d7835ca1b43ed2b84fea93dd0096a56e7d354e465d75f28bb5910a947a5
WHIRLPOOL
96e8e3b7dbae3eedcd714ec8b8ca37ed7b4a1df1d3dcb81e0c93cd1e307a81f4ec241f983c0efb5e7bfacd7a177fdaf707e0a5856db59dde2f31f78e33f42ec5
-EBUILD libclam-1.3.0.ebuild 3815 SHA256
6b06b20fa0e5318d0cc8d29b9550cd5b642cb8416ae6c3e368e8582dcbc953b7 SHA512
688c63108e4e5b061ee3dab867caa91f61132c2750162b11fc9ed5c9646289593f52bc6403a1b8861dc2fab0f4145c1e7d343ea0e136ee7266d5cf8727eb954c
WHIRLPOOL
0166f5c1db88bb7b61c0106273b1de721a7f6cb15706fb5553538951104d5738ba05614623dc894ef933593663e0da801119ed091eb029b2e98bd6e515d962e2
-EBUILD libclam-1.4.0.ebuild 4135 SHA256
fc6048d4caa2d53f520a84c62a5e192b552fd2e5761f94a5a3ee1c7867a9d9f2 SHA512
2789d761c7dbeb4459d25dcdd2a18453205054fc849b61d69d1cb8a2c0dc18eb0bab3571dffe57bbabce83fe53b977617cc7b873c6901ff2c2995b91c9576d2b
WHIRLPOOL
41b8a249a572e37c08e469d0875530db395c6ff05b03dc6f1f9f9c4da8ef31c38f238f905eb406bcf8dc6cb8391cc172a4c62173e04332156528c0316037fd4c
+EBUILD libclam-1.4.0-r1.ebuild 2667 SHA256
e45f9401867beaea628cbf92ad8b051b5b1e5f4610039f301387d6edd81f3077 SHA512
f5db89fefeef164e53454f5171a888d026e7db429257f5b6e685a422ee5d552265fdf8e9b13a484f3fa26ad4663d85fe65110aabd0dc758ab2fa53db5dfc04ed
WHIRLPOOL
e24e5506045071ff51ceac65665ff90fa73f5eae0a960ce008baa44f7749174174f1c5e0e6acf0a08a598cef635ada0e9adc917b439d0b0608b3da0f269b7ab4
EBUILD libclam-9999-r1.ebuild 4755 SHA256
a05fd4febc5fe3be9ecf4218dd5cc6aa2886f7abeac224890dacd3c2df134781 SHA512
ea65c6cffa00794a8a8d5233e63698d5c534ad0731e6ce0bd88999e7f2403f3865747cc0f14bbf016ab5dfb2e055f0e6e81275842c515ec50f192b23cc7b1a4d
WHIRLPOOL
c3a85c8d287cb7c52295cb4b10314cbc390ea4d9aca3021058248b36e4ac1c289d2eea8adbafc8605aaa007142194b32e789fbab3194415aa8f7f3ec29590b92
-MISC ChangeLog 2640 SHA256
47700f91e8798fc44de9501eb217b018a73b97c77a70171d97c0b2676fbc9091 SHA512
d5965366c31e8417caea487f863f7b6d0da8f27dff1a01096505a573b34986b44a7a8148fdf192e28bb4cd37b99fd072884ff5f861b8b8241c6553fce49e4388
WHIRLPOOL
1ac8a428c10049586d8208f1067ad38552dfde41553db53a0f1a203373bb257fe4957994533cae57b55f58e8ded8f20a56f6d174b82bf993df43843875f17af0
+MISC ChangeLog 3489 SHA256
555367bcf744315f644cd733114b50b06d053110997098d0953bb083f5c3d0a5 SHA512
18150d4b768055dc026e655c74b0e9a6bc3e4417b5729b81e4cef939cfaa097629d083c068588504066a57a3ae9b45082308bc69efee1a2204d26cbc834aa9b2
WHIRLPOOL
9efbc1066da769a4c4f2225f3f7a64891d02b395fecc7de38a9dedb8a0620074f9cc89b0b65af4e6fb304ce89d5241e5eb2bec94467183c2953be2464b2edc27
MISC metadata.xml 812 SHA256
f58d6e666e08227e898340cd87689a8307c012a7626a241f0f2754ba98d342d8 SHA512
e4dcaec217871c0e2016705923f42dc756e7f70074622c6cc73d89beb725d3e280c9bf122203bae0c9af3c284babb6e4ca7e545780376981b6ff291389c087b3
WHIRLPOOL
090415dd77bcf1b75d33e9bc62b22ad917c72cebe7d1ec4d7a3e6bc54f5e480f1b94719eb915b7413f3dcb0c60d2d030482bc59f2c077d2363f468beca5630ba
Added:
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0001-fix-creation-of-packaging-install-dir.patch
===================================================================
---
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0001-fix-creation-of-packaging-install-dir.patch
(rev 0)
+++
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0001-fix-creation-of-packaging-install-dir.patch
2013-03-15 13:54:13 UTC (rev 2534)
@@ -0,0 +1,25 @@
+From ea688b0ae9669ba28f5b557851ebe43bb20ad2f6 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <[email protected]>
+Date: Wed, 13 Mar 2013 09:59:28 +0000
+Subject: [PATCH 1/6] fix creation of packaging install dir
+
+---
+ SConstruct | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index 8c70a33..91d81fc 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -123,7 +123,7 @@ def setup_build_options( env ) :
+
+ # global options
+ opts.Add( PathVariable( 'prefix', 'Install location for CLAM',
'/usr/local'))
+- opts.Add( PathVariable( 'prefix_for_packaging', 'Install location when
packaging (just for .deb creation)', '.'))
++ opts.Add( PathVariable( 'prefix_for_packaging', 'Install location when
packaging (just for .deb creation)', '.', PathVariable.PathIsDirCreate))
+ if isWindowsPlatform :
+ opts.Add( PathVariable( 'sandbox_path', 'The working directory
in mingw where the external libraries are placed', '' ) )
+ opts.Add( BoolVariable( 'release', 'Build CLAM with optimizations and
stripping debug symbols', 'no'))
+--
+1.7.12.4
+
Added:
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0002-fix-compile-with-gcc-4.6.patch
===================================================================
---
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0002-fix-compile-with-gcc-4.6.patch
(rev 0)
+++
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0002-fix-compile-with-gcc-4.6.patch
2013-03-15 13:54:13 UTC (rev 2534)
@@ -0,0 +1,40 @@
+From 7a5139a722183f431ed582bc9e25df4dc1dc4e8d Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <[email protected]>
+Date: Wed, 13 Mar 2013 10:00:20 +0000
+Subject: [PATCH 2/6] fix compile with gcc-4.6
+
+---
+ src/Standard/Connection.cxx | 2 ++
+ src/Tools/MIDIIO/File/MIDISongPlayer.cxx | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/Standard/Connection.cxx b/src/Standard/Connection.cxx
+index 80993eb..ba5e509 100644
+--- a/src/Standard/Connection.cxx
++++ b/src/Standard/Connection.cxx
+@@ -19,6 +19,8 @@
+ *
+ */
+
++#include <cstddef>
++
+ #include "Connection.hxx"
+ #include "Signal.hxx"
+
+diff --git a/src/Tools/MIDIIO/File/MIDISongPlayer.cxx
b/src/Tools/MIDIIO/File/MIDISongPlayer.cxx
+index c01fb6e..6d8191c 100644
+--- a/src/Tools/MIDIIO/File/MIDISongPlayer.cxx
++++ b/src/Tools/MIDIIO/File/MIDISongPlayer.cxx
+@@ -21,7 +21,9 @@
+ * Maarten de Boer <[email protected]>
+ *
+ */
++#include <cstddef>
+ #include <vector>
++
+ #include "MIDISongPlayer.hxx"
+ #include "MIDITrack.hxx"
+ #include "MIDISong.hxx"
+--
+1.7.12.4
+
Added:
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0003-honour-toolchain-environment.patch
===================================================================
---
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0003-honour-toolchain-environment.patch
(rev 0)
+++
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0003-honour-toolchain-environment.patch
2013-03-15 13:54:13 UTC (rev 2534)
@@ -0,0 +1,43 @@
+From 39eafabf7e3fc41e658fc1ee26926d4da47bbdce Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <[email protected]>
+Date: Wed, 13 Mar 2013 10:43:46 +0000
+Subject: [PATCH 3/6] honour toolchain environment
+
+---
+ SConstruct | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index 91d81fc..f762227 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -230,12 +230,25 @@ if crosscompiling :
+ clam_env.Tool('textfile',toolpath=['scons/sconstools'])
+ clam_env.Tool('pc',toolpath=['scons/sconstools'])
+
++# from http://dev.gentoo.org/~vapier/scons-blows.txt
++if os.environ.has_key('CC'):
++ clam_env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++ clam_env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++ clam_env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++ clam_env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('CPPFLAGS'):
++ clam_env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++ clam_env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++
+ if clam_env['distcc_hosts'] :
+ clam_env['CXX'] = 'distcc '+clam_env['CXX']
+ clam_env['ENV']['DISTCC_HOSTS'] = clam_env['distcc_hosts']
+ SetOption('num_jobs', len( clam_env['distcc_hosts'].split() ))
+
+-
+ sys.path.append('scons/sconstools')
+ import versionInfo
+ version, fullVersion = versionInfo.versionFromLocalInfo("CLAM", "CHANGES")
+--
+1.7.12.4
+
Added:
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0004-add-libdir-option-for-multilib-strict.patch
===================================================================
---
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0004-add-libdir-option-for-multilib-strict.patch
(rev 0)
+++
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0004-add-libdir-option-for-multilib-strict.patch
2013-03-15 13:54:13 UTC (rev 2534)
@@ -0,0 +1,142 @@
+From 328af5da12e8e9df861d4c35ca9acd8f18797ad5 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <[email protected]>
+Date: Thu, 14 Mar 2013 17:01:27 +0000
+Subject: [PATCH 4/6] add libdir option for multilib-strict
+
+---
+ SConstruct | 1 +
+ scons/libs/clam_build_helpers.py | 5 +++--
+ scons/sconstools/clam.py | 25 ++++++++++++++++++-------
+ scons/sconstools/pc.py | 5 +++--
+ 4 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index f762227..0c9bb92 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -124,6 +124,7 @@ def setup_build_options( env ) :
+ # global options
+ opts.Add( PathVariable( 'prefix', 'Install location for CLAM',
'/usr/local'))
+ opts.Add( PathVariable( 'prefix_for_packaging', 'Install location when
packaging (just for .deb creation)', '.', PathVariable.PathIsDirCreate))
++ opts.Add( PathVariable( 'libdir', 'library install directory', 'lib',
PathVariable.PathAccept))
+ if isWindowsPlatform :
+ opts.Add( PathVariable( 'sandbox_path', 'The working directory
in mingw where the external libraries are placed', '' ) )
+ opts.Add( BoolVariable( 'release', 'Build CLAM with optimizations and
stripping debug symbols', 'no'))
+diff --git a/scons/libs/clam_build_helpers.py
b/scons/libs/clam_build_helpers.py
+index efa85b7..750b610 100644
+--- a/scons/libs/clam_build_helpers.py
++++ b/scons/libs/clam_build_helpers.py
+@@ -110,8 +110,8 @@ class InstallDirs :
+ if environ['prefix_for_packaging'] != '.':
+ self.prefix = environ['prefix_for_packaging']
+ else: self.prefix = environ['prefix']
+- self.lib = self.prefix + '/lib'
+- self.pc = self.prefix + '/lib/pkgconfig'
++ self.lib = os.path.join(self.prefix, environ['libdir'])
++ self.pc = os.path.join(self.prefix, environ['libdir'],
'pkgconfig')
+ self.bin = self.prefix + '/bin'
+ self.inc = self.prefix + '/include'
+ self.data = self.prefix + '/share'
+@@ -206,6 +206,7 @@ def lib_rules(name, version, folders, blacklist,
install_dirs, env, moduleDepend
+ package = "clam_%s"%name,
+ version = version,
+ prefix = env['prefix'],
++ libdir = env['libdir'],
+ description = "C++ Framework for analysis, synthesis and
transformation of music audio signals",
+ url = 'http://clam-project.org',
+ requires = ["clam_%s"%module for module in moduleDependencies],
+diff --git a/scons/sconstools/clam.py b/scons/sconstools/clam.py
+index b14299e..4e78e8e 100644
+--- a/scons/sconstools/clam.py
++++ b/scons/sconstools/clam.py
+@@ -66,11 +66,18 @@ def ClamModule(env, moduleName, version,
+ if windowsTarget :
+ plugin = [plugin[0]]
+
++ # hack for multilib
++ if env['libdir']:
++ libdir = env['libdir']
++ elif not env['libdir']:
++ libdir = 'lib'
++
+ # pkg-config file
+ pcfile = env.PkgConfigFile(
+ package = libraryName,
+ version = version,
+- prefix = env['prefix'],
++ prefix = env['prefix'],
++ libdir = libdir,
+ description = description,
+ url = url,
+ requires = clamDependencies+otherDependencies,
+@@ -126,10 +133,10 @@ def ClamModule(env, moduleName, version,
+ localLinkName = env.LinkerNameLink( linkname, lib ) #
lib***.dylib -> lib***.X.Y.Z.dylib
+ libraries = [lib, localSoName, localLinkName]
+
+- installedLib = env.Install(os.path.join(env['prefix'],'lib'), lib)
++ installedLib = env.Install(os.path.join(env['prefix'], libdir), lib)
+ install+= [
+- env.Install(os.path.join(env['prefix'],'lib','clam'), plugin),
+- env.Install(os.path.join(env['prefix'],'lib','pkgconfig'),
pcfile),
++ env.Install(os.path.join(env['prefix'], libdir, 'clam'),
plugin),
++ env.Install(os.path.join(env['prefix'], libdir, 'pkgconfig'),
pcfile),
+
env.Install(os.path.join(env['prefix'],'include','CLAM',moduleName), headers),
+ installedLib,
+ ]
+@@ -137,8 +144,8 @@ def ClamModule(env, moduleName, version,
+ return install, (libraries, plugin, pcfile)
+
+ install+= [
+- env.LinkerNameLink( os.path.join(env['prefix'],'lib',linkname),
installedLib),
+- env.SonameLink( os.path.join(env['prefix'],'lib',soname),
installedLib),
++ env.LinkerNameLink( os.path.join(env['prefix'], libdir,
linkname), installedLib),
++ env.SonameLink( os.path.join(env['prefix'], libdir, soname),
installedLib),
+ ]
+ return install, (libraries, plugin, pcfile)
+
+@@ -160,9 +167,13 @@ def ClamQuietCompilation(env) :
+
+ def enable_modules( self, libs, path) :
+ if sys.platform in ['linux2','darwin'] :
+- self.ParseConfig('PKG_CONFIG_PATH=%s/lib/pkgconfig pkg-config
%s --libs --cflags'%
++ # multilib hack
++ libdir= getattr(self['ENV'], 'libdir', 'lib')
++
++ self.ParseConfig('PKG_CONFIG_PATH=%s/%s/pkgconfig pkg-config %s
--libs --cflags'%
+ (
+ path,
++ libdir,
+ ' '.join(libs)))
+ return
+
+diff --git a/scons/sconstools/pc.py b/scons/sconstools/pc.py
+index 8a7e41c..262caaf 100644
+--- a/scons/sconstools/pc.py
++++ b/scons/sconstools/pc.py
+@@ -3,7 +3,7 @@ import os
+ pkgConfigTemplate = """\
+ name = @name@
+ prefix = @prefix@
+-libdir = ${prefix}/lib
++libdir = ${prefix}/@libdir@
+ includedir = ${prefix}/include
+
+ Name: ${name}
+@@ -15,12 +15,13 @@ Conflicts: @conflicts@
+ Libs: -L${libdir} -l${name} @libs@
+ Cflags: -I${includedir} @cflags@
+ """
+-def PkgConfigFile(env, package, version, prefix, description=None, url=None,
requires=[], conflicts=[], cflags=[], libs=[]) :
++def PkgConfigFile(env, package, version, prefix, libdir='lib',
description=None, url=None, requires=[], conflicts=[], cflags=[], libs=[]) :
+ return env.Textfile(target = package,
+ source = [env.Value(pkgConfigTemplate)],
+ TEXTFILESUFFIX='.pc',
+ SUBST_DICT=[
+ ('@prefix@', prefix ),
++ ('@libdir@', libdir ),
+ ('@name@', package ),
+ ('@version@', version ),
+ ('@description@', "C++ Framework for analysis,
synthesis and transformation of music audio signals" ),
+--
+1.7.12.4
+
Added:
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0005-remove-fomit-frame-pointer-cflags.patch
===================================================================
---
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0005-remove-fomit-frame-pointer-cflags.patch
(rev 0)
+++
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0005-remove-fomit-frame-pointer-cflags.patch
2013-03-15 13:54:13 UTC (rev 2534)
@@ -0,0 +1,25 @@
+From c3c1048032b05ece33059a9fceb7e041ade74a75 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <[email protected]>
+Date: Thu, 14 Mar 2013 17:02:09 +0000
+Subject: [PATCH 5/6] remove -fomit-frame-pointer cflags
+
+---
+ scons/libs/clam_dependent_libs_checks.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scons/libs/clam_dependent_libs_checks.py
b/scons/libs/clam_dependent_libs_checks.py
+index c172360..7df9491 100644
+--- a/scons/libs/clam_dependent_libs_checks.py
++++ b/scons/libs/clam_dependent_libs_checks.py
+@@ -43,7 +43,7 @@ def setup_global_environment( env, conf ) :
+
+ if env['release'] :
+ print 'COMPILING IN RELEASE MODE'
+- env.AppendUnique( CCFLAGS='-g -O3 -fomit-frame-pointer
-Wall'.split(' ') )
++ env.AppendUnique( CCFLAGS='-g -O3 -Wall'.split(' ') )
+ else :
+ print 'COMPILING IN DEBUG MODE'
+ env.AppendUnique( CCFLAGS='-g -Wall'.split(' ') )
+--
+1.7.12.4
+
Added:
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0006-correct-prefix-in-.pc-files-building-modules.patch
===================================================================
---
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0006-correct-prefix-in-.pc-files-building-modules.patch
(rev 0)
+++
trunk/overlays/proaudio/media-libs/libclam/files/libclam-1.4.0/0006-correct-prefix-in-.pc-files-building-modules.patch
2013-03-15 13:54:13 UTC (rev 2534)
@@ -0,0 +1,38 @@
+From 7ab2ae6dd0b38bd47526cdb48978d7c08b183634 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <[email protected]>
+Date: Thu, 14 Mar 2013 17:25:54 +0000
+Subject: [PATCH 6/6] correct prefix in .pc files building modules
+
+---
+ scons/sconstools/clam.py | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/scons/sconstools/clam.py b/scons/sconstools/clam.py
+index 4e78e8e..9f5dc82 100644
+--- a/scons/sconstools/clam.py
++++ b/scons/sconstools/clam.py
+@@ -71,12 +71,20 @@ def ClamModule(env, moduleName, version,
+ libdir = env['libdir']
+ elif not env['libdir']:
+ libdir = 'lib'
++
++ # try to set correct prefix directories in pkg-config files when
++ # building modules (networkeditor), this doesn't apply to clam lib
++ # and clam_prefix needs to be specified to build networkeditor anyway
++ if env['clam_prefix']:
++ prefix = env['clam_prefix']
++ elif not env['clam_prefix']:
++ prefix = env['prefix']
+
+ # pkg-config file
+ pcfile = env.PkgConfigFile(
+ package = libraryName,
+ version = version,
+- prefix = env['prefix'],
++ prefix = prefix,
+ libdir = libdir,
+ description = description,
+ url = url,
+--
+1.7.12.4
+
Deleted: trunk/overlays/proaudio/media-libs/libclam/libclam-1.3.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/libclam-1.3.0.ebuild
2013-03-11 18:34:11 UTC (rev 2533)
+++ trunk/overlays/proaudio/media-libs/libclam/libclam-1.3.0.ebuild
2013-03-15 13:54:13 UTC (rev 2534)
@@ -1,143 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="Framework for research and application development in the Audio
and Music domain"
-HOMEPAGE="http://clam-project.org/index.html";
-
-MY_PN="CLAM"
-MY_P="CLAM-${PV}"
-
-SRC_URI="http://clam-project.org/download/src/${MY_P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="doc double jack ladspa osc fftw fft alsa optimize sndfile vorbis mad
portaudio"
-# portmidi"
-
-RESTRICT="mirror"
-
-DEPEND="ladspa? ( media-libs/ladspa-sdk )
- =dev-libs/xerces-c-2.7*
- fftw? ( =sci-libs/fftw-3* )
- virtual/opengl
- x11-libs/fltk
- jack? ( media-sound/jack-audio-connection-kit )
- vorbis? ( media-libs/libvorbis
- media-libs/libogg )
- mad? ( media-libs/libmad )
- sndfile? ( media-libs/libsndfile )
- mad? ( media-libs/id3lib )
- portaudio? ( =media-libs/portaudio-19* )
- virtual/jpeg
- alsa? ( media-libs/alsa-lib )
- media-libs/libpng
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXi
- dev-util/cppunit
- osc? ( media-libs/oscpack )"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- # required for scons to "see" intermediate install location
- mkdir -p "${D}"/usr
-
- cd "${S}"
-
- local myconf="DESTDIR=${D}/usr prefix=/usr
prefix_for_packaging=${D}/usr"
- if use double; then
- myconf="${myconf} double=yes"
- fi
- if use optimize; then
- myconf="${myconf} optimize_and_lose_precision=yes"
- fi
- if ! use ladspa; then
- myconf="${myconf} with_ladspa=no"
- fi
- if use osc; then
- myconf="${myconf} with_osc=yes"
- fi
- if ! use jack; then
- myconf="${myconf} with_jack=no"
- fi
- if ! use fftw; then
- myconf="${myconf} with_fftw=no"
- else
- myconf="${myconf} with_fftw=no with_fftw3=yes"
- fi
- if ! use fft; then
- myconf="${myconf} with_nr_fft=no"
- fi
- if ! use sndfile; then
- myconf="${myconf} with_sndfile=no"
- fi
- if ! use vorbis; then
- myconf="${myconf} with_oggvorbis=no"
- fi
- if ! use mad; then
- myconf="${myconf} with_mad=no"
- myconf="${myconf} with_id3=no" # workaround buggy buildsys
- fi
- if use mad; then # was ! use id3 workaround buggy buildsys
- myconf="${myconf} with_mad=yes"
- myconf="${myconf} with_id3=yes" # was no
- fi
- if ! use portaudio; then
- myconf="${myconf} with_portaudio=no"
- fi
- if ! use alsa; then
- myconf="${myconf} with_alsa=no"
- fi
- scons configure ${myconf} || die "configuration failed"
- scons --help
- scons || die "compilation failed"
-}
-
-src_install() {
- dodir /usr
-
- scons install || die "scons install failed"
- dodoc CHANGES
-
- if use doc; then
- docinto examples/ConfiguratorExample
- dodoc "${S}"/examples/ConfiguratorExample/*
- docinto examples/ControlArrayExamples
- dodoc "${S}"/examples/ControlArrayExamples/*
- docinto examples/FormantTracking
- dodoc "${S}"/examples/FormantTracking/*
- docinto examples/LadspaOSCRemoteController
- dodoc "${S}"/examples/LadspaOSCRemoteController/*
- docinto examples/NetworkLADSPAPlugin
- dodoc "${S}"/examples/NetworkLADSPAPlugin/*
- docinto examples/PluginExample
- dodoc "${S}"/examples/PluginExample/*
- docinto examples/PortsAndControlsUsageExample
- dodoc "${S}"/examples/PortsAndControlsUsageExample/*
- docinto examples/ProcessingClass2Ladspa
- dodoc "${S}"/examples/ProcessingClass2Ladspa/*
- docinto examples/SDIF2Wav
- dodoc "${S}"/examples/SDIF2Wav/*
- docinto examples/SDIF2WavStreaming
- dodoc "${S}"/examples/SDIF2WavStreaming/*
- docinto examples/SDIFToWavStreaming
- dodoc "${S}"/examples/SDIFToWavStreaming/*
- docinto examples/TickExtractor
- dodoc "${S}"/examples/TickExtractor/*
- docinto examples/Tutorial
- dodoc "${S}"/examples/Tutorial/*
- docinto examples/Wav2SDIF
- dodoc "${S}"/examples/Wav2SDIF/*
- docinto examples/loopMaker
- dodoc "${S}"/examples/loopMaker/*
- docinto examples
- dodoc "${S}"/examples/*
- fi
-}
Added: trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0-r1.ebuild
(rev 0)
+++ trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0-r1.ebuild
2013-03-15 13:54:13 UTC (rev 2534)
@@ -0,0 +1,114 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+inherit eutils scons-utils toolchain-funcs multilib python-any-r1
+
+DESCRIPTION="Framework for research and application development in the Audio
and Music domain"
+HOMEPAGE="http://clam-project.org/";
+SRC_URI="http://clam-project.org/download/src/CLAM-${PV}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc double examples fft fftw jack ladspa mad optimize osc
portaudio portmidi vorbis xercesc +xmlpp"
+
+RDEPEND="dev-libs/libsigc++:2
+ dev-util/cppunit
+ media-libs/libsndfile
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ fftw? ( sci-libs/fftw:3.0 )
+ jack? ( media-sound/jack-audio-connection-kit )
+ ladspa? ( media-libs/ladspa-sdk )
+ mad? ( media-libs/libmad
+ media-libs/id3lib )
+ osc? ( media-libs/oscpack )
+ portaudio? ( >=media-libs/portaudio-19_pre20111121 )
+ portmidi? ( media-libs/portmidi )
+ vorbis? ( media-libs/libvorbis
+ media-libs/libogg )
+ xercesc? ( <dev-libs/xerces-c-3 )
+ xmlpp? ( dev-cpp/libxmlpp:2.6 )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig"
+
+S=${WORKDIR}/CLAM-${PV}
+RESTRICT="mirror"
+
+pkg_setup() {
+ tc-export CC CXX
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}/*.patch
+}
+
+src_configure() {
+ local myconf=
+ if use xercesc; then
+ if use xmlpp; then
+ myconf+=" xmlbackend=both"
+ else
+ myconf+=" xmlbackend=xercesc"
+ fi
+ else
+ if use xmlpp; then
+ myconf+=" xmlbackend=xmlpp"
+ else
+ myconf+=" xmlbackend=none"
+ fi
+ fi
+
+ escons configure \
+ prefix="${EPREFIX}/usr" \
+ prefix_for_packaging="${ED}/usr" \
+ libdir=$(get_libdir) \
+ verbose=1 \
+ release=$(use debug && echo 0 || echo 1) \
+ $(use_scons alsa with_alsa) \
+ $(use_scons double) \
+ $(use_scons fft with_nr_fft) \
+ $(use_scons fftw with_fftw3) \
+ $(use_scons jack with_jack) \
+ $(use_scons ladspa with_ladspa) \
+ $(use_scons mad with_mad) \
+ $(use_scons mad with_id3) \
+ $(use_scons optimize optimize_and_lose_precision) \
+ $(use_scons osc with_osc) \
+ $(use_scons portaudio with_portaudio) \
+ $(use_scons portmidi with_portmidi) \
+ $(use_scons vorbis with_oggvorbis) \
+ ${myconf}
+
+ escons --help
+}
+
+src_compile() {
+ escons
+ use doc && escons doxygen
+}
+
+src_install() {
+ # force -j1 because of cryptic error creating pkgconfig files
+ escons -j1 install
+
+ dodoc CHANGES INSTALL
+
+ if use doc; then
+ dohtml -r doxygen/html/*
+ fi
+
+ if use examples; then
+ docinto examples
+
+ # want examples installed? will be more convenient uncompressed
+ docompress -x /usr/share/doc/${PF}/examples
+
+ dodoc -r examples/*
+ fi
+}
Deleted: trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0.ebuild
2013-03-11 18:34:11 UTC (rev 2533)
+++ trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0.ebuild
2013-03-15 13:54:13 UTC (rev 2534)
@@ -1,166 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils python qt4-r2
-
-DESCRIPTION="Framework for research and application development in the Audio
and Music domain"
-HOMEPAGE="http://clam-project.org/";
-
-MY_PN="CLAM"
-MY_P="CLAM-${PV}"
-
-SRC_URI="http://clam-project.org/download/src/${MY_P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc double jack ladspa osc fftw fft alsa optimize vorbis mad portaudio
xercesc +xmlpp"
-# portmidi"
-
-RESTRICT="mirror"
-
-PYTHON_DEPEND="2:7"
-
-RDEPEND="
- dev-util/cppunit
- virtual/jpeg
- media-libs/libpng
- media-libs/libsndfile
- virtual/opengl
- x11-libs/fltk
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXi
- dev-qt/qtgui:4
- ladspa? ( media-libs/ladspa-sdk )
- xercesc? ( <dev-libs/xerces-c-3 )
- xmlpp? ( dev-cpp/libxmlpp:2.6 )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- vorbis? ( media-libs/libvorbis
- media-libs/libogg )
- mad? ( media-libs/libmad
- media-libs/id3lib )
- portaudio? ( >=media-libs/portaudio-19 )
- alsa? ( media-libs/alsa-lib )
- osc? ( media-libs/oscpack )"
-
-DEPEND="${RDEPEND}
- dev-util/scons
- app-doc/doxygen"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_compile() {
- # required for scons to "see" intermediate install location
- mkdir -p "${D}"/usr
-
- cd "${S}"
-
- local myconf="DESTDIR=${D}/usr prefix=/usr
prefix_for_packaging=${D}/usr"
- if use double; then
- myconf="${myconf} double=yes"
- fi
- if use optimize; then
- myconf="${myconf} optimize_and_lose_precision=yes"
- fi
- if ! use ladspa; then
- myconf="${myconf} with_ladspa=no"
- fi
- if use osc; then
- myconf="${myconf} with_osc=yes"
- fi
- if ! use jack; then
- myconf="${myconf} with_jack=no"
- fi
- if ! use fftw; then
- myconf="${myconf} with_fftw=no"
- else
- myconf="${myconf} with_fftw=no with_fftw3=yes"
- fi
- if ! use fft; then
- myconf="${myconf} with_nr_fft=no"
- fi
- if ! use vorbis; then
- myconf="${myconf} with_oggvorbis=no"
- fi
- if ! use mad; then
- myconf="${myconf} with_mad=no"
- myconf="${myconf} with_id3=no" # workaround buggy buildsys
- fi
- if use mad; then # was ! use id3 workaround buggy buildsys
- myconf="${myconf} with_mad=yes"
- myconf="${myconf} with_id3=yes" # was no
- fi
- if ! use portaudio; then
- myconf="${myconf} with_portaudio=no"
- fi
- if ! use alsa; then
- myconf="${myconf} with_alsa=no"
- fi
- if use xercesc; then
- if use xmlpp; then
- myconf+=" xmlbackend=both"
- else
- myconf+=" xmlbackend=xercesc"
- fi
- else
- if use xmlpp; then
- myconf+=" xmlbackend=xmlpp"
- else
- myconf+=" xmlbackend=none"
- fi
- fi
- scons configure ${myconf} || die "configuration failed"
- scons --help
- scons || die "compilation failed"
-}
-
-src_install() {
- dodir /usr
-
- scons install || die "scons install failed"
- dodoc CHANGES
-
- if use doc; then
- docinto examples/ConfiguratorExample
- dodoc "${S}"/examples/ConfiguratorExample/*
- docinto examples/ControlArrayExamples
- dodoc "${S}"/examples/ControlArrayExamples/*
- docinto examples/FormantTracking
- dodoc "${S}"/examples/FormantTracking/*
- docinto examples/LadspaOSCRemoteController
- dodoc "${S}"/examples/LadspaOSCRemoteController/*
- docinto examples/NetworkLADSPAPlugin
- dodoc "${S}"/examples/NetworkLADSPAPlugin/*
- docinto examples/PluginExample
- dodoc "${S}"/examples/PluginExample/*
- docinto examples/PortsAndControlsUsageExample
- dodoc "${S}"/examples/PortsAndControlsUsageExample/*
- docinto examples/ProcessingClass2Ladspa
- dodoc "${S}"/examples/ProcessingClass2Ladspa/*
- docinto examples/SDIF2Wav
- dodoc "${S}"/examples/SDIF2Wav/*
- docinto examples/SDIF2WavStreaming
- dodoc "${S}"/examples/SDIF2WavStreaming/*
- docinto examples/SDIFToWavStreaming
- dodoc "${S}"/examples/SDIFToWavStreaming/*
- docinto examples/TickExtractor
- dodoc "${S}"/examples/TickExtractor/*
- docinto examples/Tutorial
- dodoc "${S}"/examples/Tutorial/*
- docinto examples/Wav2SDIF
- dodoc "${S}"/examples/Wav2SDIF/*
- docinto examples/loopMaker
- dodoc "${S}"/examples/loopMaker/*
- docinto examples
- dodoc "${S}"/examples/*
- fi
-}
