[Mplayer-cvslog] CVS: 0_90 Makefile,1.250,1.251 configure,1.663,1.664
Arpi of Ize
arpi at mplayerhq.hu
Sat Mar 22 17:29:18 CET 2003
Update of /cvsroot/mplayer/0_90
In directory mail:/var/tmp.root/cvs-serv27007
Modified Files:
Makefile configure
Log Message:
backport: smbclient & fribidi support (both disabled by default)
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/0_90/Makefile,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- Makefile 10 Mar 2003 16:21:18 -0000 1.250
+++ Makefile 22 Mar 2003 16:29:16 -0000 1.251
@@ -36,9 +36,9 @@
VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB)
AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_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 $(PP_LIB) postproc/libswscale.a linux/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS)
+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 $(PP_LIB) postproc/libswscale.a linux/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB)
-CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) # -Wall
+CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(FRIBIDI_INC) # -Wall
ifeq ($(TARGET_ALTIVEC),yes)
ifeq ($(TARGET_OS),Darwin)
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/0_90/configure,v
retrieving revision 1.663
retrieving revision 1.664
diff -u -r1.663 -r1.664
--- configure 17 Mar 2003 00:49:57 -0000 1.663
+++ configure 22 Mar 2003 16:29:16 -0000 1.664
@@ -154,6 +154,7 @@
--disable-rtc disable RTC (/dev/rtc) on Linux [autodetect]
--disable-streaming disable network streaming support
(support for: http/mms/rtp) [enable]
+ --enable-smb enable Samba (SMB) input support [disable]
--enable-live enable LIVE.COM Streaming Media support [disable]
--enable-dvdnav enable dvdnav support [disable]
--disable-dvdread Disable libdvdread support [autodetect]
@@ -165,6 +166,7 @@
--disable-new-conf Disable new experimental config parser code [enabled]
--enable-menu Enable osd menu support (needs new config) [disabled]
--disable-sortsub Disable subtitles sorting [enabled]
+ --enable-fribidi Enable using the FriBiDi libs [disabled]
--disable-macosx Disable Mac OS X specific features [autodetect]
Codecs:
@@ -287,6 +289,8 @@
--with-xmmslibdir=DIR path to libxmms.so.1
--with-cdparanoiaincdir=DIR cdparanoia headers in DIR
--with-cdparanoialibdir=DIR cdparanoia libraries (libcdda_*) in DIR
+ --with-fribidi-config=PATH path to fribidi-config
+ (e.g. /opt/bin/fribidi-config)
EOF
exit 0
@@ -1029,6 +1033,7 @@
_tv_bsdbt848=auto
_edl=yes
_streaming=yes
+_smbsupport=no
_vidix=auto
_joystick=no
_xvid=auto
@@ -1062,6 +1067,8 @@
_macosx=auto
_sortsub=yes
_freetypeconfig='freetype-config'
+_fribidi=no
+_fribidiconfig='fribidi-config'
for ac_option do
case "$ac_option" in
@@ -1194,6 +1201,8 @@
--disable-fastmemcpy) _fastmemcpy=no ;;
--enable-streaming) _streaming=yes ;;
--disable-streaming) _streaming=no ;;
+ --enable-smb) _smbsupport=yes ;;
+ --disable-smb) _smbsupport=no ;;
--enable-vidix) _vidix=yes ;;
--disable-vidix) _vidix=no ;;
--enable-joystick) _joystick=yes ;;
@@ -1245,6 +1254,9 @@
--enable-unrarlib) _unrarlib=yes ;;
--disable-unrarlib) _unrarlib=no ;;
+ --enable-fribidi) _fribidi=yes ;;
+ --disable-fribidi) _fribidi=no ;;
+
--enable-dga) _dga=auto ;; # as we don't know if it's 1 or 2
--enable-dga=*) _dga=`echo $ac_option | cut -d '=' -f 2` ;;
--disable-dga) _dga=no ;;
@@ -1363,6 +1375,9 @@
--with-freetype-config=*)
_freetypeconfig=`echo $ac_option | cut -d '=' -f 2`
;;
+ --with-fribidi-config=*)
+ _fribidiconfig=`echo $ac_option | cut -d '=' -f 2`
+ ;;
--with-gtk-config=*)
_gtkconfig=`echo $ac_option | cut -d '=' -f 2`
;;
@@ -2296,6 +2311,31 @@
echores "$_macosx"
+echocheck "Samba support (libsmbclient)"
+if test "$_smbsupport" != no; then
+ _smbsupport=no
+ cat > $TMPC << EOF
+#include <libsmbclient.h>
+int main(void) { smbc_opendir("smb://"); return 0; }
+EOF
+ if cc_check -lsmbclient ; then
+# this is not working for me becouse it needs -ldl and some NIS (YP) libs
+# $_ld_dl and -lyp ? should be added
+ _smbsupport=yes
+ fi
+fi
+
+if test "$_smbsupport" = yes; then
+ _ld_smb="-lsmbclient"
+ _def_smbsupport="#define LIBSMBCLIENT"
+ _inputmodules="smb $_inputmodules"
+else
+ _def_smbsupport="#undef LIBSMBCLIENT"
+ _noinputmodules="smb $_noinputmodules"
+fi
+echores "$_smbsupport"
+
+
#########
# VIDEO #
#########
@@ -3724,6 +3764,38 @@
fi
echores "$_freetype"
+
+echocheck "fribidi with charsets"
+if test "$_fribidi" = yes ; then
+ if ( $_fribidiconfig --version ) >/dev/null 2>&1 ; then
+ cat > $TMPC << EOF
+#include <stdio.h>
+#include <fribidi/fribidi.h>
+int main()
+{
+ if(fribidi_parse_charset("UTF-8") != FRIBIDI_CHARSET_UTF8) {
+ printf("Fribidi headers are not consistents with the library!\n");
+ exit(1);
+ }
+ return 0;
+}
+EOF
+ _fribidi=no
+ cc_check `$_fribidiconfig --cflags` `$_fribidiconfig --libs` && ( $TMPO >> "$TMPLOG" ) && _fribidi=yes
+ else
+ _fribidi=no
+ fi
+fi
+if test "$_fribidi" = yes ; then
+ _def_fribidi='#define USE_FRIBIDI'
+ _inc_fribidi=`$_fribidiconfig --cflags`
+ _ld_fribidi=`$_fribidiconfig --libs`
+else
+ _def_fribidi='#undef USE_FRIBIDI'
+fi
+echores "$_fribidi"
+
+
echocheck "zlib"
cat > $TMPC << EOF
#include <zlib.h>
@@ -4979,10 +5051,13 @@
CDPARANOIA_LIB = $_ld_cdparanoia
FREETYPE_INC = $_inc_freetype
FREETYPE_LIB = $_ld_freetype
+FRIBIDI_INC = $_inc_fribidi
+FRIBIDI_LIB = $_ld_fribidi
LIBLZO_LIB= $_ld_liblzo
MAD_LIB = $_ld_mad
VORBIS_LIB = $_ld_vorbis $_ld_libdv
FAAD_LIB = $_ld_faad
+SMBSUPPORT_LIB = $_ld_smb
XMMS_PLUGINS = $_xmms
XMMS_LIB = $_xmms_lib
MACOSX = $_macosx
@@ -5346,6 +5421,9 @@
/* nanosleep support */
$_def_nanosleep
+/* SMB support */
+$_def_smbsupport
+
/* termcap flag for getch2.c */
$_def_termcap
@@ -5367,6 +5445,9 @@
/* enable FreeType support */
$_def_freetype
+
+/* enable FriBiDi usage */
+$_def_fribidi
/* liblzo support */
$_def_liblzo
More information about the MPlayer-cvslog
mailing list