Magellan Linux

  • Back to homepage
    • /[smage]/branches/magellan-next/core/xorg-server/xorg-server-1.9.0-r1.smage2

    Diff of /branches/magellan-next/core/xorg-server/xorg-server-1.9.0-r1.smage2

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 6501 by niro, Wed Aug 25 22:35:58 2010 UTC revision 6502 by niro, Wed Aug 25 22:48:59 2010 UTC
    # Line 92  SRC_URI=( ${SRC_URI[*]} Line 92  SRC_URI=( ${SRC_URI[*]}
    92   ftp://ftp.freedesktop.org/pub/mesa/${MESA_PVER}/${MESA_SRCFILE}   ftp://ftp.freedesktop.org/pub/mesa/${MESA_PVER}/${MESA_SRCFILE}
    93   sourceforge://mesa3d/${MESA_SRCFILE}   sourceforge://mesa3d/${MESA_SRCFILE}
    94   mirror://mesa/${MESA_SRCFILE}   mirror://mesa/${MESA_SRCFILE}
    95   mirror://${PNAME}/${PNAME}-1.4-fpic-libxf86config.patch   mirror://${PNAME}/${PNAME}-${PVER}-fpic-libxf86config.patch
    96   mirror://${PNAME}/${PNAME}-1.2.0-die-ugly-pattern-die-die-die.patch   mirror://${PNAME}/${PNAME}-1.2.0-die-ugly-pattern-die-die-die.patch
    97   mirror://${PNAME}/${PNAME}-${PVER}-match-only-sane-devices.patch   mirror://${PNAME}/${PNAME}-1.8.0-match-only-sane-devices.patch
    98   mirror://${PNAME}/${PNAME}-${PVER}-kdrive-default-mode.patch   mirror://${PNAME}/${PNAME}-1.8.0-kdrive-default-mode.patch
    99   mirror://${PNAME}/${PNAME}-${PVER}-kdrive-evdev-with-valid-mouse-devices.patch   mirror://${PNAME}/${PNAME}-1.8.0-kdrive-evdev-with-valid-mouse-devices.patch
    100  )  )
    101    
    102  UP2SUBDIR="xserver"  UP2SUBDIR="xserver"
    # Line 107  split_info_xorg-server() Line 107  split_info_xorg-server()
    107   DESCRIPTION="Modular X.Org X Server."   DESCRIPTION="Modular X.Org X Server."
    108   DEPEND="${COMMON_DEPEND}   DEPEND="${COMMON_DEPEND}
    109   == media-libs/mesa-${MESA_PVER}   == media-libs/mesa-${MESA_PVER}
    110   >= x11-misc/xkeyboard-config-1.7   >= x11-misc/xkeyboard-config-1.9
    111   >= x11-apps/iceauth-1.0.3   >= x11-apps/iceauth-1.0.3
    112   >= x11-apps/rgb-1.0.3   >= x11-apps/rgb-1.0.3
    113   >= x11-apps/xauth-1.0.4   >= x11-apps/xauth-1.0.4
    114   >= x11-apps/xinit-1.1.1   >= x11-apps/xinit-1.1.1
    115   >= x11-base/opengl-update-magellan-2.2.10   >= x11-base/opengl-update-magellan-2.2.12
    116   >= x11-libs/libpciaccess-0.10.9"   >= x11-libs/libpciaccess-0.12"
    117    
    118   preinstall()   preinstall()
    119   {   {
    # Line 171  split_info_xephyr() Line 171  split_info_xephyr()
    171   DESCRIPTION="A nested X11 server with opengl support."   DESCRIPTION="A nested X11 server with opengl support."
    172   DEPEND="${COMMON_DEPEND}   DEPEND="${COMMON_DEPEND}
    173   >= x11-libs/libXext-1.1   >= x11-libs/libXext-1.1
    174   >= x11-libs/libX11-1.3.1   >= x11-libs/libX11-1.3.5
    175   >= x11-libs/libXv-1.0.5   >= x11-libs/libXv-1.0.5
    176   == media-libs/mesa-${MESA_PVER}   == media-libs/mesa-${MESA_PVER}
    177   >= x11-libs/libXi-1.3   >= x11-libs/libXi-1.3
    # Line 186  split_info_xnest() Line 186  split_info_xnest()
    186   DESCRIPTION="A nested X11 server."   DESCRIPTION="A nested X11 server."
    187   DEPEND="${COMMON_DEPEND}   DEPEND="${COMMON_DEPEND}
    188   >= x11-libs/libXext-1.1   >= x11-libs/libXext-1.1
    189   >= x11-libs/libX11-1.3.1"   >= x11-libs/libX11-1.3.5"
    190   unset -f preinstall   unset -f preinstall
    191   unset -f postinstall   unset -f postinstall
    192   unset -f postremove   unset -f postremove
    # Line 197  split_info_xdmx() Line 197  split_info_xdmx()
    197   DESCRIPTION="A distributed multihead X11 Server."   DESCRIPTION="A distributed multihead X11 Server."
    198   DEPEND="${COMMON_DEPEND}   DEPEND="${COMMON_DEPEND}
    199   >= x11-libs/libXext-1.1   >= x11-libs/libXext-1.1
    200   >= x11-libs/libX11-1.3.1   >= x11-libs/libX11-1.3.5
    201   >= x11-libs/libdmx-1.1.0   >= x11-libs/libdmx-1.1.0
    202   >= x11-libs/libXaw-1.0.7   >= x11-libs/libXaw-1.0.7
    203   >= x11-libs/libXfixes-4   >= x11-libs/libXfixes-4
    204   >= x11-libs/libXi-1.3   >= x11-libs/libXi-1.3
    205   >= x11-libs/libXrender-0.9.5"   >= x11-libs/libXrender-0.9.6"
    206   unset -f preinstall   unset -f preinstall
    207   unset -f postinstall   unset -f postinstall
    208   unset -f postremove   unset -f postremove
    # Line 228  src_prepare() Line 228  src_prepare()
    228   cd ${SRCDIR}   cd ${SRCDIR}
    229    
    230   # fixes fpic issues with libxf86config on 64bit systems   # fixes fpic issues with libxf86config on 64bit systems
    231   mpatch ${PNAME}-1.4-fpic-libxf86config.patch || die   mpatch ${PNAME}-${PVER}-fpic-libxf86config.patch || die
    232    
    233   # adopted from redhat; use a black background   # adopted from redhat; use a black background
    234   mpatch ${PNAME}-1.2.0-die-ugly-pattern-die-die-die.patch || die   mpatch ${PNAME}-1.2.0-die-ugly-pattern-die-die-die.patch || die
    235    
      # only match sane devices in 10-evdev.conf  
      # having a generic catchall also adds devices like accelerometers. These  
      # devices make X unusable, hence restrict matching to "known sane" devices  
      # like pointers, touchpads, keyboards, tablets and touchscreens.  
      mpatch ${PNAME}-${PVER}-match-only-sane-devices.patch || die  
       
    236   # fix kdrive default mode -> use 640x480@60hz instead of 800x600@75hz   # fix kdrive default mode -> use 640x480@60hz instead of 800x600@75hz
    237   mpatch ${PNAME}-${PVER}-kdrive-default-mode.patch || die   mpatch ${PNAME}-1.8.0-kdrive-default-mode.patch || die
    238    
    239   # fix new evdev event devices (event4 and event5)   # fix new evdev event devices (event4 and event5)
    240   mpatch ${PNAME}-${PVER}-kdrive-evdev-with-valid-mouse-devices.patch || die   mpatch ${PNAME}-1.8.0-kdrive-evdev-with-valid-mouse-devices.patch || die
    241    
    242   # fix build issues, some wrapper files which should be generated   # fix build issues, some wrapper files which should be generated
    243   # at build time exist and the makefile doesn't whipe them. we patch   # at build time exist and the makefile doesn't whipe them. we patch
    Legend:
    Removed from v.6501  
    changed lines
      Added in v.6502