[MPlayer-dev-eng] latest CVS doesn't compile

[Bohdan Horst]

latest CVS:

FreeBSD 5.2.1
gcc version 3.3.3 [FreeBSD] 20031106

gmake[1]: Entering directory `/root/src/CVS.mplayer+ffmpeg/main/libao2'
cc -c -I../libvo -I../../libvo -I/usr/X11/include -O4 -march=pentium3 -mcpu=pentium3 -pipe -ffast-math -fomit-frame-pointer -D_THREAD_SAFE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/local/include  -I. -I.. -I/usr/local/include/artsc -D_THREAD_SAFE -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include  -I/usr/local/include/SDL11 -I/usr/local/include -D_REENTRANT -D_THREAD_SAFE -I/usr/X11/include -I/usr/local/include    -o afmt.o
afmt.c
afmt.c: In function `audio_out_format_name':
afmt.c:41: error: duplicate case value
afmt.c:39: error: previously used here
afmt.c:43: error: duplicate case value
afmt.c:33: error: previously used here
afmt.c:47: error: duplicate case value
afmt.c:37: error: previously used here
afmt.c: In function `audio_out_format_bits':
afmt.c:73: error: duplicate case value
afmt.c:65: error: previously used here
afmt.c:74: error: duplicate case value
afmt.c:66: error: previously used here
afmt.c:75: error: duplicate case value
afmt.c:67: error: previously used here
gmake[1]: *** [afmt.o] Error 1



FreeBSD 4.10
gcc version 2.95.4 20020320 [FreeBSD]


gmake[1]: Entering directory `/root/src/main/libao2'
cc -c -I../libvo -I../../libvo -I/usr/X11/include -O4 -march=i686 -mcpu=i686 -pipe -ffast-math -fomit-frame-pointer -D_THREAD_SAFE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/local/include  -I. -I.. -I/usr/local/include/artsc -D_THREAD_SAFE -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include  -I/usr/local/include/SDL11 -I/usr/local/include -D_REENTRANT -D_THREAD_SAFE -I/usr/X11/include -I/usr/local/include    -o afmt.o afmt.c
afmt.c: In function `audio_out_format_name':
afmt.c:41: duplicate case value
afmt.c:39: this is the first entry for that value
afmt.c:43: duplicate case value
afmt.c:33: this is the first entry for that value
afmt.c:47: duplicate case value
afmt.c:37: this is the first entry for that value
afmt.c: In function `audio_out_format_bits':
afmt.c:73: duplicate case value
afmt.c:65: this is the first entry for that value
afmt.c:74: duplicate case value
afmt.c:66: this is the first entry for that value
afmt.c:75: duplicate case value
afmt.c:67: this is the first entry for that value
gmake[1]: *** [afmt.o] Error 1



afmt.h:
[...]
/* 24 bit formats from the linux kernel */
#ifndef AFMT_S24_LE
#define AFMT_S24_LE             0x00000800
#define AFMT_S24_BE             0x00001000
#define AFMT_U24_LE             0x00002000
#define AFMT_U24_BE             0x00004000
#endif

/* 32 bit formats from the linux kernel */
#ifndef AFMT_S32_LE
#define AFMT_S32_LE             0x00008000
#define AFMT_S32_BE             0x00010000
#define AFMT_U32_LE             0x00020000
#define AFMT_U32_BE             0x00040000
#endif
[...]

FreeBSD soundcard.h:
[...]
/*
 * 32-bit formats below used for 24-bit audio data where the data is stored
 * in the 24 most significant bits and the least significant bits are not used
 * (should be set to 0).
 */
#define AFMT_S32_LE     0x00001000      /* Little endian signed 32-bit */
#define AFMT_S32_BE     0x00002000      /* Big endian signed 32-bit */
#define AFMT_U32_LE     0x00004000      /* Little endian unsigned 32-bit */
#define AFMT_U32_BE     0x00008000      /* Big endian unsigned 32-bit */
[...]


any ideas how cleanly fix this ?

regards


-- 
Bohdan 'Nexus' Horst