[Pkg-erlang-commits] r1371 - in wings3d/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sat Dec 17 08:18:33 UTC 2011
Author: sgolovan
Date: 2011-12-17 08:18:33 +0000 (Sat, 17 Dec 2011)
New Revision: 1371
Modified:
wings3d/trunk/debian/changelog
wings3d/trunk/debian/control
wings3d/trunk/debian/patches/drivers.diff
Log:
[wings3d]
* Enhanced driver loading patch.
Modified: wings3d/trunk/debian/changelog
===================================================================
--- wings3d/trunk/debian/changelog 2011-12-16 21:47:56 UTC (rev 1370)
+++ wings3d/trunk/debian/changelog 2011-12-17 08:18:33 UTC (rev 1371)
@@ -1,9 +1,11 @@
wings3d (1.4.1-2) experimental; urgency=low
- * Fixed loading Erlang drivers into R15B.
+ * Removed menu from the suggested packages list (closes: #647386).
+ * Fixed loading Erlang drivers into R15B (only those which are actually
+ enter the binary package).
* Upload to experimental where Erlang R15B is currently.
- -- Sergei Golovan <sgolovan at debian.org> Fri, 16 Dec 2011 13:41:50 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 17 Dec 2011 12:17:33 +0400
wings3d (1.4.1-1) unstable; urgency=low
Modified: wings3d/trunk/debian/control
===================================================================
--- wings3d/trunk/debian/control 2011-12-16 21:47:56 UTC (rev 1370)
+++ wings3d/trunk/debian/control 2011-12-17 08:18:33 UTC (rev 1371)
@@ -13,7 +13,7 @@
Package: wings3d
Architecture: any
Depends: ${erlang-base:Depends}, ${erlang-abi:Depends}, ${erlang-esdl:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Suggests: ${erlang-dialyzer:Depends}, ${erlang-tools:Depends}, menu (>= 1.5), yafray | aqsis
+Suggests: ${erlang-dialyzer:Depends}, ${erlang-tools:Depends}, yafray | aqsis
Description: Nendo-inspired 3D polygon mesh modeller
Wings 3D is a polygon mesh modeller written entirely in Erlang. The
user interface was designed to be easy to use for both beginners and
Modified: wings3d/trunk/debian/patches/drivers.diff
===================================================================
--- wings3d/trunk/debian/patches/drivers.diff 2011-12-16 21:47:56 UTC (rev 1370)
+++ wings3d/trunk/debian/patches/drivers.diff 2011-12-17 08:18:33 UTC (rev 1371)
@@ -1,75 +1,34 @@
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/accel/wings_pick_drv.c
++++ wings3d-1.4.1/plugins_src/accel/wings_pick_drv.c
+@@ -14,6 +14,11 @@
+ #include <stdio.h>
+ #include "erl_driver.h"
- /*
---- 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
- };
++#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
++typedef int ErlDrvSizeT;
++typedef int ErlDrvSSizeT;
++#endif
++
+ #ifdef __WIN32__
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
+@@ -25,9 +30,9 @@
+ */
+ static ErlDrvData wings_file_start(ErlDrvPort port, char *buff);
+ static void wings_file_stop(ErlDrvData handle);
+-static int control(ErlDrvData handle, unsigned int command,
+- char* buff, int count,
+- char** res, int res_size);
++static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command,
++ char* buff, ErlDrvSizeT count,
++ char** res, ErlDrvSizeT res_size);
+ static void outputv(ErlDrvData drv_data, ErlIOVec* ev);
/*
---- 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 @@
+@@ -47,7 +52,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 */
@@ -88,9 +47,53 @@
};
struct vertex_struct {
+@@ -107,14 +123,14 @@
+ * Handle commands.
+ */
+
+-static int
++static ErlDrvSSizeT
+ control(ErlDrvData handle, unsigned int command,
+- char* buf, int count,
+- char** res, int res_size)
++ char* buf, ErlDrvSizeT count,
++ char** res, ErlDrvSizeT res_size)
+ {
+ switch (command) {
+ case 0: { /* Define matrix */
+- memcpy((void *) m, (void *) buf, count);
++ memcpy((void *) m, (void *) buf, (size_t) count);
+ #if 0
+ {
+ int i, j;
--- 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 @@
+@@ -14,6 +14,11 @@
+ #include <stdio.h>
+ #include "erl_driver.h"
+
++#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
++typedef int ErlDrvSizeT;
++typedef int ErlDrvSSizeT;
++#endif
++
+ #ifdef __WIN32__
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
+@@ -57,9 +62,9 @@
+ */
+ static ErlDrvData perlin_noise_start(ErlDrvPort port, char *buff);
+ static void perlin_noise_stop(ErlDrvData handle);
+-static int control(ErlDrvData handle, unsigned int command,
+- char* buff, int count,
+- char** res, int res_size);
++static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command,
++ char* buff, ErlDrvSizeT count,
++ char** res, ErlDrvSizeT res_size);
+
+ /*
+ * Internal routines
+@@ -82,7 +87,18 @@
NULL, /* void * that is not used (BC) */
control, /* F_PTR control, port_control callback */
NULL, /* F_PTR timeout, driver_set_timer callback */
@@ -110,31 +113,53 @@
};
/*
---- 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
- };
+@@ -114,9 +130,9 @@
+
+ }
- /*
+-static int control(ErlDrvData handle, unsigned int command,
+- char* buff, int count,
+- char** res, int res_size)
++static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command,
++ char* buff, ErlDrvSizeT count,
++ char** res, ErlDrvSizeT res_size)
+ {
+ ErlDrvBinary* bin;
+
--- 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 @@
+@@ -21,6 +21,11 @@
+ #include <setjmp.h>
+ #include "erl_driver.h"
+
++#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2
++typedef int ErlDrvSizeT;
++typedef int ErlDrvSSizeT;
++#endif
++
+ #include "jpeglib.h"
+ #include "jerror.h"
+
+@@ -29,14 +34,14 @@
+ */
+ static ErlDrvData jpeg_image_start(ErlDrvPort port, char *buff);
+ static void jpeg_image_stop(ErlDrvData handle);
+-static int jpeg_image_control(ErlDrvData handle, unsigned int command,
+- char* buff, int count,
+- char** res, int res_size);
++static ErlDrvSSizeT jpeg_image_control(ErlDrvData handle, unsigned int command,
++ char* buff, ErlDrvSizeT count,
++ char** res, ErlDrvSizeT res_size);
+
+ /*
+ * Internal functions.
+ */
+-static void jpeg_buffer_src(j_decompress_ptr cinfo, char* buf, int count);
++static void jpeg_buffer_src(j_decompress_ptr cinfo, char* buf, ErlDrvSizeT count);
+ static void jpeg_buffer_dest(j_compress_ptr cinfo, ErlDrvBinary* bin);
+ static ErlDrvBinary* jpeg_buffer_dest_get_bin(j_compress_ptr cinfo);
+
+@@ -58,7 +63,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 */
@@ -154,3 +179,26 @@
};
/*
+@@ -118,10 +134,10 @@
+ longjmp(myerr->setjmp_buffer, 1);
+ }
+
+-static int
++static ErlDrvSSizeT
+ jpeg_image_control(ErlDrvData handle, unsigned int command,
+- char* buf, int count,
+- char** res, int res_size)
++ char* buf, ErlDrvSizeT count,
++ char** res, ErlDrvSizeT res_size)
+ {
+ JSAMPROW row;
+ ErlDrvBinary* bin = 0;
+@@ -286,7 +302,7 @@
+ */
+
+ static void
+-jpeg_buffer_src(j_decompress_ptr cinfo, char* buf, int count)
++jpeg_buffer_src(j_decompress_ptr cinfo, char* buf, ErlDrvSizeT count)
+ {
+ MemSourceMgr* src;
+
More information about the Pkg-erlang-commits
mailing list