# HG changeset patch
# User diego
# Date 1212849126 0
# Node ID c1dfb011c41d9c148a0a00fcb463792f20a112b1
# Parent  d0c873ddfaefcfcef5ac5b020937ac697ba69c42
Restore support for compiling with svgalib_helper.

diff -r d0c873ddfaef -r c1dfb011c41d DOCS/xml/en/video.xml
--- a/DOCS/xml/en/video.xml	Sat Jun 07 14:00:04 2008 +0000
+++ b/DOCS/xml/en/video.xml	Sat Jun 07 14:32:06 2008 +0000
@@ -1567,13 +1567,10 @@
   <filename class="directory">svgalib_helper</filename> dir, as root.
 </para></step>
 <step><para>
-  Move the <filename class="directory">svgalib_helper</filename> directory to
-  the <filename class="directory">vidix</filename> subdirectory of the
-  <application>MPlayer</application> source tree.
-</para></step>
-<step><para>
-  Remove the comment before the CFLAGS line containing the "svgalib_helper"
-  string from <filename class="directory">vidix/Makefile</filename>.
+  Then run <filename>configure</filename> again and pass the parameter
+  <option>--enable-svgalib_helper</option> as well as
+  <option>--with-extraincdir=/path/to/svgalib_helper/sources</option>,
+  adjusted to wherever you extracted svgalib_helper sources.
 </para></step>
 <step><para>
   Recompile.
diff -r d0c873ddfaef -r c1dfb011c41d Makefile
--- a/Makefile	Sat Jun 07 14:00:04 2008 +0000
+++ b/Makefile	Sat Jun 07 14:32:06 2008 +0000
@@ -774,6 +774,8 @@
 
 mp3lib/decode_i586.o: CFLAGS += -fomit-frame-pointer
 
+vidix/%: CFLAGS += $(SVGALIB_CFLAGS)
+
 VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \
                   vidix/pci_names.h vidix/pci_vendors.h
 
diff -r d0c873ddfaef -r c1dfb011c41d configure
--- a/configure	Sat Jun 07 14:00:04 2008 +0000
+++ b/configure	Sat Jun 07 14:32:06 2008 +0000
@@ -344,6 +344,7 @@
                            Available: cyberblade,ivtv,mach64,mga,mga_crtc2,
                            nvidia,pm2,pm3,radeon,rage128,s3,sis,unichrome
   --disable-vidix-pcidb    disable VIDIX PCI device name database
+  --enable-svgalib_helper  enable VIDIX svgalib_helper support
   --enable-gl              enable OpenGL video output [autodetect]
   --enable-dga2            enable DGA 2 support [autodetect]
   --enable-dga1            enable DGA 1 support [autodetect]
@@ -620,6 +621,7 @@
 _smbsupport=auto
 _vidix=auto
 _vidix_pcidb=yes
+_svgalib_helper=no
 _joystick=no
 _xvid=auto
 _xvid_lavc=auto
@@ -1020,6 +1022,8 @@
     _vidix_drivers=`echo $ac_option | cut -d '=' -f 2`
     ;;
   --disable-vidix-pcidb)        _vidix_pcidb=no         ;;
+  --enable-svgalib_helper)	_svgalib_helper=yes	;;
+  --disable-svgalib_helper)	_svgalib_helper=no	;;
   --enable-joystick)	_joystick=yes	;;
   --disable-joystick)	_joystick=no	;;
   --enable-xvid)	_xvid=yes	;;
@@ -4250,6 +4254,10 @@
     _vidix_pcidb_val=0
   fi
 
+  echocheck "VIDIX svgalib_helper support"
+  test "$_svgalib_helper" = yes && cflag_svgalib_helper=-DCONFIG_SVGAHELPER
+  echores "$_svgalib_helper"
+
 else
   _novomodules="cvidix $_novomodules"
 fi
@@ -7586,6 +7594,7 @@
 CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC)
 CFLAG_STACKREALIGN = $_stackrealign
 LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags
+CFLAG_SVGALIB_HELPER = $cflag_svgalib_helper
 ASFLAGS = $ASFLAGS
 
 EXTRALIBS = $_extra_libs