[gentoo-commits] gentoo-x86 commit in sci-electronics/gazebo: ChangeLog gazebo-5.1.0.ebuild

["Alexis Ballier (aballier)" <aballier@gentoo.org>]

aballier    15/07/15 15:50:04

  Modified:             ChangeLog gazebo-5.1.0.ebuild
  Log:
  backport fix from upstream to build against bullet 2.83
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.3                  sci-electronics/gazebo/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/gazebo/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/gazebo/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/gazebo/ChangeLog?r1=1.2&r2=1.3

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-electronics/gazebo/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	4 May 2015 12:14:40 -0000	1.2
+++ ChangeLog	15 Jul 2015 15:50:04 -0000	1.3
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/gazebo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gazebo/ChangeLog,v 1.2 2015/05/04 12:14:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gazebo/ChangeLog,v 1.3 2015/07/15 15:50:04 aballier Exp $
+
+  15 Jul 2015; Alexis Ballier <aballier@gentoo.org> gazebo-5.1.0.ebuild,
+  +files/bullet_283.patch:
+  backport fix from upstream to build against bullet 2.83
 
   04 May 2015; Alexis Ballier <aballier@gentoo.org> gazebo-5.1.0.ebuild:
   add missing build dep on qttest, bug #548580



1.3                  sci-electronics/gazebo/gazebo-5.1.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/gazebo/gazebo-5.1.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/gazebo/gazebo-5.1.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/gazebo/gazebo-5.1.0.ebuild?r1=1.2&r2=1.3

Index: gazebo-5.1.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-electronics/gazebo/gazebo-5.1.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gazebo-5.1.0.ebuild	4 May 2015 12:14:40 -0000	1.2
+++ gazebo-5.1.0.ebuild	15 Jul 2015 15:50:04 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gazebo/gazebo-5.1.0.ebuild,v 1.2 2015/05/04 12:14:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gazebo/gazebo-5.1.0.ebuild,v 1.3 2015/07/15 15:50:04 aballier Exp $
 
 EAPI=5
 
@@ -45,12 +45,16 @@
 "
 S="${WORKDIR}/${PN}$(get_major_version)_${PV}"
 CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=( "${FILESDIR}/bullet_283.patch" )
 
 src_configure() {
 	# doesnt build without it
 	append-cxxflags "-std=c++11"
 	# doesnt build with as-needed either
 	append-ldflags "-Wl,--no-as-needed"
+
+	has_version '>=sci-physics/bullet-2.83' && append-cppflags "-DLIBBULLET_VERSION_GT_282=1"
+
 	local mycmakeargs=(
 		"-DUSE_UPSTREAM_CFLAGS=OFF"
 		"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"