diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-06-07 14:32:06 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-06-07 14:32:06 +0000 |
commit | 4653f5ed7575d6070b54a88b4deb449f838825b3 (patch) | |
tree | c1d20fc8cf942de9f1a576fe4b9d2f27df230129 | |
parent | b248b393df3ab7aabb4d58de643fb17af1c141ff (diff) | |
download | mpv-4653f5ed7575d6070b54a88b4deb449f838825b3.tar.bz2 mpv-4653f5ed7575d6070b54a88b4deb449f838825b3.tar.xz |
Restore support for compiling with svgalib_helper.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27025 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | DOCS/xml/en/video.xml | 11 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rwxr-xr-x | configure | 9 |
3 files changed, 15 insertions, 7 deletions
diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml index 3284c6545b..6a2c70aa32 100644 --- a/DOCS/xml/en/video.xml +++ b/DOCS/xml/en/video.xml @@ -1567,13 +1567,10 @@ Alternatively, you can use a special kernel module, like this: <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. @@ -774,6 +774,8 @@ loader/win32.o loader/win32.d: CFLAGS += $(CFLAG_STACKREALIGN) 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 @@ -344,6 +344,7 @@ Video output: 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 @@ _winsock2=auto _smbsupport=auto _vidix=auto _vidix_pcidb=yes +_svgalib_helper=no _joystick=no _xvid=auto _xvid_lavc=auto @@ -1020,6 +1022,8 @@ for ac_option do _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 @@ if test "$_vidix" = yes ; then _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 @@ CFLAG_NO_OMIT_LEAF_FRAME_POINTER = $CFLAG_NO_OMIT_LEAF_FRAME_POINTER CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC) CFLAG_STACKREALIGN = $_stackrealign LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags +CFLAG_SVGALIB_HELPER = $cflag_svgalib_helper ASFLAGS = $ASFLAGS EXTRALIBS = $_extra_libs |