I can't get this patch to work: [EMAIL PROTECTED] ~/school/Kaffe/kaffe-1.1.6 $ patch -p1 < alsapatch patching file ChangeLog Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file ChangeLog.rej patching file libraries/clib/sound/alsa/constants_check.h Hunk #1 FAILED at 136. 1 out of 1 hunk FAILED -- saving rejects to file libraries/clib/sound/alsa/constants_check.h.rej
[EMAIL PROTECTED] ~/school/Kaffe/kaffe-1.1.6 $ cat libraries/clib/sound/alsa/constants_check.h.rej *************** *** 136,143 **** assert(SND_SEQ_PRIORITY_HIGH == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_PRIORITY_HIGH); assert(SND_SEQ_PRIORITY_MASK == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_PRIORITY_MASK); assert(SND_SEQ_CLIENT_SYSTEM == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_SYSTEM); assert(SND_SEQ_CLIENT_DUMMY == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_DUMMY); assert(SND_SEQ_CLIENT_OSS == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_OSS); /* assert(SND_SEQ_FILTER_BROADCAST == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_BROADCAST); */ /* assert(SND_SEQ_FILTER_MULTICAST == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_MULTICAST); */ /* assert(SND_SEQ_FILTER_BOUNCE == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_BOUNCE); */ --- 136,147 ---- assert(SND_SEQ_PRIORITY_HIGH == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_PRIORITY_HIGH); assert(SND_SEQ_PRIORITY_MASK == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_PRIORITY_MASK); assert(SND_SEQ_CLIENT_SYSTEM == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_SYSTEM); + #ifdef SND_SEQ_CLIENT_DUMMY assert(SND_SEQ_CLIENT_DUMMY == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_DUMMY); + #endif + #ifdef SND_SEQ_CLIENT_OSS assert(SND_SEQ_CLIENT_OSS == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_OSS); + #endif /* assert(SND_SEQ_FILTER_BROADCAST == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_BROADCAST); */ /* assert(SND_SEQ_FILTER_MULTICAST == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_MULTICAST); */ /* assert(SND_SEQ_FILTER_BOUNCE == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_BOUNCE); */ > PatchSet 7095 Date: 2006/01/18 07:37:39 Author: guilhem Branch: HEAD Tag: > (none) Log: ALSA-lib fix > > Members: ChangeLog:1.4615->1.4616 > libraries/clib/sound/alsa/constants_check.h:1.1->1.2 > > Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.4615 > kaffe/ChangeLog:1.4616 --- kaffe/ChangeLog:1.4615 Sun Jan 15 02:55:30 2006 > +++ kaffe/ChangeLog Wed Jan 18 07:37:39 2006 @@ -1,3 +1,9 @@ +2006-01-14 > Guilhem Lavaux <[EMAIL PROTECTED]> + + * > libraries/clib/sound/alsa/check_constants.h: Check + for the macro > definition because using the assert to check + the value (needed for > alsa-lib-1.0.11-rc2). + 2006-01-14 Dalibor Topic <[EMAIL PROTECTED]> > > * README, configure.ac: Bumped version to 1.1.7-rc1. Index: > kaffe/libraries/clib/sound/alsa/constants_check.h diff -u > kaffe/libraries/clib/sound/alsa/constants_check.h:1.1 > kaffe/libraries/clib/sound/alsa/constants_check.h:1.2 --- > kaffe/libraries/clib/sound/alsa/constants_check.h:1.1 Wed Apr 28 20:42:58 > 2004 +++ kaffe/libraries/clib/sound/alsa/constants_check.h Wed Jan 18 > 07:37:43 2006 @@ -136,8 +136,12 @@ assert(SND_SEQ_PRIORITY_HIGH == > org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_PRIORITY_HIGH); > assert(SND_SEQ_PRIORITY_MASK == > org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_PRIORITY_MASK); > assert(SND_SEQ_CLIENT_SYSTEM == > org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_SYSTEM); +#ifdef > SND_SEQ_CLIENT_DUMMY assert(SND_SEQ_CLIENT_DUMMY == > org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_DUMMY); +#endif +#ifdef > SND_SEQ_CLIENT_OSS assert(SND_SEQ_CLIENT_OSS == > org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_OSS); +#endif /* > assert(SND_SEQ_FILTER_BROADCAST == > org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_BROADCAST); */ /* > assert(SND_SEQ_FILTER_MULTICAST == > org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_MULTICAST); */ /* > assert(SND_SEQ_FILTER_BOUNCE == > org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_BOUNCE); */ > > _______________________________________________ kaffe mailing list > kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe > > -- George Nychis INI MSIN Masters Student, Carnegie Mellon University http://www.andrew.cmu.edu/user/gnychis/ _______________________________________________ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe