[Pkg-cli-libs-commits] r3839 - in /packages/taoframework/trunk/debian/patches: 202_disable_parts_of_glu_doc.diff 300_proper_dll_config.diff
hanska-guest at users.alioth.debian.org
hanska-guest at users.alioth.debian.org
Sat Sep 20 11:26:24 UTC 2008
Author: hanska-guest
Date: Sat Sep 20 11:26:24 2008
New Revision: 3839
URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3839
Log:
Patches refreshed
Modified:
packages/taoframework/trunk/debian/patches/202_disable_parts_of_glu_doc.diff
packages/taoframework/trunk/debian/patches/300_proper_dll_config.diff
Modified: packages/taoframework/trunk/debian/patches/202_disable_parts_of_glu_doc.diff
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/patches/202_disable_parts_of_glu_doc.diff?rev=3839&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/patches/202_disable_parts_of_glu_doc.diff (original)
+++ packages/taoframework/trunk/debian/patches/202_disable_parts_of_glu_doc.diff Sat Sep 20 11:26:24 2008
@@ -173,7 +173,7 @@
// void vertexData(GLfloat *vertex, void *userData);
public delegate void NurbsVertexDataCallback([In] float[] vertexData, [In] IntPtr[] userData);
#endregion NurbsVertexDataCallback([In] float[] vertexData, [In] IntPtr[] userData)
-@@ -1624,55 +1624,55 @@
+@@ -1624,127 +1624,127 @@
#endregion QuadricErrorCallback(int errorCode)
#region TessBeginCallback(int type)
@@ -253,7 +253,18 @@
// typedef void (CALLBACK* GLUtessEdgeFlagProc) (GLboolean);
public delegate void TessEdgeFlagCallback(int flag);
#endregion TessEdgeFlagCallback(int flag)
-@@ -1687,64 +1687,64 @@
+
+ #region TessEdgeFlagDataCallback(int flag, [In] IntPtr polygonData)
+- /// <summary>
+- /// Callback (delegate) for use with <see cref="gluTessCallback(Tao.OpenGl.Glu.GLUtesselator, int, Tao.OpenGl.Glu.TessBeginCallback)" />.
+- /// </summary>
+- /// <seealso cref="gluTessCallback(Tao.OpenGl.Glu.GLUtesselator, int, Tao.OpenGl.Glu.TessBeginCallback)" />
++ // <summary>
++ // Callback (delegate) for use with <see cref="gluTessCallback(Tao.OpenGl.Glu.GLUtesselator, int, Tao.OpenGl.Glu.TessBeginCallback)" />.
++ // </summary>
++ // <seealso cref="gluTessCallback(Tao.OpenGl.Glu.GLUtesselator, int, Tao.OpenGl.Glu.TessBeginCallback)" />
+ // typedef void (CALLBACK* GLUtessEdgeFlagDataProc) (GLboolean, void *);
+ public delegate void TessEdgeFlagDataCallback(int flag, [In] IntPtr polygonData);
#endregion TessEdgeFlagDataCallback(int flag, [In] IntPtr polygonData)
#region TessEndCallback()
Modified: packages/taoframework/trunk/debian/patches/300_proper_dll_config.diff
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/patches/300_proper_dll_config.diff?rev=3839&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/patches/300_proper_dll_config.diff (original)
+++ packages/taoframework/trunk/debian/patches/300_proper_dll_config.diff Sat Sep 20 11:26:24 2008
@@ -1,41 +1,36 @@
-Index: taoframework-2.0.0.svn20071027/Tao.Ode/Tao.Ode/Tao.Ode.dll.config
+Index: taoframework-2.1.0/source/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
===================================================================
---- taoframework-2.0.0.svn20071027.orig/Tao.Ode/Tao.Ode/Tao.Ode.dll.config 2007-10-27 09:09:57.000000000 +0000
-+++ taoframework-2.0.0.svn20071027/Tao.Ode/Tao.Ode/Tao.Ode.dll.config 2008-09-05 09:01:15.000000000 +0000
-@@ -1,3 +1,3 @@
+--- taoframework-2.1.0.orig/source/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
++++ taoframework-2.1.0/source/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
+@@ -1,16 +1,16 @@
<configuration>
-- <dllmap dll="ode.dll" target="libode.so.0" />
-+ <dllmap dll="ode.dll" target="libode.so.0debian1" />
- </configuration>
-Index: taoframework-2.0.0.svn20071027/Tao.Lua/Tao.Lua/Tao.Lua.dll.config
+ <dllmap dll="avcodec-51.dll">
+- <dllentry os="linux" dll="libavcodec.so.1d" />
++ <dllentry os="linux" dll="libavcodec.so.51" />
+ <dllentry os="windows" dll="avcodec-51.dll" />
+ <dllentry os="osx" dll="libavcodec.so.1d" />
+ </dllmap>
+ <dllmap dll="avformat-51.dll">
+- <dllentry os="linux" dll="libavformat.so.1d" />
++ <dllentry os="linux" dll="libavformat.so.52" />
+ <dllentry os="windows" dll="avformat-51.dll" />
+ <dllentry os="osx" dll="libavformat.so.1d" />
+ </dllmap>
+ <dllmap dll="avutil-49.dll">
+- <dllentry os="linux" dll="libavutil.so.1d" />
++ <dllentry os="linux" dll="libavutil.so.49" />
+ <dllentry os="windows" dll="avutil-49.dll" />
+ <dllentry os="osx" dll="libavutil.so.1d" />
+ </dllmap>
+Index: taoframework-2.1.0/source/src/Tao.OpenAl/Tao.OpenAl.dll.config
===================================================================
---- taoframework-2.0.0.svn20071027.orig/Tao.Lua/Tao.Lua/Tao.Lua.dll.config 2007-10-27 09:09:44.000000000 +0000
-+++ taoframework-2.0.0.svn20071027/Tao.Lua/Tao.Lua/Tao.Lua.dll.config 2008-09-05 09:01:15.000000000 +0000
-@@ -1,3 +1,3 @@
+--- taoframework-2.1.0.orig/source/src/Tao.OpenAl/Tao.OpenAl.dll.config
++++ taoframework-2.1.0/source/src/Tao.OpenAl/Tao.OpenAl.dll.config
+@@ -1,6 +1,6 @@
<configuration>
-- <dllmap dll="lua5.1.dll" target="liblua5.1.so" />
-+ <dllmap dll="lua5.1.dll" target="liblua5.1.so.0" />
- </configuration>
-Index: taoframework-2.0.0.svn20071027/Tao.FFmpeg/Tao.FFmpeg/Tao.FFmpeg.dll.config
-===================================================================
---- taoframework-2.0.0.svn20071027.orig/Tao.FFmpeg/Tao.FFmpeg/Tao.FFmpeg.dll.config 2008-09-05 09:01:54.000000000 +0000
-+++ taoframework-2.0.0.svn20071027/Tao.FFmpeg/Tao.FFmpeg/Tao.FFmpeg.dll.config 2008-09-05 09:02:18.000000000 +0000
-@@ -1,5 +1,5 @@
- <configuration>
-- <dllmap dll="avcodec-51.dll" target="libavcodec.so.1d" />
-- <dllmap dll="avformat-51.dll" target="libavformat.so.1d" />
-- <dllmap dll="avutil-49.dll" target="libavutil.so.1d" />
-+ <dllmap dll="avcodec-51.dll" target="libavcodec.so.51" />
-+ <dllmap dll="avformat-51.dll" target="libavformat.so.52" />
-+ <dllmap dll="avutil-49.dll" target="libavutil.so.49" />
- </configuration>
-Index: taoframework-2.0.0.svn20071027/Tao.OpenGl/Tao.OpenAl/Tao.OpenAl.dll.config
-===================================================================
---- taoframework-2.0.0.svn20071027.orig/Tao.OpenGl/Tao.OpenAl/Tao.OpenAl.dll.config 2008-09-05 09:01:30.000000000 +0000
-+++ taoframework-2.0.0.svn20071027/Tao.OpenGl/Tao.OpenAl/Tao.OpenAl.dll.config 2008-09-05 09:01:49.000000000 +0000
-@@ -1,4 +1,4 @@
- <configuration>
-- <dllmap dll="OpenAL32.dll" target="libopenal.so.0" />
-+ <dllmap dll="OpenAL32.dll" target="libopenal.so.1" />
- <dllmap dll="alut.dll" target="libalut.so.0" />
- </configuration>
+ <dllmap dll="OpenAL32.dll">
+- <dllentry os="linux" dll="libopenal.so.0" />
++ <dllentry os="linux" dll="libopenal.so.1" />
+ <dllentry os="windows" dll="OpenAL32.dll" />
+ <dllentry os="osx" dll="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+ </dllmap>
More information about the Pkg-cli-libs-commits
mailing list