Changeset 13702


Ignore:
Timestamp:
2008-12-20T22:17:43+01:00 (9 years ago)
Author:
mirko
Message:

cleanup Makefile and enable DRI/DRM

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/Xorg/xorg/xserver/xorg-server/Makefile

    r13604 r13702  
    119119 
    120120define Package/xorg/Default 
     121  PROVIDES:=xserver 
    121122  SECTION:=xorg-server 
    122123  CATEGORY:=Xorg 
     
    145146  PROVIDES:=xserver 
    146147  TITLE:=Xorg xserver 
    147 endef 
    148  
    149 define Package/xserver-kdrive-xvesa 
     148  DEPENDS+=+libdrm \ 
     149  +xf86driproto 
     150endef 
     151 
     152define Package/xserver-kdrive/Default 
    150153$(call Package/xserver/Default) 
    151   PROVIDES:=xserver 
    152   TITLE:=Kdrive vesa xserver 
    153   DEPENDS+=@TARGET_x86 \ 
    154   +X_TSLIB:tslib \ 
    155   +X_DRI:xf86driproto \ 
    156   +X_DRI:libdrm \ 
    157   +X_XCALIBRATE:calibrateproto \ 
    158   +X_COMPOSITE:compositeproto \ 
    159   +X_XINERAMA:xineramaproto 
    160 endef 
    161  
    162 define Package/xserver-kdrive-xfbdev 
    163 $(call Package/xserver/Default) 
    164   PROVIDES:=xserver 
    165   TITLE:=Kdrive framebuffer xserver 
    166154  DEPENDS+=+X_TSLIB:tslib \ 
    167155  +X_DRI:xf86driproto \ 
     
    172160endef 
    173161 
     162define Package/xserver-kdrive-xvesa 
     163$(call Package/xserver-kdrive/Default) 
     164  TITLE:=Kdrive vesa xserver 
     165  DEPENDS+=@TARGET_x86 
     166endef 
     167 
     168define Package/xserver-kdrive-xfbdev 
     169$(call Package/xserver-kdrive/Default) 
     170  TITLE:=Kdrive framebuffer xserver 
     171endef 
     172 
    174173define Package/xserver-kdrive-xephyr 
    175 $(call Package/xserver/Default) 
    176   PROVIDES:=xserver 
     174$(call Package/xserver-kdrive/Default) 
    177175  TITLE:=Kdrive ephyr xserver 
    178   DEPENDS+=+X_TSLIB:tslib \ 
    179   +X_DRI:xf86driproto \ 
    180   +X_DRI:libdrm \ 
    181   +X_XCALIBRATE:calibrateproto \ 
    182   +X_COMPOSITE:compositeproto \ 
    183   +X_XINERAMA:xineramaproto 
    184176endef 
    185177 
     
    197189define Build/Configure 
    198190        $(call Build/Configure/Default, \ 
    199                 $(if $(CONFIG_PACKAGE_xserver-xorg),--enable-xorg --disable-kdrive,--disable-xorg --enable-kdrive) \ 
     191                $(if $(CONFIG_PACKAGE_xserver-xorg),--enable-xorg --enable-dri,--disable-xorg --disable-dri) \ 
    200192                $(if $(CONFIG_PACKAGE_xserver-kdrive-xvesa), \ 
    201193                        --enable-kdrive-vesa, \ 
     
    210202                $(if $(CONFIG_X_COMPOSITE),--enable-composite,--disable-composite) \ 
    211203                $(if $(CONFIG_X_XINERAMA),--enable-xinerama,--disable-xinerama) \ 
    212                 $(if $(CONFIG_X_DRI),--enable-dri,--disable-dri) \ 
    213204                $(if $(CONFIG_X_XCALIBRATE),--enable-xcalibrate,--disable-xcalibrate) \ 
    214205        ) 
Note: See TracChangeset for help on using the changeset viewer.