[MPlayer-dev-eng] MPlayer with GUI build broken under FreeBSD

[Vladimir Kushnir]

Hello,

The subject sais it all. Last changes for BSD/OS fix it under FreeBSD as
well (patch attached).

I strongly suspect, though that there should be "#ifndef linux" there
instead of "#ifdef ..."

Regards,
Vladimir
-- 
Vladimir Kushnir - vkushnir at Alfacom.net

-------------- next part --------------
diff -rc ../ncvs/MM/mplayer/main/Gui/Makefile main/Gui/Makefile
*** ../ncvs/MM/mplayer/main/Gui/Makefile	Sat Sep  8 02:49:45 2001
--- main/Gui/Makefile	Fri Sep 28 01:15:47 2001
***************
*** 8,14 ****
  MPLAYERDIR = mplayer/
  include gui.mak
  
! INCDIR  = -I. -I./event -I./wm -I./skin $(GTKINC)
  
  OPTIMIZE =  $(OPTFLAGS) -fomit-frame-pointer \
              -fexpensive-optimizations -malign-double -fschedule-insns2 -Wall
--- 8,14 ----
  MPLAYERDIR = mplayer/
  include gui.mak
  
! INCDIR  = -I. -I./event -I./wm -I./skin $(GTKINC) $(EXTRA_INC)
  
  OPTIMIZE =  $(OPTFLAGS) -fomit-frame-pointer \
              -fexpensive-optimizations -malign-double -fschedule-insns2 -Wall
diff -rc ../ncvs/MM/mplayer/main/Gui/mplayer/gtk/fs.h main/Gui/mplayer/gtk/fs.h
*** ../ncvs/MM/mplayer/main/Gui/mplayer/gtk/fs.h	Fri Sep 14 00:27:26 2001
--- main/Gui/mplayer/gtk/fs.h	Fri Sep 28 01:34:36 2001
***************
*** 9,15 ****
  #include <glob.h>
  #include <unistd.h>
  
! #ifdef	__SVR4
  #define	get_current_dir_name()	getcwd(NULL, PATH_MAX)
  #endif
  
--- 9,15 ----
  #include <glob.h>
  #include <unistd.h>
  
! #ifndef __linux__
  #define	get_current_dir_name()	getcwd(NULL, PATH_MAX)
  #endif
  
diff -rc ../ncvs/MM/mplayer/main/Gui/mplayer/psignal.h main/Gui/mplayer/psignal.h
*** ../ncvs/MM/mplayer/main/Gui/mplayer/psignal.h	Thu Sep  6 00:49:00 2001
--- main/Gui/mplayer/psignal.h	Fri Sep 28 01:34:18 2001
***************
*** 39,45 ****
  #define mplIncAudioBufferDelay                   28
  #define mplDecAudioBufferDelay                   29
  
! #ifdef	__SVR4
  #define	SIGTYPE SIGUSR2
  #warning should we use SIGUSR1 or SIGUSR2 on linux, bsd, ... too?
  #else
--- 39,45 ----
  #define mplIncAudioBufferDelay                   28
  #define mplDecAudioBufferDelay                   29
  
! #ifndef __linux__
  #define	SIGTYPE SIGUSR2
  #warning should we use SIGUSR1 or SIGUSR2 on linux, bsd, ... too?
  #else