[Personalrobots-commit] SF.net SVN: personalrobots: [159] pkg/trunk/sdl

[<mor...@us...>]

Revision: 159
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=159&view=rev
Author:   morgan_quigley
Date:     2008-04-22 16:57:06 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
moving away from rosbuild and towards makefile. also update sdl manifest to the 'export' style of flag generation

Modified Paths:
--------------
    pkg/trunk/sdl/manifest.xml

Added Paths:
-----------
    pkg/trunk/sdl/Makefile

Removed Paths:
-------------
    pkg/trunk/sdl/rosbuild

Added: pkg/trunk/sdl/Makefile
===================================================================
--- pkg/trunk/sdl/Makefile	                        (rev 0)
+++ pkg/trunk/sdl/Makefile	2008-04-22 23:57:06 UTC (rev 159)
@@ -0,0 +1,16 @@
+all: SDL
+
+SDL-1.2.13:
+	tar xzf SDL-1.2.13.tar.gz
+
+SDL: SDL-1.2.13
+	@if [ ! -d /usr/include/X11 ]; then echo "you don't appear to have X. On Ubuntu, this is fixed with 'sudo apt-get install xorg-dev'"; false; fi
+	@if [ ! -f /usr/include/GL/gl.h ]; then echo "you don't appear to have OpenGL. On Ubuntu, this is fixed with 'sudo apt-get install libgl1-mesa-dev'"; false; fi
+	@if [ ! -f /usr/include/GL/glu.h ]; then echo "you don't appear to have the OpenGL GLU library. On Ubuntu, this can be fixed with 'sudo apt-get install libglu1-mesa-dev'"; false; fi
+	cd SDL-1.2.13 && ./configure --prefix=$(PWD)/SDL
+	cd SDL-1.2.13 && make && make install
+
+clean:
+	-rm -rf SDL-1.2.13 SDL
+
+.PHONY : clean

Modified: pkg/trunk/sdl/manifest.xml
===================================================================
--- pkg/trunk/sdl/manifest.xml	2008-04-22 23:35:36 UTC (rev 158)
+++ pkg/trunk/sdl/manifest.xml	2008-04-22 23:57:06 UTC (rev 159)
@@ -10,5 +10,8 @@
 <author>Sam Lantinga, with contributions from many others. See web page for a full credits llist.</author>
 <license>LGPL</license>
 <url>http://www.libsdl.org</url>
+<export>
+  <cpp lflags="-Xlinker -rpath ${prefix}/SDL/lib -L${prefix}/SDL/lib -lSDL" cflags="-I${prefix}/SDL/include"/>
+</export>
 </package>
 

Deleted: pkg/trunk/sdl/rosbuild
===================================================================
--- pkg/trunk/sdl/rosbuild	2008-04-22 23:35:36 UTC (rev 158)
+++ pkg/trunk/sdl/rosbuild	2008-04-22 23:57:06 UTC (rev 159)
@@ -1,44 +0,0 @@
-#!/usr/bin/env ruby
-require 'fileutils.rb'
-
-pkg_path = File.expand_path($0).split('/')
-pkg_path = pkg_path[0,pkg_path.length-1].join('/')
-puts "package path: [#{pkg_path}]"
-if pkg_path.length < 1
-  puts "woah! package path looks scary. something isn't right. bailing..."
-  exit
-end
-
-Dir.chdir(pkg_path)
-# TODO make sure we got there
-
-if ARGV.length == 0 || ARGV[0] == 'update'
-  puts "extracting SDL ============================"
-  system("tar xzvf SDL-1.2.13.tar.gz")
-  Dir.mkdir 'bin' if !File.exists? 'bin'
-  Dir.mkdir 'lib' if !File.exists? 'lib'
-  Dir.mkdir 'man' if !File.exists? 'man'
-  Dir.mkdir 'man/man1' if !File.exists? 'man/man1'
-  puts "configuring libsdl ============================"
-  Dir.chdir "#{pkg_path}/SDL-1.2.13"
-  system("./configure --prefix=${PWD}/..")
-# TODO check for blowups after configure
-  puts "making libsdl ================================="
-  system("make")
-  puts "moving files around ============================"
-  system("make install")
-# TODO check for make errors
-  puts "done! hooray! =================================="
-elsif ARGV[0] == 'clean'
-  Dir.chdir "#{pkg_path}"
-  system("rm -rf bin")
-  system("rm -rf include")
-  system("rm -rf lib")
-  system("rm -rf man")
-  system("rm -rf share")
-  system("rm -rf SDL-1.2.13")
-  puts "done!"
-else
-  puts "unknown parameter: #{ARGV[0]}"
-end
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.