Magellan Linux

  • Back to homepage
    • /[smage]/trunk/extras/xorg-server/xorg-server-1.20.0-r1.smage2

    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 31042 by niro, Tue May 29 12:13:31 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"
    11    
    12  # mesa sources are needed to compile opengl extensions  # mesa sources are needed to compile opengl extensions
    13  MESA_PVER="18.1.0"  MESA_PVER="18.1.1"
    14  MESA_SRCFILE="mesa-${MESA_PVER/_/-}.tar.xz"  MESA_SRCFILE="mesa-${MESA_PVER/_/-}.tar.xz"
    15  MESA_SRCDIR="${BUILDDIR}/mesa-${MESA_PVER/_/-}"  MESA_SRCDIR="${BUILDDIR}/mesa-${MESA_PVER/_/-}"
    16    
    # Line 18  PROVIDE="virtual/x11" Line 18  PROVIDE="virtual/x11"
    18    
    19  # see hw/xfree86/common/xf86Module.h for ABI versions  # see hw/xfree86/common/xf86Module.h for ABI versions
    20  # or installed pkg-config file  # or installed pkg-config file
    21  XORG_SERVER_PROVIDE="virtual/X-ABI-VIDEODRV-23 virtual/X-ABI-XINPUT-24.1 virtual/X-ABI-EXTENSION-10.0"  XORG_SERVER_PROVIDE="virtual/X-ABI-VIDEODRV-24.0 virtual/X-ABI-XINPUT-24.1 virtual/X-ABI-EXTENSION-10.0"
    22    
    23  # common depends  # common depends
    24  COMMON_DEPEND=">= x11-libs/libXfont2-2.0  COMMON_DEPEND=">= x11-libs/libXfont2-2.0
    # 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 114  SRC_URI=( ${SRC_URI[*]} Line 112  SRC_URI=( ${SRC_URI[*]}
    112   mirror://${PNAME}/xvfb-run   mirror://${PNAME}/xvfb-run
    113   mirror://${PNAME}/xvfb-run.1   mirror://${PNAME}/xvfb-run.1
    114   mirror://${PNAME}/${PNAME}-1.12.3-die-ugly-pattern-die-die-die.patch   mirror://${PNAME}/${PNAME}-1.12.3-die-ugly-pattern-die-die-die.patch
      mirror://${PNAME}/${PNAME}-1.12.3-kdrive-default-mode.patch  
      #mirror://${PNAME}/${PNAME}-1.12.3-kdrive-evdev-with-valid-mouse-devices.patch  
    115  )  )
    116    
    117  split_info_xorg-server()  split_info_xorg-server()
    # Line 125  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 198  src_prepare() Line 188  src_prepare()
    188   # adopted from redhat; use a black background   # adopted from redhat; use a black background
    189   mpatch ${PNAME}-1.12.3-die-ugly-pattern-die-die-die.patch || die   mpatch ${PNAME}-1.12.3-die-ugly-pattern-die-die-die.patch || die
    190    
      # fix kdrive default mode -> use 640x480@60hz instead of 800x600@75hz  
      mpatch ${PNAME}-1.12.3-kdrive-default-mode.patch || die  
       
      # fix new evdev event devices (event4 and event5)  
      #mpatch ${PNAME}-1.12.3-kdrive-evdev-with-valid-mouse-devices.patch || die  
       
    191   # fix build issues, some wrapper files which should be generated   # fix build issues, some wrapper files which should be generated
    192   # 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
    193   # the makefile to clean them and whipe these wrapper files   # the makefile to clean them and whipe these wrapper files
    # Line 283  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 313  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.31042  
    changed lines
      Added in v.31142