[Pkg-erlang-commits] r1368 - in wings3d/trunk/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Fri Dec 16 10:15:24 UTC 2011


Author: sgolovan
Date: 2011-12-16 10:15:24 +0000 (Fri, 16 Dec 2011)
New Revision: 1368

Added:
   wings3d/trunk/debian/patches/drivers.diff
Modified:
   wings3d/trunk/debian/changelog
   wings3d/trunk/debian/patches/series
Log:
[wings3d]
  * Fixed loading Erlang drivers into R15B.
  * Upload to experimental where Erlang R15B is currently.


Modified: wings3d/trunk/debian/changelog
===================================================================
--- wings3d/trunk/debian/changelog	2011-12-16 09:25:17 UTC (rev 1367)
+++ wings3d/trunk/debian/changelog	2011-12-16 10:15:24 UTC (rev 1368)
@@ -1,8 +1,9 @@
-wings3d (1.4.1-2) UNRELEASED; urgency=low
+wings3d (1.4.1-2) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * Fixed loading Erlang drivers into R15B.
+  * Upload to experimental where Erlang R15B is currently.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 13 Jun 2011 16:16:10 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 16 Dec 2011 13:41:50 +0400
 
 wings3d (1.4.1-1) unstable; urgency=low
 

Added: wings3d/trunk/debian/patches/drivers.diff
===================================================================
--- wings3d/trunk/debian/patches/drivers.diff	                        (rev 0)
+++ wings3d/trunk/debian/patches/drivers.diff	2011-12-16 10:15:24 UTC (rev 1368)
@@ -0,0 +1,156 @@
+Patch fixes loading external drivers into Erlang R15B.
+
+--- wings3d-1.4.1.orig/plugins_src/qt_file/qt_wings_file_drv.cpp
++++ wings3d-1.4.1/plugins_src/qt_file/qt_wings_file_drv.cpp
+@@ -58,7 +58,18 @@
+         NULL,                  /* void * that is not used (BC) */
+         qt_wings_file_control, /* F_PTR control, port_control callback */
+         NULL,                  /* F_PTR timeout, driver_set_timer callback */
+-        NULL                   /* F_PTR outputv, reserved */
++        NULL,                  /* F_PTR outputv, reserved */
++        NULL,
++        NULL,
++        NULL,
++        NULL,
++        ERL_DRV_EXTENDED_MARKER,
++        ERL_DRV_EXTENDED_MAJOR_VERSION,
++        ERL_DRV_EXTENDED_MINOR_VERSION,
++        0,
++        NULL,
++        NULL,
++        NULL
+     };
+ 
+ /*
+--- wings3d-1.4.1.orig/plugins_src/mac_file/mac_wings_image_drv.m
++++ wings3d-1.4.1/plugins_src/mac_file/mac_wings_image_drv.m
+@@ -52,7 +52,18 @@
+     NULL,                  /* void * that is not used (BC) */
+     mac_image_control,    /* F_PTR control, port_control callback */
+     NULL,                  /* F_PTR timeout, driver_set_timer callback */
+-    NULL                   /* F_PTR outputv, reserved */
++    NULL,                  /* F_PTR outputv, reserved */
++    NULL,
++    NULL,
++    NULL,
++    NULL,
++    ERL_DRV_EXTENDED_MARKER,
++    ERL_DRV_EXTENDED_MAJOR_VERSION,
++    ERL_DRV_EXTENDED_MINOR_VERSION,
++    0,
++    NULL,
++    NULL,
++    NULL
+ };
+ 
+ /*
+--- wings3d-1.4.1.orig/plugins_src/mac_file/mac_wings_file_drv.c
++++ wings3d-1.4.1/plugins_src/mac_file/mac_wings_file_drv.c
+@@ -54,7 +54,18 @@
+     NULL,                  /* void * that is not used (BC) */
+     mac_wings_file_control,    /* F_PTR control, port_control callback */
+     NULL,                  /* F_PTR timeout, driver_set_timer callback */
+-    NULL                   /* F_PTR outputv, reserved */
++    NULL,                  /* F_PTR outputv, reserved */
++    NULL,
++    NULL,
++    NULL,
++    NULL,
++    ERL_DRV_EXTENDED_MARKER,
++    ERL_DRV_EXTENDED_MAJOR_VERSION,
++    ERL_DRV_EXTENDED_MINOR_VERSION,
++    0,
++    NULL,
++    NULL,
++    NULL
+ };
+ 
+ /*
+--- wings3d-1.4.1.orig/plugins_src/accel/wings_pick_drv.c
++++ wings3d-1.4.1/plugins_src/accel/wings_pick_drv.c
+@@ -47,7 +47,18 @@
+     NULL,                  /* void * that is not used (BC) */
+     control,               /* F_PTR control, port_control callback */
+     NULL,                  /* F_PTR timeout, driver_set_timer callback */
+-    outputv                /* F_PTR outputv, reserved */
++    outputv,               /* F_PTR outputv, reserved */
++    NULL,
++    NULL,
++    NULL,
++    NULL,
++    ERL_DRV_EXTENDED_MARKER,
++    ERL_DRV_EXTENDED_MAJOR_VERSION,
++    ERL_DRV_EXTENDED_MINOR_VERSION,
++    0,
++    NULL,
++    NULL,
++    NULL
+ };
+ 
+ struct vertex_struct {
+--- wings3d-1.4.1.orig/plugins_src/accel/perlin_noise_drv.c
++++ wings3d-1.4.1/plugins_src/accel/perlin_noise_drv.c
+@@ -82,7 +82,18 @@
+    NULL,                  /* void * that is not used (BC) */
+    control,               /* F_PTR control, port_control callback */
+    NULL,                  /* F_PTR timeout, driver_set_timer callback */
+-   NULL                   /* F_PTR outputv, reserved */
++   NULL,                  /* F_PTR outputv, reserved */
++   NULL,
++   NULL,
++   NULL,
++   NULL,
++   ERL_DRV_EXTENDED_MARKER,
++   ERL_DRV_EXTENDED_MAJOR_VERSION,
++   ERL_DRV_EXTENDED_MINOR_VERSION,
++   0,
++   NULL,
++   NULL,
++   NULL
+ };
+ 
+ /*
+--- wings3d-1.4.1.orig/plugins_src/win32_file/wings_file_drv.c
++++ wings3d-1.4.1/plugins_src/win32_file/wings_file_drv.c
+@@ -64,7 +64,18 @@
+     NULL,                  /* void * that is not used (BC) */
+     wings_file_control,    /* F_PTR control, port_control callback */
+     NULL,                  /* F_PTR timeout, driver_set_timer callback */
+-    NULL                   /* F_PTR outputv, reserved */
++    NULL,                  /* F_PTR outputv, reserved */
++    NULL,
++    NULL,
++    NULL,
++    NULL,
++    ERL_DRV_EXTENDED_MARKER,
++    ERL_DRV_EXTENDED_MAJOR_VERSION,
++    ERL_DRV_EXTENDED_MINOR_VERSION,
++    0,
++    NULL,
++    NULL,
++    NULL
+ };
+ 
+ /*
+--- wings3d-1.4.1.orig/plugins_src/jpeg/wings_jpeg_image_drv.c
++++ wings3d-1.4.1/plugins_src/jpeg/wings_jpeg_image_drv.c
+@@ -58,7 +58,18 @@
+     NULL,                  /* void * that is not used (BC) */
+     jpeg_image_control,    /* F_PTR control, port_control callback */
+     NULL,                  /* F_PTR timeout, driver_set_timer callback */
+-    NULL                   /* F_PTR outputv, reserved */
++    NULL,                  /* F_PTR outputv, reserved */
++    NULL,
++    NULL,
++    NULL,
++    NULL,
++    ERL_DRV_EXTENDED_MARKER,
++    ERL_DRV_EXTENDED_MAJOR_VERSION,
++    ERL_DRV_EXTENDED_MINOR_VERSION,
++    0,
++    NULL,
++    NULL,
++    NULL
+ };
+ 
+ /*

Modified: wings3d/trunk/debian/patches/series
===================================================================
--- wings3d/trunk/debian/patches/series	2011-12-16 09:25:17 UTC (rev 1367)
+++ wings3d/trunk/debian/patches/series	2011-12-16 10:15:24 UTC (rev 1368)
@@ -3,3 +3,4 @@
 autouv.diff
 jpeg.diff
 lang.diff
+drivers.diff




More information about the Pkg-erlang-commits mailing list