[Pkg-cli-libs-commits] [SCM] opentk branch, master, updated. 331e9980b769c513c7261cfffa99a79281c8e196

[Jo Shields]

The following commit has been merged in the master branch:
commit 575b86af1be5c2ebedd84cabe7d4f8a5dd4074d0
Author: Jo Shields <directhex at apebox.org>
Date:   Fri May 18 18:06:06 2012 +0100

    More dllmap fixes

diff --git a/debian/patches/fix_dllmaps b/debian/patches/fix_dllmaps
index 3816f8b..7ba7a41 100644
--- a/debian/patches/fix_dllmaps
+++ b/debian/patches/fix_dllmaps
@@ -1,7 +1,7 @@
 Index: opentk/Source/Compatibility/OpenTK.Compatibility.dll.config
 ===================================================================
---- opentk.orig/Source/Compatibility/OpenTK.Compatibility.dll.config	2012-05-18 17:54:09.000000000 +0100
-+++ opentk/Source/Compatibility/OpenTK.Compatibility.dll.config	2012-05-18 17:57:35.734108855 +0100
+--- opentk.orig/Source/Compatibility/OpenTK.Compatibility.dll.config	2012-05-18 18:00:37.000000000 +0100
++++ opentk/Source/Compatibility/OpenTK.Compatibility.dll.config	2012-05-18 18:02:25.340499819 +0100
 @@ -2,8 +2,10 @@
    <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
    <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
@@ -15,13 +15,16 @@ Index: opentk/Source/Compatibility/OpenTK.Compatibility.dll.config
    <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
 Index: opentk/Source/OpenTK/OpenTK.dll.config
 ===================================================================
---- opentk.orig/Source/OpenTK/OpenTK.dll.config	2012-05-18 16:42:01.683348019 +0100
-+++ opentk/Source/OpenTK/OpenTK.dll.config	2012-05-18 18:00:00.659306911 +0100
-@@ -4,9 +4,10 @@
+--- opentk.orig/Source/OpenTK/OpenTK.dll.config	2012-05-18 18:00:37.000000000 +0100
++++ opentk/Source/OpenTK/OpenTK.dll.config	2012-05-18 18:05:47.946168039 +0100
+@@ -4,9 +4,13 @@
    <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
    <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
    <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
 +  <dllmap os="linux" dll="libXxf86vm" target="libXxf86vm.so.1"/>
++  <dllmap os="linux" dll="libXinerama" target="libXinerama.so.1"/>
++  <dllmap os="linux" dll="libGLES.dll" target="libGLESv1_CM.so.1"/>
++  <dllmap os="linux" dll="libGLESv2.dll" target="libGLESv2.so.2"/>
    <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
    <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
 -  <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />

-- 
opentk