View | Details | Raw Unified | Return to bug 10472 | Differences between
and this patch

Collapse All | Expand All

(-)origsrc/Mesa-7.8.2/configure.ac (-6 / +20 lines)
 Lines 617-633   dri) Link Here 
617 
        AC_MSG_ERROR([Can't use static libraries for DRI drivers])
 617 
        AC_MSG_ERROR([Can't use static libraries for DRI drivers])
618 
    fi
 618 
    fi
619 

          619
          

        

            

              620
              
    # Check for libdrm

              
              
            

            

              621
              
    PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])

            

            

              622
              
    PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])

            

        

          623
          
    PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])

          620
          
    PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])

        

          
            

              624
              
    GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED glproto >= $GLPROTO_REQUIRED"


              621
              

            

            

              625
              
    DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"


              622
              
    case "$host_os" in

            

            

              
              

              623
              
    cygwin*|darwin*)

            

            


              624
              
        ;;

            

            


              625
              
    *)

            

            


              626
              
        # Check for libdrm

            

            


              627
              
        PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED xxf86vm])

            

            


              628
              
        PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])

            

            


              629
              
        GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED xxf86vm dri2proto >= $DRI2PROTO_REQUIRED glproto >= $GLPROTO_REQUIRED"

            

            


              630
              
        DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED xxf86vm"

            

            


              631
              
        ;;

            

            


              632
              
    esac

            

        

          626
          

          633
          

        

        

          627
          
    # find the DRI deps for libGL

          634
          
    # find the DRI deps for libGL

        

        

          628
          
    if test "$x11_pkgconfig" = yes; then

          635
          
    if test "$x11_pkgconfig" = yes; then

        

        

          629
          
        # add xcb modules if necessary

          636
          
        # add xcb modules if necessary

        

          
            

              630
              
        dri_modules="x11 xext xxf86vm xdamage xfixes"


              637
              
        dri_modules="x11 xext xdamage xfixes"

            

            

              
              

              638
              

            

        

          631
          
        if test "$enable_xcb" = yes; then

          639
          
        if test "$enable_xcb" = yes; then

        

        

          632
          
            dri_modules="$dri_modules x11-xcb xcb-glx"

          640
          
            dri_modules="$dri_modules x11-xcb xcb-glx"

        

        

          633
          
        fi

          641
          
        fi

        

  

    

    

       Lines 800-805
      if test "$mesa_driver" = dri; then 
    
  Link Here 
    

  

        

          800
          
            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"

          809
          
            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"

        

        

          801
          
        fi

          810
          
        fi

        

        

          802
          
        ;;

          811
          
        ;;

        

            

              
              
              812
              
    cygwin*)

            

            

              813
              
        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"

            

            

              814
              
        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"

            

            

              815
              
        if test "x$DRI_DIRS" = "xyes"; then

            

            

              816
              
            DRI_DIRS="swrast"

            

            

              817
              
        fi

            

        

          803
          
    esac

          818
          
    esac

        

        

          804
          

          819
          

        

        

          805
          
    # default drivers

          820
          
    # default drivers

        



(-)origsrc/Mesa-7.8.2/src/glx/dri_common.c
      (+4 lines)




  

    

    

       Lines 106-112
      driOpenDriver(const char *driverName) 
    
  Link Here 
    

  

        

          106
          
   int len;

          106
          
   int len;

        

        

          107
          

          107
          

        

        

          108
          
   /* Attempt to make sure libGL symbols will be visible to the driver */

          108
          
   /* Attempt to make sure libGL symbols will be visible to the driver */

        

            

              
              
              109
              
#ifdef __CYGWIN__

            

            

              110
              
   glhandle = dlopen("cygGL-1.dll", RTLD_NOW | RTLD_GLOBAL);

            

            

              111
              
#else

            

        

          109
          
   glhandle = dlopen("libGL.so.1", RTLD_NOW | RTLD_GLOBAL);

          112
          
   glhandle = dlopen("libGL.so.1", RTLD_NOW | RTLD_GLOBAL);

        

            

              
              
              113
              
#endif

            

        

          110
          

          114
          

        

        

          111
          
   libPaths = NULL;

          115
          
   libPaths = NULL;

        

        

          112
          
   if (geteuid() == getuid()) {

          116
          
   if (geteuid() == getuid()) {

        



(-)origsrc/Mesa-7.8.2/src/glx/glxext.c
      (+2 lines)




  

    

    

       Lines 41-47
       
    
  Link Here 
    

  

        

          41
          
#include "glxclient.h"

          41
          
#include "glxclient.h"

        

        

          42
          
#include <X11/extensions/Xext.h>

          42
          
#include <X11/extensions/Xext.h>

        

        

          43
          
#include <X11/extensions/extutil.h>

          43
          
#include <X11/extensions/extutil.h>

        

            

              
              
              44
              
#ifdef GLX_DIRECT_RENDERING

            

        

          44
          
#include <X11/extensions/dri2proto.h>

          45
          
#include <X11/extensions/dri2proto.h>

        

            

              
              
              46
              
#endif

            

        

          45
          
#ifdef GLX_USE_APPLEGL

          47
          
#ifdef GLX_USE_APPLEGL

        

        

          46
          
#include "apple_glx.h"

          48
          
#include "apple_glx.h"

        

        

          47
          
#include "apple_visual.h"

          49
          
#include "apple_visual.h"

        



(-)origsrc/Mesa-7.8.2/src/mesa/main/dlopen.c
      (+4 lines)




  

    

    

       Lines 31-36
       
    
  Link Here 
    

  

        

          31
          
#include "compiler.h"

          31
          
#include "compiler.h"

        

        

          32
          
#include "dlopen.h"

          32
          
#include "dlopen.h"

        

        

          33
          

          33
          

        

            

              
              
              34
              
#ifdef __CYGWIN__

            

            

              35
              
#define _GNU_SOURCE

            

            

              36
              
#endif

            

            

              37
              

            

        

          34
          
#if defined(_GNU_SOURCE) && !defined(__MINGW32__) && !defined(__blrts)

          38
          
#if defined(_GNU_SOURCE) && !defined(__MINGW32__) && !defined(__blrts)

        

        

          35
          
#include <dlfcn.h>

          39
          
#include <dlfcn.h>

        

        

          36
          
#endif

          40
          
#endif

        



(-)origsrc/Mesa-7.8.2/src/mesa/main/texcompress_s3tc.c
      (-1 / +1 lines)




  

    

    

       Lines 48-54
       
    
  Link Here 
    

  

        

          48
          
#if FEATURE_texture_s3tc

          48
          
#if FEATURE_texture_s3tc

        

        

          49
          

          49
          

        

        

          50
          

          50
          

        

          
            

              51
              
#ifdef __MINGW32__


              51
              
#if defined(__MINGW32__) || defined(__CYGWIN__)

            

        

          52
          
#define DXTN_LIBNAME "dxtn.dll"

          52
          
#define DXTN_LIBNAME "dxtn.dll"

        

        

          53
          
#define RTLD_LAZY 0

          53
          
#define RTLD_LAZY 0

        

        

          54
          
#define RTLD_GLOBAL 0

          54
          
#define RTLD_GLOBAL 0

        






  


  Return to bug 10472