← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mesa/lucid

« back to all changes in this revision

Viewing changes to src/glx/x11/glxcmds.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen, Timo Aaltonen, Robert Hooker
  • Date: 2010-02-19 15:52:12 UTC
  • mfrom: (3.1.10 experimental)
  • Revision ID: james.westby@ubuntu.com-20100219155212-blqov938av7m6exj
Tags: 7.7-3ubuntu1
https://launchpad.net/bugs/522048
[ Timo Aaltonen ]
* Merge from Debian experimental.

[ Robert Hooker ]
* Add 100_no_abi_tag.patch: Removes the ABI tag in /usr/lib/libGL.so.1
  which prevented ldconfig from using a libGL from another directory
  at a higher priority than the one in /usr/lib.
* Install libGL alternatives with libgl1-mesa-swx11 as well. (LP: #522048)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/glx/x11/glxcmds.c
2575
2575
   (void) readFreq;
2576
2576
   (void) writeFreq;
2577
2577
   (void) priority;
2578
 
#endif /* GLX_DIRECT_RENDERING */
 
2578
#endif /* __DRI_ALLOCATE */
2579
2579
 
2580
2580
   return NULL;
2581
2581
}
2594
2594
   (void) dpy;
2595
2595
   (void) scrn;
2596
2596
   (void) pointer;
2597
 
#endif /* GLX_DIRECT_RENDERING */
 
2597
#endif /* __DRI_ALLOCATE */
2598
2598
}
2599
2599
 
2600
2600