helixplayer/x11-path-fixes.patch

   1 diff -Naur hxplay-1.0.8.orig/build/umakecf/freebsd-2.2-i386.cf hxplay-1.0.8/build/umakecf/freebsd-2.2-i386.cf
   2 --- hxplay-1.0.8.orig/build/umakecf/freebsd-2.2-i386.cf 2006-06-19 19:11:34.000000000 -0400
   3 +++ hxplay-1.0.8/build/umakecf/freebsd-2.2-i386.cf      2007-06-20 23:52:37.000000000 -0400
   4 @@ -118,7 +118,7 @@
   5              self.args['default'] = self.ldargs
   6
   7  platform.link = FreeBSDLinker()
   8 -platform.link.ldargs = '-L/usr/X11R6/lib'
   9 +platform.link.ldargs = '-L/usr/lib/X11'
  10
  11  # X11 include path
  12 -project.includes.append('/usr/X11R6/include')
  13 +project.includes.append('/usr/include/X11')
  14 diff -Naur hxplay-1.0.8.orig/build/umakecf/freebsd.cf hxplay-1.0.8/build/umakecf/freebsd.cf
  15 --- hxplay-1.0.8.orig/build/umakecf/freebsd.cf  2006-07-06 15:28:06.000000000 -0400
  16 +++ hxplay-1.0.8/build/umakecf/freebsd.cf       2007-06-20 23:52:37.000000000 -0400
  17 @@ -209,8 +209,8 @@
  18
  19
  20  platform.link = FreeBSDLinker()
  21 -platform.link.ldargs = '-L/usr/X11R6/lib --export-dynamic'
  22 -project.includes.append('/usr/X11R6/include')
  23 +platform.link.ldargs = '-L/usr/lib/X11 --export-dynamic'
  24 +project.includes.append('/usr/include/X11')
  25
  26
  27  ## LessTif/Motif root defined with environment variable XMROOT
  28 diff -Naur hxplay-1.0.8.orig/build/umakecf/irix-6.2-mips-gcc.cf hxplay-1.0.8/build/umakecf/irix-6.2-mips-gcc.cf
  29 --- hxplay-1.0.8.orig/build/umakecf/irix-6.2-mips-gcc.cf        2006-04-24 19:34:08.000000000 -0400
  30 +++ hxplay-1.0.8/build/umakecf/irix-6.2-mips-gcc.cf     2007-06-20 23:52:37.000000000 -0400
  31 @@ -87,4 +87,4 @@
  32  make_lib.make_var = 'MAKE_LIB'
  33  make_lib.make_flags = 'MAKE_LIB_FLAGS'
  34
  35 -platform.link.ldargs = '-L/usr/X11R6/lib'
  36 +platform.link.ldargs = '-L/usr/lib/X11'
  37 diff -Naur hxplay-1.0.8.orig/build/umakecf/irix-6.2-mips-gcc2.95.cf hxplay-1.0.8/build/umakecf/irix-6.2-mips-gcc2.95.cf
  38 --- hxplay-1.0.8.orig/build/umakecf/irix-6.2-mips-gcc2.95.cf    2006-04-24 19:34:08.000000000 -0400
  39 +++ hxplay-1.0.8/build/umakecf/irix-6.2-mips-gcc2.95.cf 2007-06-20 23:52:37.000000000 -0400
  40 @@ -87,4 +87,4 @@
  41  make_lib.make_var = 'MAKE_LIB'
  42  make_lib.make_flags = 'MAKE_LIB_FLAGS'
  43
  44 -platform.link.ldargs = '-L/usr/X11R6/lib'
  45 +platform.link.ldargs = '-L/usr/lib/X11'
  46 diff -Naur hxplay-1.0.8.orig/build/umakecf/irix-6.5-mips.cf hxplay-1.0.8/build/umakecf/irix-6.5-mips.cf
  47 --- hxplay-1.0.8.orig/build/umakecf/irix-6.5-mips.cf    2006-04-24 19:34:08.000000000 -0400
  48 +++ hxplay-1.0.8/build/umakecf/irix-6.5-mips.cf 2007-06-20 23:52:37.000000000 -0400
  49 @@ -83,6 +83,6 @@
  50  platform.cxx.args['default'] = platform.cxx.args['default'] + " -fpermissive "
  51  platform.cxx.args['debug'] = " -g -DDEBUG -D_DEBUG "
  52  platform.cc.args['debug'] = " -g -DDEBUG -D_DEBUG "
  53 -platform.link.ldargs = '-L/usr/X11R6/lib -mips3 '
  54 +platform.link.ldargs = '-L/usr/lib/X11 -mips3 '
  55
  56  DisableRTTIIfNecessary()
  57 diff -Naur hxplay-1.0.8.orig/build/umakecf/linux-2.2-libc6-armv4l-cross-gcc2.95.cf hxplay-1.0.8/build/umakecf/linux-2.2-libc6-armv4l-cross-gcc2.95.cf
  58 --- hxplay-1.0.8.orig/build/umakecf/linux-2.2-libc6-armv4l-cross-gcc2.95.cf     2006-04-24 19:34:08.000000000 -0400
  59 +++ hxplay-1.0.8/build/umakecf/linux-2.2-libc6-armv4l-cross-gcc2.95.cf  2007-06-20 23:52:37.000000000 -0400
  60 @@ -91,6 +91,6 @@
  61  DisableRTTIIfNecessary()
  62
  63  ## X11 isn't really set up for cross-compiling
  64 -project.RemoveIncludes('/usr/X11R6/include')
  65 -project.RemoveSystemPaths('-L/usr/X11R6/lib')
  66 +project.RemoveIncludes('/usr/include/X11')
  67 +project.RemoveSystemPaths('-L/usr/lib/X11')
  68  project.RemoveSystemLibraries("X11")
  69 diff -Naur hxplay-1.0.8.orig/build/umakecf/linux-2.2-libc6-iwmmxt-xscale.cf hxplay-1.0.8/build/umakecf/linux-2.2-libc6-iwmmxt-xscale.cf
  70 --- hxplay-1.0.8.orig/build/umakecf/linux-2.2-libc6-iwmmxt-xscale.cf    2006-04-24 19:34:08.000000000 -0400
  71 +++ hxplay-1.0.8/build/umakecf/linux-2.2-libc6-iwmmxt-xscale.cf 2007-06-20 23:52:37.000000000 -0400
  72 @@ -92,8 +92,8 @@
  73                     'HELIX_FEATURE_AUDDEV_BOOMER_SUPPORT')
  74
  75
  76 -project.RemoveIncludes('/usr/X11R6/include')
  77 -project.RemoveSystemPaths('-L/usr/X11R6/lib')
  78 +project.RemoveIncludes('/usr/include/X11')
  79 +project.RemoveSystemPaths('-L/usr/lib/X11')
  80
  81  ## list of PCF files to run
  82  platform.pcf_prefix_list = ["unix", "linux2", "linux-2.2-libc6-iwmmxt-xscale"]
  83 diff -Naur hxplay-1.0.8.orig/build/umakecf/linux-2.2-mizi-armv4l-xscale.cf hxplay-1.0.8/build/umakecf/linux-2.2-mizi-armv4l-xscale.cf
  84 --- hxplay-1.0.8.orig/build/umakecf/linux-2.2-mizi-armv4l-xscale.cf     2006-04-24 19:34:08.000000000 -0400
  85 +++ hxplay-1.0.8/build/umakecf/linux-2.2-mizi-armv4l-xscale.cf  2007-06-20 23:52:37.000000000 -0400
  86 @@ -90,8 +90,8 @@
  87  platform.pcf_prefix_list = ["unix", "linux2", "linux-2.2-armv4l", "linux-2.2-mizi-armv4l-xscale"]
  88
  89  ## X11 isn't really set up for cross-compiling
  90 -project.RemoveIncludes('/usr/X11R6/include')
  91 -project.RemoveSystemPaths('-L/usr/X11R6/lib')
  92 +project.RemoveIncludes('/usr/include/X11')
  93 +project.RemoveSystemPaths('-L/usr/lib/X11')
  94  project.RemoveSystemLibraries("X11")
  95  project.AddIncludes('/opt/host/armv4l/X11R6/include')
  96  project.AddSystemPaths('-L/opt/host/armv4l/X11R6/lib')
  97 diff -Naur hxplay-1.0.8.orig/build/umakecf/linux-2.6-glibc23-amd64.cf hxplay-1.0.8/build/umakecf/linux-2.6-glibc23-amd64.cf
  98 --- hxplay-1.0.8.orig/build/umakecf/linux-2.6-glibc23-amd64.cf  2006-04-24 19:34:08.000000000 -0400
  99 +++ hxplay-1.0.8/build/umakecf/linux-2.6-glibc23-amd64.cf       2007-06-20 23:52:37.000000000 -0400
 100 @@ -75,8 +75,8 @@
 101  platform.cc.args["default"] = platform.cc.args["default"] + \
 102          " -m64 -D__amd64__"
 103
 104 -project.RemoveSystemPaths("-L/usr/X11R6/lib")
 105 -project.AddSystemPaths("-L/usr/X11R6/lib64")
 106 +project.RemoveSystemPaths("-L/usr/lib/X11")
 107 +project.AddSystemPaths("-L/usr/lib/X1164")
 108
 109  # platform defines
 110  project.AddDefines("_LITTLE_ENDIAN")
 111 diff -Naur hxplay-1.0.8.orig/build/umakecf/linux-common.cf hxplay-1.0.8/build/umakecf/linux-common.cf
 112 --- hxplay-1.0.8.orig/build/umakecf/linux-common.cf     2006-07-06 15:28:06.000000000 -0400
 113 +++ hxplay-1.0.8/build/umakecf/linux-common.cf  2007-06-20 23:52:37.000000000 -0400
 114 @@ -94,8 +94,8 @@
 115  make_lib.make_flags = 'MAKE_LIB_FLAGS'
 116
 117  ## include path for X11R6 on Linux
 118 -project.AddIncludes('/usr/X11R6/include')
 119 -project.AddSystemPaths('-L/usr/X11R6/lib')
 120 +project.AddIncludes('/usr/include/X11')
 121 +project.AddSystemPaths('-L/usr/lib/X11')
 122
 123  ## LessTif/Motif root defined with environment variable XMROOT
 124  if os.environ.has_key('XMROOT'):
 125 diff -Naur hxplay-1.0.8.orig/build/umakecf/linux-common.cfc hxplay-1.0.8/build/umakecf/linux-common.cfc
 126 --- hxplay-1.0.8.orig/build/umakecf/linux-common.cfc    2006-07-19 00:19:58.000000000 -0400
 127 +++ hxplay-1.0.8/build/umakecf/linux-common.cfc 2007-06-20 23:52:37.000000000 -0400
 128 @@ -5,7 +5,7 @@
 129