[MPlayer-dev-eng] Call for unapplied patches

[Bernd Ernesti]

On Fri, May 30, 2003 at 08:07:24PM +0200, Alex Beregszaszi wrote:
> Hi,
> 
> > So it would seem. :) Maybe I should go ahead and commit it in main and
> > if someone says it's broken, I'll drink my 10l. :P
> Okay, the vo_dga.c and vo_x11.c warning fix patches make no difference
> in compiled code! (gcc -I.. -S -o vo_dga.s vo_dga.c)
> 
> So commited all the fixes (except the rejected ones).

And now mplayer.c won't compile:

In file included from mplayer.c:53:
libvo/x11_common.h:7: warning: No include path in which to find X11/Xlib.h
libvo/x11_common.h:8: warning: No include path in which to find X11/Xutil.h
In file included from mplayer.c:53:
libvo/x11_common.h:7: warning: No include path in which to find X11/Xlib.h
libvo/x11_common.h:8: warning: No include path in which to find X11/Xutil.h
[..]

Please also apply the attached patch.

But that doesn't help linking mplayer:

mplayer.o: In function `main':
mplayer.o(.text+0x7448): undefined reference to `free_font_desc'
gmake: *** [mplayer] Error 1

Full link line:

gcc -O4 -march=i686 -mcpu=i686 -pipe -ffast-math -fomit-frame-pointer -D_THREAD_SAFE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -Ilibmpdemux -Iloader -Ilibvo  -I/usr/pkg/include   -I/usr/pkg/include/SDL -I/usr/pkg/include -I/usr/X11/include   -o mplayer mplayer.o mp_msg.o cpudetect.o codec-cfg.o cfgparser.o my_profile.o spudec.o playtree.o playtreeparser.o asxparser.o vobsub.o subreader.o sub_cc.o find_sub.o m_config.o m_option.o parser-cfg.o m_struct.o unrarlib.o mixer.o parser-mpcmd.o libvo/libvo.a libao2/libao2.a  vidix/libvidix.a  libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a -ldvdread libavcodec/libavcodec.a  -lmad -lvorbis -logg   -lfaad -llzo   -lpng -lz -lz -ljpeg      -ltermcap    -lungif      -lGL -lXxf86dga -lXv -lXxf86vm -lXinerama -L/usr/X11R6/lib -lXext -lX11  -lmad  -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib -lSDL -lpthread -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lm -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -lesd -laudiofile -lm -lossaudio -L/usr/X11R6/lib -lX11 -lXext -L/usr/pkg/lib -laa-x11 -lm -L/usr/X11R6/lib -lX11 -lcurses -lusbhid        -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -lesd -laudiofile -lm -lossaudio -laudio -lXt -L/usr/X11R6/lib -lXext -lX11   -Wl,-R/usr/pkg/lib -L/usr/pkg/lib    -lossaudio -lpthread  -rdynamic -li386 -liconv  -lm

Hmm, I guess due to the fact that configure had a problem to find my freetype library,
but then free_font_desc need to be put into the
#ifdef HAVE_FREETYPE

Bernd

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.266
diff -b -u -r1.266 Makefile
--- Makefile	30 May 2003 18:23:52 -0000	1.266
+++ Makefile	30 May 2003 23:45:55 -0000
@@ -38,7 +38,7 @@
 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(MATROSKA_LIB) 
 COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB)
 
-CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(FRIBIDI_INC) # -Wall
+CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) # -Wall
 
 ifeq ($(TARGET_ALTIVEC),yes)
 ifeq ($(TARGET_OS),Darwin)