github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-03 03:19:24 +01:00
Code Releases Activity

Restore support for compiling with svgalib_helper.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27025 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-06-07 14:32:06 +00:00
parent b248b393df
commit 4653f5ed75
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DOCS/xml/en/video.xml
View File

@ -1567,13 +1567,10 @@ Alternatively, you can use a special kernel module, like this:
<filename class="directory">svgalib_helper</filename> dir, as root. <filename class="directory">svgalib_helper</filename> dir, as root.
</para></step> </para></step>
<step><para> <step><para>
Move the <filename class="directory">svgalib_helper</filename> directory to Then run <filename>configure</filename> again and pass the parameter
the <filename class="directory">vidix</filename> subdirectory of the <option>--enable-svgalib_helper</option> as well as
<application>MPlayer</application> source tree. <option>--with-extraincdir=/path/to/svgalib_helper/sources</option>,
</para></step> adjusted to wherever you extracted svgalib_helper sources.
<step><para>
Remove the comment before the CFLAGS line containing the "svgalib_helper"
string from <filename class="directory">vidix/Makefile</filename>.
</para></step> </para></step>
<step><para> <step><para>
Recompile. Recompile.

2
Makefile
View File

@ -774,6 +774,8 @@ loader/win32.o loader/win32.d: CFLAGS += $(CFLAG_STACKREALIGN)
mp3lib/decode_i586.o: CFLAGS += -fomit-frame-pointer 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_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \
vidix/pci_names.h vidix/pci_vendors.h vidix/pci_names.h vidix/pci_vendors.h

9
configure vendored
View File

@ -344,6 +344,7 @@ Video output:
Available: cyberblade,ivtv,mach64,mga,mga_crtc2, Available: cyberblade,ivtv,mach64,mga,mga_crtc2,
nvidia,pm2,pm3,radeon,rage128,s3,sis,unichrome nvidia,pm2,pm3,radeon,rage128,s3,sis,unichrome
--disable-vidix-pcidb disable VIDIX PCI device name database --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-gl enable OpenGL video output [autodetect]
--enable-dga2 enable DGA 2 support [autodetect] --enable-dga2 enable DGA 2 support [autodetect]
--enable-dga1 enable DGA 1 support [autodetect] --enable-dga1 enable DGA 1 support [autodetect]
@ -620,6 +621,7 @@ _winsock2=auto
_smbsupport=auto _smbsupport=auto
_vidix=auto _vidix=auto
_vidix_pcidb=yes _vidix_pcidb=yes
_svgalib_helper=no
_joystick=no _joystick=no
_xvid=auto _xvid=auto
_xvid_lavc=auto _xvid_lavc=auto
@ -1020,6 +1022,8 @@ for ac_option do
_vidix_drivers=`echo $ac_option | cut -d '=' -f 2` _vidix_drivers=`echo $ac_option | cut -d '=' -f 2`
;; ;;
--disable-vidix-pcidb) _vidix_pcidb=no ;; --disable-vidix-pcidb) _vidix_pcidb=no ;;
--enable-svgalib_helper) _svgalib_helper=yes ;;
--disable-svgalib_helper) _svgalib_helper=no ;;
--enable-joystick) _joystick=yes ;; --enable-joystick) _joystick=yes ;;
--disable-joystick) _joystick=no ;; --disable-joystick) _joystick=no ;;
--enable-xvid) _xvid=yes ;; --enable-xvid) _xvid=yes ;;
@ -4250,6 +4254,10 @@ if test "$_vidix" = yes ; then
_vidix_pcidb_val=0 _vidix_pcidb_val=0
fi fi
echocheck "VIDIX svgalib_helper support"
test "$_svgalib_helper" = yes && cflag_svgalib_helper=-DCONFIG_SVGAHELPER
echores "$_svgalib_helper"
else else
_novomodules="cvidix $_novomodules" _novomodules="cvidix $_novomodules"
fi fi
@ -7586,6 +7594,7 @@ CFLAG_NO_OMIT_LEAF_FRAME_POINTER = $CFLAG_NO_OMIT_LEAF_FRAME_POINTER
CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC) CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC)
CFLAG_STACKREALIGN = $_stackrealign CFLAG_STACKREALIGN = $_stackrealign
LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags
CFLAG_SVGALIB_HELPER = $cflag_svgalib_helper
ASFLAGS = $ASFLAGS ASFLAGS = $ASFLAGS
EXTRALIBS = $_extra_libs EXTRALIBS = $_extra_libs