The NMU patch for eegdev 0.2-3.1 is below. debdiff eegdev_0.2-3.dsc eegdev_0.2-3.1.dsc diff -Nru eegdev-0.2/debian/changelog eegdev-0.2/debian/changelog --- eegdev-0.2/debian/changelog 2012-05-23 20:41:23.000000000 +0100 +++ eegdev-0.2/debian/changelog 2014-03-19 11:39:19.000000000 +0000 @@ -1,3 +1,21 @@ +eegdev (0.2-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "FTBFS: conflicting types for 'cff_parse'" + Add fix-bison-grammar-file.patch + Patch by Dejan Latinovic + Closes: #720833 + * Include "config.h" before including system headers + Add include-config_h.patch + Patch by Dejan Latinovic + Closes: #742032 + * Fix unaligned memory access errors on MIPS systems + Add fix-unaligned-memory-access.patch + Patch by Dejan Latinovic + Closes: #742035 + + -- Anibal Monsalve Salazar <ani...@debian.org> Wed, 19 Mar 2014 11:39:11 +0000 + eegdev (0.2-3) unstable; urgency=low * Fix hangups when closing biosemi. (Closes: #673681) diff -Nru eegdev-0.2/debian/patches/fix-bison-grammar-file.patch eegdev-0.2/debian/patches/fix-bison-grammar-file.patch --- eegdev-0.2/debian/patches/fix-bison-grammar-file.patch 1970-01-01 01:00:00.000000000 +0100 +++ eegdev-0.2/debian/patches/fix-bison-grammar-file.patch 2014-03-17 13:54:09.000000000 +0000 @@ -0,0 +1,81 @@ +From: Dejan Latinovic <dejan.latino...@imgtec.com> +Date: Tue, 11 Mar 2014 18:16:39 +0100 +Description: FTBFS: conflicting types for 'cff_parse' + Changes to bison input files (src/core/conffile.y and src/core/confline.y), + in order to adapt to newer bison version. +Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720833 + +--- a/src/core/conffile.y ++++ b/src/core/conffile.y +@@ -17,9 +17,11 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + %define api.pure ++%no-lines + %name-prefix "cff_" + %defines "conffile.tab.h" + %parse-param { struct cfdata *pp } ++%lex-param { yyscan_t cff_scaninfo } + %{ + #if HAVE_CONFIG_H + # include <config.h> +@@ -28,6 +30,11 @@ + #include <stdio.h> + #include <stdlib.h> + #include "configuration.h" ++#ifndef YY_TYPEDEF_YY_SCANNER_T ++#define YY_TYPEDEF_YY_SCANNER_T ++typedef void* yyscan_t; ++#endif ++#include "conffile.h" + %} + + %union value { +@@ -36,9 +43,7 @@ + + %{ + #include "conffile.lex.h" +-#include "conffile.h" +-#define YYLEX_PARAM pp->scaninfo +- ++#define cff_scaninfo pp->scaninfo + static int yyerror(struct cfdata *pp, const char* s); + %} + +--- a/src/core/confline.y ++++ b/src/core/confline.y +@@ -17,9 +17,11 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + %define api.pure ++%no-lines + %name-prefix "cfl_" + %defines "confline.tab.h" + %parse-param { struct cfldata *pp } ++%lex-param { yyscan_t cfl_scaninfo } + %{ + #if HAVE_CONFIG_H + # include <config.h> +@@ -28,6 +30,11 @@ + #include <stdio.h> + #include <stdlib.h> + #include "configuration.h" ++#ifndef YY_TYPEDEF_YY_SCANNER_T ++#define YY_TYPEDEF_YY_SCANNER_T ++typedef void* yyscan_t; ++#endif ++#include "confline.h" + %} + + %union value { +@@ -36,9 +43,7 @@ + + %{ + #include "confline.lex.h" +-#include "confline.h" +-#define YYLEX_PARAM pp->scaninfo +- ++#define cfl_scaninfo pp->scaninfo + static int yyerror(struct cfldata *pp, const char* s); + %} + diff -Nru eegdev-0.2/debian/patches/fix-unaligned-memory-access.patch eegdev-0.2/debian/patches/fix-unaligned-memory-access.patch --- eegdev-0.2/debian/patches/fix-unaligned-memory-access.patch 1970-01-01 01:00:00.000000000 +0100 +++ eegdev-0.2/debian/patches/fix-unaligned-memory-access.patch 2014-03-17 17:20:49.000000000 +0000 @@ -0,0 +1,46 @@ +From: Dejan Latinovic <dejan.latino...@imgtec.com> +Date: Tue, 11 Mar 2014 18:16:39 +0100 +Description: Fix unaligned memory access errors on MIPS systems + This patch fixes unaligned memory access errors on MIPS systems. +Debian-Bug: + +--- a/src/core/typecast.c 2014-03-17 17:03:03.868239764 +0000 ++++ b/src/core/typecast.c 2014-03-17 17:07:18.253726412 +0000 +@@ -37,6 +37,28 @@ static void cast_##tsrc##_##tdst (void* + } \ + } + ++// Prototype of a generic type scale and cast function for unaligned memory access ++#define DEFINE_CASTUNALIGNED_FN(tsrc, tdst) \ ++static void cast_##tsrc##_##tdst (void* restrict d, const void* restrict s, union gval sc, size_t len) \ ++{ \ ++ union dstdata \ ++ { \ ++ tdst Data; \ ++ unsigned int intData[2]; \ ++ }; \ ++ const tsrc* src = s; \ ++ union dstdata *dst = d; \ ++ tdst scale = sc.val##tdst; \ ++ while(len) \ ++ { \ ++ union dstdata dst_tmp; \ ++ dst_tmp.Data = scale * ((tdst)(*src)); \ ++ dst->intData[0] = dst_tmp.intData[0]; \ ++ dst->intData[1] = dst_tmp.intData[1]; \ ++ src++; dst++; \ ++ len -= sizeof(*src); \ ++ } \ ++} + // Prototype of a generic type cast function + #define DEFINE_CASTNOSC_FN(tsrc, tdst) \ + static void castnosc_##tsrc##_##tdst (void* restrict d, const void* restrict s, union gval sc, size_t len) \ +@@ -60,7 +82,7 @@ static void identity(void* restrict d, c + + // Declaration/definition of type cast and scale functions + DEFINE_CAST_FN(int32_t, int32_t) +-DEFINE_CAST_FN(int32_t, double) ++DEFINE_CASTUNALIGNED_FN(int32_t, double) + DEFINE_CAST_FN(double, int32_t) + DEFINE_CAST_FN(int32_t, float) + DEFINE_CAST_FN(float, int32_t) diff -Nru eegdev-0.2/debian/patches/include-config_h.patch eegdev-0.2/debian/patches/include-config_h.patch --- eegdev-0.2/debian/patches/include-config_h.patch 1970-01-01 01:00:00.000000000 +0100 +++ eegdev-0.2/debian/patches/include-config_h.patch 2014-03-17 16:38:34.000000000 +0000 @@ -0,0 +1,79 @@ +From: Dejan Latinovic <dejan.latino...@imgtec.com> +Date: Tue, 11 Mar 2014 18:16:39 +0100 +Description: include "config.h" before including system headers + The following source files were modified to include "config.h" before + including system headers (due to changes in gnulib). +Debian-Bug: + +--- a/doc/examples/library-usage/acquisition.c ++++ b/doc/examples/library-usage/acquisition.c +@@ -15,6 +15,9 @@ + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ ++#if HAVE_CONFIG_H ++#include <config.h> ++#endif + #include <stdlib.h> + #include <stdio.h> + #include <stdint.h> +--- a/doc/examples/library-usage/eegdev_acq.c ++++ b/doc/examples/library-usage/eegdev_acq.c +@@ -15,6 +15,9 @@ + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ ++#if HAVE_CONFIG_H ++#include <config.h> ++#endif + #include <stdint.h> + #include <stdlib.h> + #include <stdio.h> +--- a/doc/examples/library-usage/recinxdf.c ++++ b/doc/examples/library-usage/recinxdf.c +@@ -15,6 +15,9 @@ + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ ++#if HAVE_CONFIG_H ++#include <config.h> ++#endif + #include <unistd.h> + #include <stdlib.h> + #include <stdio.h> +--- a/tests/sysbiosemi.c ++++ b/tests/sysbiosemi.c +@@ -17,6 +17,9 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + //#include <sys/time.h> ++#if HAVE_CONFIG_H ++#include <config.h> ++#endif + #include <time.h> + #include <string.h> + #include <stdlib.h> +--- a/tests/syseegfile.c ++++ b/tests/syseegfile.c +@@ -17,6 +17,9 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + //#include <sys/time.h> ++#if HAVE_CONFIG_H ++#include <config.h> ++#endif + #include <time.h> + #include <string.h> + #include <stdlib.h> +--- a/tests/systobiia.c ++++ b/tests/systobiia.c +@@ -16,6 +16,9 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + //#include <sys/time.h> ++#if HAVE_CONFIG_H ++#include <config.h> ++#endif + #include <time.h> + #include <string.h> + #include <stdlib.h> diff -Nru eegdev-0.2/debian/patches/series eegdev-0.2/debian/patches/series --- eegdev-0.2/debian/patches/series 2012-05-24 19:28:18.000000000 +0100 +++ eegdev-0.2/debian/patches/series 2014-03-17 16:41:17.000000000 +0000 @@ -2,3 +2,6 @@ fix-racecond-in-biosemi-tests.patch condtimedwait-kfreebsd-bug-workaround.patch fix-biosemi-close-hangups.patch +fix-bison-grammar-file.patch +include-config_h.patch +fix-unaligned-memory-access.patch
-- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
