Magellan Linux

Diff of /trunk/extras/xorg-server/xorg-server-1.20.0-r1.smage2

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

revision 31141 by niro, Tue Jun 5 13:24:34 2018 UTC revision 31142 by niro, Fri Jun 8 07:06:39 2018 UTC
# Line 4  PNAME="xorg-server" Line 4  PNAME="xorg-server"
4  PVER="1.20.0"  PVER="1.20.0"
5  PBUILD="r1"  PBUILD="r1"
6    
7  SPLIT_PACKAGES="xorg-server kdrive xephyr xdmx xnest xvfb"  SPLIT_PACKAGES="xorg-server xephyr xdmx xnest xvfb"
8    
9  PCAT="x11-base"  PCAT="x11-base"
10  HOMEPAGE="http://xorg.freedesktop.org"  HOMEPAGE="http://xorg.freedesktop.org"
# Line 58  XORG_DEPEND="${COMMON_DEPEND} Line 58  XORG_DEPEND="${COMMON_DEPEND}
58   >= x11-base/opengl-update-2.3.12   >= x11-base/opengl-update-2.3.12
59   >= x11-libs/libpciaccess-0.14"   >= x11-libs/libpciaccess-0.14"
60    
 KDRIVE_DEPEND="${COMMON_DEPEND}"  
   
61  XEPHYR_DEPEND="${COMMON_DEPEND}  XEPHYR_DEPEND="${COMMON_DEPEND}
62   ${LIBXEXT_DEPEND}   ${LIBXEXT_DEPEND}
63   ${LIBX11_DEPEND}   ${LIBX11_DEPEND}
# Line 123  split_info_xorg-server() Line 121  split_info_xorg-server()
121   PROVIDE+=" ${XORG_SERVER_PROVIDE}"   PROVIDE+=" ${XORG_SERVER_PROVIDE}"
122  }  }
123    
 split_info_kdrive()  
 {  
  DESCRIPTION="Tiny X.Org X Server."  
  DEPEND="${KDRIVE_DEPEND}"  
 }  
   
124  split_info_xephyr()  split_info_xephyr()
125  {  {
126   DESCRIPTION="A nested X11 server with opengl support."   DESCRIPTION="A nested X11 server with opengl support."
# Line 275  src_install_xorg-server() Line 267  src_install_xorg-server()
267   mlink Xorg /usr/bin/X || die   mlink Xorg /usr/bin/X || die
268    
269   # remove stuff included in other packages   # remove stuff included in other packages
  # xfbdev  
  mdelete /usr/bin/Xfbdev || die  
270   # xephyr   # xephyr
271   mdelete /usr/bin/Xephyr || die   mdelete /usr/bin/Xephyr || die
272   mdelete /usr/share/man/man1/Xephyr.1 || die   mdelete /usr/share/man/man1/Xephyr.1 || die
# Line 305  src_install_xorg-server() Line 295  src_install_xorg-server()
295   mdelete /usr/share/man/man1/Xvfb.1 || die   mdelete /usr/share/man/man1/Xvfb.1 || die
296  }  }
297    
 src_install_kdrive()  
 {  
  cd ${SRCDIR}  
   
  minstallexec hw/kdrive/fbdev/Xfbdev || die  
  #minstallman hw/kdrive/fbdev/Xfbdev.1 || die  
   
 # # suid all tinyX servers  
 # mchmod 4755 /usr/bin/X\* || die  
   
  # needed directory  
  mkeepdir /usr/share/X11/xkb/compiled || die  
 }  
   
298  src_install_xephyr()  src_install_xephyr()
299  {  {
300   cd ${SRCDIR}   cd ${SRCDIR}

Legend:
Removed from v.31141  
changed lines
  Added in v.31142