root
8 years ago
parent
853fc56517
commit
51341f3009
@ -1,5 +1,5 @@
|
||||
DIST mime-types-9.tar.bz2 15524 SHA256 b4638a734f121be30a546ed092aec16bf74e9b88ed7921fba89cf7e2c0462b5e SHA512 066cea30c02a326e64680422b31aff0849c0a8c7486738f2edf339b88426c6ac5a365d4fa4c80c84df0fa4c39b5e13d45db314a1bf47ce369c132dd1c46130d6 WHIRLPOOL 61c7fe4879caf0d732f2667f784955d40f6645e257fcca0a29180dc4462437a864fd8ea55bf37be94ac2bb572a6c8e906494c57d6c8275938d52defc0b766cde
|
||||
EBUILD mime-types-9.ebuild 682 SHA256 dd6670dd0c48b42b7b4830a01da425437bf3cf84803e0029c2788b89af09e9b4 SHA512 38f935368962a6f9493f138164c525098969c3c1029e8ba2316758a5746b6f3f538687fcb083755de4662e1e593beb55787ca3f7f6c4ce02ec6b329435d09836 WHIRLPOOL fcfe41a779b33c885a88472b11ba7919433f3313d4645d1abc9f3349645fa5a646cc5f2f9173e0c7f66c9c63bc8e499102fc64cc7af5b5d34504127cf235df97
|
||||
EBUILD mime-types-9.ebuild 683 SHA256 eacee3e7d9a6646572cdd3a0a2b3625efae841f62873da26b5097920d259da6a SHA512 67e0b361c0b7bdbd943ad3d71b4a2019311cafdedbb609c36a710afaa2e484d6ef2e57500bff64a2ec8978d53791b681929739d8e4afa871af01fea3489ee164 WHIRLPOOL d34bb442d6ccaa2f694977a289bb5cade51cb6f3d1f2ab4044a6615d3fe6df60fe03fe7ad272a2da8a2d4f951b0677e8e94be63a0b52ffad1dfa34b7b50ea0f7
|
||||
MISC ChangeLog 2451 SHA256 b47f1363ce5c5734389adf9ec741e2eb39d549b00897829e4617acd2f695615b SHA512 11e0d06d4d805e9b39c1abbf7f38ccfb9a8e670fbb7d8fb6ac334318c58eab4b4b1affc6d0eb122e219643c4595da47c50043ec6da5459cd8500da50db7c3150 WHIRLPOOL 19e2ffcb1c0baf596e9befc2702c8ac695cc9dcb145ad36e10aa3479b80ce354b7fc999d10729c5ccf6ad29ea87b962e9bda2e54977eef55325ed1fb32de37c0
|
||||
MISC ChangeLog-2015 9675 SHA256 d7e2bf08173b278f479d783bb22e8e10ad2fc76a03e44482281697e97cd2d760 SHA512 d464b578c16fad71e24b0219209671d08d896d7aea1814c95b2b9d593b429da88b0ccd8939e65f7ab6016ee8dc9083b5d3abfce4056f2639c36e3af2dc089945 WHIRLPOOL 69904e8615673d501b8823eb5c6ed3f7eb21f91395c79b3e7f42302d855f90a11d9a08183d94b27b9139889553f25b038b94bd76fe349f789935ba19adbcbf8a
|
||||
MISC metadata.xml 346 SHA256 475227af07a0ac20fddcf237b10968a6bc5295935037312bfc155e6a3a263681 SHA512 65aa65edd1d47b4d6f87120e6685cccbc90c8daedabcac6f9ebfbab562682cc226d7a6f83886f61e38bb3fbfcd6b32ca17725291d6f95939cc1d40dc8bb0173a WHIRLPOOL 3edd4091ba90a4110c17fd177e2af2ba5113d29ef0ab509c7a9dd5dd595ee0d528a1bfbf866a8158aeb8979985499395906de4fcd691379fe7b365e2301d3583
|
||||
|
||||
@ -1,113 +0,0 @@
|
||||
commit b8de9669eab6487387d76e3181e0d38df46205a5
|
||||
Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
|
||||
Date: Wed Jan 4 13:55:13 2017 +0100
|
||||
|
||||
Revert "Workaround bug 311940: Plan crashes when typing a text in..."
|
||||
|
||||
"...the filter textbox before the textbook is fully loaded when selecting
|
||||
a contact from the adressbook"
|
||||
|
||||
This reverts commit
|
||||
1fb81d2e5fc2df149261c6fc20a13b4a6a03dd7a
|
||||
and partially
|
||||
b8d7a4034e5e85577e8a7eff523c226ca2d965c5
|
||||
|
||||
diff --git a/plan/CMakeLists.txt b/plan/CMakeLists.txt
|
||||
index 25427da..119b23c 100644
|
||||
--- a/plan/CMakeLists.txt
|
||||
+++ b/plan/CMakeLists.txt
|
||||
@@ -5,10 +5,7 @@ project(kplato)
|
||||
add_definitions( -DKDE_DEFAULT_DEBUG_AREA=42000 )
|
||||
|
||||
if (KF5AkonadiContact_FOUND)
|
||||
- # disable for now: there is a bug
|
||||
- # it only works if you use kde contacts (of course) but many use other stuff, so gets dissapointed
|
||||
- # add_definitions(-DPLAN_KDEPIMLIBS_FOUND)
|
||||
- message(WARNING "AkonadiContacs available, but funtion is disabled due to Bug 311940")
|
||||
+ add_definitions(-DPLAN_KDEPIMLIBS_FOUND)
|
||||
endif ()
|
||||
|
||||
if (PLANCHARTDEBUG)
|
||||
@@ -25,6 +22,7 @@ set( KPLATO_INCLUDES
|
||||
${CMAKE_BINARY_DIR}/plan
|
||||
|
||||
${KOMAIN_INCLUDES}
|
||||
+ ${KDEPIMLIBS_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
add_subdirectory( libs )
|
||||
diff --git a/plan/kpttaskdefaultpanel.cpp b/plan/kpttaskdefaultpanel.cpp
|
||||
index 27eca57..6f119e5 100644
|
||||
--- a/plan/kpttaskdefaultpanel.cpp
|
||||
+++ b/plan/kpttaskdefaultpanel.cpp
|
||||
@@ -55,10 +55,6 @@ ConfigTaskPanelImpl::ConfigTaskPanelImpl(QWidget *p )
|
||||
chooseLeader->hide();
|
||||
#endif
|
||||
|
||||
- // FIXME
|
||||
- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
|
||||
- chooseLeader->hide();
|
||||
-
|
||||
initDescription();
|
||||
|
||||
connect(chooseLeader, SIGNAL(clicked()), SLOT(changeLeader()));
|
||||
diff --git a/plan/libs/ui/kptmainprojectpanel.cpp b/plan/libs/ui/kptmainprojectpanel.cpp
|
||||
index ac7212b..2078d4d 100644
|
||||
--- a/plan/libs/ui/kptmainprojectpanel.cpp
|
||||
+++ b/plan/libs/ui/kptmainprojectpanel.cpp
|
||||
@@ -48,10 +48,6 @@ MainProjectPanel::MainProjectPanel(Project &p, QWidget *parent)
|
||||
chooseLeader->hide();
|
||||
#endif
|
||||
|
||||
- // FIXME
|
||||
- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
|
||||
- chooseLeader->hide();
|
||||
-
|
||||
QString s = i18n( "The Work Breakdown Structure introduces numbering for all tasks in the project, according to the task structure.\nThe WBS code is auto-generated.\nYou can define the WBS code pattern using the Define WBS Pattern command in the Tools menu." );
|
||||
wbslabel->setWhatsThis( s );
|
||||
wbs->setWhatsThis( s );
|
||||
diff --git a/plan/libs/ui/kptresourcedialog.cpp b/plan/libs/ui/kptresourcedialog.cpp
|
||||
index 5e092c4..ff9eae0 100644
|
||||
--- a/plan/libs/ui/kptresourcedialog.cpp
|
||||
+++ b/plan/libs/ui/kptresourcedialog.cpp
|
||||
@@ -53,10 +53,6 @@ ResourceDialogImpl::ResourceDialogImpl( const Project &project, Resource &resour
|
||||
chooseBtn->hide();
|
||||
#endif
|
||||
|
||||
- // FIXME
|
||||
- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
|
||||
- chooseBtn->hide();
|
||||
-
|
||||
QSortFilterProxyModel *pr = new QSortFilterProxyModel( ui_teamView );
|
||||
QStandardItemModel *m = new QStandardItemModel( ui_teamView );
|
||||
pr->setSourceModel( new QStandardItemModel( ui_teamView ) );
|
||||
diff --git a/plan/libs/ui/kptsummarytaskgeneralpanel.cpp b/plan/libs/ui/kptsummarytaskgeneralpanel.cpp
|
||||
index 1a2af87..dd66ca8 100644
|
||||
--- a/plan/libs/ui/kptsummarytaskgeneralpanel.cpp
|
||||
+++ b/plan/libs/ui/kptsummarytaskgeneralpanel.cpp
|
||||
@@ -45,10 +45,6 @@ SummaryTaskGeneralPanel::SummaryTaskGeneralPanel(Task &task, QWidget *p, const c
|
||||
chooseLeader->hide();
|
||||
#endif
|
||||
|
||||
- // FIXME
|
||||
- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
|
||||
- chooseLeader->hide();
|
||||
-
|
||||
m_description = new TaskDescriptionPanel( task, this );
|
||||
m_description->namefield->hide();
|
||||
m_description->namelabel->hide();
|
||||
diff --git a/plan/libs/ui/kpttaskgeneralpanel.cpp b/plan/libs/ui/kpttaskgeneralpanel.cpp
|
||||
index b3c2974..562ea9d 100644
|
||||
--- a/plan/libs/ui/kpttaskgeneralpanel.cpp
|
||||
+++ b/plan/libs/ui/kpttaskgeneralpanel.cpp
|
||||
@@ -228,10 +228,6 @@ TaskGeneralPanelImpl::TaskGeneralPanelImpl(QWidget *p, const char *n)
|
||||
chooseLeader->hide();
|
||||
#endif
|
||||
|
||||
- // FIXME
|
||||
- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
|
||||
- chooseLeader->hide();
|
||||
-
|
||||
connect(namefield, SIGNAL(textChanged(QString)), SLOT(checkAllFieldsFilled()));
|
||||
connect(leaderfield, SIGNAL(textChanged(QString)), SLOT(checkAllFieldsFilled()));
|
||||
connect(chooseLeader, SIGNAL(clicked()), SLOT(changeLeader()));
|
||||
@ -1,7 +1,7 @@
|
||||
DIST yaml-0.1.6.tar.gz 503012 SHA256 7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749 SHA512 eef1f26fec0a305836b8c6a65def4e2864fe2415618e7490717d4e42f0fc51048727ab0e7e4a6c3a2783ae762fddd6b78091a76a6cd3a2710ae18e3dfb27cd44 WHIRLPOOL b3dc733ae79c2798ad80390fee90648ab65b32b9550d6b3d336138e3d664ee6fa50f71594747e49c7e0b9b72600cb4dd22aaac62970bbf50ae343be4a8c956ca
|
||||
DIST yaml-0.1.7.tar.gz 527518 SHA256 8088e457264a98ba451a90b8661fcb4f9d6f478f7265d48322a196cec2480729 SHA512 1ee5007dd10db137b5ee80f8117f07390ec04af98d087a5f5475dd2b38d87c699b79ab1676e6c7bfa263323fcdf8edd69fada2b0b7f9c57bef4e46cd65f1e975 WHIRLPOOL 2003d3892df783324dfaa6a04195baeccae341e38e0741b8d7c2b8b29f674264644c45f334517ce9d4a45fb907adaf8a5f36a85da832a7b783d759cc13b1acac
|
||||
EBUILD libyaml-0.1.6.ebuild 1032 SHA256 bf5d9d57e9dce1887e0ded931a40d69b44a60a128d0a61246802cbf204c5151b SHA512 d0c19b277795764600326a0a19e01f35fac9c6cd1d972af7ea8d156b8d090466ae4bd400581ce4756acd1fb31256bfc975743affd2562061d1b7f1bbf756eadb WHIRLPOOL 7b13d33c037dd400522a9c1bdbe8961b6b4f2464f6f8279b36efde80e34f29606c2c4e7c14fac4d3c15f445b8ca2b99998fc4238e0a8923ece6056659964ea36
|
||||
EBUILD libyaml-0.1.7.ebuild 1082 SHA256 be5ed5ffcce2bbf6ff3319c8d36aacab52bdcec2e23fb2f7156bd5cbc86361bc SHA512 eaa97296c30b54af1c8d40ffd25e4291c6dcd1221a9429d5ebcf94ae156cd3a7ef971a7ded0cbedaa0ff9f1fc46264dfd14262d00eda84b3cd0f16b7b4220600 WHIRLPOOL 2cda91731cbe0e685900fdf01c64d9edea0ca7236e53eb463a96098282a63eeccf0808b2019f264ad06cb354e1193cb26b1535cb22c3a7e28758141f8454a8b3
|
||||
EBUILD libyaml-0.1.7.ebuild 1081 SHA256 81b62911f2f8e1196b847660425177e88decb9a28fbabc5387e3289e22f54d11 SHA512 a4d77237585338b9ae719d0f5055baee43f72cefe7a7b7a961a76ba730a07010479223b17db67ec6f5735bb47eb32b687a999369fb1a357c36c6e5aa46ede052 WHIRLPOOL 0b0108e6f89eefce506d612a404247b320ee0fa730db34d4adecf2318bac20aaba0e6ac4325de9a0f704a7f9ad35bbe4a41fc46bc83146ccee677b90f855153a
|
||||
MISC ChangeLog 3063 SHA256 aec6fc23dad1f30afb47778964b690b8a70dda6b6ccff558b9de2df3b5a3598e SHA512 fe36bf06f9422ea6a68a152a57797ecebfc0047f5c93bc541f13ae9e82392c1a621ea93aeb2c71fed95abf6b1ecb87689e11833254c71d7f8981314bd250129f WHIRLPOOL ddf96b5ba04c708a4040fe6fe24c33cad96b78c56af57e0a22a327b06645890f86ab41aa1a0e5fb9edaefdff90cbc3eb9691cb62a29cb5792ab235c594e57397
|
||||
MISC ChangeLog-2015 6477 SHA256 d26b7e68b6e50ee65d6f4ccbbda588c063fd48c0b53feea84f4f5c486246107d SHA512 8fc1ec9ba8ff332d6e79698f5e3b9e0b4ab2e60dc2d5a4bf579c146cd0f0a143d568d8023a7b2b1dc810ab1ae20514cbda08e0ed14a5fa1e2634efb3f7a6df84 WHIRLPOOL 9b246d31d8dafa7ac7da9550f086e4e2e647b9b04da89f8c75da9a7cd5c59c149cfb617c434fefbf40475c9bcfdbf82c5e05f5754c45d3225f8249a06d19cd6e
|
||||
MISC metadata.xml 393 SHA256 a542ba2e71fbc6b13edfe1d081b1d89bc8c398bb940557ecc2a493ad9daeb602 SHA512 ce775cab169e0601244583a8b771dc9f3fa58ccbe6e9bd315d5a778cc92e887b97ee63c7d5bcbc87d0b0483d89444855562aabf0d7f0067f660c173c4aeaad37 WHIRLPOOL d00f737a250d6f333e13ee2628d7843defdf0554da844ffe7742fffaa38a31a3e1a3d7c1c07288e724ff05e933033c18a114c089e213b302769f52b81491a746
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="Utility class for dealing with MIME types"
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
|
||||
IUSE=""
|
||||
RDEPEND="dev-php/PEAR-System_Command"
|
||||
@ -1,16 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="Provides classes to deal with creation and manipulation of mime messages"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
|
||||
IUSE=""
|
||||
|
||||
PDEPEND="dev-php/PEAR-Mail_mimeDecode"
|
||||
@ -1,9 +1,7 @@
|
||||
DIST Net_Sieve-1.3.2.tgz 14895 SHA256 dd2bca102e9cbc8dad42d32f6799894e065e91eacb0d186546abf3de644d776c SHA512 0eb9a514f0af11b21d308ac7e9531be4a3b3f668d2ce8b8f153cd32920297df93618729851809bbe5837aaaa5f948c26477013c7a351cd9fba1ff0c0ec22f34d WHIRLPOOL 37d35423cdef4311defeffba928a4129315beee7d24838264e59d8612ae2d1d32ba148e69668d0d7e00acfed5840367b2cb5651f4f57f15e926c55efef218d83
|
||||
DIST Net_Sieve-1.3.3.tgz 15109 SHA256 53666be373739b7b98dfd9538d6d8aaa7e45f51c191fc034b2675e8f12297db6 SHA512 3fd41c7f60ce1ba89ecdf0d2cbeed61e7ceb53d1218dc2b4079267235da9b17a478eaf85ecf4e0449122ec866ad1a0b579f1a7484b37681081dcabe261fc7213 WHIRLPOOL e08aae13555ee24f8fae3659d3ed54dc67946215ba7da5ce3e9d68f2756232e6220769f7a40a78b31f7b9d72ac55484221bfd860211162d4354e200394aa3edd
|
||||
DIST PEAR-Net_Sieve-1.5.2.tar.gz 16332 SHA256 07d6b4dff6cf67fd022fd521c4a2555a0e0e82ee2804fe8eb14624524586a6a4 SHA512 672d2f6f4c3241f748fbdebd804f2186dd2a5f8b7be6a75cb9187ed16e61502e4a338bfaa1815190b74ab534cb7277b534b0542309098797fcb63582dc81bdbe WHIRLPOOL 065bb5629de459b884d63a5411ffa6bc10eab8c195e41623cf923afb22eb56201c16799f15dc1477e3e97ca34d1216fe9be49645c717f4058ddb8e98271e5848
|
||||
EBUILD PEAR-Net_Sieve-1.3.2.ebuild 387 SHA256 e51186cb6d48c6c9def66804ece4d5de46a2f615f2a445ee3ce64cd5ec177a7c SHA512 cfc5ca353cf898929ae336b6cea6ccce48bc074186853264f828fda759753a50b338d7632fcf7cbf049a89039fb35a38c0cabaceecd3f5d5afaaf255b474982f WHIRLPOOL a79febd1c16191814016564d9e8c87ac1c351ae1b6256896f4fa35a205c0085af23f844ba4000122c3aaa9919263a26692fee397beeb33b2efb8e7dbb070c421
|
||||
EBUILD PEAR-Net_Sieve-1.3.3.ebuild 431 SHA256 1e047932f588059b73cf885a27b8658aaafcea4058b5c99d26f10b73fd70dc3e SHA512 28f3c10fc1c1db894ead904ea9ce2885af26e9c3ff67f7b3c5365b80d80ba43dff28e10b1977fd0c8ba32cbb2f85d9999f9ac586a80071ec2eff3d4d60f1b022 WHIRLPOOL 526ec84c38ce6c1728f15e22e24e587ce19e240fe7251725a9ec0c90cfea956707b15d7fec853e0ae32f2f6d906c7e84ec92b72a7d23ac3af5071b46866a7b74
|
||||
EBUILD PEAR-Net_Sieve-1.5.2-r1.ebuild 716 SHA256 c7378182c21a426f31b0a533888b6f2311f0df0d66f597f190b102ed7a15d1b0 SHA512 20508d4797e9ca47f532ad6415e721b74f7b9dba78bd9854ae5acacb889db0dd4c60cd6970afdd6f3db65212e3a884232eae828ace6c99c6ba47df0f10409ea6 WHIRLPOOL e8adb3c91cdacb22a1c20a52ac45caeba3a9a2bd414391a83b4e25f08f9c1b713ec8f02ead8f4656ea4393d41442c150d7665da4a51ed98ef3be1331e5706b1e
|
||||
MISC ChangeLog 3801 SHA256 2ce1123042b1cd63bc6cc38a369805ed8b2aedde66173df0727e34c94a066987 SHA512 c4abbf2f89f6e386d0471e321938765b905a64354a2c56fa0dcf15c94e081dd57b9de3b4a7dad09b2070d883d01d3cc0f60cd43d7a407730a453bc3b956a6f99 WHIRLPOOL 84898fdc54480d6d0fd7e73bdd46a26527634baa44d73f8976519d188f7bfcbb16b744af1f48fd5280116969138337438c0a34d8637631c44fa45a4b8650fcaa
|
||||
MISC ChangeLog-2015 10516 SHA256 15da042d1ff2a30b46b8872c263871f06b0194a15b8c211008d2d6228747b5b0 SHA512 fb5b138ec1df85e19c9402371d6fb610be5c4de35dd9f2d43e9f70276481c8ee91868f36200916b4e456ffb8f075f7c2c453ef46b7a8c5711cd96ecdf2cf6646 WHIRLPOOL a94c6f26223a551ea3f8db2a49f37eef77a02e8a25fab9be6cb68c4746976dc9ac9d296cd40be1d8cec8910d722df12081b219673eaf15737d162996f277eac5
|
||||
MISC metadata.xml 235 SHA256 b248157b2feece4fbe51f91e87ab0c0249a13655e50e070080763a2a6556606f SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64 WHIRLPOOL d9032f2fa2b465d0658cb19728a50849c3ca8e021574651e7aa69a9f949f186bb43812034fffda1273cfa8fbbec663ee5f08fd30db366b96ab6945b7ed4291e0
|
||||
MISC metadata.xml 333 SHA256 c1bff444c5484a918ccfac44ff395794db533f4dbd6ae2578a1fbca64577ef55 SHA512 e8eead1b207a468cbde1939d92c40408ab9aecec4646e1fbba116fa2846340f7d9a14b4a10014021b85242f766b44ce2fc68c8111272943fbb3539885566e1a8 WHIRLPOOL 0466734f7e29ba81b15addb559562430f5dcb03d094d6f6850b0c72dc5b5c5018b39bae5a531a32ee07f18c8c545aaf79f2acc936b9e1dd9985e03b5d7caae8d
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="Provides an API to talk to the timsieved server that comes with Cyrus IMAPd"
|
||||
|
||||
LICENSE="BSD BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-php/PEAR-Net_Socket-1.0.6-r1"
|
||||
@ -1,8 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">roundcube/Net_Sieve</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
DIST Net_Socket-1.0.14.tgz 5600 SHA256 651541aeefe829eecc84ce4cb929d9a15e2ce92d2a74d5389d1cddb3d4f22f00 SHA512 1c4ad8bdb96830e32caa7ffe739ba8785bc07a1737ef85b7694b878a38bd693b10ad426361a4a8f758a63ec6fa407650ec9b5d2df086999a041529128f7fa403 WHIRLPOOL 300a233113ae2d2207a5333644780d4fe703cb42f333927311e9bb3ee8f67c1ad85968542a6a0e27b7e6e3b41439cbf81f228cc2bad2dc8435898c6ced7c2c06
|
||||
EBUILD PEAR-Net_Socket-1.0.14-r3.ebuild 570 SHA256 611061c1051d0b6f5d4876f41ff55327c0ba0fe0c148091d194fe83f364248b2 SHA512 570d91917b8a976f2bdb20afdca3f717d83149ac1ba9818ac2be9b853262df9118c33157ebe6bfb16eb6a0079f08d512edbece9b03636a195cc74af14c9e030b WHIRLPOOL 7ee6eca79c0cb08547b9642bb9a724cc3810f906c586e5a014cb5709b8845704eb377ae83a7f47471b2bd0610616e1f26a7423ce0c87916c0850f70c57cc77fa
|
||||
EBUILD PEAR-Net_Socket-1.0.14-r3.ebuild 570 SHA256 93706e7e5f61065d65cf392a81b43d9a79e6c7cc4695f27b0a0f243c994b8c05 SHA512 fb95892a1f1dbb0e587c72d006057c5e99a5a39ce9f5f2a4a3078395ea17ef8b488a8a098beee5b3c61df983e089fbc923e5e6c5d63558a1c41e1d67aaa37a27 WHIRLPOOL 5069486afb1db5ec884c76da946e0ae5af81b5107cd0595d0d2065e5c53d6cdd5f696fd350435b2507292fead44961737cee0bf349eafcad704d42cc10562230
|
||||
EBUILD PEAR-Net_Socket-1.0.14.ebuild 295 SHA256 bd0d4de2f310df4f5fd61e6c030f1d102ed9f630f4a8e81666fa1fc0f88915fa SHA512 1865d75ea51eb22a9bc72c0e331d323024408370ee94782c4ebb2778c4c48a95b8dea7a6e0cd7e59b706cb118f4e047f28a4d8b5d29d57575bcae1b9ec80eb6f WHIRLPOOL f4cbe4ab6428433d8224f2119bc9a37b817755f1df82c15bd1116f9097c21d6813afaed161e87750a2d02d2a4a9790f21a4fa673921267cd5fb59724772b390b
|
||||
MISC ChangeLog 3532 SHA256 4f3c61d592dc696bfe4b075292050142e372a89077b78458a957637b4a021a87 SHA512 5de8d885777da3392c5c948b620667b8c4c3e4ce91f602a6fe5a038a6799fca54851e831cb705d645374db6a6f22b8c11d0e46eaf6fab9fdb51c89a5ccf98cb1 WHIRLPOOL b866d4c7b5c24eb65a00e222243ab67b0ac4f3732dda7a4577769aa16b84adb26205deb38d6e3b858ac442895cd0c0bc590dd348945d36a5cd503d0466ecc8aa
|
||||
MISC ChangeLog-2015 9886 SHA256 aedd97e02b790103d6394c80052ef2b118130c7701e0b68bd3e2970f49cf8d05 SHA512 25a1c5c77f405cdd2fdde55ff4115fb5c891b002b0b37cbe7d7d9e23a0b2fe0f0643d330aa78894db33d5580a2f49faf075c663980868e92aae77caef55886d9 WHIRLPOOL 36d69a55c1b45c05d844d59693e2d6bcf2c74c5f41c5571f8092fbc40a1f4b82b3175aa8f3361546bd20cda5a009943535c47e57556e4d649e31b2fcf1eb0395
|
||||
MISC metadata.xml 235 SHA256 b248157b2feece4fbe51f91e87ab0c0249a13655e50e070080763a2a6556606f SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64 WHIRLPOOL d9032f2fa2b465d0658cb19728a50849c3ca8e021574651e7aa69a9f949f186bb43812034fffda1273cfa8fbbec663ee5f08fd30db366b96ab6945b7ed4291e0
|
||||
MISC metadata.xml 329 SHA256 e4f05938e789ea0b3d500777e583d7d813d98209085b1bc61dca965161fc604d SHA512 44f27ba629f6dc22fe322cf90fbf3377c388e195ce3920105e2c0ec312a408d06ec684cedb2a373b29df61d1f7dd3ba722d8cab0b56718c68302226aa2fbf1c7 WHIRLPOOL 37994f2b6d94af2ce3e4586d3c65d6c3625576725e69b0d5b4b0c8b53cc955ad4a28d23aa316301a44fedb15e52d77f7c8b0f2fdeffb25da9e3b237c1aa5d300
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">pear/Net_Socket</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,108 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils
|
||||
|
||||
PEAR="${PV//_alpha/dev}"
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos"
|
||||
|
||||
DESCRIPTION="PEAR Base System"
|
||||
HOMEPAGE="http://pear.php.net/package/PEAR"
|
||||
SRC_URI="http://pear.php.net/get/PEAR-${PEAR}.tgz"
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=dev-lang/php-5.4:*[cli,xml,zlib]"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PDEPEND="dev-php/pear"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
pkg_setup() {
|
||||
[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
|
||||
[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
|
||||
[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
|
||||
|
||||
elog
|
||||
elog "cache_dir is set to: ${PEAR_CACHEDIR}"
|
||||
elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
|
||||
elog "temp_dir is set to: ${PEAR_TEMPDIR}"
|
||||
elog
|
||||
elog "If you want to change the above values, you need to set"
|
||||
elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
|
||||
elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
|
||||
elog
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cd PEAR-${PEAR}
|
||||
epatch "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch"
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Prevent SNMP related sandbox violoation.
|
||||
addpredict /usr/share/snmp/mibs/.index
|
||||
addpredict /var/lib/net-snmp/
|
||||
|
||||
# install PEAR package
|
||||
cd "${S}"/PEAR-${PEAR}
|
||||
|
||||
insinto /usr/share/php
|
||||
doins -r PEAR/
|
||||
doins -r OS/
|
||||
doins PEAR.php System.php
|
||||
doins scripts/pearcmd.php
|
||||
doins scripts/peclcmd.php
|
||||
|
||||
newbin scripts/pear.sh pear
|
||||
newbin scripts/peardev.sh peardev
|
||||
newbin scripts/pecl.sh pecl
|
||||
|
||||
# adjust some scripts for current version
|
||||
for i in pearcmd.php peclcmd.php ; do
|
||||
sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}"
|
||||
done
|
||||
|
||||
for i in pear peardev pecl ; do
|
||||
sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}"
|
||||
sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}"
|
||||
done
|
||||
sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" -i "${D}/usr/bin/pear"
|
||||
|
||||
sed "s:@package_version@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/Command/Package.php"
|
||||
sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/Dependency2.php"
|
||||
sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php"
|
||||
sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php"
|
||||
|
||||
# finalize install
|
||||
insinto /etc
|
||||
newins "${FILESDIR}"/pear.conf-r2 pear.conf
|
||||
sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" -i "${D}/etc/pear.conf"
|
||||
sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" -i "${D}/etc/pear.conf"
|
||||
sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" -i "${D}/etc/pear.conf"
|
||||
sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" -i "${D}/etc/pear.conf"
|
||||
|
||||
# Change the paths for eprefix!
|
||||
sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" -i "${D}/etc/pear.conf"
|
||||
sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" -i "${D}/etc/pear.conf"
|
||||
sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" -i "${D}/etc/pear.conf"
|
||||
sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" -i "${D}/etc/pear.conf"
|
||||
sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" -i "${D}/etc/pear.conf"
|
||||
|
||||
[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
|
||||
keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
|
||||
diropts -m1777
|
||||
keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
rm -f "${EROOT}/etc/pear.conf"
|
||||
}
|
||||
@ -1,108 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils
|
||||
|
||||
PEAR="${PV}"
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos"
|
||||
|
||||
DESCRIPTION="PEAR Base System"
|
||||
HOMEPAGE="http://pear.php.net/package/PEAR"
|
||||
SRC_URI="http://pear.php.net/get/PEAR-${PEAR}.tgz"
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-lang/php:*[cli,pcre(+),xml,zlib]"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PDEPEND="dev-php/pear"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
pkg_setup() {
|
||||
[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
|
||||
[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
|
||||
[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
|
||||
|
||||
elog
|
||||
elog "cache_dir is set to: ${PEAR_CACHEDIR}"
|
||||
elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
|
||||
elog "temp_dir is set to: ${PEAR_TEMPDIR}"
|
||||
elog
|
||||
elog "If you want to change the above values, you need to set"
|
||||
elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
|
||||
elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
|
||||
elog
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cd PEAR-${PV}
|
||||
epatch "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch"
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Prevent SNMP related sandbox violoation.
|
||||
addpredict /usr/share/snmp/mibs/.index
|
||||
addpredict /var/lib/net-snmp/
|
||||
|
||||
# install PEAR package
|
||||
cd "${S}"/PEAR-${PEAR}
|
||||
|
||||
insinto /usr/share/php
|
||||
doins -r PEAR/
|
||||
doins -r OS/
|
||||
doins PEAR.php PEAR5.php System.php
|
||||
doins scripts/pearcmd.php
|
||||
doins scripts/peclcmd.php
|
||||
|
||||
newbin scripts/pear.sh pear
|
||||
newbin scripts/peardev.sh peardev
|
||||
newbin scripts/pecl.sh pecl
|
||||
|
||||
# adjust some scripts for current version
|
||||
for i in pearcmd.php peclcmd.php ; do
|
||||
sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}"
|
||||
done
|
||||
|
||||
for i in pear peardev pecl ; do
|
||||
sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}"
|
||||
sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}"
|
||||
done
|
||||
sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" -i "${D}/usr/bin/pear"
|
||||
|
||||
sed "s:@package_version@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/Command/Package.php"
|
||||
sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/Dependency2.php"
|
||||
sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php"
|
||||
sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php"
|
||||
|
||||
# finalize install
|
||||
insinto /etc
|
||||
newins "${FILESDIR}"/pear.conf-r2 pear.conf
|
||||
sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" -i "${D}/etc/pear.conf"
|
||||
sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" -i "${D}/etc/pear.conf"
|
||||
sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" -i "${D}/etc/pear.conf"
|
||||
sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" -i "${D}/etc/pear.conf"
|
||||
|
||||
# Change the paths for eprefix!
|
||||
sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" -i "${D}/etc/pear.conf"
|
||||
sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" -i "${D}/etc/pear.conf"
|
||||
sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" -i "${D}/etc/pear.conf"
|
||||
sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" -i "${D}/etc/pear.conf"
|
||||
sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" -i "${D}/etc/pear.conf"
|
||||
|
||||
[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
|
||||
keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
|
||||
diropts -m1777
|
||||
keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
rm -f "${EROOT}/etc/pear.conf"
|
||||
}
|
||||
@ -1,18 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="Takes an existing package.xml file and updates it with a new filelist and changelog"
|
||||
|
||||
LICENSE="PHP-3.01"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="minimal"
|
||||
|
||||
DEPEND=">=dev-php/pear-1.8.1"
|
||||
RDEPEND="dev-lang/php[xml,simplexml]
|
||||
!minimal? ( >=dev-php/PEAR-PHP_CompatInfo-1.4.0 )"
|
||||
@ -1,7 +1,5 @@
|
||||
EBUILD pear-1.10.1-r1.ebuild 384 SHA256 e67fc31466d077ccfda20825e5423de0c6c6da36af90cfafff4eaa8862eb52b9 SHA512 606461081d39bd0b8efbcadeba30757196887f1d718e1b2c8cbeee874453afac9346b2ee166a0beafa70641ae32c0981269276f56c62c02b7cb0d212b4a78d53 WHIRLPOOL 6df73d4791a65c230bf1bc4281b97c66ccb32a9c72a578bedd0cbdee7d5bcba7922ba3ccabd9584d13646d0257d60c9030c3cbcad9f6af766a00baa440da3582
|
||||
EBUILD pear-1.10.1.ebuild 971 SHA256 c50929baa290608d2d8ffed985646b16711f6b6cf9f674ea1bc089d0e9f420a7 SHA512 316aad62d5c9cb7a85aad3331aa66e74f26ff795cb5dbe74f9668c5c9a2a157166610caa26b81133c3be5a8fe8659eea82264e2cc6c0ec4e263d262409d3f073 WHIRLPOOL 2ea3f2df7cafcc6690fb3306b5bbb8c846af651d04060c10b971e200959f6f16035574bce256502c904da4b8e9b3c3db3233029828afedbf8bb681edbe086862
|
||||
EBUILD pear-1.9.4.ebuild 996 SHA256 fb7bb56b86a6ace54ae5a72498b208e8a0fe49f5dfc7f92885dc6295a6a682a9 SHA512 bf5a9b0fa2bffb7ff1fdce8e8e6a7ed1b4890834a9e054afd068ad69eb2b3136ce719da1b9f7f66f79af19848759c70d0c18bb391ccbd06e64f3e3ee5c955656 WHIRLPOOL 965ba54b113f1e628d6f596f7a1997b3a5d6f32356efc2fdf92663013e88fe9b7363b65cf3f95d4abb4079f4ebc46532b0466e390a0b62c962870b27bd8a6bc1
|
||||
EBUILD pear-1.9.5.ebuild 1005 SHA256 ebdbece39555534abca832c7e24d22e1ff40dbb5b8c7ee70fef45ae3fd3ad578 SHA512 f8a0b965810c6518277819244c22f3699edd7e9f119c8a51b7b6bcf89f8d57dc4a8833fb68565ee7668280bd533c5b7a8b20e614ee768dd1df1b7626fe653c33 WHIRLPOOL 3b18e721f4c3bb104eeca3b04a39e4a3b34b7fcbfda432f5358a2a44e2fc435a4a5d9fccfec2c828167ca65573d476e7e29e66c8ecefad95935d98056c62cd85
|
||||
MISC ChangeLog 3350 SHA256 849122254b20d4d1fdf93378ec5f0509af504c99943556a99ba6086b27a5a5c5 SHA512 81f0102642f32be9ea6695b362d9f7837317a5bededde3a60d9b53a0d2f067c4cffd6ffd1a38d8c42dd9b1fb8f51211036e2a2954c6654dba8821430139ea18c WHIRLPOOL 482fdd7cf03fd274b438b27e54d53c07cef1f470676c5008b1919e8fe88df49366177ea0596f68eb49070c118e0699665cf301951d32eb705069a87a70b9441c
|
||||
MISC ChangeLog-2015 4806 SHA256 59eb3db2cbef0de9a6e3afcf8dd8b9b8a0855cccab2a39a493296a316e8888d3 SHA512 df5d00a8683638354584f92bdc190f32dd94afe2066cb5e678553b4807c79705a80e47d7e8d100f1b6e3e153480c5296f17343581a00f96fed2118fee473653f WHIRLPOOL 884ec97103f8e97ea43a7f664d475b2a9acedc15a2961a4ae0ed45863ff4ca325fc71eaca3e83807ac4cb2a39d7e0d840e3a350af38907d0913ab7a68d8fb287
|
||||
MISC metadata.xml 239 SHA256 b54aca642ac424532264a97d14931720ed288cf387dbdef6a10b34ffed6689f1 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 WHIRLPOOL 80ab9605bb31ce3310bf524de4705c67ca85cf8f2346b7e13274595598b9fe92c9b119beb865ef214ad33ef172b880e318d18ff8c8d2026cb7319f0524d8a7aa
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
|
||||
DESCRIPTION="PEAR - PHP Extension and Application Repository"
|
||||
HOMEPAGE="http://pear.php.net/"
|
||||
SRC_URI=""
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
S="${WORKDIR}"
|
||||
|
||||
DEPEND=">=dev-lang/php-5.4:*
|
||||
!<dev-php/PEAR-PEAR-1.8.1
|
||||
~dev-php/PEAR-PEAR-${PV}
|
||||
>=dev-php/PEAR-Archive_Tar-1.4.0
|
||||
>=dev-php/PEAR-Console_Getopt-1.4.1
|
||||
>=dev-php/PEAR-Structures_Graph-1.1.0
|
||||
>=dev-php/PEAR-XML_Util-1.3.0"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_install() {
|
||||
:;
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
pear clear-cache
|
||||
|
||||
# Update PEAR/PECL channels as needed, add new ones to the list if needed
|
||||
elog "Updating PEAR/PECL channels"
|
||||
local pearchans="pear.php.net pecl.php.net pear.phing.info pear.symfony-project.com
|
||||
pear.agavi.org"
|
||||
|
||||
for chan in ${pearchans} ; do
|
||||
pear channel-discover ${chan}
|
||||
pear channel-update ${chan}
|
||||
done
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
|
||||
DESCRIPTION="PEAR - PHP Extension and Application Repository"
|
||||
HOMEPAGE="http://pear.php.net/"
|
||||
SRC_URI=""
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
S="${WORKDIR}"
|
||||
|
||||
DEPEND="!<dev-php/PEAR-PEAR-1.8.1
|
||||
~dev-php/PEAR-PEAR-${PV}
|
||||
>=dev-php/PEAR-Archive_Tar-1.3.7
|
||||
>=dev-php/PEAR-Console_Getopt-1.2.3
|
||||
>=dev-php/PEAR-Structures_Graph-1.0.2
|
||||
>=dev-php/PEAR-XML_Util-1.2.1"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_install() {
|
||||
:;
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
pear clear-cache
|
||||
|
||||
# Update PEAR/PECL channels as needed, add new ones to the list if needed
|
||||
elog "Updating PEAR/PECL channels"
|
||||
local pearchans="pear.php.net pecl.php.net components.ez.no
|
||||
pear.propelorm.org pear.phing.info pear.symfony-project.com
|
||||
pear.phpontrax.com pear.agavi.org"
|
||||
|
||||
for chan in ${pearchans} ; do
|
||||
pear channel-discover ${chan}
|
||||
pear channel-update ${chan}
|
||||
done
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
DIST ansicolor-0.2.1.tar.gz 5678 SHA256 f5a5e105cf2457112df3cb2fe0200803129fa5dde86395a680e95b0e951b3956 SHA512 334b90eaf3f21469062ff4f70043fa902c1cfd53e7d73d22e4df63dbeb55db1f33d71b5a88ef6ba4481a9144ee7652ea68d9554f5155e129f462872d064430b5 WHIRLPOOL 38b24fc0880ace1d632e932fcfd3fbe805e7139f40410709477c17659839ca8b0cf909e0ef7f594ec9bde7b51ae3016486b4931d63b50cc9b63e28e2012636e7
|
||||
DIST ansicolor-0.2.4.tar.gz 5971 SHA256 30f889b330f611271e97d850fd09d911d5389deec8b6cfa1f6c576034e9a937e SHA512 1f20955a5ddf6a2125146fab220884b3dace2faef5b06c637c396b1769ad60e69ef7ae8a4ae3ecd49d0b849efdbd388b611eb738dc7c1b7f19027afc3f30e57c WHIRLPOOL 83ee2de115d02f38bf45a12cf0b3b9930516fd189b7947d4c1d05ae71d1e406feab4ff003f495a14d4e17a9e7f3c18f60b8271d47df6a007731861ddbe0aafc4
|
||||
EBUILD ansicolor-0.2.1.ebuild 522 SHA256 779abcefe17582808ee6dc6664e18b6c35139d49dbe22ffa924a6d10ad96c703 SHA512 575ef6d228c1164385fce277fc4f27e853ec2cc58d5faad6a5d24b4c38f5e7c8decd693fc401420d638cd7ee3a5780f3356a1fbff9974d55160735c80aa3ec32 WHIRLPOOL 90618a13ea6ffd28003c3b360537db02b20b86e733e1364adf27a5ea45093f71a9943ea755b47b431edc10ef9f4666c1e0172e9a982d1f696ff6bea8684e5a7c
|
||||
EBUILD ansicolor-0.2.4.ebuild 526 SHA256 2ada89681f96b0e6dd1c062d6924787a935e2f63bbc258119eb46bef8403e047 SHA512 e9d4e3bd24fd8e2cd79f57daac5965524336d3418ea95a3c47c8f584da0a6eb7336c32bff49b52babadbaca5c0078fb034310b058c2f8cab8aed64e1183d6b6f WHIRLPOOL 7df65f561092daebf3136cc127bd6e3e883bbdc659bd615ebad79add4dccd37000c1cccf7fff1237df00b23b33c6bae76b066ccd239e82bb2dcb1760ec2bde86
|
||||
EBUILD ansicolor-0.2.4.ebuild 530 SHA256 b5dca4f635ff89be97541855af7efc5322f8903c008bbc27bb4271ab72eea595 SHA512 9ea917ec82aaddeefd0c6bfeb20daf00ffead70d5ef4bca8275a8abb30b8cb0e3c66689c9ca74f6426944ebac681300902ec419b3551bb18670442130d060df2 WHIRLPOOL 8b081bb47459ca701f10a488a55c79615645b8112a50269e09cd434d2fa85d5152e4270babed26bce0b20611d06869acf38b4d8cae7e6c21c345e8e982baf6c2
|
||||
MISC ChangeLog 2787 SHA256 8213df997e3384a12e33ce57bdb64c1f4950202413964105c123d5a4ecef6059 SHA512 d2f4c023b3db25ed4435d20dea978feb00305e7a15e408dc837b10375d02a47fe7b63cf3e458533478e465472f840e503a244aef76818cf036574ed7be7fb614 WHIRLPOOL d64e4ee8c4cc914c20693d75b18fb01be77c6e5ca852e955c0564095c9e59825deca938cd03f3083321a3fe34fbe634d095d441152d90948906b7a01cf9359c8
|
||||
MISC ChangeLog-2015 1137 SHA256 0994cd825fa4337af8004626f31b869bae5138b5a06419c651694ddac1543170 SHA512 c0b1131d54ce02c66b5dcdbc845137a3d2a9a995b1bb4b9c393c0c9cb34b14212d64298ccd00191de0d5c89bd90a60bf8de9091b3678f1cce5507abd91673d39 WHIRLPOOL 7b4ef86203d0a191cde56b6e3135d2da86432528a1d25e5b5ceb4f90e463b62c9b2b9efc4fdbfa06c4fd3513990273c2b1350abc8ac06a6975db48e6e3c29494
|
||||
MISC metadata.xml 383 SHA256 5c6003a188ffdc4ff4088caf9429321ba075dbeba69228832650af48d0081ef3 SHA512 5253cd94479f0e26e5c59ee796789da6c044bac7b1a9671ad0b6557d21d3fae9b7643a9ed77bd6b119142e63c55de3cd12feb8463e580cb404268808f71f593a WHIRLPOOL 854ebd57793d34ce7345461fedb75b2c1c6a1d2f4089995f5e6251f457f7b898e45798105e2c386e51308f29f706708bd84425f8389f2c674796c5b6bd6b2755
|
||||
|
||||
@ -1,10 +1,5 @@
|
||||
AUX urdfdom1.patch 10198 SHA256 d2cdb8e5ddb2f5ed8a20a7ecca3b0a9e8e20a046512052af8341fe83cd0f3c24 SHA512 309a793b27980ad06f6207f493554c66c89c9c7be83a9a00908af6b56160040ead5ed291720cdebc0427665854b4fcb569ccf00276090121958588f5d314c949 WHIRLPOOL 191fc5bf2f1700d1d6e9f48c41b352093ebcc25a3e40802bd5112d95215ac751711a61a8d39f63975a5085b8b8b09f1e6434db2060fbb7e5a9c9f7b45072084b
|
||||
DIST robot_model-1.12.3.tar.gz 1292139 SHA256 4b2bf070e4d07450fd9977a62c260e8abb40645ff9fcf5f5781f505a8b61b194 SHA512 eae18db87bdd7fc867868493f54f1812358f1a301c88fc7eae611fa75bc2418165b5cb2f5c5839f3cb644d4c1f560f85d84b635ffbecaa631c78a3176d1fb6db WHIRLPOOL c555faee5282942db894866a08aa3a675c6db618fce2acdd1f67d622cf1c0a8e5747f5f9a5217b4fc83997f9bb9125f1c7f2ca6b77e9fd75244f121b48a77f66
|
||||
DIST robot_model-1.12.4.tar.gz 1293354 SHA256 e40bd4519fd4010bcde0cb179611a19c04c3a32073830a675090671b4cea0ee5 SHA512 f78bfd9a72d795e301836a7946d87250f4c8be2082593f7a0fb282831152bc8125885f30408ff99823c4dd1d606060b71695c1cc3097dee8870efe0fe862ab0d WHIRLPOOL cff984eec217cd4615f1bf316eaa255f0d7f2c531fede6d4764edd57a11277980b0aad87bee4af7e89b2fc56394c7d457a0bb50b103b22afc4f5f449824293e9
|
||||
DIST robot_model-1.12.5.tar.gz 1294607 SHA256 c0784cebf4b5ef38c9bf7a0f6e66f5350aa7e12460d46e2e8c4c9420b40217cc SHA512 4e1952bf9218a1ee1c09c1ff3ad607a9546675874f2d97052a1015fa1c221829e42d95c735dd136e5406fdccdbf969d55a43b318db1fed206c86c2c7a5c5ab86 WHIRLPOOL 38f0150bc4b991c7fef829e0c02c015e603d6162a3986a28433adc1d496d9098efc97f0da15cae32b8316d8677b5e156c64e36304af82f8a94a3b231a027e59c
|
||||
EBUILD collada_parser-1.12.3-r1.ebuild 638 SHA256 801bdd19fb888b1abaacd39ccfa81e110cc6a108f4f4f11acf29864e66587fde SHA512 e9c1f505d045737587bfdeabb555c9ee1a32cadc834ab740ac424a57180e49a11a31c26b272e3c2ad9b4df35a1077725b5e39249e5d0ef2a758f486112405880 WHIRLPOOL f0289415a0638d1febea6fffbd4c03d51666c17fc284f6749aec05d271c88e17f21cff816980d81de69d8d61dbde9e23b1f31fa5b50e602d3ef31fb7cf9d175e
|
||||
EBUILD collada_parser-1.12.4.ebuild 638 SHA256 801bdd19fb888b1abaacd39ccfa81e110cc6a108f4f4f11acf29864e66587fde SHA512 e9c1f505d045737587bfdeabb555c9ee1a32cadc834ab740ac424a57180e49a11a31c26b272e3c2ad9b4df35a1077725b5e39249e5d0ef2a758f486112405880 WHIRLPOOL f0289415a0638d1febea6fffbd4c03d51666c17fc284f6749aec05d271c88e17f21cff816980d81de69d8d61dbde9e23b1f31fa5b50e602d3ef31fb7cf9d175e
|
||||
EBUILD collada_parser-1.12.5.ebuild 638 SHA256 801bdd19fb888b1abaacd39ccfa81e110cc6a108f4f4f11acf29864e66587fde SHA512 e9c1f505d045737587bfdeabb555c9ee1a32cadc834ab740ac424a57180e49a11a31c26b272e3c2ad9b4df35a1077725b5e39249e5d0ef2a758f486112405880 WHIRLPOOL f0289415a0638d1febea6fffbd4c03d51666c17fc284f6749aec05d271c88e17f21cff816980d81de69d8d61dbde9e23b1f31fa5b50e602d3ef31fb7cf9d175e
|
||||
EBUILD collada_parser-9999.ebuild 495 SHA256 3f4d2403adaf2daaf2ab3f7a454fb90dcc4a2b8f2e97a4076b53baa2d7bfe639 SHA512 05bbe9e7c1784795d009dcda5978fa6b7560867c012613919e8d621260bb1ea375c9bbb3734ba02218f4ce8d7bf4d8d3921408166c28f442243b99d64c3aff9b WHIRLPOOL b07d9c73a83340dc0cf1741439b145dc91cd3038d6215a008b61a847ff6d64642611a6bdcd56c5dc1a124e42c2e56fffbc4b8df2b66e627a4ffafa13de66a776
|
||||
DIST robot_model-1.12.6.tar.gz 1295666 SHA256 ac335cec5a3706a104411222a2f89ef1862c0ac8caa5ddadd390e9c25641bf27 SHA512 60270b3ec20c0473e9c8d02d661794e253405c836b06cf5c15b65dddf104bfb5e4865463e12232e94548d68eead2b5499eb04c71aee3f851fa9f85dbe733ee12 WHIRLPOOL 6cec339181a6570fbe4e61415d341f5f7404ea69d8d2a4058d5c837fa15f74c7c95a4ee3f74a78fcca624d272995f09aae4ad3a6027178b2c25daa466754adc4
|
||||
EBUILD collada_parser-1.12.6.ebuild 527 SHA256 0ae41ac9ba25ca83bd1f2716597ff0f3a8929c47fa68fd8b21f83cc1b924a69d SHA512 b289c31636ea3aff8bdc2500d833aacf90e7343c75ca7d65960ce9d26eb93ac4e948c99a9a1edba6d0421ddae80b5de5c41ce1d338df92402c424678744415ec WHIRLPOOL 2dd37cb2007e0362011a85de60666759db72ed038f903782bd52cc66ae734e6cdbad292acc17de985f7359db9f15ba41457cb678938ff1072a00fada87f49bfb
|
||||
EBUILD collada_parser-9999.ebuild 527 SHA256 0ae41ac9ba25ca83bd1f2716597ff0f3a8929c47fa68fd8b21f83cc1b924a69d SHA512 b289c31636ea3aff8bdc2500d833aacf90e7343c75ca7d65960ce9d26eb93ac4e948c99a9a1edba6d0421ddae80b5de5c41ce1d338df92402c424678744415ec WHIRLPOOL 2dd37cb2007e0362011a85de60666759db72ed038f903782bd52cc66ae734e6cdbad292acc17de985f7359db9f15ba41457cb678938ff1072a00fada87f49bfb
|
||||
MISC ChangeLog 3518 SHA256 37f271b0666f234de1ca78888c79b80506af2005825f6bba94709cc679338a8b SHA512 9b0da2c7f5de593f397d60210564555cee1a378791444a4bda64b4b90cf177ad2892b7d84852d47c97a923adb5939ea0f7e81e2e8d7f8b98cc6d19d98dbc038f WHIRLPOOL 920cd19f49ec6686d4bd9e0c7a25881a9bddb17491cc669ff300db5b1056b43f697a7952984c2a0c039f5d5e278d71c11a8b6e6acb00b093d2256325b612af10
|
||||
MISC metadata.xml 329 SHA256 cbddc06c1e002968d8c8a9586accaf9b777dcc72bafda910d59e5909fbf55454 SHA512 901cb37bff7bfd07cd7b6ec49833301caea33cf9696e3a644a1b128d4371b31eee2f3afdab937d39b6da925bab51604a8bb6ea370407d0170133655e9222d988 WHIRLPOOL 9b7f562542be16c41cb79a5b218a66882bd1be2c42d0cbed2884fdf967eb00025593ba0aa34fef5b5773fa1971701a28274500ebe0bf2c6ed61d4da00096e66a
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros/robot_model"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin flag-o-matic
|
||||
|
||||
DESCRIPTION="C++ parser for the Collada robot description format"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/boost:=
|
||||
>=dev-ros/urdf_parser_plugin-1.12.3-r1
|
||||
dev-ros/roscpp
|
||||
dev-ros/class_loader
|
||||
dev-libs/urdfdom_headers
|
||||
dev-libs/collada-dom
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
PATCHES=( "${FILESDIR}/urdfdom1.patch" )
|
||||
|
||||
src_configure() {
|
||||
append-cxxflags -std=gnu++11
|
||||
ros-catkin_src_configure
|
||||
}
|
||||
@ -1,31 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros/robot_model"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin flag-o-matic
|
||||
|
||||
DESCRIPTION="C++ parser for the Collada robot description format"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/boost:=
|
||||
>=dev-ros/urdf_parser_plugin-1.12.3-r1
|
||||
dev-ros/roscpp
|
||||
dev-ros/class_loader
|
||||
dev-libs/urdfdom_headers
|
||||
dev-libs/collada-dom
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
PATCHES=( "${FILESDIR}/urdfdom1.patch" )
|
||||
|
||||
src_configure() {
|
||||
append-cxxflags -std=gnu++11
|
||||
ros-catkin_src_configure
|
||||
}
|
||||
@ -1,224 +0,0 @@
|
||||
Index: collada_parser/include/collada_parser/collada_parser.h
|
||||
===================================================================
|
||||
--- collada_parser.orig/include/collada_parser/collada_parser.h
|
||||
+++ collada_parser/include/collada_parser/collada_parser.h
|
||||
@@ -47,7 +47,7 @@
|
||||
namespace urdf {
|
||||
|
||||
/// \brief Load Model from string
|
||||
-boost::shared_ptr<ModelInterface> parseCollada(const std::string &xml_string );
|
||||
+std::shared_ptr<ModelInterface> parseCollada(const std::string &xml_string );
|
||||
|
||||
}
|
||||
|
||||
Index: collada_parser/include/collada_parser/collada_parser_plugin.h
|
||||
===================================================================
|
||||
--- collada_parser.orig/include/collada_parser/collada_parser_plugin.h
|
||||
+++ collada_parser/include/collada_parser/collada_parser_plugin.h
|
||||
@@ -46,7 +46,7 @@ class ColladaURDFParser : public URDFPar
|
||||
{
|
||||
public:
|
||||
|
||||
- virtual boost::shared_ptr<ModelInterface> parse(const std::string &xml_string);
|
||||
+ virtual std::shared_ptr<ModelInterface> parse(const std::string &xml_string);
|
||||
};
|
||||
|
||||
}
|
||||
Index: collada_parser/src/collada_parser.cpp
|
||||
===================================================================
|
||||
--- collada_parser.orig/src/collada_parser.cpp
|
||||
+++ collada_parser/src/collada_parser.cpp
|
||||
@@ -176,7 +176,7 @@ public:
|
||||
USERDATA(double scale) : scale(scale) {
|
||||
}
|
||||
double scale;
|
||||
- boost::shared_ptr<void> p; ///< custom managed data
|
||||
+ std::shared_ptr<void> p; ///< custom managed data
|
||||
};
|
||||
|
||||
enum GeomType {
|
||||
@@ -409,7 +409,7 @@ public:
|
||||
};
|
||||
|
||||
public:
|
||||
- ColladaModelReader(boost::shared_ptr<ModelInterface> model) : _dom(NULL), _nGlobalSensorId(0), _nGlobalManipulatorId(0), _model(model) {
|
||||
+ ColladaModelReader(std::shared_ptr<ModelInterface> model) : _dom(NULL), _nGlobalSensorId(0), _nGlobalManipulatorId(0), _model(model) {
|
||||
daeErrorHandler::setErrorHandler(this);
|
||||
_resourcedir = ".";
|
||||
}
|
||||
@@ -715,7 +715,7 @@ protected:
|
||||
}
|
||||
|
||||
// find the target joint
|
||||
- boost::shared_ptr<Joint> pjoint = _getJointFromRef(pf->getTarget()->getParam()->getValue(),pf);
|
||||
+ std::shared_ptr<Joint> pjoint = _getJointFromRef(pf->getTarget()->getParam()->getValue(),pf);
|
||||
if (!pjoint) {
|
||||
continue;
|
||||
}
|
||||
@@ -785,7 +785,7 @@ protected:
|
||||
}
|
||||
BOOST_ASSERT(psymboljoint->hasAttribute("encoding"));
|
||||
BOOST_ASSERT(psymboljoint->getAttribute("encoding")==std::string("COLLADA"));
|
||||
- boost::shared_ptr<Joint> pbasejoint = _getJointFromRef(psymboljoint->getCharData().c_str(),pf);
|
||||
+ std::shared_ptr<Joint> pbasejoint = _getJointFromRef(psymboljoint->getCharData().c_str(),pf);
|
||||
if( !!pbasejoint ) {
|
||||
// set the mimic properties
|
||||
pjoint->mimic.reset(new JointMimic());
|
||||
@@ -801,7 +801,7 @@ protected:
|
||||
}
|
||||
|
||||
/// \brief Extract Link info and add it to an existing body
|
||||
- boost::shared_ptr<Link> _ExtractLink(const domLinkRef pdomlink,const domNodeRef pdomnode, const Pose& tParentWorldLink, const Pose& tParentLink, const std::vector<domJointRef>& vdomjoints, const KinematicsSceneBindings& bindings) {
|
||||
+ std::shared_ptr<Link> _ExtractLink(const domLinkRef pdomlink,const domNodeRef pdomnode, const Pose& tParentWorldLink, const Pose& tParentLink, const std::vector<domJointRef>& vdomjoints, const KinematicsSceneBindings& bindings) {
|
||||
const std::list<JointAxisBinding>& listAxisBindings = bindings.listAxisBindings;
|
||||
// Set link name with the name of the COLLADA's Link
|
||||
std::string linkname = _ExtractLinkName(pdomlink);
|
||||
@@ -817,7 +817,7 @@ protected:
|
||||
}
|
||||
}
|
||||
|
||||
- boost::shared_ptr<Link> plink;
|
||||
+ LinkSharedPtr plink;
|
||||
_model->getLink(linkname,plink);
|
||||
if( !plink ) {
|
||||
plink.reset(new Link());
|
||||
@@ -921,7 +921,7 @@ protected:
|
||||
|
||||
if (!pdomjoint || pdomjoint->typeID() != domJoint::ID()) {
|
||||
ROS_WARN_STREAM(str(boost::format("could not find attached joint %s!\n")%pattfull->getJoint()));
|
||||
- return boost::shared_ptr<Link>();
|
||||
+ return std::shared_ptr<Link>();
|
||||
}
|
||||
|
||||
// get direct child link
|
||||
@@ -952,7 +952,7 @@ protected:
|
||||
}
|
||||
|
||||
// create the joints before creating the child links
|
||||
- std::vector<boost::shared_ptr<Joint> > vjoints(vdomaxes.getCount());
|
||||
+ std::vector<std::shared_ptr<Joint> > vjoints(vdomaxes.getCount());
|
||||
for (size_t ic = 0; ic < vdomaxes.getCount(); ++ic) {
|
||||
bool joint_active = true; // if not active, put into the passive list
|
||||
FOREACHC(itaxisbinding,listAxisBindings) {
|
||||
@@ -966,7 +966,7 @@ protected:
|
||||
}
|
||||
}
|
||||
|
||||
- boost::shared_ptr<Joint> pjoint(new Joint());
|
||||
+ std::shared_ptr<Joint> pjoint(new Joint());
|
||||
pjoint->limits.reset(new JointLimits());
|
||||
pjoint->limits->velocity = 0.0;
|
||||
pjoint->limits->effort = 0.0;
|
||||
@@ -995,12 +995,12 @@ protected:
|
||||
}
|
||||
|
||||
_getUserData(pdomjoint)->p = pjoint;
|
||||
- _getUserData(pdomaxis)->p = boost::shared_ptr<int>(new int(_model->joints_.size()));
|
||||
+ _getUserData(pdomaxis)->p = std::shared_ptr<int>(new int(_model->joints_.size()));
|
||||
_model->joints_[pjoint->name] = pjoint;
|
||||
vjoints[ic] = pjoint;
|
||||
}
|
||||
|
||||
- boost::shared_ptr<Link> pchildlink = _ExtractLink(pattfull->getLink(), pchildnode, _poseMult(_poseMult(tParentWorldLink,tlink), tatt), tatt, vdomjoints, bindings);
|
||||
+ std::shared_ptr<Link> pchildlink = _ExtractLink(pattfull->getLink(), pchildnode, _poseMult(_poseMult(tParentWorldLink,tlink), tatt), tatt, vdomjoints, bindings);
|
||||
|
||||
if (!pchildlink) {
|
||||
ROS_WARN_STREAM(str(boost::format("Link has no child: %s\n")%plink->name));
|
||||
@@ -1035,7 +1035,7 @@ protected:
|
||||
}
|
||||
|
||||
ROS_DEBUG_STREAM(str(boost::format("Joint %s assigned %d \n")%vjoints[ic]->name%ic));
|
||||
- boost::shared_ptr<Joint> pjoint = vjoints[ic];
|
||||
+ std::shared_ptr<Joint> pjoint = vjoints[ic];
|
||||
pjoint->child_link_name = pchildlink->name;
|
||||
|
||||
#define PRINT_POSE(pname, apose) ROS_DEBUG(pname" pos: %f %f %f, rot: %f %f %f %f", \
|
||||
@@ -1178,7 +1178,7 @@ protected:
|
||||
return plink;
|
||||
}
|
||||
|
||||
- boost::shared_ptr<Geometry> _CreateGeometry(const std::string& name, const std::list<GEOMPROPERTIES>& listGeomProperties)
|
||||
+ urdf::GeometrySharedPtr _CreateGeometry(const std::string& name, const std::list<GEOMPROPERTIES>& listGeomProperties)
|
||||
{
|
||||
std::vector<std::vector<Vector3> > vertices;
|
||||
std::vector<std::vector<int> > indices;
|
||||
@@ -1219,12 +1219,12 @@ protected:
|
||||
}
|
||||
|
||||
if (vert_counter == 0) {
|
||||
- boost::shared_ptr<Mesh> ret;
|
||||
+ std::shared_ptr<Mesh> ret;
|
||||
ret.reset();
|
||||
return ret;
|
||||
}
|
||||
|
||||
- boost::shared_ptr<Mesh> geometry(new Mesh());
|
||||
+ std::shared_ptr<Mesh> geometry(new Mesh());
|
||||
geometry->type = Geometry::MESH;
|
||||
geometry->scale.x = 1;
|
||||
geometry->scale.y = 1;
|
||||
@@ -2020,7 +2020,7 @@ protected:
|
||||
//std::string aname = pextra->getAttribute("name");
|
||||
domTechniqueRef tec = _ExtractOpenRAVEProfile(pextra->getTechnique_array());
|
||||
if( !!tec ) {
|
||||
- boost::shared_ptr<Joint> pjoint;
|
||||
+ std::shared_ptr<Joint> pjoint;
|
||||
daeElementRef domactuator;
|
||||
{
|
||||
daeElementRef bact = tec->getChild("bind_actuator");
|
||||
@@ -2413,7 +2413,7 @@ protected:
|
||||
return name.substr(pos+1)==type;
|
||||
}
|
||||
|
||||
- boost::shared_ptr<Joint> _getJointFromRef(xsToken targetref, daeElementRef peltref) {
|
||||
+ std::shared_ptr<Joint> _getJointFromRef(xsToken targetref, daeElementRef peltref) {
|
||||
daeElement* peltjoint = daeSidRef(targetref, peltref).resolve().elt;
|
||||
domJointRef pdomjoint = daeSafeCast<domJoint> (peltjoint);
|
||||
|
||||
@@ -2426,10 +2426,10 @@ protected:
|
||||
|
||||
if (!pdomjoint || pdomjoint->typeID() != domJoint::ID() || !pdomjoint->getName()) {
|
||||
ROS_WARN_STREAM(str(boost::format("could not find collada joint %s!\n")%targetref));
|
||||
- return boost::shared_ptr<Joint>();
|
||||
+ return std::shared_ptr<Joint>();
|
||||
}
|
||||
|
||||
- boost::shared_ptr<Joint> pjoint;
|
||||
+ std::shared_ptr<Joint> pjoint;
|
||||
std::string name(pdomjoint->getName());
|
||||
if (_model->joints_.find(name) == _model->joints_.end()) {
|
||||
pjoint.reset();
|
||||
@@ -2797,7 +2797,7 @@ protected:
|
||||
int _nGlobalSensorId, _nGlobalManipulatorId;
|
||||
std::string _filename;
|
||||
std::string _resourcedir;
|
||||
- boost::shared_ptr<ModelInterface> _model;
|
||||
+ std::shared_ptr<ModelInterface> _model;
|
||||
Pose _RootOrigin;
|
||||
Pose _VisualRootOrigin;
|
||||
};
|
||||
@@ -2805,9 +2805,9 @@ protected:
|
||||
|
||||
|
||||
|
||||
-boost::shared_ptr<ModelInterface> parseCollada(const std::string &xml_str)
|
||||
+std::shared_ptr<ModelInterface> parseCollada(const std::string &xml_str)
|
||||
{
|
||||
- boost::shared_ptr<ModelInterface> model(new ModelInterface);
|
||||
+ std::shared_ptr<ModelInterface> model(new ModelInterface);
|
||||
|
||||
ColladaModelReader reader(model);
|
||||
if (!reader.InitFromData(xml_str))
|
||||
Index: collada_parser/src/collada_parser_plugin.cpp
|
||||
===================================================================
|
||||
--- collada_parser.orig/src/collada_parser_plugin.cpp
|
||||
+++ collada_parser/src/collada_parser_plugin.cpp
|
||||
@@ -38,7 +38,7 @@
|
||||
#include "collada_parser/collada_parser.h"
|
||||
#include <class_loader/class_loader.h>
|
||||
|
||||
-boost::shared_ptr<urdf::ModelInterface> urdf::ColladaURDFParser::parse(const std::string &xml_string)
|
||||
+std::shared_ptr<urdf::ModelInterface> urdf::ColladaURDFParser::parse(const std::string &xml_string)
|
||||
{
|
||||
return urdf::parseCollada(xml_string);
|
||||
}
|
||||
@ -1,10 +1,5 @@
|
||||
AUX urdfdom1.patch 8997 SHA256 9fdb92de2c7b3929106a2f0b3941e64c6d03fa73ebb904c5f600ba890cee8600 SHA512 9de6df5bde047f633555b1b484b8b7c2cbbfe77435106090a7f577f91aa76d89d4c06035e40fab8472f17834aaa0dcb79313d68c09632ecbca13ad37ed316b05 WHIRLPOOL 6dcc0dffefdfb9d554064ff60be8a9c330dff72186b3984e519658e4b96222771630f9114b233a243d383d46047c11740a7f071f417c130e6bce193cfff39d00
|
||||
DIST robot_model-1.12.3.tar.gz 1292139 SHA256 4b2bf070e4d07450fd9977a62c260e8abb40645ff9fcf5f5781f505a8b61b194 SHA512 eae18db87bdd7fc867868493f54f1812358f1a301c88fc7eae611fa75bc2418165b5cb2f5c5839f3cb644d4c1f560f85d84b635ffbecaa631c78a3176d1fb6db WHIRLPOOL c555faee5282942db894866a08aa3a675c6db618fce2acdd1f67d622cf1c0a8e5747f5f9a5217b4fc83997f9bb9125f1c7f2ca6b77e9fd75244f121b48a77f66
|
||||
DIST robot_model-1.12.4.tar.gz 1293354 SHA256 e40bd4519fd4010bcde0cb179611a19c04c3a32073830a675090671b4cea0ee5 SHA512 f78bfd9a72d795e301836a7946d87250f4c8be2082593f7a0fb282831152bc8125885f30408ff99823c4dd1d606060b71695c1cc3097dee8870efe0fe862ab0d WHIRLPOOL cff984eec217cd4615f1bf316eaa255f0d7f2c531fede6d4764edd57a11277980b0aad87bee4af7e89b2fc56394c7d457a0bb50b103b22afc4f5f449824293e9
|
||||
DIST robot_model-1.12.5.tar.gz 1294607 SHA256 c0784cebf4b5ef38c9bf7a0f6e66f5350aa7e12460d46e2e8c4c9420b40217cc SHA512 4e1952bf9218a1ee1c09c1ff3ad607a9546675874f2d97052a1015fa1c221829e42d95c735dd136e5406fdccdbf969d55a43b318db1fed206c86c2c7a5c5ab86 WHIRLPOOL 38f0150bc4b991c7fef829e0c02c015e603d6162a3986a28433adc1d496d9098efc97f0da15cae32b8316d8677b5e156c64e36304af82f8a94a3b231a027e59c
|
||||
EBUILD collada_urdf-1.12.3-r2.ebuild 764 SHA256 e827cde0e338a6cab6aa3be4265dafdac66da4b394250cdce82da43a968dd293 SHA512 45fb1f306cb4afc9adc237f9918bc8c6977980958c880d2efcc36bcfdb422fecfa3c6ed01e465fb1226569ae4b486b92ca787635ea5c95793b0cb56e241d6df6 WHIRLPOOL 65e89ed2b692cffe6c38724211a43e5ed093a5b8c84d85d5cca392079a434def5c03a67dfa614763186e17e4af52bd39294f8d1bd16088b2a1e9c3bb2da42885
|
||||
EBUILD collada_urdf-1.12.4.ebuild 827 SHA256 2de9fd2ee538d602dc19523a62a0dad3465923f27610d9baf82ccc369cf2e3f4 SHA512 a01dc6f4496e66d473b789b2aeac877a7c33061f8c55ce7eb4e5675788008b1e70844969f1335daa8a510e92f703cb2b7fb491fd8e13359a8ff34f4846862287 WHIRLPOOL 982da6d679cabb84b0487ae4876f2137e9f6c0e4c372880ef6d928778ba557c9c6643bf8060ff5c971cd700a9cb640c3c9268c7275fd744e1564bf3dd327fcff
|
||||
EBUILD collada_urdf-1.12.5.ebuild 827 SHA256 2de9fd2ee538d602dc19523a62a0dad3465923f27610d9baf82ccc369cf2e3f4 SHA512 a01dc6f4496e66d473b789b2aeac877a7c33061f8c55ce7eb4e5675788008b1e70844969f1335daa8a510e92f703cb2b7fb491fd8e13359a8ff34f4846862287 WHIRLPOOL 982da6d679cabb84b0487ae4876f2137e9f6c0e4c372880ef6d928778ba557c9c6643bf8060ff5c971cd700a9cb640c3c9268c7275fd744e1564bf3dd327fcff
|
||||
DIST robot_model-1.12.6.tar.gz 1295666 SHA256 ac335cec5a3706a104411222a2f89ef1862c0ac8caa5ddadd390e9c25641bf27 SHA512 60270b3ec20c0473e9c8d02d661794e253405c836b06cf5c15b65dddf104bfb5e4865463e12232e94548d68eead2b5499eb04c71aee3f851fa9f85dbe733ee12 WHIRLPOOL 6cec339181a6570fbe4e61415d341f5f7404ea69d8d2a4058d5c837fa15f74c7c95a4ee3f74a78fcca624d272995f09aae4ad3a6027178b2c25daa466754adc4
|
||||
EBUILD collada_urdf-1.12.6.ebuild 597 SHA256 8afe3bd5c9ce77d9142db622022dea1589a8ceaab39d758f4e3a79c8ee1dfd1c SHA512 d89d7ff128e3199d322f48b2c156e4b10d7be578cc06ea873e1c44dec5c1ffb7761e5de3eff5586f2a5d3a1ce6ba1e2145b38257e67ce4db55ac933a8ca0a898 WHIRLPOOL e401737723cb3a7f2a31209facb5a27daf673dcd08b2e5fdc5b5f11b5f19faf296d929c15cd58883fdc817453275bff6a8b9af58340c9b1a4ee74a3ad7ea7e54
|
||||
EBUILD collada_urdf-9999.ebuild 597 SHA256 e7576536a9068c7a11f1cbccb346d45dfb85c4898ff6b4252e81312ec79f692c SHA512 3d10407f16ca9510a260db375663a9e6a8f33613072efe4b89e5fc903469b927153d111adbda979d7f90035d0853d5c3e09dce6ee460cfe72530e13ccc2af3d0 WHIRLPOOL be02a85168a3e5edf383e9599119d359e1ffaaffb0ece50d4be590b4bae82be731bde1fb31fa6e265302c9c6908b1bca2ef254c73e6c1d70c0c5908d21109358
|
||||
MISC ChangeLog 3704 SHA256 423405f7417673065b1801b8c6b4aab9debc6d237be46f50fbd306b33053b912 SHA512 b4d7e260369958fc962282e5838400398b1443b5faf3cc818e44f1f97637d50877822999ec5a3f6bef6c88e138a484d21f6dae345d70063cd22b328a65312e0a WHIRLPOOL 7a02acaf6358fbd9696e9115f9c5d76e1b3449e9e8ed49e8ff695b390f1aa2fa31b2be6036f8b17815471c293c0ffb58018c4d11822d24340d652a163bcf627f
|
||||
MISC metadata.xml 329 SHA256 cbddc06c1e002968d8c8a9586accaf9b777dcc72bafda910d59e5909fbf55454 SHA512 901cb37bff7bfd07cd7b6ec49833301caea33cf9696e3a644a1b128d4371b31eee2f3afdab937d39b6da925bab51604a8bb6ea370407d0170133655e9222d988 WHIRLPOOL 9b7f562542be16c41cb79a5b218a66882bd1be2c42d0cbed2884fdf967eb00025593ba0aa34fef5b5773fa1971701a28274500ebe0bf2c6ed61d4da00096e66a
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros/robot_model"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin flag-o-matic
|
||||
|
||||
DESCRIPTION="Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/boost:=
|
||||
dev-ros/angles
|
||||
dev-ros/collada_parser
|
||||
dev-ros/resource_retriever
|
||||
>=dev-ros/urdf-1.12.3-r1
|
||||
dev-ros/geometric_shapes
|
||||
dev-ros/tf
|
||||
media-libs/assimp
|
||||
dev-libs/tinyxml
|
||||
dev-libs/collada-dom
|
||||
>=dev-libs/urdfdom-1:=
|
||||
dev-cpp/eigen:3
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
PATCHES=( "${FILESDIR}/urdfdom1.patch" )
|
||||
|
||||
src_configure() {
|
||||
append-cppflags `pkg-config --cflags eigen3`
|
||||
append-cxxflags -std=gnu++11
|
||||
ros-catkin_src_configure
|
||||
}
|
||||
@ -1,38 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros/robot_model"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin flag-o-matic
|
||||
|
||||
DESCRIPTION="Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/boost:=
|
||||
dev-ros/angles
|
||||
dev-ros/collada_parser
|
||||
dev-ros/resource_retriever
|
||||
>=dev-ros/urdf-1.12.3-r1
|
||||
dev-ros/geometric_shapes
|
||||
dev-ros/tf
|
||||
media-libs/assimp
|
||||
dev-libs/tinyxml
|
||||
dev-libs/collada-dom
|
||||
>=dev-libs/urdfdom-1:=
|
||||
dev-cpp/eigen:3
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
PATCHES=( "${FILESDIR}/urdfdom1.patch" )
|
||||
|
||||
src_configure() {
|
||||
append-cppflags `pkg-config --cflags eigen3`
|
||||
append-cxxflags -std=gnu++11
|
||||
ros-catkin_src_configure
|
||||
}
|
||||
@ -1,185 +0,0 @@
|
||||
Index: collada_urdf/src/collada_urdf.cpp
|
||||
===================================================================
|
||||
--- collada_urdf.orig/src/collada_urdf.cpp
|
||||
+++ collada_urdf/src/collada_urdf.cpp
|
||||
@@ -538,7 +538,7 @@ private:
|
||||
domInstance_with_extraRef piscene;
|
||||
};
|
||||
|
||||
- typedef std::map< boost::shared_ptr<const urdf::Link>, urdf::Pose > MAPLINKPOSES;
|
||||
+ typedef std::map< std::shared_ptr<const urdf::Link>, urdf::Pose > MAPLINKPOSES;
|
||||
struct LINKOUTPUT
|
||||
{
|
||||
list<pair<int,string> > listusedlinks;
|
||||
@@ -562,7 +562,7 @@ private:
|
||||
axis_output() : iaxis(0) {
|
||||
}
|
||||
string sid, nodesid;
|
||||
- boost::shared_ptr<const urdf::Joint> pjoint;
|
||||
+ std::shared_ptr<const urdf::Joint> pjoint;
|
||||
int iaxis;
|
||||
string jointnodesid;
|
||||
};
|
||||
@@ -788,7 +788,7 @@ protected:
|
||||
|
||||
for(size_t idof = 0; idof < _ikmout->vaxissids.size(); ++idof) {
|
||||
string axis_infosid = _ComputeId(str(boost::format("axis_info_inst%d")%idof));
|
||||
- boost::shared_ptr<const urdf::Joint> pjoint = _ikmout->kmout->vaxissids.at(idof).pjoint;
|
||||
+ std::shared_ptr<const urdf::Joint> pjoint = _ikmout->kmout->vaxissids.at(idof).pjoint;
|
||||
BOOST_ASSERT(_mapjointindices[pjoint] == (int)idof);
|
||||
//int iaxis = _ikmout->kmout->vaxissids.at(idof).iaxis;
|
||||
|
||||
@@ -966,7 +966,7 @@ protected:
|
||||
kmout->vlinksids.resize(_robot.links_.size());
|
||||
|
||||
FOREACHC(itjoint, _robot.joints_) {
|
||||
- boost::shared_ptr<urdf::Joint> pjoint = itjoint->second;
|
||||
+ std::shared_ptr<urdf::Joint> pjoint = itjoint->second;
|
||||
int index = _mapjointindices[itjoint->second];
|
||||
domJointRef pdomjoint = daeSafeCast<domJoint>(ktec->add(COLLADA_ELEMENT_JOINT));
|
||||
string jointid = _ComputeId(pjoint->name); //str(boost::format("joint%d")%index);
|
||||
@@ -1039,7 +1039,7 @@ protected:
|
||||
// create the formulas for all mimic joints
|
||||
FOREACHC(itjoint, _robot.joints_) {
|
||||
string jointsid = _ComputeId(itjoint->second->name);
|
||||
- boost::shared_ptr<urdf::Joint> pjoint = itjoint->second;
|
||||
+ std::shared_ptr<urdf::Joint> pjoint = itjoint->second;
|
||||
if( !pjoint->mimic ) {
|
||||
continue;
|
||||
}
|
||||
@@ -1125,7 +1125,7 @@ protected:
|
||||
/// \param pkinparent Kinbody parent
|
||||
/// \param pnodeparent Node parent
|
||||
/// \param strModelUri
|
||||
- virtual LINKOUTPUT _WriteLink(boost::shared_ptr<const urdf::Link> plink, daeElementRef pkinparent, domNodeRef pnodeparent, const string& strModelUri)
|
||||
+ virtual LINKOUTPUT _WriteLink(std::shared_ptr<const urdf::Link> plink, daeElementRef pkinparent, domNodeRef pnodeparent, const string& strModelUri)
|
||||
{
|
||||
LINKOUTPUT out;
|
||||
int linkindex = _maplinkindices[plink];
|
||||
@@ -1141,8 +1141,8 @@ protected:
|
||||
pnode->setSid(nodesid.c_str());
|
||||
pnode->setName(plink->name.c_str());
|
||||
|
||||
- boost::shared_ptr<urdf::Geometry> geometry;
|
||||
- boost::shared_ptr<urdf::Material> material;
|
||||
+ std::shared_ptr<urdf::Geometry> geometry;
|
||||
+ std::shared_ptr<urdf::Material> material;
|
||||
urdf::Pose geometry_origin;
|
||||
if( !!plink->visual ) {
|
||||
geometry = plink->visual->geometry;
|
||||
@@ -1161,7 +1161,7 @@ protected:
|
||||
if ( !!plink->visual ) {
|
||||
if (plink->visual_array.size() > 1) {
|
||||
int igeom = 0;
|
||||
- for (std::vector<boost::shared_ptr<urdf::Visual > >::const_iterator it = plink->visual_array.begin();
|
||||
+ for (std::vector<std::shared_ptr<urdf::Visual > >::const_iterator it = plink->visual_array.begin();
|
||||
it != plink->visual_array.end(); it++) {
|
||||
// geom
|
||||
string geomid = _ComputeId(str(boost::format("g%s_%s_geom%d")%strModelUri%linksid%igeom));
|
||||
@@ -1208,7 +1208,7 @@ protected:
|
||||
|
||||
// process all children
|
||||
FOREACHC(itjoint, plink->child_joints) {
|
||||
- boost::shared_ptr<urdf::Joint> pjoint = *itjoint;
|
||||
+ std::shared_ptr<urdf::Joint> pjoint = *itjoint;
|
||||
int index = _mapjointindices[pjoint];
|
||||
|
||||
// <attachment_full joint="k1/joint0">
|
||||
@@ -1269,7 +1269,7 @@ protected:
|
||||
return out;
|
||||
}
|
||||
|
||||
- domGeometryRef _WriteGeometry(boost::shared_ptr<urdf::Geometry> geometry, const std::string& geometry_id, urdf::Pose *org_trans = NULL)
|
||||
+ domGeometryRef _WriteGeometry(std::shared_ptr<urdf::Geometry> geometry, const std::string& geometry_id, urdf::Pose *org_trans = NULL)
|
||||
{
|
||||
domGeometryRef cgeometry = daeSafeCast<domGeometry>(_geometriesLib->add(COLLADA_ELEMENT_GEOMETRY));
|
||||
cgeometry->setId(geometry_id.c_str());
|
||||
@@ -1308,7 +1308,7 @@ protected:
|
||||
return cgeometry;
|
||||
}
|
||||
|
||||
- void _WriteMaterial(const string& geometry_id, boost::shared_ptr<urdf::Material> material)
|
||||
+ void _WriteMaterial(const string& geometry_id, std::shared_ptr<urdf::Material> material)
|
||||
{
|
||||
string effid = geometry_id+string("_eff");
|
||||
string matid = geometry_id+string("_mat");
|
||||
@@ -1386,7 +1386,7 @@ protected:
|
||||
rigid_body->setSid(rigidsid.c_str());
|
||||
rigid_body->setName(itlink->second->name.c_str());
|
||||
domRigid_body::domTechnique_commonRef ptec = daeSafeCast<domRigid_body::domTechnique_common>(rigid_body->add(COLLADA_ELEMENT_TECHNIQUE_COMMON));
|
||||
- boost::shared_ptr<urdf::Inertial> inertial = itlink->second->inertial;
|
||||
+ std::shared_ptr<urdf::Inertial> inertial = itlink->second->inertial;
|
||||
if( !!inertial ) {
|
||||
daeSafeCast<domRigid_body::domTechnique_common::domDynamic>(ptec->add(COLLADA_ELEMENT_DYNAMIC))->setValue(xsBoolean(true)); //!!inertial));
|
||||
domTargetable_floatRef mass = daeSafeCast<domTargetable_float>(ptec->add(COLLADA_ELEMENT_MASS));
|
||||
@@ -1916,9 +1916,9 @@ private:
|
||||
|
||||
boost::shared_ptr<instance_kinematics_model_output> _ikmout;
|
||||
boost::shared_ptr<instance_articulated_system_output> _iasout;
|
||||
- std::map< boost::shared_ptr<const urdf::Joint>, int > _mapjointindices;
|
||||
- std::map< boost::shared_ptr<const urdf::Link>, int > _maplinkindices;
|
||||
- std::map< boost::shared_ptr<const urdf::Material>, int > _mapmaterialindices;
|
||||
+ std::map< std::shared_ptr<const urdf::Joint>, int > _mapjointindices;
|
||||
+ std::map< std::shared_ptr<const urdf::Link>, int > _maplinkindices;
|
||||
+ std::map< std::shared_ptr<const urdf::Material>, int > _mapmaterialindices;
|
||||
Assimp::Importer _importer;
|
||||
};
|
||||
|
||||
Index: collada_urdf/src/collada_to_urdf.cpp
|
||||
===================================================================
|
||||
--- collada_urdf.orig/src/collada_to_urdf.cpp
|
||||
+++ collada_urdf/src/collada_to_urdf.cpp
|
||||
@@ -188,7 +188,7 @@ void assimp_calc_bbox(string fname, floa
|
||||
}
|
||||
}
|
||||
|
||||
-void addChildLinkNamesXML(boost::shared_ptr<const Link> link, ofstream& os)
|
||||
+void addChildLinkNamesXML(std::shared_ptr<const Link> link, ofstream& os)
|
||||
{
|
||||
os << " <link name=\"" << link->name << "\">" << endl;
|
||||
if ( !!link->visual ) {
|
||||
@@ -405,14 +405,14 @@ void addChildLinkNamesXML(boost::shared_
|
||||
}
|
||||
#endif
|
||||
|
||||
- for (std::vector<boost::shared_ptr<Link> >::const_iterator child = link->child_links.begin(); child != link->child_links.end(); child++)
|
||||
+ for (std::vector<std::shared_ptr<Link> >::const_iterator child = link->child_links.begin(); child != link->child_links.end(); child++)
|
||||
addChildLinkNamesXML(*child, os);
|
||||
}
|
||||
|
||||
-void addChildJointNamesXML(boost::shared_ptr<const Link> link, ofstream& os)
|
||||
+void addChildJointNamesXML(std::shared_ptr<const Link> link, ofstream& os)
|
||||
{
|
||||
double r, p, y;
|
||||
- for (std::vector<boost::shared_ptr<Link> >::const_iterator child = link->child_links.begin(); child != link->child_links.end(); child++){
|
||||
+ for (std::vector<std::shared_ptr<Link> >::const_iterator child = link->child_links.begin(); child != link->child_links.end(); child++){
|
||||
(*child)->parent_joint->parent_to_joint_origin_transform.rotation.getRPY(r,p,y);
|
||||
std::string jtype;
|
||||
if ( (*child)->parent_joint->type == urdf::Joint::UNKNOWN ) {
|
||||
@@ -443,7 +443,7 @@ void addChildJointNamesXML(boost::shared
|
||||
os << " <axis xyz=\"" << (*child)->parent_joint->axis.x << " ";
|
||||
os << (*child)->parent_joint->axis.y << " " << (*child)->parent_joint->axis.z << "\"/>" << endl;
|
||||
{
|
||||
- boost::shared_ptr<urdf::Joint> jt((*child)->parent_joint);
|
||||
+ std::shared_ptr<urdf::Joint> jt((*child)->parent_joint);
|
||||
|
||||
if ( !!jt->limits ) {
|
||||
os << " <limit ";
|
||||
@@ -501,7 +501,7 @@ void addChildJointNamesXML(boost::shared
|
||||
}
|
||||
}
|
||||
|
||||
-void printTreeXML(boost::shared_ptr<const Link> link, string name, string file)
|
||||
+void printTreeXML(std::shared_ptr<const Link> link, string name, string file)
|
||||
{
|
||||
std::ofstream os;
|
||||
os.open(file.c_str());
|
||||
@@ -667,7 +667,7 @@ int main(int argc, char** argv)
|
||||
}
|
||||
xml_file.close();
|
||||
|
||||
- boost::shared_ptr<ModelInterface> robot;
|
||||
+ std::shared_ptr<ModelInterface> robot;
|
||||
if( xml_string.find("<COLLADA") != std::string::npos )
|
||||
{
|
||||
ROS_DEBUG("Parsing robot collada xml string");
|
||||
@ -1,22 +0,0 @@
|
||||
commit ead421b85eeb750cbf7988657015296ed6789bcf
|
||||
Author: Hodorgasm <nsane457@gmail.com>
|
||||
Date: Mon Sep 19 20:27:51 2016 -0400
|
||||
|
||||
Fix "stdlib.h: No such file or directory" errors in GCC-6
|
||||
|
||||
Including '-isystem /usr/include' breaks building with GCC-6.
|
||||
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
|
||||
|
||||
diff --git a/image_geometry/CMakeLists.txt b/image_geometry/CMakeLists.txt
|
||||
index 3c9cb30..e7c9eea 100644
|
||||
--- a/image_geometry/CMakeLists.txt
|
||||
+++ b/image_geometry/CMakeLists.txt
|
||||
@@ -12,7 +12,7 @@ catkin_package(CATKIN_DEPENDS sensor_msgs
|
||||
|
||||
catkin_python_setup()
|
||||
|
||||
-include_directories(SYSTEM ${catkin_INCLUDE_DIRS}
|
||||
+include_directories(${catkin_INCLUDE_DIRS}
|
||||
${OpenCV_INCLUDE_DIRS}
|
||||
)
|
||||
include_directories(include)
|
||||
@ -1,24 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
media-libs/opencv:=
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
|
||||
PATCHES=("${FILESDIR}"/${PN}-1.12.0-gcc-6.patch)
|
||||
@ -1,24 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
media-libs/opencv:=
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
|
||||
PATCHES=("${FILESDIR}"/${PN}-1.12.0-gcc-6.patch)
|
||||
@ -1,23 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
media-libs/opencv:=
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
|
||||
@ -0,0 +1,23 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros/robot_model"
|
||||
KEYWORDS="~amd64"
|
||||
ROS_SUBDIR=${PN}
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="${DEPEND}
|
||||
dev-ros/rospy[${PYTHON_USEDEP}]
|
||||
dev-ros/python_qt_binding[${PYTHON_USEDEP}]
|
||||
dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
|
||||
"
|
||||
@ -1,10 +1,5 @@
|
||||
AUX urdfdom1.patch 1208 SHA256 1292fad94c037ac046279c93fa286e7c20df2494628f85795798f4feb2896af5 SHA512 83471a44de7d51a3d885c698417e42fb962404bf2c977753617977d59f80bb2c9f8bf1d5d477e1a36b2cb59c29f17a8b95e728c0c28884ff95adc408513eb3fd WHIRLPOOL 341d16976272cb083d4fe6176e795605af99b6e6c62881bb233dadd289b790dc6038d2095d8aa27266947a0fd8d720cdbc3eb719806d1172649baf99adda0ecc
|
||||
DIST robot_model-1.12.3.tar.gz 1292139 SHA256 4b2bf070e4d07450fd9977a62c260e8abb40645ff9fcf5f5781f505a8b61b194 SHA512 eae18db87bdd7fc867868493f54f1812358f1a301c88fc7eae611fa75bc2418165b5cb2f5c5839f3cb644d4c1f560f85d84b635ffbecaa631c78a3176d1fb6db WHIRLPOOL c555faee5282942db894866a08aa3a675c6db618fce2acdd1f67d622cf1c0a8e5747f5f9a5217b4fc83997f9bb9125f1c7f2ca6b77e9fd75244f121b48a77f66
|
||||
DIST robot_model-1.12.4.tar.gz 1293354 SHA256 e40bd4519fd4010bcde0cb179611a19c04c3a32073830a675090671b4cea0ee5 SHA512 f78bfd9a72d795e301836a7946d87250f4c8be2082593f7a0fb282831152bc8125885f30408ff99823c4dd1d606060b71695c1cc3097dee8870efe0fe862ab0d WHIRLPOOL cff984eec217cd4615f1bf316eaa255f0d7f2c531fede6d4764edd57a11277980b0aad87bee4af7e89b2fc56394c7d457a0bb50b103b22afc4f5f449824293e9
|
||||
DIST robot_model-1.12.5.tar.gz 1294607 SHA256 c0784cebf4b5ef38c9bf7a0f6e66f5350aa7e12460d46e2e8c4c9420b40217cc SHA512 4e1952bf9218a1ee1c09c1ff3ad607a9546675874f2d97052a1015fa1c221829e42d95c735dd136e5406fdccdbf969d55a43b318db1fed206c86c2c7a5c5ab86 WHIRLPOOL 38f0150bc4b991c7fef829e0c02c015e603d6162a3986a28433adc1d496d9098efc97f0da15cae32b8316d8677b5e156c64e36304af82f8a94a3b231a027e59c
|
||||
EBUILD kdl_parser-1.12.3-r1.ebuild 697 SHA256 18605ba2bea0d9bc63c9877464ddd8164eb47716300843348ce6b755756abaf1 SHA512 ccb7bf9d48f84ba89f1d8af009752766cb38fc8d57b9b55d338ed6e8225c548561dd89a437a3e307a2dfa6dd72d5169c40df7193d33720b7873c57d60ce60edf WHIRLPOOL c3ecf2df20fd422d934cce98da7c0d88b108b8384da3ad40c1f6612eee1ae50620ac10d4d47f3ada561d7deeb3d8fbcdd01b2f98409edfc796ab4cee4a3050ec
|
||||
EBUILD kdl_parser-1.12.4.ebuild 697 SHA256 18605ba2bea0d9bc63c9877464ddd8164eb47716300843348ce6b755756abaf1 SHA512 ccb7bf9d48f84ba89f1d8af009752766cb38fc8d57b9b55d338ed6e8225c548561dd89a437a3e307a2dfa6dd72d5169c40df7193d33720b7873c57d60ce60edf WHIRLPOOL c3ecf2df20fd422d934cce98da7c0d88b108b8384da3ad40c1f6612eee1ae50620ac10d4d47f3ada561d7deeb3d8fbcdd01b2f98409edfc796ab4cee4a3050ec
|
||||
EBUILD kdl_parser-1.12.5.ebuild 697 SHA256 18605ba2bea0d9bc63c9877464ddd8164eb47716300843348ce6b755756abaf1 SHA512 ccb7bf9d48f84ba89f1d8af009752766cb38fc8d57b9b55d338ed6e8225c548561dd89a437a3e307a2dfa6dd72d5169c40df7193d33720b7873c57d60ce60edf WHIRLPOOL c3ecf2df20fd422d934cce98da7c0d88b108b8384da3ad40c1f6612eee1ae50620ac10d4d47f3ada561d7deeb3d8fbcdd01b2f98409edfc796ab4cee4a3050ec
|
||||
DIST robot_model-1.12.6.tar.gz 1295666 SHA256 ac335cec5a3706a104411222a2f89ef1862c0ac8caa5ddadd390e9c25641bf27 SHA512 60270b3ec20c0473e9c8d02d661794e253405c836b06cf5c15b65dddf104bfb5e4865463e12232e94548d68eead2b5499eb04c71aee3f851fa9f85dbe733ee12 WHIRLPOOL 6cec339181a6570fbe4e61415d341f5f7404ea69d8d2a4058d5c837fa15f74c7c95a4ee3f74a78fcca624d272995f09aae4ad3a6027178b2c25daa466754adc4
|
||||
EBUILD kdl_parser-1.12.6.ebuild 554 SHA256 10065e956ed7bfd7992f4d0464728413cd2060ae69d4230a7f684c53396a15cd SHA512 2b043b1fba3e11fe6fdc08eb03aa62fbf4f0166e77ac345004779d61f7ebcc0db6ae6f55c174ec0a25f5a86cb83ab2b16ec4799bb2a6520271abb67b192fc8d7 WHIRLPOOL 5b115029589a7788a1c5fad86921a208cca876d69ede1548cda8757110d62cdcac2993a5b15dfd3a534dd42959f7e776d30553dce9730669d49a6e1f6fed91f7
|
||||
EBUILD kdl_parser-9999.ebuild 554 SHA256 8e9d73a381abe14e58a78423c6d6340aaf43980bb3422cbda0c314fa6a6289f8 SHA512 6d3bface0e24b9c2908086c837ee8023d5bd32f2c638301b1a1a5856c75f784777af4982ccc5d3d1102cd1a7479a4f90b9951a1661b9adb05094627d132efa9d WHIRLPOOL 686e1c4fb922d736455e9dc9823124189df3e9bddb20464b84679e6da15b916de210009d0b938f3663657cc5c0123629964702677373d5f8d80f5f928e3d050f
|
||||
MISC ChangeLog 3603 SHA256 eda1cc7c6bbc8b6ab641b9f3a6979dc0a8a92b02a540fbc22916af6e54d3818d SHA512 2d868ab569cfa65cd0e2b452250808c708e105c2f22cbd6a6e551cad621174b367003485722c8d6116d7da4032409868da26f9ab13d4664efe00c92987518f8b WHIRLPOOL 8a2030b6549c6ab7cfb0e4b7fdd3ba8540082c076f329e0052b44bec146a2ccd98585b066a9e32c2270a931e8507f9b35776edf3e06fb9b694a9e3389a772729
|
||||
MISC metadata.xml 329 SHA256 cbddc06c1e002968d8c8a9586accaf9b777dcc72bafda910d59e5909fbf55454 SHA512 901cb37bff7bfd07cd7b6ec49833301caea33cf9696e3a644a1b128d4371b31eee2f3afdab937d39b6da925bab51604a8bb6ea370407d0170133655e9222d988 WHIRLPOOL 9b7f562542be16c41cb79a5b218a66882bd1be2c42d0cbed2884fdf967eb00025593ba0aa34fef5b5773fa1971701a28274500ebe0bf2c6ed61d4da00096e66a
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
Index: kdl_parser/src/kdl_parser.cpp
|
||||
===================================================================
|
||||
--- kdl_parser.orig/src/kdl_parser.cpp
|
||||
+++ kdl_parser/src/kdl_parser.cpp
|
||||
@@ -64,7 +64,7 @@ Frame toKdl(urdf::Pose p)
|
||||
}
|
||||
|
||||
// construct joint
|
||||
-Joint toKdl(boost::shared_ptr<urdf::Joint> jnt)
|
||||
+Joint toKdl(std::shared_ptr<urdf::Joint> jnt)
|
||||
{
|
||||
Frame F_parent_jnt = toKdl(jnt->parent_to_joint_origin_transform);
|
||||
|
||||
@@ -93,7 +93,7 @@ Joint toKdl(boost::shared_ptr<urdf::Join
|
||||
}
|
||||
|
||||
// construct inertia
|
||||
-RigidBodyInertia toKdl(boost::shared_ptr<urdf::Inertial> i)
|
||||
+RigidBodyInertia toKdl(std::shared_ptr<urdf::Inertial> i)
|
||||
{
|
||||
Frame origin = toKdl(i->origin);
|
||||
|
||||
@@ -124,9 +124,9 @@ RigidBodyInertia toKdl(boost::shared_ptr
|
||||
|
||||
|
||||
// recursive function to walk through tree
|
||||
-bool addChildrenToTree(boost::shared_ptr<const urdf::Link> root, Tree& tree)
|
||||
+bool addChildrenToTree(std::shared_ptr<const urdf::Link> root, Tree& tree)
|
||||
{
|
||||
- std::vector<boost::shared_ptr<urdf::Link> > children = root->child_links;
|
||||
+ std::vector<std::shared_ptr<urdf::Link> > children = root->child_links;
|
||||
ROS_DEBUG("Link %s had %i children", root->name.c_str(), (int)children.size());
|
||||
|
||||
// constructs the optional inertia
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros/robot_model"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
ROS_SUBDIR=${PN}
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit ros-catkin flag-o-matic
|
||||
|
||||
DESCRIPTION="Constructs a KDL tree from an XML robot representation in URDF"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/boost:=
|
||||
dev-ros/roscpp
|
||||
dev-ros/rosconsole
|
||||
>=dev-ros/urdf-1.12.3-r1
|
||||
sci-libs/orocos_kdl
|
||||
dev-libs/tinyxml
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
|
||||
PATCHES=( "${FILESDIR}/urdfdom1.patch" )
|
||||
|
||||
src_configure() {
|
||||
append-cxxflags -std=gnu++11
|
||||
ros-catkin_src_configure
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros/robot_model"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
ROS_SUBDIR=${PN}
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit ros-catkin flag-o-matic
|
||||
|
||||
DESCRIPTION="Constructs a KDL tree from an XML robot representation in URDF"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/boost:=
|
||||
dev-ros/roscpp
|
||||
dev-ros/rosconsole
|
||||
>=dev-ros/urdf-1.12.3-r1
|
||||
sci-libs/orocos_kdl
|
||||
dev-libs/tinyxml
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
|
||||
PATCHES=( "${FILESDIR}/urdfdom1.patch" )
|
||||
|
||||
src_configure() {
|
||||
append-cxxflags -std=gnu++11
|
||||
ros-catkin_src_configure
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros/robot_model"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
ROS_SUBDIR=${PN}
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Python tools to construct a KDL tree from an XML robot representation in URDF"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/urdf[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
|
||||
@ -1,8 +1,5 @@
|
||||
AUX urdfdom1.patch 2052 SHA256 a9aa9e5d689aaa437e20e1403e8f180ce9058f3804cc9330f792732db7bf4ca4 SHA512 bbddb30bcd2df2f5390770b2c13559c41fd743f08f2bab2941e850a4427498d9d273f1eee861c3fbd88f4e17f53b440f04d1396a572a2a50a1abd95c7f6b7de2 WHIRLPOOL 489881c408dbedfa9d7fb1e3b93459dba19153d1eefd612b966472521d570b0cfe1de1a9998b0b46e368d1040d56928946d3d03ad1cb11dd7910de1c4fb3fdb3
|
||||
DIST robot_state_publisher-1.13.2.tar.gz 24774 SHA256 b4bc99d4ba01ca59dffd81aac99d3420a1035f960fdf5eac17d1aa96790ce28d SHA512 0b9f3f01f015b37cb6e1636271441d0e5dc60e7bd16c4ac897c3c3dbdb9fe589453bc66b1610d8b13ba006a68e1c223cf102a8e6a8ae55a57757b2924c2dafbe WHIRLPOOL 733b3ad512e7fa9b8be0f2eb373cfd1a691170ea97bb19b4ec14a7485313e2e7463a6bedeffa4c4fbc5a4833ea4a264f6d9e29cb36ac1eaa4a92fbfa399432d1
|
||||
DIST robot_state_publisher-1.13.3.tar.gz 24973 SHA256 384b8fd0990ce9f9c2ceae8b4793ed0f24a32df60b88c2ffaecf78813242cc94 SHA512 622325c37eb35e141c1113f8dc23eb873a72433ca64ff58ebc793c39bdb704ecaeab54a3484aa973251ec5de4e43cd078fdb1fa3becbb18788910be8f16abe94 WHIRLPOOL aa3fc25f1247ac49c2dcd0115aa02c7f8ecfc1f994d637bd1f6721f804214d81b7974dd72dac1803a60c9214c495741876f07bc486a1631e90188323c3274ece
|
||||
EBUILD robot_state_publisher-1.13.2-r1.ebuild 765 SHA256 ce3c223d25228dde0f08989b871c516439451e8c881fb6ddc5998e4aed3aad6b SHA512 a35f305c1c3b90f28279787fcf6e163e621519ca3bf5d98151b600adf8727c97ba8980f11ae31f1fafece6650123cd5e0a8d2e321b550428000d91344afe1f30 WHIRLPOOL 0c860cc565700b3e90287c9879313bf56d7f8dd090637dd336c3c8446cce8dd747d5dda08ba0da23b95e1c09d3e87722eda40f4151a39ffb114a50bf6fdc0356
|
||||
EBUILD robot_state_publisher-1.13.3.ebuild 765 SHA256 ce3c223d25228dde0f08989b871c516439451e8c881fb6ddc5998e4aed3aad6b SHA512 a35f305c1c3b90f28279787fcf6e163e621519ca3bf5d98151b600adf8727c97ba8980f11ae31f1fafece6650123cd5e0a8d2e321b550428000d91344afe1f30 WHIRLPOOL 0c860cc565700b3e90287c9879313bf56d7f8dd090637dd336c3c8446cce8dd747d5dda08ba0da23b95e1c09d3e87722eda40f4151a39ffb114a50bf6fdc0356
|
||||
DIST robot_state_publisher-1.13.4.tar.gz 25267 SHA256 d84b0457a085f23a76b7eb103df5196a70d34623a844e7f380a0301d7f850e27 SHA512 e4ee41bb3e9b01883d2767cc899cf4798b94d975dd6d06494dc6c34344423ee73d5ed524b612b2ea8144ed905a6a44d8dc87f7c554c2ecd720615bb78eef2bcf WHIRLPOOL fea22422a952c1d130432eb3f64c67b03c540fab0bdfdf8fd5060a92bc57ff4f1a36a87409bfc98edc6a1f0b9aa173b7c5389b995dcee6a3e3038906961c5483
|
||||
EBUILD robot_state_publisher-1.13.4.ebuild 635 SHA256 bcc9aeec257cca24024f00212fdf4a63c5f35907c5c5fb10bea796c6f69bd8aa SHA512 0908f8592754a12667bb7bce75617d5db8335d0b4321981676524bb9a3541f4996c4d093a526fbc8fb43f580be1ed8012b642643f9c185ad9052392b64f7bee6 WHIRLPOOL 7f4e7b60331a955ec666f4ba4e798fa801ab1e335e433f969aa191fe2c5be8337409e53a7cb848e8efe2b823c4b42b7757691e08144e77e234ded621077b143a
|
||||
EBUILD robot_state_publisher-9999.ebuild 635 SHA256 81dabc967c0442af631b940bfe5509936e666504ae3bf618b53de8ea467a25af SHA512 d820db2789da7cd0e7f6ea556a81a4404e48c50aa75de9d58afc2fa384d87fd4341e87b67b7eed446a5e34b3d0234f69d7d0735a3a821efdeac52216c1b2fd84 WHIRLPOOL 1eef8a4ad713a83dc574643466926fea8c90f608f650d1ba5a893ab32a26254e1dfa01640abf4e9be3d22218c155ee3cee434b63d1d6cb41873d60739e2c1a74
|
||||
MISC ChangeLog 3614 SHA256 fc3818b8cc27b18466397cea0ef5f5f5ae70312a65b535159e9b6193b750ed96 SHA512 633608ba814bd3522ae62e415d9e52bdae53dd2f44318328b3d4f72289256bff040ac25cc0f8cb8ffcbe1d608ade98aa7fd08c91b01f56fcaaf9f788d2a88030 WHIRLPOOL 76858b5b433440b82cf5ca51cb09cfeb8cff7a33cfa517dfda0998cef2d78f38c45ee908fa353d191dd23bf6f87f842ecbb4f41ae6aaebf257a818dddd055ba4
|
||||
MISC metadata.xml 339 SHA256 c59d8ea6c8fd3f30802c6b85a53cf3eec961b404854959ac95c1a30aca0c0f94 SHA512 c6c382ed3b649d5e464df1c13fb5f6798f4005fc34cb5f8b5c5062fa5885bc2a2ef6c543bc85a734e0f9ebd90adad0177de84c801dafee9e4cffe51e052a86f7 WHIRLPOOL 642af78e5783802ebf1d8241a0be3f32c568e652fe2e0754c6c42bc290f85791824daeeb12fbc7485871d7f817b5e8420354e284ef166470a5f4a22f782db7b9
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
Index: robot_state_publisher-1.13.2/include/robot_state_publisher/joint_state_listener.h
|
||||
===================================================================
|
||||
--- robot_state_publisher-1.13.2.orig/include/robot_state_publisher/joint_state_listener.h
|
||||
+++ robot_state_publisher-1.13.2/include/robot_state_publisher/joint_state_listener.h
|
||||
@@ -48,7 +48,7 @@ using namespace ros;
|
||||
using namespace KDL;
|
||||
|
||||
typedef boost::shared_ptr<sensor_msgs::JointState const> JointStateConstPtr;
|
||||
-typedef std::map<std::string, boost::shared_ptr<urdf::JointMimic> > MimicMap;
|
||||
+typedef std::map<std::string, std::shared_ptr<urdf::JointMimic> > MimicMap;
|
||||
|
||||
namespace robot_state_publisher{
|
||||
|
||||
Index: robot_state_publisher-1.13.2/src/joint_state_listener.cpp
|
||||
===================================================================
|
||||
--- robot_state_publisher-1.13.2.orig/src/joint_state_listener.cpp
|
||||
+++ robot_state_publisher-1.13.2/src/joint_state_listener.cpp
|
||||
@@ -161,7 +161,7 @@ int main(int argc, char** argv)
|
||||
|
||||
MimicMap mimic;
|
||||
|
||||
- for(std::map< std::string, boost::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){
|
||||
+ for(std::map< std::string, std::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){
|
||||
if(i->second->mimic){
|
||||
mimic.insert(make_pair(i->first, i->second->mimic));
|
||||
}
|
||||
Index: robot_state_publisher-1.13.2/test/test_subclass.cpp
|
||||
===================================================================
|
||||
--- robot_state_publisher-1.13.2.orig/test/test_subclass.cpp
|
||||
+++ robot_state_publisher-1.13.2/test/test_subclass.cpp
|
||||
@@ -82,7 +82,7 @@ TEST(TestRobotStatePubSubclass, robot_st
|
||||
|
||||
MimicMap mimic;
|
||||
|
||||
- for(std::map< std::string, boost::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){
|
||||
+ for(std::map< std::string, std::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){
|
||||
if(i->second->mimic){
|
||||
mimic.insert(make_pair(i->first, i->second->mimic));
|
||||
}
|
||||
@ -1,39 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros/robot_state_publisher"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Package for publishing the state of a robot to tf"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/kdl_parser
|
||||
dev-cpp/eigen:3
|
||||
sci-libs/orocos_kdl
|
||||
dev-ros/roscpp
|
||||
dev-ros/rosconsole
|
||||
dev-ros/rostime
|
||||
dev-ros/tf2_ros
|
||||
dev-ros/tf2_kdl
|
||||
dev-ros/kdl_conversions
|
||||
dev-ros/sensor_msgs
|
||||
dev-ros/tf
|
||||
>=dev-ros/urdf-1.12.3-r1
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-ros/rostest[${PYTHON_USEDEP}]
|
||||
"
|
||||
PATCHES=( "${FILESDIR}/urdfdom1.patch" )
|
||||
|
||||
src_configure() {
|
||||
append-cxxflags -std=gnu++11
|
||||
ros-catkin_src_configure
|
||||
}
|
||||
@ -1,11 +1,5 @@
|
||||
AUX ns.patch 729 SHA256 093d633bce31ce337f85b453d13d66e99697a445db35dfe7142ecada350e4f9b SHA512 f140c029b3a3602c6feda337dec3a32c6459df08517e637dfaebc6aa8e549cdb1977aae70cb44234191449ccf089d581f5689ec54684d5eb012b235307e1812e WHIRLPOOL 3adb74189d57fecf643ddbe6f47f91b6559b58df0ccb54eb43cd2712dba998d820248361e6da54ebb7e42e404a43ee7f759596b6f17a92663d28434e7aa8ee18
|
||||
AUX urdfdom1.patch 433 SHA256 d86a0e49d995b3f8a9c6d29e57087cadf0e90cc16e4782cfd48a822f8ac78919 SHA512 ddb5852c63845fb1ad564be08bf270f5392ce285af0973626e8ad6bc68a57879955cacf03cae660053afcd99032ec6b9358c08c4e0b407ac4d9dfb1a857966ed WHIRLPOOL 1ff5de897000be4b48a151767812fbd0f15969b09025bdcb82ce30db57a60005bce8d00c3eb72aca1a8480b2711ec3e916277812be6c012cbe57bd67cead9f57
|
||||
DIST robot_model-1.12.3.tar.gz 1292139 SHA256 4b2bf070e4d07450fd9977a62c260e8abb40645ff9fcf5f5781f505a8b61b194 SHA512 eae18db87bdd7fc867868493f54f1812358f1a301c88fc7eae611fa75bc2418165b5cb2f5c5839f3cb644d4c1f560f85d84b635ffbecaa631c78a3176d1fb6db WHIRLPOOL c555faee5282942db894866a08aa3a675c6db618fce2acdd1f67d622cf1c0a8e5747f5f9a5217b4fc83997f9bb9125f1c7f2ca6b77e9fd75244f121b48a77f66
|
||||
DIST robot_model-1.12.4.tar.gz 1293354 SHA256 e40bd4519fd4010bcde0cb179611a19c04c3a32073830a675090671b4cea0ee5 SHA512 f78bfd9a72d795e301836a7946d87250f4c8be2082593f7a0fb282831152bc8125885f30408ff99823c4dd1d606060b71695c1cc3097dee8870efe0fe862ab0d WHIRLPOOL cff984eec217cd4615f1bf316eaa255f0d7f2c531fede6d4764edd57a11277980b0aad87bee4af7e89b2fc56394c7d457a0bb50b103b22afc4f5f449824293e9
|
||||
DIST robot_model-1.12.5.tar.gz 1294607 SHA256 c0784cebf4b5ef38c9bf7a0f6e66f5350aa7e12460d46e2e8c4c9420b40217cc SHA512 4e1952bf9218a1ee1c09c1ff3ad607a9546675874f2d97052a1015fa1c221829e42d95c735dd136e5406fdccdbf969d55a43b318db1fed206c86c2c7a5c5ab86 WHIRLPOOL 38f0150bc4b991c7fef829e0c02c015e603d6162a3986a28433adc1d496d9098efc97f0da15cae32b8316d8677b5e156c64e36304af82f8a94a3b231a027e59c
|
||||
EBUILD urdf-1.12.3-r1.ebuild 804 SHA256 78b08710c72c6177402cc3cc2c69ed3470028cf969eed646894176bad491cabf SHA512 dc1eec44794f683c766475a14087caaeb6909c360c8c32d0cb2d2b91298cafdb372304de435fd60d90415f852dbfd9b56599175b958747ae96f2259268a5becb WHIRLPOOL 3a0aa8855b90c3a3f01f14cdae4244be5b18c37b33a6cd442c3645faecd9f63f79203a1f4273fec0f0b4a4f8382ca42289b6dc31b946b5e9e6ed76249ed21cad
|
||||
EBUILD urdf-1.12.4.ebuild 804 SHA256 78b08710c72c6177402cc3cc2c69ed3470028cf969eed646894176bad491cabf SHA512 dc1eec44794f683c766475a14087caaeb6909c360c8c32d0cb2d2b91298cafdb372304de435fd60d90415f852dbfd9b56599175b958747ae96f2259268a5becb WHIRLPOOL 3a0aa8855b90c3a3f01f14cdae4244be5b18c37b33a6cd442c3645faecd9f63f79203a1f4273fec0f0b4a4f8382ca42289b6dc31b946b5e9e6ed76249ed21cad
|
||||
EBUILD urdf-1.12.5.ebuild 827 SHA256 23cea64ca46e70379f804bf41c70c5678dd9ee78105110cada033abd67fde801 SHA512 22cf0a03e02e5dacf5086d9c7996ebc97359f635361a3ce8c462775966f9e3bc1b96c349e478ce5cc0b4d0181755a903635c3368bfdaaf209fd81e57dae3b502 WHIRLPOOL 6d575841b4d1761f8c7ff2bff8a09b78978c78eeb1bec19ff064aad36b8d3386a6e7ed0e4b3b2fc72d2b181b9bbc38f016b237957326cdb4207a3fb8bf9ffab8
|
||||
DIST robot_model-1.12.6.tar.gz 1295666 SHA256 ac335cec5a3706a104411222a2f89ef1862c0ac8caa5ddadd390e9c25641bf27 SHA512 60270b3ec20c0473e9c8d02d661794e253405c836b06cf5c15b65dddf104bfb5e4865463e12232e94548d68eead2b5499eb04c71aee3f851fa9f85dbe733ee12 WHIRLPOOL 6cec339181a6570fbe4e61415d341f5f7404ea69d8d2a4058d5c837fa15f74c7c95a4ee3f74a78fcca624d272995f09aae4ad3a6027178b2c25daa466754adc4
|
||||
EBUILD urdf-1.12.6.ebuild 659 SHA256 201324397303515be8d3ac6976095587d33f4d04653611608fa6b16c05a00556 SHA512 688fa4a1d7d7d826ac7c7a0832aeb66eab12d4a5b4195489327876f5457110c01bf55250e5df98398aed35ee9350adac77a0b537fe19802a71e8ee4689a73f7b WHIRLPOOL f6f59e991e01a77cb9f6978b5fdfb0878ce6e02f52035f0590e3370076d55be90f3d3055334def8bf056cc8d149c94e49bb3f1af7697d2508c59eee77b265105
|
||||
EBUILD urdf-9999.ebuild 659 SHA256 7d1d1a18e0d6c0e9f2caad2f848455a3eea579e9d51a23868eb47c4db1bc6652 SHA512 1e01a258d9b4ed04f51502a0f0858a32bf67ea76ea049e99c2f32132403cb65beecb65cda8f65db17971f83c5057d3d6207919ce58284a5e345b42a8495afc0e WHIRLPOOL 414900f14eb44cd2febe4c891d8441aed04aeb16ee6f1042705fbdb29645eafb03f7249fe4b7d18df3e620e135397f22fc31b6e1f302e4a254e555ab0cfa8db7
|
||||
MISC ChangeLog 3453 SHA256 6d1d814f98a25bd93336f909912dd8f32a29a781b9acda1370aa861318269bb6 SHA512 a39bab0c47ef55c46d5f78c9589cc9675569eb45a2d8c28b93e2822acf2aba4e80bc9be0419ac6f8698dbd5c50140a767789f97405e25cf1bee063c1ffdfff14 WHIRLPOOL 4fce2c2e331eb2106cf99b671839b0350732a4d3dce75e0fc47113404fb4787d90ef6ac7be4a51f6f16da2ad7d67ef44810b0daa8815b7b030b236e801169b32
|
||||
MISC metadata.xml 329 SHA256 cbddc06c1e002968d8c8a9586accaf9b777dcc72bafda910d59e5909fbf55454 SHA512 901cb37bff7bfd07cd7b6ec49833301caea33cf9696e3a644a1b128d4371b31eee2f3afdab937d39b6da925bab51604a8bb6ea370407d0170133655e9222d988 WHIRLPOOL 9b7f562542be16c41cb79a5b218a66882bd1be2c42d0cbed2884fdf967eb00025593ba0aa34fef5b5773fa1971701a28274500ebe0bf2c6ed61d4da00096e66a
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
Index: urdf/urdfdom_compatibility.h.in
|
||||
===================================================================
|
||||
--- urdf.orig/urdfdom_compatibility.h.in
|
||||
+++ urdf/urdfdom_compatibility.h.in
|
||||
@@ -75,9 +75,9 @@ URDF_TYPEDEF_CLASS_POINTER(ModelInterfac
|
||||
|
||||
#else // urdfdom <= 0.4
|
||||
|
||||
-typedef std::shared_ptr<ModelInterface> ModelInterfaceSharedPtr;
|
||||
-typedef std::shared_ptr<const ModelInterface> ModelInterfaceConstSharedPtr;
|
||||
-typedef std::weak_ptr<ModelInterface> ModelInterfaceWeakPtr;
|
||||
+typedef std::shared_ptr<urdf::ModelInterface> ModelInterfaceSharedPtr;
|
||||
+typedef std::shared_ptr<const urdf::ModelInterface> ModelInterfaceConstSharedPtr;
|
||||
+typedef std::weak_ptr<urdf::ModelInterface> ModelInterfaceWeakPtr;
|
||||
|
||||
#endif // urdfdom > 0.4
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
Index: urdf/src/model.cpp
|
||||
===================================================================
|
||||
--- urdf.orig/src/model.cpp
|
||||
+++ urdf/src/model.cpp
|
||||
@@ -136,7 +136,7 @@ bool Model::initXml(TiXmlElement *robot_
|
||||
|
||||
bool Model::initString(const std::string& xml_string)
|
||||
{
|
||||
- boost::shared_ptr<ModelInterface> model;
|
||||
+ std::shared_ptr<ModelInterface> model;
|
||||
|
||||
// necessary for COLLADA compatibility
|
||||
if( IsColladaData(xml_string) ) {
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros/robot_model"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
ROS_SUBDIR=${PN}
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit ros-catkin flag-o-matic
|
||||
|
||||
DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/boost:=[threads]
|
||||
>=dev-libs/urdfdom-1
|
||||
dev-libs/urdfdom_headers
|
||||
>=dev-ros/urdf_parser_plugin-1.12.3-r1
|
||||
dev-ros/pluginlib
|
||||
dev-ros/rosconsole_bridge
|
||||
dev-ros/roscpp
|
||||
dev-libs/tinyxml
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-ros/cmake_modules
|
||||
test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
|
||||
PATCHES=( "${FILESDIR}/urdfdom1.patch" )
|
||||
|
||||
src_configure() {
|
||||
append-cxxflags -std=c++11
|
||||
ros-catkin_src_configure
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros/robot_model"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
ROS_SUBDIR=${PN}
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit ros-catkin flag-o-matic
|
||||
|
||||
DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/boost:=[threads]
|
||||
>=dev-libs/urdfdom-1
|
||||
dev-libs/urdfdom_headers
|
||||
>=dev-ros/urdf_parser_plugin-1.12.3-r1
|
||||
dev-ros/pluginlib
|
||||
dev-ros/rosconsole_bridge
|
||||
dev-ros/roscpp
|
||||
dev-libs/tinyxml
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-ros/cmake_modules
|
||||
test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
|
||||
PATCHES=( "${FILESDIR}/urdfdom1.patch" "${FILESDIR}/ns.patch" )
|
||||
|
||||
src_configure() {
|
||||
append-cxxflags -std=c++11
|
||||
ros-catkin_src_configure
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros/robot_model"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
ROS_SUBDIR=${PN}
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="C++ base class for URDF parsers"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-libs/urdfdom_headers"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,7 +1,9 @@
|
||||
AUX ark-16.12.0-disable-executables.patch 913 SHA256 a333dae4f3ed9092941efd4ca8821fdca4db1c7246c3b9fc863e2358ff3cdf60 SHA512 08180646eb27d8f13d7e5109f2b589b5430a5f4d90efdfd40d901bf74bebff437a7267c8691286593986031da0c55c704f08a85a284a0694f58767bb1100160b WHIRLPOOL c7d784edee9c51e6bd23ffcd724e91b10e7de4647a745c6edd43090c34cca82a622c3c8e010b0f8cce8f593445bb24835f82253863e629256f32e6f66c4a99bc
|
||||
DIST ark-16.08.3.tar.xz 1293460 SHA256 c713f6afe0784229796e14ef6e67a1afb5f276a97651bd2a973eff22f8932c08 SHA512 80cecfce8ff417c68f3d0a4e0bf2467d7345fc9d90c4f8b93bb66b09624ea40283aa6f84bd75843d9fe92b6fdbb018117feec5835fa87aca0f21b3e8a02b8abd WHIRLPOOL 9f80598d2a087fc16b023bdf55210114513b0f7c2a446b96f158533a9ca73f2c335fa20d2ada5d6569a860cc6b1625476b5016df5fa9622d4d9395d36f79f0a2
|
||||
DIST ark-16.12.0.tar.xz 1348304 SHA256 2a149b63478edd260fb03b53b667d66424511b93b770ecf7a3b32a85c325e83d SHA512 cdbd49743c6d5700aca6ab4de867177d84dd332b005d6e658a98d394b39eebc6ddfc714bf1486fa2bb326c8914cb4a3a17086e42bb89320a7ae8079c93cef86b WHIRLPOOL 28a96ff8e8064a088b29f22809fc3130318b747d66f2778ff5b583f5acd047fcec2b59d1954a8a9aa0b3fb1591070ce35a692aee9eac5ecfdd027ff648913ef9
|
||||
EBUILD ark-16.08.3-r1.ebuild 1677 SHA256 28b9f703e384dcee94d8d3c469ff4d1579fad5c1ecfe939298a7d0cd5c590f1d SHA512 4267c67afaf89b3c754157f44b599e1d276e452dd5e808376e86b85f4e9c4ba74230696cf663b4bb9992e963ac1e8c739c47ef7f50d4c5bd9a911e5d552dd27a WHIRLPOOL 25f2153994169df292dbec7fda214f71d58fac1277ff30124608f92203dfb26dc7122d8b172e11d6eba9e1166e52a20c780106f5f2b6ddce259046e700f39391
|
||||
EBUILD ark-16.08.3.ebuild 1608 SHA256 66b76633c3dbbb8e1dd0bfb76bd523bc2a6cc611a1dd634072e060fffb7f17e7 SHA512 5a71f0c597f270c99c0f18f9ea743ecb7ab1165a1d2079ede938a1c5e877d99a9252c01513fcc6a8e46206ff1314d1f88ce26f287e0113abed85864126125f16 WHIRLPOOL 6e1cbd5163aa2c1115d4c37f0f0540e7ab39659c8ac720c9f25ceb13e2d2e74f111d5c027b7d7520cdb351ccd4e9725a96033287a0da03abf3c737c3f4783c33
|
||||
EBUILD ark-16.12.0.ebuild 1612 SHA256 7026670b2eabbeeae80d9197c55967de9b36409a4a5bf77513afdb57ec00f689 SHA512 203e2cf1e801c6fe17c54dc286cb3ae9ac3a7865cb18be8085d0448617267bcc16d5c72fc88d2e73cabae2b1c2dd235fdd4fe6ae5807dff01fb9384a95915724 WHIRLPOOL ee75657646c711650342049c01e7d0c7cd3f1a4b73a26fc9b9b057a74b0506409a271e469ba5ab5be8f26061c60fdd5f3489245e046347cb166cd02ace92b9cc
|
||||
EBUILD ark-16.12.0-r1.ebuild 1670 SHA256 df42c1424e424fd0b1cf38e1e53de0db8941e1adeaf7c3b1d19f8ac2dcdfa667 SHA512 f5af7f8ed6fd0a4f7b8fc9a389a3051aaa57998f66e34b8ab8bf2e5e95cec49ffccf47dc73a3af47ee7299a6f59d75e7b3240dc4e2bff633d2a766a187e1a482 WHIRLPOOL 8e26e19346f0fe29e6c90fd8812236bfa5e44cc2fd51bfc3fea5a135c56879cfcb3bbdeb180e90ddfac0a81c263fc1782062880f23f28bfa4f8b085f284fa98e
|
||||
MISC ChangeLog 7982 SHA256 a5677612342997775dbca6a305f59a938c5dd5fee710d66f9bd5e5549dbf171a SHA512 9a4e8d19632683d7be21a326e46c39a48ae916c06ea02fb31e13161782b63658e62912f8bb30660878157cd53cf052c86ff9c0e0dc35d3844e8ac9a7b715fd35 WHIRLPOOL 66ae2d3b56b3404c660003698d9ccc4aec80d27c337d7197fd4aab3e2073a3d004fefd357557322737f49f65a470a6489a33c665cf07a29c77364b95ec0fccfb
|
||||
MISC ChangeLog-2015 39909 SHA256 c8584c3f0048f12c835f18f543a2ff849a6bf732f8411e8876505d5fa846f47f SHA512 a7ef7432e357ff25defaa5c0e22973fc6dcda626a1ff7f1e78f69a56b4535b063ac26fd3623694b390684eb1b8ba79f6e6cc83007841e3832a090a89e87beae6 WHIRLPOOL 88c1cd2603a119624e3ba4212f1dfa89988b1942eb122fa67b3976c3060e2bbfa1a673d67b977d583ccc0830b008fb18c518c2e8c4220a2aa6d075748152ba17
|
||||
MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
|
||||
|
||||
@ -0,0 +1,70 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
KDE_HANDBOOK="forceoptional"
|
||||
KDE_TEST="optional"
|
||||
VIRTUALX_REQUIRED="test"
|
||||
inherit kde5
|
||||
|
||||
DESCRIPTION="KDE Archiving tool"
|
||||
HOMEPAGE="https://www.kde.org/applications/utilities/ark
|
||||
https://utils.kde.org/projects/ark"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="bzip2 lzma zlib"
|
||||
|
||||
RDEPEND="
|
||||
$(add_frameworks_dep karchive)
|
||||
$(add_frameworks_dep kcompletion)
|
||||
$(add_frameworks_dep kconfig)
|
||||
$(add_frameworks_dep kconfigwidgets)
|
||||
$(add_frameworks_dep kcoreaddons)
|
||||
$(add_frameworks_dep kcrash)
|
||||
$(add_frameworks_dep kdbusaddons)
|
||||
$(add_frameworks_dep ki18n)
|
||||
$(add_frameworks_dep kiconthemes)
|
||||
$(add_frameworks_dep kio)
|
||||
$(add_frameworks_dep kjobwidgets)
|
||||
$(add_frameworks_dep kparts)
|
||||
$(add_frameworks_dep kpty)
|
||||
$(add_frameworks_dep kservice)
|
||||
$(add_frameworks_dep kwidgetsaddons)
|
||||
$(add_frameworks_dep kxmlgui)
|
||||
$(add_qt_dep qtdbus)
|
||||
$(add_qt_dep qtgui)
|
||||
$(add_qt_dep qtwidgets)
|
||||
>=app-arch/libarchive-3.1.0[bzip2?,lzma?,zlib?]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
$(add_qt_dep qtconcurrent)
|
||||
sys-devel/gettext
|
||||
"
|
||||
|
||||
# bug #560548, last checked with 16.04.1
|
||||
RESTRICT="test"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-16.12.0-disable-executables.patch" )
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_find_package bzip2 BZip2)
|
||||
$(cmake-utils_use_find_package lzma LibLZMA)
|
||||
$(cmake-utils_use_find_package zlib ZLIB)
|
||||
)
|
||||
|
||||
kde5_src_configure
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
kde5_pkg_postinst
|
||||
|
||||
if ! has_version app-arch/unar ; then
|
||||
elog "For handling rar archives, install app-arch/unar"
|
||||
fi
|
||||
|
||||
if ! has_version app-arch/p7zip ; then
|
||||
elog "For handling 7-Zip archives, install app-arch/p7zip"
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
commit 82fdfd24d46966a117fa625b68784735a40f9065
|
||||
Author: Elvis Angelaccio <elvis.angelaccio@kde.org>
|
||||
Date: Fri Jan 6 15:35:46 2017 +0100
|
||||
|
||||
Stop running executables when opening urls
|
||||
|
||||
This is a security risk because it's not clear when an entry in an
|
||||
archive is an executable.
|
||||
|
||||
BUG: 374572
|
||||
FIXED-IN: 16.12.1
|
||||
|
||||
diff --git a/part/part.cpp b/part/part.cpp
|
||||
index f1adf21..80f657b 100644
|
||||
--- a/part/part.cpp
|
||||
+++ b/part/part.cpp
|
||||
@@ -988,7 +988,7 @@ void Part::slotOpenExtractedEntry(KJob *job)
|
||||
} else {
|
||||
KRun::runUrl(QUrl::fromUserInput(fullName, QString(), QUrl::AssumeLocalFile),
|
||||
QMimeDatabase().mimeTypeForFile(fullName).name(),
|
||||
- widget());
|
||||
+ widget(), false, false);
|
||||
}
|
||||
} else if (job->error() != KJob::KilledJobError) {
|
||||
KMessageBox::error(widget(), job->errorString());
|
||||
@ -1,5 +1,8 @@
|
||||
DIST kodi-platform-16_p20150805.tar.gz 8389 SHA256 158b083f5c18ca17a939e6858efd09959b9416e56b42ca884aa35f2ddae9fd2d SHA512 6668735206124a2942d8f3138b9e1eafeb2c97c5a81a6fd3e80e3d4ced676993d629f3dc7683ad226fd1665232c7c2cc062a3b52e8d0efcb9a7583506a29890d WHIRLPOOL 6b0bafb93cbb9a421d4f5d3d578c41899488a05f654f517da308a3f5b85b71267a011771906f97141a9b83ebcc153d7bf9e3c18391849865f13618ef48e508e6
|
||||
DIST kodi-platform-17.1.0.1.tar.gz 8538 SHA256 972dff4acc9580551113da8d5895f9aedd27c3579e8e48126303384a54424f94 SHA512 c3501b30d6e643239d1a5726eae79d734392709240b21fd314c97fa8a98b0c4ba912c8a246bd53e7049fadde0f695274ae4d1920442ab9a22337258388f80bcb WHIRLPOOL 088658b114fe62e5941b389c33b1acc887d757ce109f1a83c57ce21748b7da73d69bd87baaf96aa82ce5aed70bb725cb31699851e5441b5f6e31b51cb632f7da
|
||||
EBUILD kodi-platform-16.9999.ebuild 561 SHA256 f1b7b173ed165500d04c31c35786751888636cf13ec28498bafcf4156ecf186b SHA512 f8b4393bd10a27b70641d48fd6726a71f46ac49994ea55a05fca773dc231a48af409dfb37634c301522c6fad47401858f4e13e45263e66e5514014330a4187b0 WHIRLPOOL a4c3fb339d21d1b9044018bfa648a7b93816e5adb16580c39531d60568dc998e54ce00db15511563228ceb64dc0029ecc2336a8a2edf1afc0a49a1eeea58579f
|
||||
EBUILD kodi-platform-16_p20150805.ebuild 629 SHA256 11d394d2789156321e502f05f858ab8e5a3b8527e7dbe009cd6424ef45374fa3 SHA512 4acb00f5d48f1937a8a16c80d74f8c53075c0e01906ea74ad3fb61583bae972c116aee9569f67404313a84537b02f938bb640f6dda8e9ba5bf967991b11d3f16 WHIRLPOOL 0f35f65376b5fcd1e077425d4b80572a361c6975ce16bdbc3a40d005acb78532537bc332017ffc1fb574aca85e46c822d23f25917ec493cb0197137d561b55d7
|
||||
EBUILD kodi-platform-17.1.0.1.ebuild 651 SHA256 9eabbb6010a6c2ca7f5c5d309033ccfd3e261de8ec7057fdd8dd93698a795f97 SHA512 0f4f53666fb6e47c15e3f59df2e315fafb98eea3bf3defd656226cc4c988e86db4ed42d80becb523ce9f187843fff37452a1fc10d0b08c4866e5aa82b30e8412 WHIRLPOOL cbad6febbe6cfd89039bf9db96efcf8592de9c399c2f3c8f47e2e29bf0447c2c74cff488f6dfc38071dd8fa542e81b097840a03f4bf257cfd89e6657c166337d
|
||||
EBUILD kodi-platform-9999.ebuild 652 SHA256 bbd9334f081513bbe41b11a70bd27fc54a1ea3c3f8797acf0fb0659857f15ac0 SHA512 f8203bbad15d2bf37561294b525245dd8d3a350557530f3091b1f35a0b76f1aa497b9667508a853898c79dd6fdd9097d3b16554a314804e9b2223f2c0002f997 WHIRLPOOL 82b035d5d851989b3127b30231d85a8a3e430844acfa3a6afdd19c4d58134869c5220e6868f89815f37f1f3661c25d0f787e8baa223c7722cf8af68f278118c4
|
||||
MISC ChangeLog 679 SHA256 f82bd8a50b487de6b73db6e9e36cb8a68b21b6e7f8ebcb9797a8f21bdb560837 SHA512 2e7eb4c4791974aa10eb5cc278adbba88afb2d12dab40a035fac8c895b8aa8f4abbc4942eae6c9bdda794ebff5678389e592786ee4fbe14926b5a12fe9e57aa7 WHIRLPOOL 2a5c20e737d8da43ce8029c0bc58e05468943700d7a079198b3ca4f7bf1b16d41f2a169e32682a80a2c7dd1ab455e3f268111a21c6dc75343e40bece43ebb622
|
||||
MISC metadata.xml 398 SHA256 90cd7605d4ac219504bcd0ba23e3c05b590bc4fd5946973688bde789672fe6c0 SHA512 1db940ad831c7f4857c9904170d05a07f81872a4fdecd220e76a3761de78209ad3fd588309253ae62430124020e339dd22ab04ec0f6c4c6dfbc0bc112af71441 WHIRLPOOL 5568728626bca0330de4ad05f7fc9598e3de73830a6b9bb41b2b371273a91d974235a8ee036f8583efe5e561e114cca4b687881f25d8c7305cf7370e1a867fcb
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
SRC_URI=""
|
||||
EGIT_REPO_URI="git://github.com/xbmc/kodi-platform.git"
|
||||
inherit git-r3
|
||||
else
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
GIT_COMMIT="c8188d8"
|
||||
SRC_URI="https://github.com/xbmc/kodi-platform/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/xbmc-kodi-platform-${GIT_COMMIT}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Kodi platform support library"
|
||||
HOMEPAGE="http://kodi.tv"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
=media-tv/kodi-17*
|
||||
=dev-libs/libplatform-2*
|
||||
dev-libs/tinyxml
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
SRC_URI=""
|
||||
EGIT_REPO_URI="git://github.com/xbmc/kodi-platform.git"
|
||||
inherit git-r3
|
||||
else
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
GIT_COMMIT="c8188d8"
|
||||
SRC_URI="https://github.com/xbmc/kodi-platform/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/xbmc-kodi-platform-${GIT_COMMIT}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Kodi platform support library"
|
||||
HOMEPAGE="http://kodi.tv"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
=media-tv/kodi-9999
|
||||
=dev-libs/libplatform-2*
|
||||
dev-libs/tinyxml
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -0,0 +1,62 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils multilib-minimal
|
||||
|
||||
DESCRIPTION="C library for image processing and analysis"
|
||||
HOMEPAGE="http://www.leptonica.org/"
|
||||
SRC_URI="http://www.leptonica.org/source/${P}.tar.gz"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0/5"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
|
||||
IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
|
||||
|
||||
# N.B. Tests need some features enabled:
|
||||
REQUIRED_USE="test? ( jpeg png tiff zlib )"
|
||||
|
||||
DEPEND="gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
|
||||
jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
|
||||
jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
|
||||
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
|
||||
sys-libs/zlib:=[${MULTILIB_USEDEP}] )
|
||||
tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
|
||||
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
|
||||
zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
ECONF_SOURCE="${S}"
|
||||
DOCS=( README version-notes )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# unhtmlize docs
|
||||
local X
|
||||
for X in ${DOCS[@]}; do
|
||||
awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
|
||||
"${X}.html" > "${X}" || die 'awk failed'
|
||||
rm -f -- "${X}.html"
|
||||
done
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
econf \
|
||||
--enable-shared \
|
||||
$(use_with gif giflib) \
|
||||
$(use_with jpeg) \
|
||||
$(use_with jpeg2k libopenjpeg) \
|
||||
$(use_with png libpng) \
|
||||
$(use_with tiff libtiff) \
|
||||
$(use_with webp libwebp) \
|
||||
$(use_with zlib) \
|
||||
$(use_enable static-libs static) \
|
||||
$(multilib_native_use_enable utils programs)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
multilib-minimal_src_install
|
||||
prune_libtool_files
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
Description: use unsigned char to keep int value
|
||||
Use unsigned char to keep all bits of int values in the array.
|
||||
Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
|
||||
Bug-Debian: https://bugs.debian.org/811762
|
||||
Last-Update: 2016-07-16
|
||||
|
||||
---
|
||||
|
||||
--- libsidplay-1.36.59.orig/src/samples.cpp
|
||||
+++ libsidplay-1.36.59/src/samples.cpp
|
||||
@@ -75,7 +75,7 @@ struct sampleChannel
|
||||
sampleChannel ch4, ch5;
|
||||
|
||||
|
||||
-const sbyte galwayNoiseTab1[16] =
|
||||
+const ubyte galwayNoiseTab1[16] =
|
||||
{
|
||||
0x80,0x91,0xa2,0xb3,0xc4,0xd5,0xe6,0xf7,
|
||||
0x08,0x19,0x2a,0x3b,0x4c,0x5d,0x6e,0x7f
|
||||
@@ -84,7 +84,7 @@ const sbyte galwayNoiseTab1[16] =
|
||||
ubyte galwayNoiseVolTab[16];
|
||||
sbyte galwayNoiseSamTab[16];
|
||||
|
||||
-const sbyte sampleConvertTab[16] =
|
||||
+const ubyte sampleConvertTab[16] =
|
||||
{
|
||||
// 0x81,0x99,0xaa,0xbb,0xcc,0xdd,0xee,0xff,
|
||||
// 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x7f
|
||||
@ -0,0 +1,39 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit libtool multilib-minimal
|
||||
|
||||
DESCRIPTION="C64 SID player library"
|
||||
HOMEPAGE="http://critical.ch/distfiles/"
|
||||
SRC_URI="http://critical.ch/distfiles/${P}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="1"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE="static-libs"
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
|
||||
DOCS=( AUTHORS DEVELOPER )
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-gcc43.patch
|
||||
"${FILESDIR}"/${P}-fix-c++14.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
elibtoolize # required for fbsd .so versioning
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE="${S}" \
|
||||
econf $(use_enable static-libs static)
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
@ -1,6 +1,9 @@
|
||||
AUX mp3blaster-3.2.5-fix-build-system.patch 2785 SHA256 b8318c80c4d54e838dc4aba1116d1cc31514f54dd2e6a48262df0fc696d6b41a SHA512 307796e8967b942f1b8133c271eb2a4a24ac9ce3ef2d3ed144197d615ba801198b4af115439f4306c5b84c5c3b7b4025475ed1dbae992d2731f646636ce8df8f WHIRLPOOL dd059aad6df1da82d8bd3dd82d906ec42c34613703941a9278c02cff61ba2a8fbdad94b8d8eaac46b674b1deca54ef6a9261cbb4b7ef1d5ae05bf8614956e22e
|
||||
AUX mp3blaster-3.2.5-fix-c++14.patch 1206 SHA256 27e6a194539c25ce5f41e9cfa4bb07cafc059fe6610de576ebcb75c4ce4c743d SHA512 cf0fe93ad0e6a75a58a855aae87222de923709a775552138ad95754ced9812a62c3a1cdc4d7091e1b727c0425cec40d223a9533ad4a735efed24d5a62db4e8e4 WHIRLPOOL 7ae4faa050aca0eb619cb5e3233c7506ba08fa570c5627b8cf82bc77f53e8100c2bf3d474e978fb7cd221b935b03e0383793c8d5f95448822a651c393953b4c1
|
||||
DIST mp3blaster-3.2.5.tar.gz 329407 SHA256 129115742c77362cc3508eb7782702cfb44af2463a5453e8d19ea68abccedc29 SHA512 53f623340b7a8e4be6cd973474fd5f23c623b6d1c667478dc0d4c7a1ef5758f4bbc09d9d0698d1539d8d1c3ef45301b447f3ed74f68586070a07a7f9fa8c353e WHIRLPOOL 96cdc3b6436dec282a5836c00e2151dd04f218175fdd2451fcfd45f70bced05dea0c8915cf1a817d24a9961fc8ab3d9c5b568a5ae67e23e2b1915604b2d7806e
|
||||
DIST mp3blaster_3.2.5-3.debian.tar.gz 11000 SHA256 e4d424aeccde6ccd219270f4e4f0bf8f70b97e13075447b6d6d069110ed092c9 SHA512 1d899c85c2a2e1326fac0f87c61ead82273a08c672aeab0929479d9aa10c6ae703bb63c1a6aec14c8f5b6a139089fa5228cf09db72ea5b114efb60a196bd4788 WHIRLPOOL 9c1c99d5a4f4e5060a9eae4e681f0df841d6932f34a12102a82d2e1f795d4db41fd3f15d6aa6a34d04d42259d73ba67f775b24a51df30779d4f4466ded40f69f
|
||||
EBUILD mp3blaster-3.2.5-r1.ebuild 1644 SHA256 81844f6b6af8c35e99a5d09e4533b36b27b4ae2dbe7ac575ed38d93127a7d783 SHA512 68a51fdd978dca50c29d09656b24aa2f2aa2561fb97dd2e1d09b9477f6365f563c9e97a057af8614b2543fe902148bea0b54db3991a42ce11c8e4c34edb3b556 WHIRLPOOL 79dae42f59bd3708a0fd05ebf955383432203e44bb624f55d51e2979dfe40fa01b40c3a809ae70b5808903f05e1a6dbda6d92170d1a6de65aa0e7cf1392ffc9b
|
||||
EBUILD mp3blaster-3.2.5-r2.ebuild 1650 SHA256 de5dfc39c69fcf31739a6f79058480c85df10b64705fe701c7b37c2420f31a0a SHA512 dfdcc8634e38a4a9d80381923db3b9b23daa9d3dd8ef10ae28772e0f465d574d7cc5a881d396254ff2f4698cf583dd13c34bb517aed3539c644485df59e83ad5 WHIRLPOOL c7492a183e1adc92f06bb2c1f1a96351fd7aa33b7976e95a71445ea4331aa47e050a7a09198f7e4a073c2b12ef4fe7807bb32c24c23fbbfa495dd8d549adf462
|
||||
MISC ChangeLog 2665 SHA256 74403c3822735e7a0a2ca825f1395423e3b2c886a7c0ad40a42ecaa90eda7975 SHA512 b48a91ee8781e052c9f406e3ddfab14a4a11cd80a1db99670ae2c03d394bccfd9c7b7204f382b8e52a7cb95dbd6578ee723bc668616be16ceac581b8b269f31d WHIRLPOOL 9db8f4d90e0254be27ee84dc372c250961f94d73ce605ce2fc8dfe80568e7f9efedfe604b7a6ff73eaa5591cc32ce4ff0e49b3856492143f04ec00f53bff5797
|
||||
MISC ChangeLog-2015 8308 SHA256 e3a3ad043d654e2c03a08cd5454c4fa6dc183a2aceaeb4e93de4b4c88e20b4dc SHA512 5623907d9824e694eeaaf2910c0f3c837745f53b2f751573978ae0d2aa33d32eb320a616c4f9166f35cb64ed44f8c231f74be51986d14d8effe2c98ccf3486cc WHIRLPOOL 0b5c91f15838d06a565e26d57a3923962c67fbfd2989814f6120ec98230f03c97b71ffe296df2cfe12b8fceb426687aca3707f922ab640c94b30d06d36097e79
|
||||
MISC metadata.xml 432 SHA256 694e6b73b6c12ad1b7c2a5069a43b7c0f393d3b099ca89fca181a3bd44850846 SHA512 e59462dc17d0e050f0876eb74334ddb5c980900a8b4268c281f92e30545a7cf7a3589dc1961640cba9a01d3ce01ec210904dd7033e42d9b3d237740f6820f375 WHIRLPOOL f968017b9a88a08d1dcce5e049814cfd6331d9f885f21f3d248f862592e9cce664b646871ae8ee161997880f0a09c1f6bf94a3dde747fdb0cf1b69cc25411784
|
||||
|
||||
@ -0,0 +1,94 @@
|
||||
Fix broken handling of ncurses by relying on pkg-config
|
||||
instead of broken detection.
|
||||
See also: https://bugs.gentoo.org/show_bug.cgi?id=559210
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -9,7 +9,7 @@
|
||||
CXXFLAGS="-O2 -Wall -W -fno-strength-reduce"
|
||||
fi
|
||||
|
||||
-AM_CONFIG_HEADER(config.h)
|
||||
+AC_CONFIG_HEADERS(config.h)
|
||||
|
||||
dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
@@ -17,6 +17,7 @@
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_RANLIB
|
||||
+AM_PROG_AR
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_C_CONST
|
||||
@@ -26,7 +27,7 @@
|
||||
AC_PROG_GCC_TRADITIONAL
|
||||
AC_CHECK_FUNCS(strdup strstr)
|
||||
|
||||
-AC_LANG_CPLUSPLUS
|
||||
+AC_PROG_CXX
|
||||
|
||||
#For FreeBSD, look in /usr/local/(lib,include) first, since ncurses4
|
||||
#must be installed as an add-on on these systems in /usr/local
|
||||
@@ -233,55 +234,12 @@
|
||||
REQ_CURSES=1
|
||||
|
||||
if test "$WANT_CURSES" = "1" ; then
|
||||
- AC_CHECK_LIB(curses,main,HAVE_LIBCURSES=1)
|
||||
- AC_CHECK_LIB(ncurses,main,HAVE_LIBNCURSES=1)
|
||||
- AC_CHECK_HEADER(curses.h,HAVE_CURSES_H=1,HAVE_CURSES_H=0)
|
||||
- AC_CHECK_HEADER(ncurses/ncurses.h,HAVE_NCURSES_NCURSES_H=1)
|
||||
- AC_CHECK_HEADER(ncurses/curses.h,HAVE_NCURSES_CURSES_H=1)
|
||||
- AC_CHECK_HEADER(ncurses.h,HAVE_NCURSES_H=1)
|
||||
-
|
||||
- if test "$FORCECURSES" = "1" ; then
|
||||
- if test "$HAVE_LIBCURSES" = 0 -o "$HAVE_CURSES_H" = 0; then
|
||||
- AC_MSG_ERROR([you forced using curses instead of ncurses, but lib/include cannot be found])
|
||||
- fi
|
||||
- AC_DEFINE_UNQUOTED(NCURSES_HEADER, [<curses.h>],
|
||||
- [Which headerfile to include for ncurses support])
|
||||
- NCURSES_LIBS="-lcurses"
|
||||
- AC_SUBST(NCURSES_LIBS)
|
||||
- else
|
||||
- HAVE_CURSES="yes"
|
||||
- if test "$HAVE_LIBNCURSES" = 1 ; then
|
||||
- NCURSES_LIBS="-lncurses"
|
||||
- elif test "$HAVE_LIBCURSES" = 1 ; then
|
||||
- NCURSES_LIBS="-lcurses"
|
||||
- else
|
||||
- HAVE_CURSES="no"
|
||||
- fi
|
||||
-
|
||||
- #header(s) found?
|
||||
- HAVE_CURSES_HEADER=1
|
||||
- if test "$HAVE_NCURSES_NCURSES_H" = "1" ; then
|
||||
- NCURSES_HEADER="<ncurses/ncurses.h>"
|
||||
- elif test "$HAVE_NCURSES_CURSES_H" = "1" ; then
|
||||
- NCURSES_HEADER="<ncurses/curses.h>"
|
||||
- elif test "$HAVE_NCURSES_H" = "1" ; then
|
||||
- NCURSES_HEADER="<ncurses.h>"
|
||||
- elif test "$HAVE_CURSES_H" = "1" ; then
|
||||
- NCURSES_HEADER="<curses.h>"
|
||||
- else
|
||||
- HAVE_CURSES_HEADER=0
|
||||
- fi
|
||||
-
|
||||
- if test "$HAVE_CURSES_HEADER" = "0" ; then HAVE_CURSES="no" ; fi
|
||||
-
|
||||
- if test "$HAVE_CURSES" = "yes" ; then
|
||||
- AC_SUBST(NCURSES_LIBS)
|
||||
- AC_DEFINE_UNQUOTED(NCURSES_HEADER, $NCURSES_HEADER,
|
||||
- [Which headerfile to include for ncurses support])
|
||||
- elif test "$REQ_CURSES" = "1" ; then
|
||||
- AC_MSG_ERROR([could not find (n)curses libs or includes, which are required])
|
||||
- fi
|
||||
- fi #FORCECURSES
|
||||
+ PKG_CHECK_MODULES([NCURSES], [ncurses])
|
||||
+ HAVE_CURSES="yes"
|
||||
+ HAVE_CURSES_HEADER=1
|
||||
+ NCURSES_HEADER="<ncurses.h>"
|
||||
+ AC_DEFINE_UNQUOTED(NCURSES_HEADER, $NCURSES_HEADER,
|
||||
+ [Which headerfile to include for ncurses support])
|
||||
fi
|
||||
|
||||
#Sound output devices.
|
||||
@ -0,0 +1,39 @@
|
||||
Fix -Wnarrowing failures in C++14 mode
|
||||
See also: https://bugs.gentoo.org/show_bug.cgi?id=600158
|
||||
|
||||
--- a/mpegsound/huffmantable.cc
|
||||
+++ b/mpegsound/huffmantable.cc
|
||||
@@ -550,11 +550,11 @@
|
||||
|
||||
const HUFFMANCODETABLE Mpegtoraw::ht[HTN]=
|
||||
{
|
||||
- { 0, 0-1, 0-1, 0, 0, htd33},
|
||||
+ { 0, (unsigned int)0-1, (unsigned int)0-1, 0, 0, htd33},
|
||||
{ 1, 2-1, 2-1, 0, 7,htd01},
|
||||
{ 2, 3-1, 3-1, 0, 17,htd02},
|
||||
{ 3, 3-1, 3-1, 0, 17,htd03},
|
||||
- { 4, 0-1, 0-1, 0, 0, htd33},
|
||||
+ { 4, (unsigned int)0-1, (unsigned int)0-1, 0, 0, htd33},
|
||||
{ 5, 4-1, 4-1, 0, 31,htd05},
|
||||
{ 6, 4-1, 4-1, 0, 31,htd06},
|
||||
{ 7, 6-1, 6-1, 0, 71,htd07},
|
||||
@@ -564,7 +564,7 @@
|
||||
{11, 8-1, 8-1, 0,127,htd11},
|
||||
{12, 8-1, 8-1, 0,127,htd12},
|
||||
{13,16-1,16-1, 0,511,htd13},
|
||||
- {14, 0-1, 0-1, 0, 0, htd33},
|
||||
+ {14, (unsigned int)0-1, (unsigned int)0-1, 0, 0, htd33},
|
||||
{15,16-1,16-1, 0,511,htd15},
|
||||
{16,16-1,16-1, 1,511,htd16},
|
||||
{17,16-1,16-1, 2,511,htd16},
|
||||
--- a/nmixer/nmixer.h
|
||||
+++ b/nmixer/nmixer.h
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
#define MIXER_DEVICE "/dev/mixer"
|
||||
#define MYMIN(x, y) ((x) < (y) ? (x) : (y))
|
||||
-#define MYVERSION "<<NMixer "VERSION">>"
|
||||
+#define MYVERSION "<<NMixer " VERSION ">>"
|
||||
|
||||
#define BOTH_CHANNELS 0x11
|
||||
#define RIGHT_CHANNEL 0x10
|
||||
@ -0,0 +1,70 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="Text console based program for playing audio files"
|
||||
HOMEPAGE="http://mp3blaster.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
|
||||
mirror://debian/pool/main/m/${PN}/${PN}_${PV}-3.debian.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE="lirc oss +sdl sid vorbis"
|
||||
|
||||
RDEPEND="
|
||||
sys-libs/ncurses:0=
|
||||
lirc? ( app-misc/lirc )
|
||||
sdl? ( media-libs/libsdl )
|
||||
sid? ( media-libs/libsidplay:1 )
|
||||
vorbis? ( media-libs/libvorbis )"
|
||||
DEPEND="${RDEPEND}
|
||||
x11-misc/imake
|
||||
oss? ( virtual/os-headers )"
|
||||
|
||||
REQUIRED_USE="|| ( oss sdl )"
|
||||
|
||||
PATCHES=(
|
||||
"${WORKDIR}"/debian/patches
|
||||
"${FILESDIR}"/${PN}-3.2.5-fix-c++14.patch
|
||||
"${FILESDIR}"/${PN}-3.2.5-fix-build-system.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
|
||||
# file collision with media-sound/splay
|
||||
sed -i -e 's:splay.1:splay_mp3blaster.1:' Makefile.in || die
|
||||
mv -vf splay{,_mp3blaster}.1 || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# libpth and newthreads support are both broken
|
||||
econf \
|
||||
--disable-newthreads \
|
||||
--without-pth \
|
||||
--without-nas \
|
||||
$(use_with lirc) \
|
||||
$(use_with vorbis oggvorbis) \
|
||||
$(use_with sid sidplay) \
|
||||
--without-esd \
|
||||
$(use_with sdl) \
|
||||
$(use_with oss)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
doman "${WORKDIR}"/debian/manpages/mp3tag.1
|
||||
|
||||
# relocate everything except commands.txt because it's used by src/main.cc
|
||||
mv -vf "${ED%/}"/usr/share/{${PN}/{charmap,sample.*},doc/${PF}} || die
|
||||
|
||||
# file collision with media-sound/splay
|
||||
mv -vf "${ED%/}"/usr/bin/splay{,_mp3blaster} || die
|
||||
}
|
||||
@ -1,28 +0,0 @@
|
||||
diff --git a/wafadmin/Tools/perl.py b/wafadmin/Tools/perl.py
|
||||
index 9e3b12a..9005e6a 100644
|
||||
--- a/wafadmin/Tools/perl.py
|
||||
+++ b/wafadmin/Tools/perl.py
|
||||
@@ -99,8 +99,8 @@ def check_perl_ext_devel(conf):
|
||||
conf.env["CPPPATH_PERLEXT"] = read_out(" -MConfig -e'print \"$Config{archlib}/CORE\"'")
|
||||
conf.env["CCFLAGS_PERLEXT"] = read_out(" -MConfig -e'print \"$Config{ccflags} $Config{cccdlflags}\"'")
|
||||
|
||||
- conf.env["XSUBPP"] = read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}\"'")
|
||||
- conf.env["EXTUTILS_TYPEMAP"] = read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/typemap\"'")
|
||||
+ conf.env["XSUBPP"] = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::xsubpp\")'")
|
||||
+ conf.env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::typemap\")'")
|
||||
|
||||
if not getattr(Options.options, 'perlarchdir', None):
|
||||
conf.env["ARCHDIR_PERL"] = Utils.cmd_output(perl + " -MConfig -e'print $Config{sitearch}'")
|
||||
diff --git a/src/clients/lib/perl/typemap b/src/clients/lib/perl/typemap
|
||||
index 6cb033f..54e6c4d 100644
|
||||
--- a/src/clients/lib/perl/typemap
|
||||
+++ b/src/clients/lib/perl/typemap
|
||||
@@ -3,6 +3,8 @@ xmmsc_connection_t* XMMSC_CONNECTION_T
|
||||
xmmsv_coll_t* XMMSV_COLL_T
|
||||
xmmsv_coll_type_t XMMSV_COLL_TYPE_T
|
||||
xmmsv_coll_namespace_t T_PV
|
||||
+const unsigned char* T_PV
|
||||
+xmmsv_t* T_PV
|
||||
xmmsc_result_t* XMMSC_RESULT_T
|
||||
xmmsc_result_propdict_t* XMMSC_RESULT_PROPDICT_T
|
||||
xmms_plugin_type_t XMMS_PLUGIN_TYPE_T
|
||||
@ -1,127 +0,0 @@
|
||||
commit 2df15fc79acc7ef5ea9213c87f6700faf138518d
|
||||
Author: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Date: Sun Oct 10 21:08:05 2010 +0300
|
||||
|
||||
OTHER: one more me in AUTHORS
|
||||
|
||||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
|
||||
diff --git a/AUTHORS b/AUTHORS
|
||||
index f2ef9af..e33acb5 100644
|
||||
--- a/AUTHORS
|
||||
+++ b/AUTHORS
|
||||
@@ -354,6 +354,7 @@ D: Various fixes
|
||||
|
||||
N: Sergei Trofimovich
|
||||
E: slyich@gmail.com
|
||||
+E: slyfox@gentoo.org
|
||||
E: slyfox@inbox.ru
|
||||
E: st@anti-virus.by
|
||||
D: Various Cleanups
|
||||
|
||||
commit fb4eede29ba11d2ecec039de6899f8cce55dde8d
|
||||
Author: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Date: Sun Oct 10 21:01:49 2010 +0300
|
||||
|
||||
OTHER: explicitely declare xmmsc_mainloop_gmain_init() and _xmmsc_medialib_encode_url()
|
||||
|
||||
Added according includefiles
|
||||
|
||||
Was spotted by ZogG on #xmms2
|
||||
And reported as: https://bugs.gentoo.org/show_bug.cgi?id=340361
|
||||
|
||||
gcc's warning:
|
||||
../src/clients/medialib-updater/main.c: In function 'updater_connect':
|
||||
../src/clients/medialib-updater/main.c:135: warning: implicit declaration of function 'xmmsc_mainloop_gmain_init'
|
||||
../src/clients/medialib-updater/main.c: In function 'updater_remove_directory':
|
||||
../src/clients/medialib-updater/main.c:468: warning: implicit declaration of function '_xmmsc_medialib_encode_url'
|
||||
../src/clients/medialib-updater/main.c:468: warning: cast to pointer from integer of different size
|
||||
|
||||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
|
||||
diff --git a/src/clients/medialib-updater/main.c b/src/clients/medialib-updater/main.c
|
||||
index 3b36bc9..2dd7b08 100644
|
||||
--- a/src/clients/medialib-updater/main.c
|
||||
+++ b/src/clients/medialib-updater/main.c
|
||||
@@ -18,6 +18,9 @@
|
||||
|
||||
#include <gio/gio.h>
|
||||
#include <xmmsclient/xmmsclient.h>
|
||||
+#include <xmmsclient/xmmsclient-glib.h>
|
||||
+
|
||||
+#include "xmmsclientpriv/xmmsclient.h" // _xmmsc_medialib_encode_url
|
||||
|
||||
#include <xmms_configuration.h>
|
||||
|
||||
diff --git a/src/clients/medialib-updater/wscript b/src/clients/medialib-updater/wscript
|
||||
index 841ae85..cd38b5e 100644
|
||||
--- a/src/clients/medialib-updater/wscript
|
||||
+++ b/src/clients/medialib-updater/wscript
|
||||
@@ -4,7 +4,7 @@ def build(bld):
|
||||
obj = bld.new_task_gen('cc', 'program')
|
||||
obj.target = 'xmms2-mlib-updater'
|
||||
obj.source = "main.c"
|
||||
- obj.includes = '. ../../.. ../../include'
|
||||
+ obj.includes = '. ../../.. ../../include ../../includepriv'
|
||||
obj.uselib = 'glib2 GIO-2.0 GTHREAD-2.0'
|
||||
obj.uselib_local = 'xmmsclient-glib xmmsclient'
|
||||
|
||||
|
||||
commit a3dff97f048bae91cdfd8b2bc761cd9ebe184eb9
|
||||
Author: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Date: Sun Oct 10 20:52:30 2010 +0300
|
||||
|
||||
OTHER: explicitely declare g_sprintf()
|
||||
|
||||
g_sprintf is not defined by glib.h (glib-2.24.2),
|
||||
but it's defined by <glib/gsprintf.h>
|
||||
|
||||
Was spotted by ZogG on #xmms2
|
||||
And reported as: https://bugs.gentoo.org/show_bug.cgi?id=340361
|
||||
|
||||
gcc's warning:
|
||||
../src/xmms/magic.c: In function 'xmms_magic_match':
|
||||
../src/xmms/magic.c:470: warning: implicit declaration of function 'g_sprintf'
|
||||
|
||||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
|
||||
diff --git a/src/xmms/magic.c b/src/xmms/magic.c
|
||||
index 31b0b00..a0f9658 100644
|
||||
--- a/src/xmms/magic.c
|
||||
+++ b/src/xmms/magic.c
|
||||
@@ -15,8 +15,8 @@
|
||||
*/
|
||||
|
||||
|
||||
-
|
||||
#include <glib.h>
|
||||
+#include <glib/gprintf.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
|
||||
commit 43648e7b701a9598d9a9769caec152fd23b4e2f5
|
||||
Author: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Date: Sun Oct 10 20:47:23 2010 +0300
|
||||
|
||||
OTHER: explicitely declare semtimedop()
|
||||
|
||||
semtimedop(2) is a GNU extension which needs _GNU_SOURCE
|
||||
to be defined. Was spotted by ZogG on #xmms2
|
||||
And reported as: https://bugs.gentoo.org/show_bug.cgi?id=340361
|
||||
|
||||
gcc's warning:
|
||||
|
||||
* ../src/clients/lib/xmmsclient/visualization/unixshm.c:102: warning: implicit declaration of function 'semtimedop'
|
||||
|
||||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
|
||||
diff --git a/src/clients/lib/xmmsclient/visualization/unixshm.c b/src/clients/lib/xmmsclient/visualization/unixshm.c
|
||||
index 50883a9..3d28ccc 100644
|
||||
--- a/src/clients/lib/xmmsclient/visualization/unixshm.c
|
||||
+++ b/src/clients/lib/xmmsclient/visualization/unixshm.c
|
||||
@@ -1,3 +1,4 @@
|
||||
+#define _GNU_SOURCE // semtimedop is a GNU extension
|
||||
#include "common.h"
|
||||
|
||||
#include <sys/shm.h>
|
||||
@ -1,52 +0,0 @@
|
||||
commit 3bc7fbff50bfcb065fb89d020c1b3fb8de049b19
|
||||
Author: Sergei Trofimovich <st@anti-virus.by>
|
||||
Date: Mon Apr 19 13:16:56 2010 +0300
|
||||
|
||||
OTHER: fix build failure on windres aware binutils (linux host, native build)
|
||||
|
||||
Trying to use windres under linux (native build) is worthless:
|
||||
|
||||
[ 26/269] winrc: pixmaps/xmms2.rc -> _build_/default/pixmaps/xmms2.rc.o
|
||||
/usr/bin/windres: can't get BFD_RELOC_RVA relocation type: No error
|
||||
Waf: Leaving directory `/var/tmp/paludis/media-sound-xmms2-9999-r3/work/xmms2-devel/_build_'
|
||||
Build failed
|
||||
-> task failed (err #1):
|
||||
{task: winrc xmms2.rc -> xmms2.rc.o}
|
||||
|
||||
Signed-off-by: Sergei Trofimovich <st@anti-virus.by>
|
||||
|
||||
diff --git a/wscript b/wscript
|
||||
index 2a29016..1d73813 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -265,12 +265,6 @@ def configure(conf):
|
||||
conf.check_tool('gcc')
|
||||
conf.check_tool('g++')
|
||||
|
||||
- try:
|
||||
- conf.check_tool('winres')
|
||||
- conf.env['WINRCFLAGS'] = '-I' + os.path.abspath('pixmaps')
|
||||
- conf.env['xmms_icon'] = True
|
||||
- except Configure.ConfigurationError:
|
||||
- conf.env['xmms_icon'] = False
|
||||
|
||||
if Options.options.target_platform:
|
||||
Options.platform = Options.options.target_platform
|
||||
@@ -412,6 +406,17 @@ def configure(conf):
|
||||
else:
|
||||
conf.env['socket_impl'] = 'posix'
|
||||
|
||||
+ # platform does not support icons ...
|
||||
+ conf.env['xmms_icon'] = False
|
||||
+ # ... unless we target on windows
|
||||
+ if Options.platform == 'win32':
|
||||
+ try:
|
||||
+ conf.check_tool('winres')
|
||||
+ conf.env['WINRCFLAGS'] = '-I' + os.path.abspath('pixmaps')
|
||||
+ conf.env['xmms_icon'] = True
|
||||
+ except Configure.ConfigurationError:
|
||||
+ pass
|
||||
+
|
||||
# Glib is required by everyone, so check for it here and let them
|
||||
# assume its presence.
|
||||
conf.check_cfg(package='glib-2.0', atleast_version='2.8.0', uselib_store='glib2', args='--cflags --libs', mandatory=1)
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue