Fix build with bison-2.6 and skip check for unused fltk gl library (bug #427268).

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

5 files changed, 158 insertions, 20 deletions

diff --git a/media-sound/csound/ChangeLog b/media-sound/csound/ChangeLog
index ba1ad00e75fe..e3a1d9e6225a 100644
--- a/media-sound/csound/ChangeLog
+++ b/media-sound/csound/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/csound
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.19 2012/05/29 12:12:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.20 2012/07/23 21:18:24 radhermit Exp $
+
+  23 Jul 2012; Tim Harder <radhermit@gentoo.org> csound-5.17.11.ebuild,
+  +files/csound-5.17.11-bison-2.6.patch,
+  +files/csound-5.17.11-no-fltk-gl.patch:
+  Fix build with bison-2.6 and skip check for unused fltk gl library (bug
+  #427268).
 
   29 May 2012; Tim Harder <radhermit@gentoo.org>
   -files/csound-5.16.6-install.patch, -csound-5.17.2-r1.ebuild,
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index f6625aa57ed0..92f42ce55246 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX csound-5.16.6-tests.patch 2356 RMD160 6b3d93e4e062d009b7776ece4cf9c39a7da7ac0c SHA1 11e2132a702565c7386c4b54b2e42d63820fd568 SHA256 0b242d94b1718671d325b20cbd3faf4bc2437738fd88d49586a73fc84e5e9dca
-AUX csound-5.17.11-cmake.patch 256 RMD160 e247ddcc2c690226a70c1d2074abef77e3901b97 SHA1 ca29f48940c392fd277d8fed89ebfdfd6353695c SHA256 abcf62d9aabaa8e761d1f9ff5cf5b93c7701d7ac917e149dd62efc3be7964acd
-AUX csound-5.17.6-fltk.patch 343 RMD160 704ed3df1f9dabbe9720c5a35b7c01430e7a4a2a SHA1 f7b9025d03232bc457d9e0949d75b4cbcda3420d SHA256 b6d8f8df2b2f8930d4d84191e3791912ede9f068722fa82d3afa81f55c2eaf86
-AUX csound-5.17.6-porttime-in-portmidi.patch 614 RMD160 61ce8520f0480879487f42b3d2a1074b830cfa9c SHA1 b5c6c5a7ee027452bde510dcbc61740479ad012c SHA256 98a9fd9a7d3b2ff5fd287aedd062763c695c50ba369748b5fecb7338a7b1b48c
-DIST Csound5.17.11.tar.gz 9152189 RMD160 d2bb317fcfcde12453ea83d1b1f54421cdb36570 SHA1 750beb4daadfec63084b476ddf1581a8c64df17b SHA256 a86595c4328b63e9b37205b40bf1441182a453451b0ea20558a7777dbc0380b7
-DIST Csound5.17.6.tar.gz 9132954 RMD160 8b42227b149664bb0c72713818d67018bbe428ee SHA1 ee1e999e51dc3377b9409cd43cd84ce32f3bf1c8 SHA256 d161acddb4a419fc15097e4f508b7b4e09fadb25b72906cf4f485ca9415fe6d1
-EBUILD csound-5.17.11.ebuild 5556 RMD160 5ec526560418b0074dc253653a813a1a9e1b758e SHA1 a308f1f31805eadf4358bcd3a5c0db1288ef31ee SHA256 16553479a201d1b03b4b422cd351c247c0484cc1d7d25ca5f3958f3420f371c3
-EBUILD csound-5.17.6-r1.ebuild 5485 RMD160 c1d55437982e19f8cedf347595adf937574e43af SHA1 7e0c22758f53c0792105872b37156cab9a3f8152 SHA256 5f9f80743d417bad23684c23b840dd69c79977b7eb7aa02b7659a586d430a147
-MISC ChangeLog 3431 RMD160 4e9a82b4e0d37d2784dc8ef0b70f4d0e61f2b477 SHA1 b56bff8662457f4c1aed19b0e3d54485dda9e28d SHA256 154855283ece23710694005d431f80708f11ebafed23703135acf85870c670ed
-MISC metadata.xml 1357 RMD160 487c931ae628d65fcd485a447c654347692132b6 SHA1 3ee61c4f508d0361107eb956cc7229779bd10997 SHA256 82e7de59c27c84a574f06e24d17c97eb7561fed13c1119602b518ce7c850bfee
+AUX csound-5.16.6-tests.patch 2356 SHA256 0b242d94b1718671d325b20cbd3faf4bc2437738fd88d49586a73fc84e5e9dca SHA512 d85bf2458ef0b709f497f85c15b010ef9da3a70c9b2fcc4ba0ff0d44a7f1cd2547aa6bc823ffa0834c3dabb301b06e08fbf83089ec584d45545dc368955d780a WHIRLPOOL 9ed37a4f9aadfca902ce278c706759c3643b729ddda290060e88b7f83c0f0d33e0b371beb14ff371e60319bb5e2b58d12fa9bc248a6e001c8bd6d1238214907e
+AUX csound-5.17.11-bison-2.6.patch 2973 SHA256 be1b650ba9673de4bfc52a8264934cb624dd68ea9aec81971fcc1dbae18f8daa SHA512 581772ce21d870a3a0a55bae6c12bde40a8a8e35c8cfc8f54a3319757a7bb95776f32a67ee89ef147e8960b5f5f7fc1cfb7df4957260d6d3986444a4e7f05559 WHIRLPOOL 2f7e982306a0d6fada01cccf123a06a84f974e2cf28be040d3a50bffdf3398df926e8a8ada7bd295d66bd81511c30a3c4650fe584c06f71256d5516ad370679c
+AUX csound-5.17.11-cmake.patch 256 SHA256 abcf62d9aabaa8e761d1f9ff5cf5b93c7701d7ac917e149dd62efc3be7964acd SHA512 71bd58ba57304ba3b7dca88e0894af7d9b065bc5ebbcbb55af54a4e7528fec44f3ba9e9473f73a1e8bf1af41db83b85776ac570684adb7e778e24f5742adb593 WHIRLPOOL 38baac976621ffbc0284c7b75affa1df3ea2d96bf75259e41c57330e222d6d73701c6c57e65c87eec407d1b5ee5a2eff07b3d25af3884d21c36bf6d31bbadea3
+AUX csound-5.17.11-no-fltk-gl.patch 552 SHA256 af22c544b5811a2133ae2aaa93cb8e2e07183556d5a0faa06325d04c21c865f5 SHA512 4ee09f27325a49d4ea83264cb20842f760731f1e89153e7f301ac0b646745cef1a83c0a264a9922c2a7c65356afdc9a0ee1a14c944b3b8b6bccdc8976dbebf4b WHIRLPOOL 7bceb70cf3e1b78ba5ff59a4294cc163dd2b891b3b8bca320647d8e86cc2db2a53b5082d74d1f93977542e21c77b1f95b937926f3d086420dcf46726e9b6bb8b
+AUX csound-5.17.6-fltk.patch 343 SHA256 b6d8f8df2b2f8930d4d84191e3791912ede9f068722fa82d3afa81f55c2eaf86 SHA512 816f46ece3cdfd57cd399ae73f5fbfe2c9e42f418b62ed4f1273cdf5fe9f005b884c3702d69574c38b107d9b50fb0ca473d964e8e6e5397d87a06a3856f8204b WHIRLPOOL c340b9116571f1556107a85772d942c7f2426fdee474aac4c68432b2a56c2fe2633544dae7a55aae3215dec163826eae3d2eadc712a5eb550b098b1ec10ae51b
+AUX csound-5.17.6-porttime-in-portmidi.patch 614 SHA256 98a9fd9a7d3b2ff5fd287aedd062763c695c50ba369748b5fecb7338a7b1b48c SHA512 70b5e417fc1f59624fa2a5bc94f47cda8314317618843a892fa55985f83b0a46313f30c7d2e95716f47fe3cc934ff75060b682f2418581b20441854f88e8bf57 WHIRLPOOL dcd8161596e30ac42a08318b90e3108569debf6f62a0605cf8b9db4cab276ffd1be20892b6b5b7725dd7fabc5e00226bcac518c8fb64bf9adc2be2a9aeb5ddc8
+DIST Csound5.17.11.tar.gz 9152189 SHA256 a86595c4328b63e9b37205b40bf1441182a453451b0ea20558a7777dbc0380b7 SHA512 ff45b5ce057cc92481de90ad67515eaca1ce3a2bd906e43920e7f7597a285a6cf2289d379b4d8fa1ee9e66da712da0290d06f7f98f173603c159d484b91f3c31 WHIRLPOOL 127ca5947640c36e9a6c082127525c21abd69e5dde58fa54c6383f5c56b5863ea86e7c4d8832038efa0631862406aba75a09a3c2e250ffdf774fe5de7f87a1f6
+DIST Csound5.17.6.tar.gz 9132954 SHA256 d161acddb4a419fc15097e4f508b7b4e09fadb25b72906cf4f485ca9415fe6d1 SHA512 be2c894df3d5974f82552958b2df5f3f23cc4f33887bd464978728320db011cbc09745e81f348a0d27f906f2a85c497d48e8362db191644286fb3617e6cbe35c WHIRLPOOL d0b4eef4f30d17ae5468b35f453a1f39ce089ca58e8b7861abedae3ce8d1b96001f546f851ac6ca31fb920e04641f36a796de648c5303ccb4ab4a6b75f745809
+EBUILD csound-5.17.11.ebuild 5661 SHA256 94e83442ef946953035b6cc96eb865f964be694c798e62729d3302adefaafe06 SHA512 fe14aea891f440b3e658b16c5243c8f09de21eca31be4961ff8607ff8df24070dfd82df32ab54a3238d502b5be12444af7291e873c1e7944a4861d639b0190a6 WHIRLPOOL a7d30ba8c80ff5f43c9a618e54b18ce20c14c0feff6bd648b3c982899837bb5be810ad15b0be9432c652c1101bf3be5010451bb26fed68f56a530e03b3f8bb2a
+EBUILD csound-5.17.6-r1.ebuild 5485 SHA256 5f9f80743d417bad23684c23b840dd69c79977b7eb7aa02b7659a586d430a147 SHA512 414e4852949d8c8e15334482d5dbf8b42aadb24e8547314270bf266ed40ace39857fe2647672287c21f91239bbb52c41a4712c6fc6c94b57556ac08f07f23a4e WHIRLPOOL ddf118479bb381cdb90fed44ec4e53b8acadeed2a419442e44261703befc405c8603cb8d717ed41986e451684d1518a6dfa52a509266afc5a26f4478262215df
+MISC ChangeLog 3673 SHA256 a907fe3fa4fe6bdb3f11e5fa1ef663285627a1c2c599be2c69be493ec271d540 SHA512 fdd1d4d1d50d6e14d9d4497b90afc236900540bebabd34d910a4a5110ddeb94e2700926c8a8ef4cc7e058ca59dda0aaf3425b41c2036a0bd34c05577353c46ae WHIRLPOOL 1c64c12b94ff50c751f7fa59bb25fe226875d40c1ff72c08bcf8ac11671aa7ce894923c2ecc65f5326d84e179a3e48eda7537b952d16139dcabf1bd25785bf84
+MISC metadata.xml 1357 SHA256 82e7de59c27c84a574f06e24d17c97eb7561fed13c1119602b518ce7c850bfee SHA512 147cac3dc74b94d8ceab87d160cf94373643324ec93a99786ceb45715c94bc24d9f47cf6e6f4816795dd66a63b3f83a8b027a50844978c7d49598e0b5c6ce34d WHIRLPOOL 7c0e7f3f168a31e3fabb878885b0200e50c837213e515e7f091bea1181191d61cafc82a2f7ded9c6affa03a4c63ed4c7b477d815b539199c705eb9ebed37505f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPxL1HAAoJEEqz6FtPBkyj7LQIALcZaWVNLRlWJMPXvW8m2Hbe
-u94ZKtoLcL9RH2oH/kUil18Az0qsKsC37TRWfEpFhT462Lmh5yPSq9bHZ9PcWwTs
-rDtjnz/svaVLDydt7aa63QDnylMpO0pq33E8zqycG6CyTI9GN734Wg8Jx7FdKLoG
-C1A6NlS5xvGcELrZ0L+dOL1OL/ZGUJD74P3X43xDd5D8qIfMx4ILXXhh0M0JhU8w
-mjnsI7oc6a8ImEKQNmMP3TsfX8a6eJLCI4bAEbW4qoCY2ZeZfulK1FLTo3Gd3cdz
-ldu9asQQ5wBSIneYx8atjG5T91zYyp2LV/bFNNHcqkxlQbnmGjaWShEd3u2tYUY=
-=K2QK
+iQEcBAEBCAAGBQJQDb+pAAoJEEqz6FtPBkyjSYsH/A8mb0qeQJJS7ZfWDD+fiI96
+DN5Ldt7FTCGcK6J0RVl4PsiCnrLNWDQCNeBO0E3kWkWQiZJA+wkktDMZHc3djiq5
+/kVUN/K1sdNZQcodzKu5LNJ/Mi91YOawxCBe+i2lnPaY+TSpFbDIGYThTT1h+U5c
+jfy+zbMajPHl6XO+XZAcvnskDslKbm9UhTi1MZ0MQZLHxEXOn3s0nKYjhrUiCIOQ
+Pu3qeOYXaNB+jYbGJinQvj4n512UF+POKHfr2AJd8LOhCdJop0rjlERN3oamG6U6
+bS/Cm3ztQjSZmQFhHQy0Z04FzYjPnAiXYoI47I6bjDB0FBHLsKn8bQzg1mOPdeo=
+=rlWn
 -----END PGP SIGNATURE-----
diff --git a/media-sound/csound/csound-5.17.11.ebuild b/media-sound/csound/csound-5.17.11.ebuild
index 13428f7c1978..265e06506000 100644
--- a/media-sound/csound/csound-5.17.11.ebuild
+++ b/media-sound/csound/csound-5.17.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.17.11.ebuild,v 1.1 2012/05/29 12:02:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.17.11.ebuild,v 1.2 2012/07/23 21:18:24 radhermit Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -82,6 +82,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.17.6-fltk.patch
 	epatch "${FILESDIR}"/${PN}-5.17.6-porttime-in-portmidi.patch
 	epatch "${FILESDIR}"/${P}-cmake.patch
+	epatch "${FILESDIR}"/${PN}-5.17.11-bison-2.6.patch
+	epatch "${FILESDIR}"/${PN}-5.17.11-no-fltk-gl.patch
 
 	sed -i -e "s:^\(csoundExecutable =\).*:\1 \"${WORKDIR}/${P}_build/csound\":" \
 		tests/test.py || die
diff --git a/media-sound/csound/files/csound-5.17.11-bison-2.6.patch b/media-sound/csound/files/csound-5.17.11-bison-2.6.patch
new file mode 100644
index 000000000000..545f5f9de912
--- /dev/null
+++ b/media-sound/csound/files/csound-5.17.11-bison-2.6.patch
@@ -0,0 +1,108 @@
+--- Csound5.17.11/Engine/csound_orc_compile.c
++++ Csound5.17.11/Engine/csound_orc_compile.c
+@@ -24,6 +24,7 @@
+ */
+ 
+ #include "csoundCore.h"
++#include "parse_param.h"
+ #include "csound_orc.h"
+ #include <math.h>
+ #include <ctype.h>
+@@ -1849,7 +1850,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;
+--- Csound5.17.11/Engine/csound_orc.l
++++ Csound5.17.11/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;
+--- Csound5.17.11/Engine/cs_par_dispatch.c
++++ Csound5.17.11/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"
+--- Csound5.17.11/Engine/new_orc_parser.c
++++ Csound5.17.11/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 *);
+--- Csound5.17.11/Engine/parse_param.h
++++ Csound5.17.11/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
+--- Csound5.17.11/Engine/symbtab.c
++++ Csound5.17.11/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"
+--- Csound5.17.11/H/csound_orc.h
++++ Csound5.17.11/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;
+--- Csound5.17.11/Top/main.c
++++ Csound5.17.11/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/media-sound/csound/files/csound-5.17.11-no-fltk-gl.patch b/media-sound/csound/files/csound-5.17.11-no-fltk-gl.patch
new file mode 100644
index 000000000000..ae07d41a63e3
--- /dev/null
+++ b/media-sound/csound/files/csound-5.17.11-no-fltk-gl.patch
@@ -0,0 +1,20 @@
+--- Csound5.17.11/frontends/CsoundAC/CMakeLists.txt
++++ Csound5.17.11/frontends/CsoundAC/CMakeLists.txt
+@@ -7,6 +7,7 @@
+ 

+ find_package(Boost)

+ find_library(MUSICXML_LIBRARY musicxml2)

++set(FLTK_SKIP_OPENGL true)

+ find_package(FLTK)

+ find_package(SWIG)

+ find_package(PythonLibs)

+--- Csound5.17.11/InOut/CMakeLists.txt
++++ Csound5.17.11/InOut/CMakeLists.txt
+@@ -56,6 +56,7 @@
+     find_library(COREAUDIO_LIBRARY CoreAudio)

+ endif()

+ if(USE_FLTK OR BUILD_VIRTUAL_KEYBOARD)

++    set(FLTK_SKIP_OPENGL true)

+     find_package(FLTK)

+ endif()

+