Skip to content

Commit

Permalink
Updated patches to reflect the latest releases of each stack.
Browse files Browse the repository at this point in the history
  • Loading branch information
wjwwood committed Oct 19, 2011
1 parent 5247e44 commit 63af591
Show file tree
Hide file tree
Showing 29 changed files with 481 additions and 671 deletions.
13 changes: 6 additions & 7 deletions electric-lion-homebrew/patches/bond_core-1.6.0-homebrew-hg.patch
@@ -1,12 +1,11 @@
diff -r 79d22151d49e rosdep.yaml
--- a/rosdep.yaml Mon Aug 08 09:44:11 2011 -0700
+++ b/rosdep.yaml Tue Sep 06 21:55:32 2011 -0500
@@ -3,3 +3,8 @@
+++ b/rosdep.yaml Tue Oct 18 22:33:04 2011 -0500
@@ -3,3 +3,7 @@
debian: uuid-dev
fedora: libuuid-devel
macports: ossp-uuid
+ osx:
+ lion:
+ homebrew:
+ packages: [ ossp-uuid ]
+ args: [ --universal ]
+ osxbrew:
+ homebrew:
+ packages: [ ossp-uuid ]
+ args: [ --universal ]
13 changes: 0 additions & 13 deletions electric-lion-homebrew/patches/bullet-2.76.3-homebrew-hg.patch

This file was deleted.

12 changes: 12 additions & 0 deletions electric-lion-homebrew/patches/bullet-2.76.4-homebrew-hg.patch
@@ -0,0 +1,12 @@
diff -r 8694fa7710a9 rosdep.yaml
--- a/rosdep.yaml Mon Oct 17 21:02:54 2011 -0700
+++ b/rosdep.yaml Tue Oct 18 22:33:05 2011 -0500
@@ -16,4 +16,7 @@
fedora: freeglut-devel
arch: freeglut
gentoo: freeglut
- osx: mesa
+ macports: mesa
+ osxbrew:
+ homebrew:
+ packages: |
11 changes: 5 additions & 6 deletions electric-lion-homebrew/patches/common-1.6.0-homebrew-hg.patch
@@ -1,12 +1,11 @@
diff -r 6c39eaf0e0f0 rosdep.yaml
--- a/rosdep.yaml Wed Aug 10 14:28:01 2011 -0700
+++ b/rosdep.yaml Tue Sep 06 21:55:33 2011 -0500
@@ -4,4 +4,8 @@
+++ b/rosdep.yaml Tue Oct 18 22:33:05 2011 -0500
@@ -4,4 +4,7 @@
fedora: SDL_image-devel
arch: sdl_image
macports: libsdl_image
+ osx:
+ lion:
+ homebrew:
+ packages: [ sdl_image ]
+ osxbrew:
+ homebrew:
+ packages: [ sdl_image ]
gentoo: sdl-image
@@ -1,166 +1,165 @@
diff -r 6d4935c374bf rosdep.yaml
--- a/rosdep.yaml Wed Jul 27 18:19:09 2011 -0700
+++ b/rosdep.yaml Tue Sep 06 21:55:33 2011 -0500
@@ -10,6 +10,10 @@
diff -r 93fc4a9f7175 rosdep.yaml
--- a/rosdep.yaml Fri Oct 14 12:45:28 2011 -0700
+++ b/rosdep.yaml Tue Oct 18 22:33:05 2011 -0500
@@ -6,10 +6,10 @@
source:
uri: 'https://kforge.ros.org/rosrelease/viewvc/sourcedeps/assimp/assimp-2.0.86-1.rdmanifest'
md5sum: d5137302d8f00241ee10e623b97f9d22
+ lion:
+ source:
+ uri: 'http://mirror.ausparc.com/ros/sourcedeps/assimp-2.0.86.rdmanifest'
+ md5sum: e010ee3ae3f301dd02dd879d013aba51
- osx:
+ osxbrew:
source:
- uri: 'https://kforge.ros.org/rosrelease/viewvc/sourcedeps/assimp/assimp-2.0.86-1.rdmanifest'
- md5sum: d5137302d8f00241ee10e623b97f9d22
+ uri: 'http://mirror.ausparc.com/ros/sourcedeps/assimp-2.0.86.rdmanifest'
+ md5sum: e010ee3ae3f301dd02dd879d013aba51
eigen:
ubuntu:
lucid:
@@ -29,6 +33,9 @@
source:
@@ -29,10 +29,9 @@
uri: 'https://kforge.ros.org/rosrelease/viewvc/sourcedeps/eigen/eigen-3.0.1-1.rdmanifest'
md5sum: 941db2fbb09d80c28426d335022fad95
+ lion:
+ homebrew:
+ packages: [ eigen ]
gentoo: ">=dev-cpp/eigen-3"
- osx:
- source:
- uri: 'https://kforge.ros.org/rosrelease/viewvc/sourcedeps/eigen/eigen-3.0.1-1.rdmanifest'
- md5sum: 941db2fbb09d80c28426d335022fad95
+ osxbrew:
+ homebrew:
+ packages: [ eigen ]
yaml-cpp:
ubuntu:
apt:
@@ -38,6 +45,10 @@
@@ -41,10 +40,10 @@
source:
uri: 'https://kforge.ros.org/rosrelease/viewvc/sourcedeps/yaml-cpp/yaml-cpp-0.2.5.rdmanifest'
md5sum: f7fb81fd4a2fbd5022daa7686e816359
osx:
+ lion:
+ homebrew:
+ packages: [ yaml-cpp ]
+ depends: [ yaml ]
source:
uri: 'https://kforge.ros.org/rosrelease/viewvc/sourcedeps/yaml-cpp/yaml-cpp-cmake-0.2.5.rdmanifest'
md5sum: 863fb3b7e5b5f1e22ff1365de6e66b34
@@ -48,6 +59,10 @@
- osx:
- source:
- uri: 'https://kforge.ros.org/rosrelease/viewvc/sourcedeps/yaml-cpp/yaml-cpp-cmake-0.2.5.rdmanifest'
- md5sum: 863fb3b7e5b5f1e22ff1365de6e66b34
+ osxbrew:
+ homebrew:
+ packages: [ yaml-cpp ]
+ depends: [ yaml ]
checkinstall:
ubuntu:
apt:
@@ -52,6 +51,9 @@
debian:
apt:
packages: [checkinstall]
+ osx:
+ lion:
+ homebrew:
+ packages: |
+ osxbrew:
+ homebrew:
+ packages: |
curl:
ubuntu: libcurl4-openssl-dev
debian: libcurl4-openssl-dev
@@ -55,6 +70,10 @@
@@ -59,6 +61,9 @@
fedora: libcurl-devel
arch: curl
macports: curl
+ osx:
+ lion:
+ homebrew:
+ packages: |
+ osxbrew:
+ homebrew:
+ packages: |
gentoo: net-misc/curl
freebsd: curl
libxml2:
@@ -64,6 +83,10 @@
@@ -68,6 +73,9 @@
opensuse: libxml2-devel
fedora: libxml2-devel
macports: libxml2
+ osx:
+ lion:
+ homebrew:
+ packages: [ libxml2 ]
+ osxbrew:
+ homebrew:
+ packages: [ libxml2 ]
gentoo: dev-libs/libxml2
freebsd: libxml2
fedora: libxml2
@@ -75,6 +98,11 @@
fedora: libxml2-devel
@@ -79,6 +87,10 @@
rhel: cppunit-devel
arch: cppunit
macports: cppunit
+ osx:
+ lion:
+ homebrew:
+ packages: [ cppunit ]
+ args: [ --universal ]
+ osxbrew:
+ homebrew:
+ packages: [ cppunit ]
+ options: [ --universal ]
gentoo: dev-util/cppunit
freebsd: cppunit
scons:
@@ -84,6 +112,10 @@
@@ -88,6 +100,9 @@
opensuse: scons
fedora: scons
macports: scons
+ osx:
+ lion:
+ homebrew:
+ packages: |
+ osxbrew:
+ homebrew:
+ packages: |
gentoo: dev-util/scons
freebsd: scons
libxext:
@@ -93,6 +125,10 @@
@@ -97,6 +112,9 @@
fedora: libXext-devel
rhel: libXext-devel
macports: xorg-libXext
+ osx:
+ lion:
+ homebrew:
+ packages: |
+ osxbrew:
+ homebrew:
+ packages: |
arch: libxext
gentoo: x11-libs/libXext
freebsd: libXext
@@ -103,6 +139,10 @@
@@ -107,6 +125,9 @@
fedora: zziplib-devel
rhel: zziplib-devel
macports: libzzip
+ osx:
+ lion:
+ homebrew:
+ packages: [ libzzip ]
+ osxbrew:
+ homebrew:
+ packages: [ libzzip ]
arch: zziplib
gentoo: dev-libs/zziplib
freebsd: zziplib
@@ -113,6 +153,10 @@
@@ -117,6 +138,9 @@
fedora: libXaw-devel
rhel: libXaw-devel
macports: xorg-libXaw
+ osx:
+ lion:
+ homebrew:
+ packages: |
+ osxbrew:
+ homebrew:
+ packages: |
arch: libxaw
gentoo: x11-libs/libXaw
freebsd: libXaw
@@ -123,6 +167,10 @@
@@ -127,6 +151,9 @@
fedora: mesa-libGL-devel mesa-libGLU-devel
rhel: mesa-libGL-devel mesa-libGLU-devel
macports: mesa
+ osx:
+ lion:
+ homebrew:
+ packages: |
+ osxbrew:
+ homebrew:
+ packages: |
arch: mesa
gentoo: media-libs/mesa
freebsd: mesagl-mangled
@@ -133,6 +181,10 @@
@@ -137,6 +164,9 @@
fedora: libXxf86vm-devel
rhel: libXxf86vm-devel
macports: xorg-libXxf86vm
+ osx:
+ lion:
+ homebrew:
+ packages: |
+ osxbrew:
+ homebrew:
+ packages: |
arch: libxxf86vm
gentoo: x11-libs/libXxf86vm
freebsd: libXxf86vm
@@ -142,11 +194,19 @@
@@ -146,11 +176,17 @@
fedora: atlas-devel
arch: |
macports: atlas
+ osx:
+ lion:
+ homebrew:
+ packages: |
+ osxbrew:
+ homebrew:
+ packages: |
gentoo: atlas
python-sip4:
ubuntu: python-sip4-dev sip4
debian: python-sip4-dev sip4
macports: py25-sip
+ osx:
+ lion:
+ homebrew:
+ packages: [sip]
+ osxbrew:
+ homebrew:
+ packages: [sip]
gentoo: dev-python/sip
arch: sip
festival:
11 changes: 11 additions & 0 deletions electric-lion-homebrew/patches/delete_empty.sh
@@ -0,0 +1,11 @@
#!/usr/bin/env bash

for file in *;
do
file_size=$(du $file | awk '{print $1}');
if [ $file_size == 0 ]; then
echo "Deleting empty file $file with file size $file_size.";
echo "rm -f $file";
rm -f $file
fi;
done
@@ -1,6 +1,6 @@
Index: robot_monitor/scripts/robot_monitor
===================================================================
--- robot_monitor/scripts/robot_monitor (revision 37882)
--- robot_monitor/scripts/robot_monitor (revision 38006)
+++ robot_monitor/scripts/robot_monitor (working copy)
@@ -43,7 +43,9 @@

Expand All @@ -15,7 +15,7 @@ Index: robot_monitor/scripts/robot_monitor
wxversion.select(WXVER)
Index: robot_monitor/src/robot_monitor/__init__.py
===================================================================
--- robot_monitor/src/robot_monitor/__init__.py (revision 37882)
--- robot_monitor/src/robot_monitor/__init__.py (revision 38006)
+++ robot_monitor/src/robot_monitor/__init__.py (working copy)
@@ -1,4 +1,5 @@
-WXVER = '2.8'
Expand Down
@@ -1,33 +1,31 @@
Index: rosdep.yaml
===================================================================
--- rosdep.yaml (revision 14926)
--- rosdep.yaml (revision 15206)
+++ rosdep.yaml (working copy)
@@ -5,6 +5,10 @@
@@ -5,6 +5,9 @@
arch: doxygen
debian: doxygen
macports: doxygen
+ osx:
+ lion:
+ homebrew:
+ packages: [ doxygen ]
+ osxbrew:
+ homebrew:
+ packages: [ doxygen ]
gentoo: app-doc/doxygen
freebsd: doxygen
epydoc:
@@ -12,10 +16,18 @@
@@ -12,10 +15,16 @@
debian: python-epydoc
fedora: epydoc
macports: py26-epydoc
+ osx:
+ lion:
+ pip:
+ packages: [ epydoc ]
+ osxbrew:
+ pip:
+ packages: [ epydoc ]
gentoo: dev-python/epydoc
freebsd: epydoc
python-sphinx:
ubuntu: python-sphinx
macports: py26-sphinx
+ osx:
+ lion:
+ pip:
+ packages: [ Sphinx ]
+ osxbrew:
+ pip:
+ packages: [ Sphinx ]
debian: python-sphinx
freebsd: py27-sphinx
@@ -1,6 +1,6 @@
Index: dynamic_reconfigure/scripts/reconfigure_gui
===================================================================
--- dynamic_reconfigure/scripts/reconfigure_gui (revision 37882)
--- dynamic_reconfigure/scripts/reconfigure_gui (revision 38006)
+++ dynamic_reconfigure/scripts/reconfigure_gui (working copy)
@@ -39,11 +39,12 @@
import roslib; roslib.load_manifest('dynamic_reconfigure')
Expand Down

0 comments on commit 63af591

Please sign in to comment.