[Mplayer-cvslog] CVS: main fibmap_mplayer.c,1.3,1.4 Makefile,1.278,1.279

[Torinthiel]

On Mon, Dec 08, 2003 at 12:22:33PM +0100, Attila Kinali CVS wrote:
> Update of /cvsroot/mplayer/main
> In directory mail:/var/tmp.root/cvs-serv24782
> 
> Modified Files:
> 	fibmap_mplayer.c Makefile 
> Log Message:
> Security fixes for fibmap_mplayer by Adam Rice <adamrice at ntlworld.com>

Does anyone here compile with GUI enabled?

On my box linking breaks with
cc -o fibmap_mplayer fibmap_mplayer.o mp_msg.o
mp_msg.o: In function `mp_msg_c':
.../main/mp_msg.c:75: undefined reference to `use_gui'
.../main/mp_msg.c:83: undefined reference to `gtkMessageBox'

after examining I find that the code is included in #if ENABLE_GUI_CODE,
which in turn is cleared if FOR_MENCODER or CODECS2HTML is defined.
But as this was never used in fibmap it is not disabled.

Attached a patch based on what is done in MEncoder. Sorry it is in parts
but I don't know how to force CVS into treating file not in repository
as empty. cvs diff -N mp_msg-fibmap.c gives me only 'I know nothing
about mp_msg-fibmap.c'. Ok to apply?
Torinthiel


-- 
 Waclaw "Torinthiel" Schiller       GG#: 542916, 3073512
   torinthiel(at)wp(dot)pl
   gpg: B06901F1 fpr: FAA3 559F CAE9 34DE CDC8  7346 2B6E 39F2 B069 01F1
 "No classmates may be used during this examination"
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.280
diff -u -r1.280 Makefile
--- Makefile	8 Dec 2003 12:11:28 -0000	1.280
+++ Makefile	8 Dec 2003 13:49:59 -0000
@@ -230,8 +230,8 @@
 	./darwinfixlib.sh $(MPLAYER_DEP)
 	$(CC) $(CFLAGS) -shared -Wl,-Bsymbolic -o mplayer_wine.so mplayer_wine.spec.c $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) -lwine $(ARCH_LIB) -lm
 
-$(PRG_FIBMAP): fibmap_mplayer.o mp_msg.o
-	$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o mp_msg.o
+$(PRG_FIBMAP): fibmap_mplayer.o mp_msg-fibmap.o
+	$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o mp_msg-fibmap.o
 
 ifeq ($(MENCODER),yes)
 $(PRG_MENCODER): $(MENCODER_DEP)
Index: mp_msg.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp_msg.c,v
retrieving revision 1.24
diff -u -r1.24 mp_msg.c
--- mp_msg.c	12 Sep 2003 15:46:16 -0000	1.24
+++ mp_msg.c	8 Dec 2003 13:49:59 -0000
@@ -7,7 +7,7 @@
 
 #include "config.h"
 
-#if	defined(FOR_MENCODER) || defined(CODECS2HTML)
+#if	defined(FOR_MENCODER) || defined(CODECS2HTML) || defined(FOR_FIBMAP)
 #undef	ENABLE_GUI_CODE
 #elif	defined(HAVE_NEW_GUI)
 #define	ENABLE_GUI_CODE	HAVE_NEW_GUI
-------------- next part --------------

#define FOR_FIBMAP 1
#include "mp_msg.c"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/attachments/20031208/232bc758/attachment.pgp>