← Back to branch summary

~peter-pearse/ubuntu/oneiric/xorg-server/prop001

« back to all changes in this revision

Viewing changes to debian/patches/214_glx_dri_searchdirs.patch

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2011-04-11 09:51:56 UTC
  • mfrom: (1.1.41 upstream) (0.1.26 experimental)
  • Revision ID: james.westby@ubuntu.com-20110411095156-ymlp7gnfsoplroug
Tags: 2:1.10.0.902-1ubuntu1
* Merge from Debian experimental.
  - dropped patches, included upstream:
    213_xichangehierarchy-check-oom.patch
    216_fix_sdksyms_build.diff, included upstream.
    218_getValuatorEvents_cleanup.patch
    219_xi1_handle_noncontinuous_valuator_data.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/214_glx_dri_searchdirs.patch
1
1
Index: xorg-server/glx/glxdri.c
2
2
===================================================================
3
 
--- xorg-server.orig/glx/glxdri.c       2011-02-22 09:34:13.115682466 +1100
4
 
+++ xorg-server/glx/glxdri.c    2011-02-22 09:34:15.855686483 +1100
 
3
--- xorg-server.orig/glx/glxdri.c       2011-04-09 10:38:10.000000000 +0300
 
4
+++ xorg-server/glx/glxdri.c    2011-04-09 10:39:42.000000000 +0300
5
5
@@ -858,8 +858,6 @@
6
6
 
7
7
 
126
126
 
127
127
Index: xorg-server/glx/glxdri2.c
128
128
===================================================================
129
 
--- xorg-server.orig/glx/glxdri2.c      2011-02-22 09:34:13.155682524 +1100
130
 
+++ xorg-server/glx/glxdri2.c   2011-02-22 09:34:15.855686483 +1100
 
129
--- xorg-server.orig/glx/glxdri2.c      2011-04-09 10:38:10.000000000 +0300
 
130
+++ xorg-server/glx/glxdri2.c   2011-04-09 10:39:42.000000000 +0300
131
131
@@ -599,8 +599,6 @@
132
132
     NULL
133
133
 };
245
245
 }
246
246
Index: xorg-server/glx/glxdricommon.c
247
247
===================================================================
248
 
--- xorg-server.orig/glx/glxdricommon.c 2011-02-22 09:29:22.105255652 +1100
249
 
+++ xorg-server/glx/glxdricommon.c      2011-02-22 09:39:11.016119400 +1100
 
248
--- xorg-server.orig/glx/glxdricommon.c 2011-04-06 18:25:24.000000000 +0300
 
249
+++ xorg-server/glx/glxdricommon.c      2011-04-09 10:39:42.000000000 +0300
250
250
@@ -29,6 +29,7 @@
251
251
 
252
252
 #include <stdint.h>
346
346
+}
347
347
Index: xorg-server/glx/glxdricommon.h
348
348
===================================================================
349
 
--- xorg-server.orig/glx/glxdricommon.h 2011-02-22 09:29:22.175255757 +1100
350
 
+++ xorg-server/glx/glxdricommon.h      2011-02-22 09:34:15.875686524 +1100
 
349
--- xorg-server.orig/glx/glxdricommon.h 2011-04-06 18:25:24.000000000 +0300
 
350
+++ xorg-server/glx/glxdricommon.h      2011-04-09 10:39:42.000000000 +0300
351
351
@@ -38,4 +38,9 @@
352
352
 
353
353
 extern const __DRIsystemTimeExtension systemTimeExtension;
360
360
 #endif
361
361
Index: xorg-server/glx/glxdriswrast.c
362
362
===================================================================
363
 
--- xorg-server.orig/glx/glxdriswrast.c 2011-02-22 09:29:22.125255677 +1100
364
 
+++ xorg-server/glx/glxdriswrast.c      2011-02-22 09:34:15.875686524 +1100
 
363
--- xorg-server.orig/glx/glxdriswrast.c 2011-04-06 18:25:24.000000000 +0300
 
364
+++ xorg-server/glx/glxdriswrast.c      2011-04-09 10:39:42.000000000 +0300
365
365
@@ -427,17 +427,13 @@
366
366
     }
367
367
 }
438
438
 
439
439
Index: xorg-server/configure.ac
440
440
===================================================================
441
 
--- xorg-server.orig/configure.ac       2011-02-22 09:34:15.505685983 +1100
442
 
+++ xorg-server/configure.ac    2011-02-22 09:34:15.875686524 +1100
443
 
@@ -1259,7 +1259,12 @@
 
441
--- xorg-server.orig/configure.ac       2011-04-09 10:38:10.000000000 +0300
 
442
+++ xorg-server/configure.ac    2011-04-09 10:42:51.000000000 +0300
 
443
@@ -1260,7 +1260,12 @@
444
444
 AC_DEFINE_DIR(SERVER_MISC_CONFIG_PATH, SERVERCONFIG, [Server miscellaneous config path])
445
445
 AC_DEFINE_DIR(BASE_FONT_PATH, FONTROOTDIR, [Default base font path])
446
446
 dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri`