Porting to Karmic. This consists of:

1) Making use of version 1.0 of Clutter/PyClutter if present.

2) Porting to the 2.6 LLVM API.

3) Moving over to using <4 x float> LLVM vectors throughout. This means we can
   finally drop the 'disable-mmx' option which is no-longer supported in LLVM
   2.6.

bindings/python/CMakeLists.txt

@@ -12,13 +12,18 @@ set(BUILD_PYTHON_BINDINGS 1)
 if(NOT APPLE)
     find_package(PkgConfig)
     pkg_check_modules(CAIRO cairo)
-    pkg_check_modules(CLUTTER clutter-0.8)
+    pkg_check_modules(CLUTTER clutter-1.0)
+    if(NOT CLUTTER_FOUND)
+        pkg_check_modules(CLUTTER clutter-0.8)
+        if(CLUTTER_FOUND)
+            pkg_check_modules(PYCLUTTER REQUIRED pyclutter-0.8)
+        endif(CLUTTER_FOUND)
+    else(NOT CLUTTER_FOUND)
+        pkg_check_modules(PYCLUTTER REQUIRED pyclutter-1.0)
+    endif(NOT CLUTTER_FOUND)
     if(CAIRO_FOUND)
         pkg_check_modules(PYCAIRO REQUIRED pycairo)
     endif(CAIRO_FOUND)
-    if(CLUTTER_FOUND)
-        pkg_check_modules(PYCLUTTER REQUIRED pyclutter-0.8)
-    endif(CLUTTER_FOUND)
 endif(NOT APPLE)
 
 if(NOT PYGOBJECT_FOUND)

firtree/CMakeLists.txt

@@ -4,9 +4,7 @@
 #
 # See LICENSE file for distribution rights.
 
-set(LLVM_CONFIG_COMPONENTS core 
-    codegen linker bitreader
-    jit native)
+set(LLVM_CONFIG_COMPONENTS all) 
 
 find_package(LLVM)
 find_package(PythonInterp)
@@ -22,7 +20,19 @@ include_directories(${LLVM_INCLUDE_DIRS})
 if(NOT APPLE)
     find_package(PkgConfig)
     pkg_check_modules(CAIRO cairo)
-    pkg_check_modules(CLUTTER clutter-0.8)
+    pkg_check_modules(CLUTTER clutter-1.0)
+    if(NOT CLUTTER_FOUND)
+        pkg_check_modules(CLUTTER clutter-0.8)
+        if(CLUTTER_FOUND)
+            set(CLUTTER_VERSION "0.8")
+            set(CLUTTER_VERSION_MAJOR "0")
+            set(CLUTTER_VERSION_MINOR "8")
+        endif(CLUTTER_FOUND)
+    else(NOT CLUTTER_FOUND)
+        set(CLUTTER_VERSION "1.0")
+        set(CLUTTER_VERSION_MAJOR "1")
+        set(CLUTTER_VERSION_MINOR "0")
+    endif(NOT CLUTTER_FOUND)
     pkg_check_modules(GDK_PIXBUF gdk-pixbuf-2.0)
 endif(NOT APPLE)
 

firtree/engines/cpu/CMakeLists.txt

@@ -15,7 +15,7 @@ set(LLVM_CONFIG_COMPONENTS core
 find_package(LLVM)
 find_package(PythonInterp)
 
-find_program(LLVM_GCC_EXECUTABLE llvm-gcc)
+find_program(LLVM_GCC_EXECUTABLE llvm-gcc PATH /usr/lib/llvm/llvm/gcc-4.2/bin)
 
 if(NOT LLVM_GCC_EXECUTABLE)
     message(SEND_ERROR "llvm-gcc not found.")
@@ -40,6 +40,7 @@ add_custom_command(
         -O3 builtins.nonopt.bc -f -o=builtins.bc
     COMMAND ${LLVM_GCC_EXECUTABLE} 
         -fno-math-errno
+        -msse3 -march=i686 -O3
         -o render-buffer.o
         -c -emit-llvm
         ${GLIB_CFLAGS}