Update of /cvsroot/fink/experimental/beren12/finkinfo/graphics
In directory sc8-pr-cvs1:/tmp/cvs-serv3861

Added Files:
        kcdlabel-2.9-1.info kcdlabel-2.9-1.patch 
        mplayer-0.90pre10-2.info mplayer-0.90pre10-2.patch 
        mplayer-0.90rc1-1.info mplayer-0.90rc1-1.patch 
        mplayer-debug-0.90rc1-1.info mplayer-debug-0.90rc1-1.patch 
        mplayer-font-arial-iso-8859-1-0.1-1.info 
        mplayer-skin-default-1.5-1.info 
Log Message:
more tests

--- NEW FILE: kcdlabel-2.9-1.info ---
Package: kcdlabel
Version: 2.9
Revision: 1
Depends: libjpeg-shlibs, libpng-shlibs
BuildDepends: libjpeg, libpng
Description: CD Label Creation in KDE3
Source: http://kcdlabel.sourceforge.net/download/%n-%v-KDE3.tar.gz
SourceDirectory: %n-%v-KDE3
Source-MD5: 
Patch: %f.patch
ConfigureParams: --mandir='${prefix}/share/man' --disable-dependency-tracking 
--with-xinerama --with-extra-includes=%p/include --with-extra-libs=%p/lib
DocFiles: AUTHORS README COPYING TODO README-round-labels
DescDetail: <<
A program to create labels, covers, and booklets for CD cases. It can include text, 
bitmapped images, and directory content recursively read from a directory. KCDlabel 
can print and output postscript files. It can also create round labels to stick on 
CDs. KCDLabel can access CDDB to retrieve information about a CD.
<<
Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]>
Homepage: http://kcdlabel.sf.net
License: GPL

--- NEW FILE: kcdlabel-2.9-1.patch ---
diff -ruN kcdlabel-2.9-KDE3/kcdlabel/audiocd.h kcdlabel-2.9-KDE3.new/kcdlabel/audiocd.h
--- kcdlabel-2.9-KDE3/kcdlabel/audiocd.h        Sun Nov  3 15:43:43 2002
+++ kcdlabel-2.9-KDE3.new/kcdlabel/audiocd.h    Mon Nov  4 10:00:06 2002
@@ -29,7 +29,9 @@
 #include <vector>
 #include <qobject.h>
 
+#ifdef __LINUX__
 #include <linux/cdrom.h>               // specific to Linux !!! --> must be 
encapsulated in DEFINE IFDEF to enable compilation on other Un*x platforms...
+#endif /* __LINUX__ */
 
 /**Access all the audio CD functions and compute CDDB DiscID
   *@author Pascal 'PeP' Panneels

--- NEW FILE: mplayer-0.90pre10-2.info ---
Package: mplayer
Version: 0.90pre10
Revision: 2
Depends: libdvdread-shlibs, lame, ffmpeg, pth, x11, gtk+-shlibs, glib-shlibs, 
libpng-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)
BuildDepends: libdvdread, gtk+, glib, libpng, aalib (>= 1.4rc5-2), libogg, libvorbis0, 
libdnet, libdv, mad, sdl, arts-dev (>= 1.1.0-2), dlcompat-dev
#Depends: libdvdread-shlibs, libfame-shlibs, lame, ffmpeg, pth, x11, gtk+-shlibs, 
glib-shlibs, libpng-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)
#BuildDepends: libdvdread, libfame, gtk+, glib, libpng, 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: cd972417e29cc7ca692dc7dd214a2cd0
###
Patch: %f.patch
###
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
SetCFLAGS: -O -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.90pre10-2.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);
                }

--- NEW FILE: mplayer-0.90rc1-1.info ---
Package: mplayer
Version: 0.90rc1
Revision: 1
Depends: libdvdread-shlibs, libfame-shlibs, lame, ffmpeg, pth, x11, gtk+-shlibs, 
glib-shlibs, libpng-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-skin-default, 
mplayer-font
BuildDepends: libdvdread, libfame, gtk+, glib, libpng, 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: 42224042b3b3c2f639c0e3c88eb3e810
Patch: %f.patch
Conflicts: mplayer-debug
Replaces: mplayer-debug
ConfigureParams: --enable-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
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.90rc1-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);
                }

--- NEW FILE: mplayer-debug-0.90rc1-1.info ---
Package: mplayer-debug
Version: 0.90rc1
Revision: 1
Depends: libdvdread-shlibs, libfame-shlibs, lame, ffmpeg, pth, x11, gtk+-shlibs, 
glib-shlibs, libpng-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, libpng, 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: cd972417e29cc7ca692dc7dd214a2cd0
Patch: %f.patch
Conflicts: mplayer
Replaces: mplayer
ConfigureParams: --enable-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: -O -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-debug-0.90rc1-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);
                }

--- NEW FILE: mplayer-font-arial-iso-8859-1-0.1-1.info ---
Package: mplayer-font
Version: 1
Revision: 1
Depends: mplayer
Provides: mplayer-font
Source: http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
Source-MD5: 
NoSourceDirectory: true
CompileScript: echo "Unpacking..."
InstallScript: <<
  mkdir -p %i/share/mplayer/sub-fonts
  cp -r font-arial-24-iso-8859-1 font-arial-28-iso-8859-1 font-arial-18-iso-8859-1 
font-arial-14-iso-8859-1  %i/share/mplayer/sub-fonts
  ln -s %p/share/mplayer/sub-fonts/font-arial-14-iso-8859-1 %i/share/mplayer/font
  mkdir -p %i/share/doc/%n
  echo "This is licensed under the GPL. for more information, please see the docs for 
mplayer." > %i/share/doc/%n/COPYRIGHT
<<
DocFiles: README-arial-iso-8859-1
Description: Subtitle font for mplayer
DescDetail: <<
This package installs font-arial-14-iso-8859-1 as the subtitle font.
<<
DescUsage: <<
To change the font, create a new symlink from the font folder you want to use to 
%p/share/mplayer/font
<<
License: GPL
Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]>
Homepage: http://www.mplayerhq.hu/

--- NEW FILE: mplayer-skin-default-1.5-1.info ---
Package: mplayer-skin-default
Version: 1.5
Revision: 1
Depends: mplayer
Provides: mplayer-skin
Source: http://www1.mplayerhq.hu/MPlayer/Skin/default.tar.bz2
Source-MD5: 95417702dbb28226a2b0a20139ddfd0b
CompileScript: echo "Unpacking..."
InstallScript: <<
  mkdir -p %i/share/mplayer/Skin/default
  cp * %i/share/mplayer/Skin/default
  chmod 664 %i/share/mplayer/Skin/default/*
  mkdir -p %i/share/doc/%n
  echo "This is licensed under the GPL. for more information, please see the docs for 
mplayer." > %i/share/doc/%n/COPYRIGHT
<<
DocFiles: VERSION README
Description: Default skin for mplayer
DescDetail: <<
This package provides a default gui skin for MPlayer.
<<
License: GPL
Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]>
Homepage: http://www.mplayerhq.hu/



-------------------------------------------------------
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

Reply via email to