1 files changed, 11 insertions, 67 deletions
diff --git a/multimedia/mplayer/files/patch-vidix-drivers-Makefile b/multimedia/mplayer/files/patch-vidix-drivers-Makefile
index d39d65e13b2..d8e995550ae 100644
--- a/multimedia/mplayer/files/patch-vidix-drivers-Makefile
+++ b/multimedia/mplayer/files/patch-vidix-drivers-Makefile
@@ -1,67 +1,11 @@
---- vidix/drivers/Makefile.orig	Mon May 31 16:15:35 2004
-+++ vidix/drivers/Makefile	Thu Jul 22 22:30:40 2004
-@@ -8,55 +8,55 @@
- CYBERBLADE_SRCS=cyberblade_vid.c
- CYBERBLADE_OBJS=cyberblade_vid.o
- CYBERBLADE_LIBS=-L../../libdha -ldha -lm
--CYBERBLADE_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
-+CYBERBLADE_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I..
- 
- RADEON_VID=radeon_vid.so
- RADEON_SRCS=radeon_vid.c
- RADEON_OBJS=radeon_vid.o
- RADEON_LIBS=-L../../libdha -ldha -lm $(X_LIB)
--RADEON_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
-+RADEON_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I..
- 
- RAGE128_VID=rage128_vid.so
- RAGE128_SRCS=radeon_vid.c
- RAGE128_OBJS=rage128_vid.o
- RAGE128_LIBS=-L../../libdha -ldha -lm $(X_LIB)
--RAGE128_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DRAGE128
-+RAGE128_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. -DRAGE128
- 
- PM3_VID=pm3_vid.so
- PM3_SRCS=pm3_vid.c
- PM3_OBJS=pm3_vid.o
- PM3_LIBS=-L../../libdha -ldha
--PM3_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
-+PM3_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I..
- 
- MACH64_VID=mach64_vid.so
- MACH64_SRCS=mach64_vid.c
- MACH64_OBJS=mach64_vid.o
- MACH64_LIBS=-L../../libdha -ldha
--MACH64_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DRAGE128
-+MACH64_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. -DRAGE128
- 
- MGA_VID=mga_vid.so
- MGA_SRCS=mga_vid.c
- MGA_OBJS=mga_vid.o
- MGA_LIBS=-L../../libdha -ldha -lm
--MGA_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
-+MGA_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I..
- 
- MGA_CRTC2_VID=mga_crtc2_vid.so
- MGA_CRTC2_SRCS=mga_vid.c
- MGA_CRTC2_OBJS=mga_crtc2_vid.o
- MGA_CRTC2_LIBS=-L../../libdha -ldha -lm
--MGA_CRTC2_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DCRTC2
-+MGA_CRTC2_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. -DCRTC2
- 
- NVIDIA_VID=nvidia_vid.so
- NVIDIA_SRCS=nvidia_vid.c
- NVIDIA_OBJS=nvidia_vid.o
- NVIDIA_LIBS=-L../../libdha -ldha -lm
--NVIDIA_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. 
-+NVIDIA_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I..
- 
- SIS_VID=sis_vid.so
- SIS_SRCS=sis_vid.c sis_bridge.c
- SIS_OBJS=sis_vid.o sis_bridge.o
- SIS_LIBS=-L../../libdha -ldha
--SIS_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
-+SIS_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I..
- 
- all:    $(CYBERBLADE_VID) $(RADEON_VID) $(RAGE128_VID) $(MACH64_VID) $(NVIDIA_VID) $(GENFB_VID) $(MGA_VID) $(MGA_CRTC2_VID) $(PM3_VID) $(SIS_VID)
- 
+--- vidix/drivers/Makefile.orig	Mon Oct 23 00:32:26 2006
++++ vidix/drivers/Makefile	Tue Oct 24 22:04:38 2006
+@@ -6,7 +6,7 @@
+ VIDIX_LIBS = -L../../libdha -ldha
+ VIDIX_LIBS_M = $(VIDIX_LIBS) -lm
+ VIDIX_LIBS_X = $(VIDIX_LIBS_M) $(X_LIB)
+-VIDIX_CFLAGS= -I. -I.. $(OPTFLAGS) -fPIC
++VIDIX_CFLAGS= -I. -I.. $(OPTFLAGS) $(X11_INC) -fPIC
+ 
+ RAGE128_CFLAGS=$(VIDIX_CFLAGS) -DRAGE128
+ MGA_CRTC2_CFLAGS=$(VIDIX_CFLAGS) -DCRTC2