Magellan Linux

  • Back to homepage
    • /[mcore-svn]/smage/trunk/core/kdrive/kdrive-1.8.0-r1.smage2

    Diff of /smage/trunk/core/kdrive/kdrive-1.8.0-r1.smage2

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

    revision 244 by niro, Mon Apr 26 23:30:22 2010 UTC revision 385 by niro, Wed May 5 19:45:07 2010 UTC
    # Line 10  STATE="unstable" Line 10  STATE="unstable"
    10  DESCRIPTION="Modular X.Org X Server."  DESCRIPTION="Modular X.Org X Server."
    11  HOMEPAGE="http://xorg.freedesktop.org"  HOMEPAGE="http://xorg.freedesktop.org"
    12    
     sminclude xorg mtools cleanutils mcore-split  
       
     PROVIDE="virtual/x11"  
       
    13  DEPEND=">= x11-libs/libXfont-1.4.1  DEPEND=">= x11-libs/libXfont-1.4.1
    14   >= x11-libs/libXau-1.0.5   >= x11-libs/libXau-1.0.5
    15   >= x11-libs/libXext-1.1   >= x11-libs/libXext-1.1
    # Line 24  DEPEND=">= x11-libs/libXfont-1.4.1 Line 20  DEPEND=">= x11-libs/libXfont-1.4.1
    20   >= media-libs/freetype-2.3.9   >= media-libs/freetype-2.3.9
    21   >= media-fonts/font-misc-misc-1   >= media-fonts/font-misc-misc-1
    22   >= media-fonts/font-cursor-misc-1   >= media-fonts/font-cursor-misc-1
    23     >= x11-misc/xkeyboard-config-1.7
    24   >= dev-libs/libsha1-0.2"   >= dev-libs/libsha1-0.2"
    25  # >= x11-libs/libXv-1.0.5  # >= x11-libs/libXv-1.0.5
    26    
    # Line 53  SDEPEND=">= x11-libs/xtrans-1.2 Line 50  SDEPEND=">= x11-libs/xtrans-1.2
    50   >= x11-apps/mkfontdir-1.0.5   >= x11-apps/mkfontdir-1.0.5
    51   >= x11-apps/mkfontscale-1.0.7"   >= x11-apps/mkfontscale-1.0.7"
    52    
    53    PROVIDE="virtual/x11"
    54    
    55    MCORE_ONLY_KEEP="usr/bin usr/share/X11/xkb"
    56    sminclude xorg mtools cleanutils mcore-split
    57    
    58  SRCFILE="xorg-server-${PVER}.tar.bz2"  SRCFILE="xorg-server-${PVER}.tar.bz2"
    59  SRCDIR="${BUILDDIR}/xorg-server-${PVER}"  SRCDIR="${BUILDDIR}/xorg-server-${PVER}"
    60    
    # Line 61  SRC_URI=( Line 63  SRC_URI=(
    63   mirror://xorg-server/${SRCFILE}   mirror://xorg-server/${SRCFILE}
    64   mirror://xorg-server/xorg-server-1.4-fpic-libxf86config.patch   mirror://xorg-server/xorg-server-1.4-fpic-libxf86config.patch
    65   mirror://xorg-server/xorg-server-1.2.0-die-ugly-pattern-die-die-die.patch   mirror://xorg-server/xorg-server-1.2.0-die-ugly-pattern-die-die-die.patch
    66     mirror://xorg-server/xorg-server-1.4.99.906-no-evdev-keyboards.patch
    67  )  )
    68    
    69  UP2SUBDIR="xserver"  UP2SUBDIR="xserver"
    # Line 77  src_prepare() Line 80  src_prepare()
    80   # adopted from redhat; use a black background   # adopted from redhat; use a black background
    81   mpatch xorg-server-1.2.0-die-ugly-pattern-die-die-die.patch || die   mpatch xorg-server-1.2.0-die-ugly-pattern-die-die-die.patch || die
    82    
    83     # evdev is way too broken
    84     mpatch xorg-server-1.4.99.906-no-evdev-keyboards.patch || die
    85    
    86   # fix build issues, some wrapper files which should be generated   # fix build issues, some wrapper files which should be generated
    87   # 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
    88   # the makefile to clean them and whipe these wrapper files   # the makefile to clean them and whipe these wrapper files
    # Line 122  src_compile() Line 128  src_compile()
    128   --disable-xsdl \   --disable-xsdl \
    129   --disable-config-dbus \   --disable-config-dbus \
    130   --disable-config-hal \   --disable-config-hal \
    131   --enable-config-udev \   --disable-config-udev \
    132   --with-sha1=libsha1 \   --with-sha1=libsha1 \
    133     --enable-kdrive-kbd \
    134     --enable-kdrive-mouse \
    135     --disable-kdrive-evdev \
    136   || die   || die
    137    
    138   mmake || die   mmake || die
    Legend:
    Removed from v.244  
    changed lines
      Added in v.385