Update of /cvsroot/fink/experimental/beren12/finkinfo/graphics In directory sc8-pr-cvs1:/tmp/cvs-serv26229
Added Files: mplayer-0.90rc2-1.info mplayer-0.90rc2-1.patch Log Message: testing --- NEW FILE: mplayer-0.90rc2-1.info --- Package: mplayer Version: 0.90rc2 Revision: 1 Depends: libdvdread-shlibs, libfame-shlibs, lame, ffmpeg, pth, x11, gtk+-shlibs, glib-shlibs, libpng3-shlibs, aalib-shlibs (>= 1.4rc5-2), sdl-shlibs, libogg-shlibs, libvorbis0-shlibs, mad-shlibs, lame-shlibs, libdnet-shlibs, lynx (>= 2.8.4-2) | lynx-ssl (>= 2.8.4-2), libdv-shlibs, arts (>= 1.1.0-2), mplayer-font, mplayer-skin-default BuildDepends: libdvdread, libfame, gtk+, glib, libpng3, aalib (>= 1.4rc5-2), libogg, libvorbis0, libdnet, libdv, mad, sdl, arts-dev (>= 1.1.0-2), dlcompat-dev Source: http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-%v.tar.bz2 Source-MD5: b6b6d83276ac7086702ad62ead1bcfe5tar.bz2 Patch: %f.patch #Conflicts: mplayer #Replaces: mplayer #Provides: mplayer ConfigureParams: --disable-libfame --enable-libavcodec --disable-vidix --enable-gui --enable-mad --enable-gl --enable-sdl --enable-aa --enable-xv --enable-xinerama --enable-x11 --with-extraincdir="%p/include" --with-extralibdir="%p/lib" --mandir=%p --enable-debug SetCFLAGS: -O3 -g InstallScript: << make install DESTDIR=%d mkdir -p %i/etc/mplayer cp etc/input.conf %i/etc/mplayer/input.conf cp etc/example.conf %i/etc/mplayer/mplayer.conf mkdir -p %i/share/mplayer/Skin mkdir -p %i/share/mplayer/font << ### DocFiles: DOCS/*.html DOCS/tech/*.txt ConfFiles: << %p/etc/mplayer/mplayer.conf %p/etc/mplayer/codecs.conf %p/etc/mplayer/input.conf << ### Description: MPEG 1/2, .ogm and AVI movie player DescDetail: << MPlayer is a movie and animation player based on the 0.2.0 version of libmpeg2 (mpeg2dec) and the Avifile library. It uses mpeg2dec/libmpeg2 for MPEG decoding. The supported file formats are MPEG 1/2 (MPG, DAT, BIN, VOB) and AVI/ASF/WMF(Mpeg/PCM/AC3/DivX/MS-ADPCM/aLaw audio, MPEG4/DivX/Indeo/CVID/WMF video codecs and many more). It supports hardware YUV colorspace conversion and scaling via mga_vid/syncfb devices or the X11 Xv extension. << DescPort: << X11 and xv vedoa modes do not work because of x-shm being screwed up in XDarwin so no GUI modes are avail, though sdl works fine and is the default. Previously by Justin Hallett << License: GPL Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]> Homepage: http://www.mplayerhq.hu/ --- NEW FILE: mplayer-0.90rc2-1.patch --- diff -ruN MPlayer-0.90pre10/configure MPlayer-0.90pre10.new/configure --- MPlayer-0.90pre10/configure 2002-11-09 12:44:28.000000000 -0500 +++ MPlayer-0.90pre10.new/configure 2002-11-21 17:48:42.000000000 -0500 @@ -29,13 +29,13 @@ echo >> "$TMPLOG" cat "$TMPC" >> "$TMPLOG" echo >> "$TMPLOG" - echo "$_cc $_inc_extra $_ld_static $_ld_extra $TMPC -o $TMPO $@" >> "$TMPLOG" + echo "$_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra $TMPC -o $TMPO $@" >> +"$TMPLOG" rm -f "$TMPO" - ( "$_cc" $_inc_extra $_ld_static $_ld_extra "$TMPC" -o "$TMPO" "$@" ) >> "$TMPLOG" 2>&1 + ( "$_cc" $CFLAGS $_inc_extra $_ld_static $_ld_extra "$TMPC" -o "$TMPO" "$@" ) >> +"$TMPLOG" 2>&1 TMP="$?" echo >> "$TMPLOG" - echo "ldd $TMPO" >> "$TMPLOG" - ( ldd "$TMPO" ) >> "$TMPLOG" 2>&1 + echo "nm $TMPO" >> "$TMPLOG" + ( nm "$TMPO" ) >> "$TMPLOG" 2>&1 echo >> "$TMPLOG" return "$TMP" } @@ -1622,6 +1622,10 @@ cc_check -lsocket -lnsl && _ld_sock="-lsocket -lnsl" if test "$_ld_sock" ; then echores "yes (using $_ld_sock)" +elif cc_check $_ld_sock -ldnet ; then + # NOTE: needed for Darwin at least + _ld_sock="$_ld_sock -ldnet" + echores "yes (using $_ld_sock)" else echores "no" fi @@ -2065,6 +2069,16 @@ else _def_shm='#undef HAVE_SHM' fi +# Darwin Xfree86 has x-shm disabled thus shm has to be disabled +if darwin ; then + if test `uname -r` > 5.9 ; then + _def_shm='#define HAVE_SHM 1' + _shm='yes (Darwin 6+/OSX 10.2+ supports SHM)' + else + _def_shm='#undef HAVE_SHM' + _shm='no (not supported by Darwin)' + fi +fi echores "$_shm" diff -ruN MPlayer-0.90pre10/etc/example.conf MPlayer-0.90pre10.new/etc/example.conf --- MPlayer-0.90pre10/etc/example.conf 2002-10-07 07:27:20.000000000 -0400 +++ MPlayer-0.90pre10.new/etc/example.conf 2002-11-21 17:48:42.000000000 -0500 @@ -8,13 +8,13 @@ ## more flexibly here. See below. ## -# vo=xv # To specify default video driver (see -vo help for +vo=sdl # To specify default video driver (see -vo help for # list) -# ao=oss # To specify default audio driver (see -ao help for +ao=sdl # To specify default audio driver (see -ao help for # list) -fs=yes # Enlarges movie window to your desktop's size. +fs=no # Enlarges movie window to your desktop's size. # Used by drivers: all # vm=no # Tries to change to a different videomode @@ -38,7 +38,7 @@ ## Use GUI mode by default ## -# gui = yes +gui = yes ## ## Specify your preferred default skin here @@ -46,7 +46,7 @@ ## and ~/.mplayer/Skin/yourskin) ## -# skin = default +skin = default ## ## Multiple languages are available :) @@ -133,4 +133,4 @@ ## Delete this default :) ## -include = /home/gabucino/.mplayer/i_did_not_RTFM_carefully_enough... +#include = /home/gabucino/.mplayer/i_did_not_RTFM_carefully_enough... diff -ruN MPlayer-0.90pre10/libmpcodecs/vf_fame.c MPlayer-0.90pre10.new/libmpcodecs/vf_fame.c --- MPlayer-0.90pre10/libmpcodecs/vf_fame.c 2002-09-29 15:19:31.000000000 -0400 +++ MPlayer-0.90pre10.new/libmpcodecs/vf_fame.c 2002-11-21 17:48:01.000000000 -0500 @@ -16,7 +16,7 @@ #include "vf.h" //#include "../libvo/fastmemcpy.h" -#include "../libfame/fame.h" +#include <fame.h> struct vf_priv_s { unsigned char* outbuf; diff -ruN MPlayer-0.90pre10/libvo/vo_sdl.c MPlayer-0.90pre10.new/libvo/vo_sdl.c --- MPlayer-0.90pre10/libvo/vo_sdl.c 2002-11-06 18:54:27.000000000 -0500 +++ MPlayer-0.90pre10.new/libvo/vo_sdl.c 2002-12-04 22:03:00.000000000 -0500 @@ -918,7 +918,7 @@ ||(strcmp(priv->driver, "windib") == 0) ||(strcmp(priv->driver, "directx") == 0) ||((strcmp(priv->driver, "aalib") == 0) - && priv->X)) { + && priv->X) || (strcmp(priv->driver, "Quartz") == 0)) { if(verbose) printf("SDL: setting windowed mode\n"); set_video_mode(priv->dstwidth, priv->dstheight, priv->bpp, priv->sdlflags); } ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _______________________________________________ Fink-commits mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/fink-commits