Magellan Linux

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

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

revision 336 by niro, Thu Apr 29 22:02:41 2010 UTC revision 341 by niro, Thu Apr 29 22:46:29 2010 UTC
# Line 15  DEPEND=">= x11-libs/libXfont-1.4.1 Line 15  DEPEND=">= x11-libs/libXfont-1.4.1
15   >= x11-libs/libXext-1.1   >= x11-libs/libXext-1.1
16   >= x11-libs/libX11-1.3.1   >= x11-libs/libX11-1.3.1
17   >= x11-libs/libXdmcp-1.0.3   >= x11-libs/libXdmcp-1.0.3
18     >= x11-libs/libxkbfile-1.0.6
19   >= x11-libs/pixman-0.16.2   >= x11-libs/pixman-0.16.2
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     >= dev-libs/libsha1-0.2"
24  # >= x11-libs/libXv-1.0.5  # >= x11-libs/libXv-1.0.5
25    
26  SDEPEND=">= x11-libs/xtrans-1.2  SDEPEND=">= x11-libs/xtrans-1.2
# Line 49  SDEPEND=">= x11-libs/xtrans-1.2 Line 51  SDEPEND=">= x11-libs/xtrans-1.2
51    
52  PROVIDE="virtual/x11"  PROVIDE="virtual/x11"
53    
54  MCORE_ONLY_KEEP="usr/bin usr/share/X11/xkb"  MCORE_ONLY_KEEP="usr/bin usr/share/X11/xkb usr/$(mlibdir)/xorg/protocol.txt"
55  sminclude xorg mtools cleanutils mcore-split  sminclude xorg mtools cleanutils mcore-split
56    
57  SRCFILE="xorg-server-${PVER}.tar.bz2"  SRCFILE="xorg-server-${PVER}.tar.bz2"
# Line 61  SRC_URI=( Line 63  SRC_URI=(
63   mirror://xorg-server/xorg-server-1.4-fpic-libxf86config.patch   mirror://xorg-server/xorg-server-1.4-fpic-libxf86config.patch
64   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
65   mirror://xorg-server/xorg-server-1.7.6-libsha1-support.patch   mirror://xorg-server/xorg-server-1.7.6-libsha1-support.patch
66     mirror://xorg-server/xorg-server-1.7.6-dlopen-fix.patch
67  )  )
68    
69  UP2SUBDIR="xserver"  UP2SUBDIR="xserver"
# Line 80  src_prepare() Line 83  src_prepare()
83   # support other sha1 implemtations as well   # support other sha1 implemtations as well
84   mpatch xorg-server-1.7.6-libsha1-support.patch || die   mpatch xorg-server-1.7.6-libsha1-support.patch || die
85    
86     # fix linking issues against dlopen (xfbdev needs this)
87     mpatch xorg-server-1.7.6-dlopen-fix.patch || die
88    
89   # fix build issues, some wrapper files which should be generated   # fix build issues, some wrapper files which should be generated
90   # 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
91   # the makefile to clean them and whipe these wrapper files   # the makefile to clean them and whipe these wrapper files

Legend:
Removed from v.336  
changed lines
  Added in v.341