[MPlayer-dev-eng] [PATH] X11 + sysroot fix

[Enrico Weigelt]

Hi folks,


here's a little patch which should help building mplayer with X11 
in an SYSROOT environment. It simply puts $SYSROOT as prefix to 
the X11 pathes. 

I'm not completely happy with this - we should better provide some
way for specifying the X11 pathes, compile-time as well as run-time.


cu
-- 
"*Who am I*? I am Susan Ivanova, Commander, daughter of Andrei and Sophie
  Ivanova. I am the right hand of vengeance, and the boot that is going 
  to kick your sorry ass all the way back to Earth... I am Death Incarnate, 
  and the last living thing that you are ever going to see. God sent me."
                                                       -- Cmdr. Ivanova
-------------- next part --------------
diff -ruN MPlayer-1.0pre5.orig/TOOLS/GL-test/compile.sh MPlayer-1.0pre5/TOOLS/GL-test/compile.sh
--- MPlayer-1.0pre5.orig/TOOLS/GL-test/compile.sh	Sun May 25 02:20:46 2003
+++ MPlayer-1.0pre5/TOOLS/GL-test/compile.sh	Mon Aug 29 16:58:40 2005
@@ -1,2 +1,2 @@
 
-gcc -g -O4 gltest.c ../../osdep/timer-lx.o -o gltest -L/usr/X11/lib -lglut -lGL -lGLU -lX11 -lXext -lXmu -lXi -lm
+gcc -g -O4 gltest.c ../../osdep/timer-lx.o -o gltest -L$SYSROOT/usr/X11/lib -lglut -lGL -lGLU -lX11 -lXext -lXmu -lXi -lm
diff -ruN MPlayer-1.0pre5.orig/TOOLS/mwallp/compile.sh MPlayer-1.0pre5/TOOLS/mwallp/compile.sh
--- MPlayer-1.0pre5.orig/TOOLS/mwallp/compile.sh	Sun Oct 26 12:23:37 2003
+++ MPlayer-1.0pre5/TOOLS/mwallp/compile.sh	Mon Aug 29 16:57:44 2005
@@ -3,4 +3,4 @@
     ../../cpudetect.o ../../mp_msg-mencoder.o ../../libavcodec/libavcodec.a \
     ../../postproc/libswscale.a ../../osdep/libosdep.a \
     -I../../libmpcodecs -I../.. -I../../postproc \
-    -L/usr/X11/lib -L/usr/X11R6/lib -lX11 -lm -ljpeg -o mwallp
+    -L$SYSROOT/usr/X11/lib -L$SYSROOT/usr/X11/lib -lX11 -lm -ljpeg -o mwallp
diff -ruN MPlayer-1.0pre5.orig/libavcodec/libpostproc/Makefile MPlayer-1.0pre5/libavcodec/libpostproc/Makefile
--- MPlayer-1.0pre5.orig/libavcodec/libpostproc/Makefile	Thu Jul 15 02:18:47 2004
+++ MPlayer-1.0pre5/libavcodec/libpostproc/Makefile	Mon Aug 29 16:59:46 2005
@@ -11,7 +11,7 @@
 SPPOBJS=postprocess_pic.o
 
 CFLAGS  = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
-# -I/usr/X11R6/include/
+# -I$(SYSROOT)/usr/X11/include/
 
 .SUFFIXES: .c .o
 
diff -ruN MPlayer-1.0pre5.orig/osdep/Makefile MPlayer-1.0pre5/osdep/Makefile
--- MPlayer-1.0pre5.orig/osdep/Makefile	Sun Jun 27 19:54:31 2004
+++ MPlayer-1.0pre5/osdep/Makefile	Mon Aug 29 16:59:57 2005
@@ -31,7 +31,7 @@
 OBJS=$(SRCS:.c=.o)
 
 CFLAGS  = $(OPTFLAGS) -I. -I.. $(EXTRA_INC)
-# -I/usr/X11R6/include/
+# -I$(SYSROOT)/usr/X11/include/
 
 .SUFFIXES: .c .o
 
diff -ruN MPlayer-1.0pre5.orig/postproc/Makefile MPlayer-1.0pre5/postproc/Makefile
--- MPlayer-1.0pre5.orig/postproc/Makefile	Sun Jun 27 02:07:15 2004
+++ MPlayer-1.0pre5/postproc/Makefile	Mon Aug 29 16:59:51 2005
@@ -12,7 +12,7 @@
 endif
 
 CFLAGS  = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
-# -I/usr/X11R6/include/
+# -I$(SYSROOT)/usr/X11/include/
 
 .SUFFIXES: .c .o