[SCM] csound/master: Fix FTBFS with bison 2.6

Mon Jun 3 12:56:54 UTC 2013

The following commit has been merged in the master branch:
commit 025ea079604552a15a2ecab40a0a987290608b89
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Jun 3 14:55:57 2013 +0200

    Fix FTBFS with bison 2.6
    
    Apply patches from upstream to fix the build. Also bump Build-Depends on bison
    to >= 2.6 to be on the safe side.
    
    Closes: #710619

diff --git a/debian/changelog b/debian/changelog
index 7759a33..354ac86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 csound (1:5.17.11~dfsg-3) UNRELEASED; urgency=low
 
+  [ Jonas Smedegaard ]
   * Update README.source to emphasize control.in file as *not* a
     show-stopper for contributions, referring to wiki page for details.
 
+  [ Sebastian Ramacher ]
+  * debian/patches/2015-bison-2.6.patch: Apply patch from upstream to fix
+    compilation with bison 2.6. (Closes: #710619)
+  * debian/{control,rules}: Bump bison to (>= 2.6) to be on the safe side.
+
  -- Jonas Smedegaard <dr at jones.dk>  Thu, 18 Apr 2013 21:12:41 +0200
 
 csound (1:5.17.11~dfsg-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index cef980c..3d0e61e 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Build-Depends: debhelper,
  dssi-dev,
  libstk0-dev,
  libgmm++-dev,
- bison,
+ bison (>= 2.6),
  flex,
  libeigen3-dev,
  doxygen,
diff --git a/debian/patches/2015-bison-2.6.patch b/debian/patches/2015-bison-2.6.patch
new file mode 100644
index 0000000..c28e5d8
--- /dev/null
+++ b/debian/patches/2015-bison-2.6.patch
@@ -0,0 +1,118 @@
+Description: Fix compilation with bison 2.6
+Origin: upstream,
+ http://sourceforge.net/p/csound/csound5-git/ci/a8bc8d505cd05ea4e989b02ffd43d2632abaa63d/,
+ http://sourceforge.net/p/csound/csound5-git/ci/96102e2b48176b669b7cbe8acd372498af901053/,
+ http://sourceforge.net/p/csound/csound5-git/ci/8190391da6ed248a86f9f363e536dba6c2e5fa16/,
+ http://sourceforge.net/p/csound/csound5-git/ci/df9f511370de339abc603364de8da4c99fc5d27a/
+Bug-Debian: http://bugs.debian.org/710619
+Last-Update: 2013-06-03
+
+--- a/Engine/csound_orc_compile.c
++++ b/Engine/csound_orc_compile.c
+@@ -24,6 +24,8 @@
+ */
+ 
+ #include "csoundCore.h"
++        /* needed for bison 2.6 */
++#include "parse_param.h"
+ #include "csound_orc.h"
+ #include <math.h>
+ #include <ctype.h>
+@@ -1849,7 +1851,7 @@
+ }
+ 
+ /* For diagnostics map file name or macro name to an index */
+-int file_to_int(CSOUND *csound, const char *name)
++uint8_t file_to_int(CSOUND *csound, const char *name)
+ {
+     extern char *strdup(const char *);
+     int n = 0;
+--- a/Engine/parse_param.h
++++ b/Engine/parse_param.h
+@@ -1,3 +1,6 @@
++#ifndef __PARSE_PARAM_H
++#define __PARSE_PARAM_H
++
+ #define MARGS   (3)
+ #define MAX_INCLUDE_DEPTH 100
+ struct MACRO;
+@@ -54,4 +57,6 @@
+ void    cs_init_omacros(CSOUND*, PRE_PARM*, NAMES*);
+ 
+ uint32_t make_location(PRE_PARM *);
+-extern uint8_t file_to_int(CSOUND*, char*);
++extern uint8_t file_to_int(CSOUND*, const char*);
++
++#endif
+--- a/Engine/csound_orc.l
++++ b/Engine/csound_orc.l
+@@ -33,8 +33,9 @@
+ #define YYLTYPE ORCTOKEN*
+ #include "tok.h"
+ #define YY_DECL int yylex (YYLTYPE *lvalp, CSOUND *csound, yyscan_t yyscanner)
+-#include "csound_orcparse.h"
++//#include "parse_param.h"
+ #include "csound_orc.h"
++#include "csound_orcparse.h"
+ #include "corfile.h"
+ YYSTYPE *yylval_param;
+ YYLTYPE *yylloc_param;
+--- a/Engine/symbtab.c
++++ b/Engine/symbtab.c
+@@ -27,7 +27,7 @@
+ #include <string.h>
+ #include "csoundCore.h"
+ #include "tok.h"
+-#include "csound_orcparse.h"
++#include "csound_orc.h"
+ #include "insert.h"
+ #include "namedins.h"
+ #include "interlocks.h"
+--- a/Engine/cs_par_dispatch.c
++++ b/Engine/cs_par_dispatch.c
+@@ -26,7 +26,7 @@
+ 
+ #include "csoundCore.h"
+ #include "csound_orc.h"
+-#include "tok.h"
++//#include "tok.h"
+ #include "cs_par_base.h"
+ #include "cs_par_orc_semantics.h"
+ #include "cs_par_dispatch.h"
+--- a/Engine/new_orc_parser.c
++++ b/Engine/new_orc_parser.c
+@@ -24,9 +24,9 @@
+ */
+ 
+ #include "csoundCore.h"
+-#include "csound_orcparse.h"
+ #include "csound_orc.h"
+-#include "parse_param.h"
++#include "csound_orcparse.h"
++//#include "parse_param.h"
+ #include "corfile.h"
+ 
+ extern void csound_orcrestart(FILE*, void *);
+--- a/H/csound_orc.h
++++ b/H/csound_orc.h
+@@ -1,6 +1,7 @@
+ #ifndef __CSOUND_ORC_H
+ 
+ #define __CSOUND_ORC_H
++#include "parse_param.h"
+ #include "tok.h"
+ typedef struct TREE {
+   int           type;
+--- a/Top/main.c
++++ b/Top/main.c
+@@ -52,8 +52,8 @@
+ extern  OENTRY  opcodlst_1[];
+ extern  uintptr_t  kperfThread(void * cs);
+ #if defined(ENABLE_NEW_PARSER)
+-extern void cs_init_math_constants_macros(CSOUND *csound,void *yyscanner);
+-extern void cs_init_omacros(CSOUND *csound, NAMES *nn);
++extern void cs_init_math_constants_macros(CSOUND *csound,PRE_PARM *yyscanner);
++extern void cs_init_omacros(CSOUND *csound, PRE_PARM* yyscanner, NAMES *nn);
+ #endif
+ 
+ static void create_opcodlst(CSOUND *csound)
diff --git a/debian/patches/series b/debian/patches/series
index 1b6fda0..665ba27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 2013-no-rawwave-defined.diff
 
 2014-cmake-libsndfile-hack.patch
+2015-bison-2.6.patch
diff --git a/debian/rules b/debian/rules
index e6888c5..ce521e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -300,7 +300,7 @@ CDBS_BUILD_DEPENDS += , \
 	dssi-dev, \
 	libstk0-dev, \
 	libgmm++-dev, \
-	bison, \
+	bison (>= 2.6), \
 	flex, \
 	libeigen3-dev
 

-- 
csound packaging

