Remove comedilib-9999-comedi.i.patch.

Changes accepted upstream:

revision 1.13
date: 2010-12-20 09:50:21 -0500;
author: abbotti;
state: Exp;
lines: +16 -2;
commitid: bYxCcTeCEsZcX11v;

Add sampl_t and lsampl_t array_class()es to comedi.i.

This makes it easier (possible?) to setup comedi_insn_struct and
comedi_cmd_struct instances.

Patch from W. Trevor King.

diff --git a/ChangeLog b/ChangeLog
index 980a079d53e31574924d8b183400b7acc4157da5..e361f4334aabc0ab546b253249d266c9beaf3979 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,8 @@
 *comedilib-9999 (31 Dec 2010)
 
   31 Dec 2010; W. Trevor King <wking@drexel.edu> comedilib-9999.ebuild :
-  Fix repoman-reported issues with 9999.
+  - Fix repoman-reported issues with 9999.
+  - Remove comedi.i patch (changes accepted upstream)
 
 *comedilib-9999 (08 Dec 2010)
 

diff --git a/Manifest b/Manifest
index 354b1096db60c0942b34735d1a86009fd779b314..93ac8762dc7c5c796b7957f6e2c7f93eecad94a1 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -1,5 +1,4 @@
-AUX comedilib-9999-comedi.i.patch 919 RMD160 f4302074d6fe2a0a75eea2ab329f2067d479e7e1 SHA1 75b80d40bf5363bd1478fb8516f10bdc78c83276 SHA256 ef975b802a94330d60d607b79b2b330106d7ef841bdeb168e84769d298d306cd
 AUX comedilib-9999-demo-Makefile.patch 2505 RMD160 76278a724696a5fc3f4fb9e1b297018b6ce83953 SHA1 bc3401ed2c69ac87144621eba6bbe825b16e679f SHA256 25fd857769c8c5390289db546cd8e7686372edcdbdea0ffd989b45689a8ba6b1
-EBUILD comedilib-9999.ebuild 3710 RMD160 c01a7787c0e775f3ea0b8f1db2376366c4847457 SHA1 fa9eb340f0c1ad061750a0fdec13a602c5bca5d8 SHA256 73cb9370efdfdb99e3fd2c027a6621a88d84730602cb1e3e6de11db5d0b48892
-MISC ChangeLog 1314 RMD160 3b8376466974203fd1338d7a7d0044c66afd842b SHA1 79f8bf856c3831f72ff9c59f0654dd7d98eff37e SHA256 7ec9d7819457a0aaffb4ff318b2d42e533b92323b0a28d802d05142913e7db50
+EBUILD comedilib-9999.ebuild 3668 RMD160 8cb21562a3b86b5ac2a23dd986968f1876b762b0 SHA1 4ae4b390cde56ec5747fe9e6f26bc6c4c660158a SHA256 a66f2a3398c70c066c6dba6943dfb93188f9b00fb49ab552a718915bb727276a
+MISC ChangeLog 1370 RMD160 5151951a42307c9b2f53d48780c01a216c2cc5df SHA1 5ece3fb640a6a99d7d1bf750683156530d9e7fed SHA256 d694b2b121dec0dc7b2f6e441c5fd7eb2126b7bf0b211aedba51a35148b18891
 MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72

diff --git a/comedilib-9999.ebuild b/comedilib-9999.ebuild
index c3e1a6bb5a5559dd94391ec2b957285b8949991b..1855f9ee65587452168b3a53074d1273eca613c7 100644 (file)
--- a/comedilib-9999.ebuild
+++ b/comedilib-9999.ebuild
@@ -50,7 +50,6 @@ src_prepare()
        if [ "${PV}" == "9999" ] ; then
                ./autogen.sh
        fi
-       epatch "${FILESDIR}/${P}-comedi.i.patch"
        if use python ; then
                pushd "${S}/swig/python" || die "failed to pushd"
                distutils_src_prepare

diff --git a/files/comedilib-9999-comedi.i.patch b/files/comedilib-9999-comedi.i.patch
deleted file mode 100644 (file)
index 42dccdc..0000000
--- a/files/comedilib-9999-comedi.i.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/swig/comedi.i    2010-12-17 19:53:09.000000000 -0500
-+++ b/swig/comedi.i    2010-12-18 15:05:18.000000000 -0500
-@@ -55,8 +55,6 @@
- }
- %}
- 
--%array_class(unsigned int, chanlist);
--
- #ifdef SWIGRUBY
- %typemap(argout) comedi_cmd *INOUT(VALUE info) {
-     $result = output_helper($result, $arg);
-@@ -66,3 +64,19 @@
- %include "comedi.h"
- %include "comedilib.h"
- 
-+/* These typedefs work around limitations in SWIG's array_class().
-+ * Without them, you get errors like:
-+ * >>> import comedi
-+ * >>> cmd = comedi.comedi_cmd_struct()
-+ * >>> data = comedi.sampl_array(3)
-+ * >>> cmd.data = data
-+ * Traceback (most recent call last):
-+ *   ...
-+ * TypeError: in method 'comedi_cmd_struct_data_set', argument 2 of type 'sampl_t *'
-+ */
-+typedef unsigned short sampl_array;
-+typedef unsigned int lsampl_array;
-+
-+%array_class(unsigned int, chanlist);
-+%array_class(sampl_t, sampl_array);
-+%array_class(lsampl_t, lsampl_array);