| [proaudio] proaudio/proaudio: [3019] zynaddsubfx: use git-r3; fix compilation errors |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 3019
Author: dominique
Date: 2016-11-18 16:28:54 +0100 (Fri, 18 Nov 2016)
Log Message:
-----------
zynaddsubfx: use git-r3; fix compilation errors
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog
trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest
trunk/overlays/proaudio/media-sound/zynaddsubfx/metadata.xml
trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999-r1.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/gnustd.diff
Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog 2016-11-17 11:19:41 UTC (rev 3018)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog 2016-11-18 15:28:54 UTC (rev 3019)
@@ -2,6 +2,10 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 18 Nov 2016; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
+ +files/gnustd.diff: fix compilation errors on gentoo
+ zynaddsubfx-99999999-r1.ebuild: use git-r3 eclass.
+
31 Mar 2014; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
+zynaddsubfx-99999999-r1.ebuild:
Experimental ebuild for the git version. Need some work on the configure
Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest 2016-11-17 11:19:41 UTC (rev 3018)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest 2016-11-18 15:28:54 UTC (rev 3019)
@@ -2,6 +2,7 @@
AUX 02-ifdef-jackmidi.patch 3178 SHA256 405fe2696e6b8c0f8cb1c4842f822cd654e4070d163824e9d401c4a6b5fc5073 SHA512 d38a36b3d0d9aaf59cf0f2c1f47854970a79da8bbd646e6d8d9a9d5ae62b1603d44ed7dd24f9f066bdd0f0a8a86fd54e6beaa529cc871a7e1e260330e18f0d06 WHIRLPOOL df20fc2c5de7919d94874efa309a885627817334a1bc53d762a971fbfc9ecc4e5aa4eb74553b3710c9ae8fd031a3349899bf2249cb00be2276f3bba713ba3cb3
AUX 03-fix_jackmidi.patch 446 SHA256 c85c642b2528a7978ce4402174158d4da78ab74f0ae61139ac8f2aa9dac712b9 SHA512 ff67c9bcdd256545199cd74839766052bc674b66ee14065d06f901b93b6cd54b8cb88fd03ad798d63306238f8c0781054233557d5f65b0351acd80efd737ad58 WHIRLPOOL cee3d28862c5383938bfa9a24947d795686d7c98f302bccacc0528023fce0426cde1fdb1b360580012d9683e621de464b8e42345396419efa2a10b1c860bb65b
AUX fix_jack_midi_api.patch 722 SHA256 e8727347f905ca1c21d8c17f413b09c75ad94d1d49caa872242f049bd7a9d514 SHA512 e7f11864e9789447ccb78c5c17a605e33fe3c8262ca9fb108e475beaade0e3b808b72dc53e2ae2ac58b482cf4770a798e1d1f47ca095e2bd3175c989616bec10 WHIRLPOOL 88c6519e766392523919253ec7ab2a08f195c299d4ad8eb7b33e09fb025fd8f5e5095b02f046e30eb3386370ab9cabcbd3d874559950e8e09ecae129f485f1b0
+AUX gnustd.diff 391 SHA256 33810a39a73b389a74cab5f9473a81aa202e600e2110a218b2645c5c61b40f6e SHA512 fce0a12d96ac18f8852416ad32d5a541377abb10f8fdcd7344bc2b1d894fc5fbceaf85ad25d66ce26153b6b028b467eee5f7b7195ab3b81c59e648b35cbd1146 WHIRLPOOL a72fcbc9d5cc54d0d99ff1db1c4e116d17bab93b67f8b1b2017f118abd94ac02bc8b8a38d22ff8a96b9168d2102c937460690537f5bab3605890902a05c5661d
AUX jackmidi_ifdef.patch 2715 SHA256 9b480711e0d21cee208aa0266f6cc6fc8b4a089f17674f49e3b733dfb566f749 SHA512 7af6bff786104db883ee37b9f1759198eec29b4c12c324663f1ea4546e2bd8817b3757435fa70061575e2cb9c006b09a9b48d4f49503df62a4311bafcee2a986 WHIRLPOOL 99f708050d3fd2e0c8758e937a0ae451220b3452338a6948167ebb56e64f420213787074ecd41cd0f82e90ebf78db556e53d643d2905c4f2d0b70f9d89a0706a
AUX unzombify.diff 1027 SHA256 43a3cecc60ce0793c9303b44f4d225eaee69a2a0177a02eccc3129ae1a727d4b SHA512 f1dd1a4037ab4bddf95b12718f37f051f17a18645bcd23e9abc7d4e94a05b3f44057b68dc877701f448bb44a6cb19b0e022a9056543f472d8d23e7c74bb1b88a WHIRLPOOL 0b088f3cfeba60f1c1284c4a30fca4a9e40dae51720b0be3cf027a95ca3306d030b18328a4e494db26c194589402726e5c4b091f6e973fa38526155444e5216f
AUX zyn-jackmidi-051205.diff 3875 SHA256 eeca9f41cb0c100095c90676b224ba09cc2281132633ad1453f1fd5983dc17f2 SHA512 4f3016cd32cc6591436da2760c94b6ce9e1c4a6b6262306f46a58c434cebc8d10600fcd2c710a6333e69f9c0c3c08e9127c31ea731ca324572d4ba3c8c181bde WHIRLPOOL 0ddd91afbadea7739c82342e46a25042dec279bc61a15be3bb6c68532f05e4328d277ada2037e8f7fb5a117bb5f7632c4ac6204ba719a16478e11fecb234cd8e
@@ -10,11 +11,11 @@
AUX zynaddsubfx-2.4.1-fltk13.patch 1978 SHA256 34b328ae07ec901e0508914ae76f0b9b38cb0cf2e12afed585900eaee7048d22 SHA512 7fc4ddf564035b88ec7c9100eb1b29c0011a6b567c141d25861db1c1a76ab931d5dc6a704d9300d78ae524b00a05eca61612e1ea05f284026524b56af799ccdf WHIRLPOOL 91ab050f379fb7724c49486e0da31d70e72806e690b873f06201a7ce1be7b67f526846d0b1b73c3e70447fd60c10760f4f6494c724c484f9b785118bc0806b72
AUX zynaddsubfx-2.4.3-docs.patch 420 SHA256 379c61a8f911d4794f3369f5b12b46142b46fb771d2cd2877e220c33e6891ec2 SHA512 541da21e9b1e86da83a9d369f86efcdcac4fc49c9b0158182c42dbf49287e5eb59e466443be2cf7ce87c1daca85ccc141e0fa5f288839ee6fe2da4e7cd978157 WHIRLPOOL 67e128af2a008a0db6436c7f9c2792d50af679c0a1ddae9f457f62576587bdf9f6b3a644d82142a6860775abf3866527b11c1723b6c57c8c72394fa7d895f7bb
AUX zynaddsubfx-2.4.3-nofltk.patch 487 SHA256 8428e1214a257a03ec6cdb3aa702d2ff55ad055c6ed59f4432ecb416af107528 SHA512 c0ecfc942eb3e3ceced6fffbd05f764fc4ded5e16eb74510b327c0c7ac7641d5a33cf219a1c111c6a2a48ce327a075dbe2f4f9768a0e67f260db9c2334328d9e WHIRLPOOL 97e7fae25a218cbb83c50bee855b6b7e10245a6ef7e92fbc28986492ca6eb27c4e84e64bb77cc22569c07b75032b3fc8435e4480e6f50d89e20068abb3348ac2
-DIST ZynAddSubFX-2.2.1.tar.bz2 927022 SHA256 dab5dc86e0a2459fa2a870da133c7dda0aa2e1d895839594f4b520ca05cc80d2
-DIST ZynAddSubFX-2.4.0.tar.bz2 1418352 SHA256 7675a7ac7741dcfce0bed197e2190f2e21b5b0a072458bcb605184b7be246c63
+DIST ZynAddSubFX-2.2.1.tar.bz2 927022 SHA256 dab5dc86e0a2459fa2a870da133c7dda0aa2e1d895839594f4b520ca05cc80d2 SHA512 defc1c0a29a7184ad8fad410dbf615df4f0c746f51682ed14847e70e422850a4146fbca753901b9fc3e8108ad5700304ef1ac9986d240e44f31bfc0c293c5d0a WHIRLPOOL 3c4dcfebceac37850df48a887aa536630ef3109cd5d80e02d1b9b16cf48251bfc60f6f531ff8af587ca51dcdee21eab9d1bb7e2abde7c3ebd1f7cca15f061f99
+DIST ZynAddSubFX-2.4.0.tar.bz2 1418352 SHA256 7675a7ac7741dcfce0bed197e2190f2e21b5b0a072458bcb605184b7be246c63 SHA512 3dfc93888d73bab7ba8a75f237730f4ece621a371841c09cc99189dc083f5eb71e66db867e19a0aa8948add1f2d776223e1bb102ecb34f82cb8235dc98b03201 WHIRLPOOL 35d8f815f6f1ebc926fd759e2334d0de492cfe120368635505220b2dc07a705ea17abbb649e88feef97f5391ffa808bf088df237b89f8b1ee3274e7654b84014
DIST ZynAddSubFX-2.4.3.tar.bz2 2536667 SHA256 b84b595660ccec3ebc364c29c2d29def7d28a6947fc1dfb26bd8c34ca0e7f54d SHA512 2314c456db1a8a032a38b012c7c9e01f0a487c5eeb0027a741a4ffd6a7eea3382fcd26a8cd97b89af40800613c1ba164bb683be800957ea403f97dd6f23df5ff WHIRLPOOL 46aa59378f310105504b0ab5903d35826aa03dd080e6c7313237e34a2c9c82cea1d9c0f2cd986c65da38320b1376477b33424b8c69fd8fa591a53325df0b4a65
-DIST ZynAddSubFX-20070707.tar.bz2 206680 SHA256 036482f2aa68fc25b9bd8426032c458dcf46052ab9cde12ab30279126b0db4fa
-DIST zynaddsubfx-patches-2.tar.gz 6423 SHA256 b0d0f784940b647dcd2e3cfc4c0f1faba344f33e2ae568dd7c8bd97af0abb7b3
+DIST ZynAddSubFX-20070707.tar.bz2 206680 SHA256 036482f2aa68fc25b9bd8426032c458dcf46052ab9cde12ab30279126b0db4fa SHA512 f81cc427628b301e846dde1e51d5cd3d737e7c04387338a86728a327ed0abd5c45a722b61ac9e1088b7c52a49bb1a38df6bcc731c0b44ce73bf472f1dda6a3d9 WHIRLPOOL 1a459da1182358084d23741c328f81eb75d4eea90e257660649489216c6ebd57afe717003f8f1cfe75d1d006807392a1332dd18afd43e3e672c950bd77748474
+DIST zynaddsubfx-patches-2.tar.gz 6423 SHA256 b0d0f784940b647dcd2e3cfc4c0f1faba344f33e2ae568dd7c8bd97af0abb7b3 SHA512 0b27a8db2be1b4fda1bd44b47264820dd45dbec56598c43501984380cbe3b64ef0379af78447cd03bdc5083afabf8206303231457433f71037199b80ac0304b7 WHIRLPOOL 8f6c857ebbbf3fa7c996dd84ee1c030ef2bac4788c78d031eb8a4295f5ae52481ab93bbffdc0164059045ddf9721619345bba1a5c533a5471aaa7d3ba853b210
DIST zynaddsubfx-presets-0.1.tar.bz2 27052 SHA256 b2fc41cc8b45531007270efd81536c9a99a6a169d2433ec12d3d6854cb9a10d6 SHA512 63cbe5306d01a325958cdcb8938a517944f6ab33c6a1eb8f9986dc26fabc8e0d3b32be14d2cf0ec4b30b3b594880fa478478367b6657545a3a0b6d1ae7ed3626 WHIRLPOOL 582674fbdfe7b770b93a6559c38bb79f718aa042e6f9795dbac8d5821f50ef1caa1655e71c350f28b7f7a8f94151bb07365d20896dd5101f925af56e21b993fc
EBUILD zynaddsubfx-2.2.1-r8.ebuild 3157 SHA256 148e8466a6a4e6c0193aec1dfbcf7c52ed744c9e5aea02cf98cbac5f34d22f59 SHA512 054e7e1dc84195a39a3f40a3e5241afa7d491f1f63046895a643ae1a958de48cafa8bcac73fee256abd6fcad693f9fea734d36f8bffad8a3e251c20fce5d6339 WHIRLPOOL faf2ed9802adaf70deb13a347f8cf2383c368f20995ff0353e6e89aec089571f3e5a1041ed0be5846f951119ee1c83b31ea7d3356b1409bc5658029aadb8caa3
EBUILD zynaddsubfx-2.4.0.ebuild 2733 SHA256 1db058464596dc84a60ca88997ecd6489df61542383f23202133b5483cf6333f SHA512 6ac350babf2a1d550e7961b5b88792a357e02a12d4ebeabe219430b8236b4ee26b9e2e07e7144bd9e7489e35fcc49b8ed634b368a2450072f4dc449eef6b9a51 WHIRLPOOL f94a9a25bee1467af460618d960c4653fa27480a601b97766c4ad9b9ccb728719646a53d7275f28f919b7149705c2a2f596968f57b5e5096760f1b1bbad91aa8
@@ -21,7 +22,7 @@
EBUILD zynaddsubfx-2.4.3.ebuild 1585 SHA256 9773e2ffd8d4373399d59ac748925b5f483f66dbc21712513c7129264a275d49 SHA512 0e19c3a50bdc6b4a684f74788f207b49a0bdb363d1b774c8d4c42c4e37252b30eba58c020addcd98baccacf9f7657812e7ab626c98289f7157c2a1caaeb6b1b1 WHIRLPOOL 58c2cfe80d2c94b7872d7051e20e6726365eeb4f0003e486528463989ac426fc5ac8c6ef36b407bfb89a0e5d82e3b5e26148a39f6dd804dea1f4aa0ae47cf92f
EBUILD zynaddsubfx-20070707-r1.ebuild 3094 SHA256 feaa56afa960ec2d51fb0e62629e98ce202646a4afee04dd4ec18a27e46e23e2 SHA512 9a4de8f8fddc497f0396ad43a85ef4b3d2c1a3aea68d903d045edf98999abd0fec06ce020a9120ab24907767b202f23cc5700d5f2c43e47d24f167b358fec620 WHIRLPOOL b507af8cf295e4e351eb7bb74d8e4ae5b83bbc4669c187e6b305522c56b5546ba641c251663c96f89999e0dc259bc9277a409002d9d0665c784b3384ba706d34
EBUILD zynaddsubfx-20070707.ebuild 3018 SHA256 ed9aae5e87f2fc3b0c796647331b214f7058e1368196fe976d81b5977250fd1c SHA512 f56b55ace1360c8b21bd6e97441b057a8c3a32a12a42a2bf5b0593fcfa4cac05d9c4336aff4757b48ef0710cf8677d5f0b8116711bbfd6c196ecaa6e10b39348 WHIRLPOOL b366f5ba35a95231cb96032c26702c09619a874f177e852224eb216055e1cd73793b622fa75fda7ed2be2c4c9ec4297f2b2e778472beeb9ac31127a8396a36a4
-EBUILD zynaddsubfx-99999999-r1.ebuild 2892 SHA256 30798474527cedb82496ef3816bfdeb4f81fc29badbef9ffe1f7149881a53d46 SHA512 430fbb472b24972b0dcfddc7cb4bc4410925fb4ee48b366120270461b22cc119da8a1e35e9ce19f46614e793f938b8996966c0339f3d9720c7a0175ea484c7cc WHIRLPOOL 807047c25dedc0e3feb7d9410152f8e25c4cb23c2b6ad9af28701ae3e218b0e3a61b1e0d7f9827c92b07273c16923e8d2160f4252707fb5d30d89c89f2cc2e9a
+EBUILD zynaddsubfx-99999999-r1.ebuild 2409 SHA256 e1648b9b947f592b6e12217d43ae08eb7150d5d6c72b1b25f9c199309536b52a SHA512 9dbf6bb1cd629dc161296735007bc36815f25b413b188491309c7ba4541eff2824f92a06f343325bfdba750fb2ee540745f9c50b585b2d78eb3ef9c172094558 WHIRLPOOL f5245a2b91fe49f4278de1a6b9828e929fdcb3a4a92df4349abcf164e31f0da2ea2479a85d397bafb189bba8338f1afe3a790ee5c1b62258c253bb261068446a
EBUILD zynaddsubfx-99999999.ebuild 3567 SHA256 4dbb9ed6c0effdf6af0411ff6d12b0b91f4174df99d1686d69c75386ee2a2b61 SHA512 7a649238734c847d774e480be4751170ef3c205f84ae555fd6c8b7ecf61d668359264f3f3b15c497b110f1e83ac53cad8d7b4a73181a3d6e2ab862d8e815a195 WHIRLPOOL 509d9cbfeada744c5ff427e689890af03fdcbeff3fb2c8f691ddebd17b02c400f2238764069f10ab1d4940b712e508b9fdd6c3bd689a8a039da5e5ad86989763
MISC ChangeLog 2513 SHA256 9a3cb4aae71e50b8379a255a3fa10019d54f13f0aab272f0fcd637aa690b6e93 SHA512 707328b6e1d67e736a07b030296746ceb012a0a97e9e59f5a3fa3c4e36070256f7b3ef52e22efab0010282b6a3bc634abf32ca06911b57e2ac0f05f85f110731 WHIRLPOOL 7513871bb8055ae132d95a5589ce118e5d9f79bbdd98b899501f2c07c015f332a21a8fc097238d9007c63b152067252523c169b7b3795a9e662eae96b8cf35b6
-MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f
+MISC metadata.xml 261 SHA256 3812db1cff66d287c945fc7987f7d2cb37fea10ad28fdae3b7277beb8cfe7392 SHA512 590077890c7cc0e1fd1c8b4388764030dcf95e6bd04f996a73839809b011e666a859417ae2ec91eba8af11e4fe5bbe9c89791e1eccd23b7fc6ec43cca304e0b1 WHIRLPOOL 539e44c7fa67fe66d40aea271af64a7da8cb15c7f990400572ea7372b6268575cf1bf1d536772276b8df4340a7919392d21120a7f7321d198a24460b3b383154
Added: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/gnustd.diff
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/gnustd.diff (rev 0)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/gnustd.diff 2016-11-18 15:28:54 UTC (rev 3019)
@@ -0,0 +1,11 @@
+--- zynaddsubfx-99999999/CMakeLists.txt.orig 2016-11-18 01:02:35.000000000 +0100
++++ zynaddsubfx-99999999/CMakeLists.txt 2016-11-18 01:08:52.534082842 +0100
+@@ -4,7 +4,7 @@
+ set(VERSION_MAJOR "3")
+ set(VERSION_MINOR "0")
+ set(VERSION_REVISION "0")
+-
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+
+ #Include RTOSC
+ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/metadata.xml 2016-11-17 11:19:41 UTC (rev 3018)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/metadata.xml 2016-11-18 15:28:54 UTC (rev 3019)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <maintainer>
+ <maintainer type="project">
<email>proaudio@xxxxxxxxxxxxx</email>
<name>pro-audio overlay team</name>
</maintainer>
Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999-r1.ebuild 2016-11-17 11:19:41 UTC (rev 3018)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-99999999-r1.ebuild 2016-11-18 15:28:54 UTC (rev 3019)
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=5
-inherit cmake-utils exteutils git-2 jackmidi
+inherit cmake-utils exteutils git-r3 jackmidi
#patcher toolchain-funcs jackmidi
RESTRICT="mirror"
@@ -13,11 +13,8 @@
SRC_URI="http://download.tuxfamily.org/proaudio/distfiles/zynaddsubfx-presets-0.1.tar.bz2";
EGIT_REPO_URI="git://git.code.sf.net/p/zynaddsubfx/code"
-EGIT_PROJECT="${PN}"
+EGIT_SUBMODULES=( '*' )
-EGIT_REPO_URI_INSTRUMENTS="git://git.code.sf.net/p/zynaddsubfx/instruments"
-EGIT_PROJECT_INSTRUMENTS="${PN}-instruments"
-
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
@@ -34,6 +31,8 @@
RDEPEND="!media-libs/zynaddsubfx-banks
!media-sound/zynaddsubfx-cvs"
+PATCHES=( "${FILESDIR}/gnustd.diff" )
+
#pkg_setup() {
# jackmidi.eclass
# use jackmidi && need_jackmidi
@@ -40,19 +39,8 @@
#}
src_unpack() {
- git-2_src_unpack
-
- unset EGIT_BRANCH EGIT_COMMIT
- EGIT_SOURCEDIR="${S}"/instruments \
- EGIT_REPO_URI="${EGIT_REPO_URI_INSTRUMENTS}" \
- EGIT_PROJECT="${EGIT_PROJECT_INSTRUMENTS}" \
- git-2_src_unpack
-
+ git-r3_src_unpack
unpack "zynaddsubfx-presets-0.1.tar.bz2"
-
- # fix the desktop files
- esed_check -i -e 's:Application;AudioVideo;:AudioVideo;Audio;:' "${S}"/zynaddsubfx-alsa.desktop
- esed_check -i -e 's:Application;AudioVideo;:AudioVideo;Audio;:' "${S}"/zynaddsubfx-jack.desktop
}
src_configure() {