[MPlayer-G2-dev] FreeBSD patches (g2p21)

[Bohdan Horst]

after:
- apply two included patches
- import config.h, config.mak from g1
- #undef HAVE_VCD, #undef USE_ESD  in  config.h

G2 compile without any problems on my FreeBSD :) (and works;)

best regards

-- 
 /  irl: Bohdan 'Nexus' Horst  |  irc: Nexus  \
{----------------------v-------^---------------}
 \ http://irc.pl/nexus | mailto: nexus at irc.pl /
-------------- next part --------------
--- Makefile	Sun May  4 21:00:05 2003
+++ Makefile	Sat May 10 17:55:52 2003
@@ -71,20 +71,20 @@
 	$(MAKE) -C swscale
 
 test-stream: $(OBJS) $(STREAM_DEPS) osdep/libosdep.a test-stream.o
-	$(CC) $(OBJS) test-stream.o -o test-stream $(STREAM_DEPS) osdep/libosdep.a $(CDPARANOIA_LIB)  $(SMBCLIENT_LIB) -lm
+	$(CC) $(OBJS) test-stream.o -o test-stream $(STREAM_DEPS) osdep/libosdep.a $(EXTRA_LIB) $(CDPARANOIA_LIB)  $(SMBCLIENT_LIB) $(I18NLIBS) -lm
 
 test-codecs: $(OBJS) $(CODECS_DEPS) $(STREAM_DEPS) $(PLAYER_DEPS) osdep/libosdep.a test-codecs.o
-	$(CC) $(OBJS) test-codecs.o -o test-codecs $(CODECS_DEPS) $(STREAM_DEPS) $(PLAYER_DEPS) osdep/libosdep.a $(CDPARANOIA_LIB)  $(SMBCLIENT_LIB) $(AO_LIBS) $(VO_LIBS) -lm
+	$(CC) $(OBJS) test-codecs.o -o test-codecs $(CODECS_DEPS) $(STREAM_DEPS) $(PLAYER_DEPS) osdep/libosdep.a $(CDPARANOIA_LIB)  $(SMBCLIENT_LIB) $(AO_LIBS) $(X11_INC) $(VO_LIBS) $(I18NLIBS) -lm
 
 test-play: $(OBJS) $(CODECS_DEPS) $(STREAM_DEPS) $(PLAYER_DEPS) osdep/libosdep.a test-play.o input/libinput.a
-	$(CC) $(OBJS) test-play.o -o test-play $(CODECS_DEPS) $(STREAM_DEPS) $(PLAYER_DEPS) input/libinput.a osdep/libosdep.a $(CDPARANOIA_LIB)  $(SMBCLIENT_LIB) $(AO_LIBS) $(VO_LIBS) $(TERMCAP_LIB) $(LIRC_LIB) -lm
+	$(CC) $(OBJS) test-play.o -o test-play $(CODECS_DEPS) $(STREAM_DEPS) $(PLAYER_DEPS) input/libinput.a osdep/libosdep.a $(CDPARANOIA_LIB)  $(SMBCLIENT_LIB) $(AO_LIBS) $(VO_LIBS) $(TERMCAP_LIB) $(LIRC_LIB) $(I18NLIBS) -lm
 
 test-input: test-input.o input/libinput.a osdep/libosdep.a mp_msg.o get_path.o
-	$(CC) test-input.o -o test-input input/libinput.a osdep/libosdep.a mp_msg.o get_path.o $(TERMCAP_LIB) $(LIRC_LIB)
+	$(CC) test-input.o -o test-input input/libinput.a osdep/libosdep.a mp_msg.o get_path.o $(TERMCAP_LIB) $(LIRC_LIB) $(EXTRA_LIB) $(I18NLIBS)
 
 
 .c.o:
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CC) -c $(CFLAGS) $(X11_INC) -o $@ $<
 
 clean:
 	rm -f *.o *.a *~
-------------- next part --------------
--- libvo2/Makefile	Fri May  2 18:34:00 2003
+++ libvo2/Makefile	Sat May 10 17:52:59 2003
@@ -29,7 +29,7 @@
 	$(AR) r $(LIBNAME) $(OBJS)
 
 test:	test.o $(LIBNAME)
-	$(CC) test.o -o test $(LIBNAME) $(X_LIB) ../mp_msg.c
+	$(CC) test.o -o test $(EXTRA_INC) $(EXTRA_LIB) $(LIBNAME) $(X_LIB) $(I18NLIBS) ../mp_msg.c
 
 clean:
 	rm -f *.o *.a *~