[MPlayer-users] [BUGREPORT] Latest CVS does not build

[Reimar Döffinger]

Hi,
On Fri, Mar 10, 2006 at 03:16:29AM -0500, John Brown wrote:
> See output below:
> 
> gcc  -I. codec-cfg.c mp_msg.c -o codec-cfg -DCODECS2HTML
> mp_msg.c: In function `mp_msg':
> mp_msg.c:106: warning: passing arg 2 of `libiconv' from incompatible 
> pointer type
> c:/windows/temp/ccqEcaaa.o(.text+0x1ad):mp_msg.c: undefined reference to 
> `libiconv_close'
> c:/windows/temp/ccqEcaaa.o(.text+0x1c2):mp_msg.c: undefined reference to 
> `libiconv_open'
> c:/windows/temp/ccqEcaaa.o(.text+0x22c):mp_msg.c: undefined reference to 
> `libiconv'
> collect2: ld returned 1 exit status
> make: *** [codec-cfg] Error 1
> 
> When I manually compile the offending file with:
> gcc  -I. codec-cfg.c mp_msg.c -o codec-cfg -DCODECS2HTML  -liconv, the 
> build continues successfully to the end and produces MPlayer 
> dev-CVS-060310-01:05-3.4.2.
> 
> I am using gcc-3.4.2, GNU ld version 2.15.91 20040904, MSYS 1.0.10 on 
> Windows XP SP2.

Try attached patch.

Greetings,
Reimar Döffinger
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.348
diff -u -r1.348 Makefile
--- Makefile	8 Mar 2006 19:52:51 -0000	1.348
+++ Makefile	11 Mar 2006 09:07:03 -0000
@@ -448,7 +448,7 @@
 $(MENCODER_DEP): version.h help_mp.h
 
 $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
-	$(HOST_CC) $(HOST_CFLAGS) -I. codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS)
+	$(HOST_CC) $(HOST_CFLAGS) -I. codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC)
 
 install: $(ALL_PRG)
 ifeq ($(VIDIX),yes)
Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.126
diff -u -r1.126 codec-cfg.c
--- codec-cfg.c	7 Mar 2006 15:40:49 -0000	1.126
+++ codec-cfg.c	11 Mar 2006 09:07:05 -0000
@@ -26,6 +26,13 @@
 
 #include "config.h"
 #include "mp_msg.h"
+#ifdef CODECS2HTML
+#ifdef __GNUC__
+#define mp_msg(t, l, m, args...) fprintf(stderr, m, ##args)
+#else
+#define mp_msg(t, l, m, ...) fprintf(stderr, m, __VA_ARGS__)
+#endif
+#endif
 
 #include "help_mp.h"