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

[Jo Shields]

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

    More dllmap fixes

diff --git a/debian/patches/fix_dllmaps b/debian/patches/fix_dllmaps
index 267ba95..3816f8b 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 16:42:01.615347597 +0100
-+++ opentk/Source/Compatibility/OpenTK.Compatibility.dll.config	2012-05-18 17:50:12.590385608 +0100
+--- 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
 @@ -2,8 +2,10 @@
    <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
    <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
@@ -13,3 +13,20 @@ Index: opentk/Source/Compatibility/OpenTK.Compatibility.dll.config
    <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" />
+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 @@
+   <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="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" />
+-  <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
++  <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
++  <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+   <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
+ </configuration>
diff --git a/debian/rules b/debian/rules
index d544ec8..8ab3f8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,4 +13,5 @@ override_dh_auto_clean:
 override_dh_clideps:
 	dh_clideps --exclude-moduleref=/System/Library/Frameworks/Carbon.framework/Versions/Current/Carbon \
 		--exclude-moduleref=/System/Library/Frameworks/ApplicationServices.framework/Versions/Current/ApplicationServices \
-		--exclude-moduleref=/System/Library/Frameworks/AGL.framework/Versions/Current/AGL
+		--exclude-moduleref=/System/Library/Frameworks/AGL.framework/Versions/Current/AGL \
+		--exclude-moduleref=libdl.dylib

-- 
opentk