Magellan Linux

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

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

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

    revision 33147 by niro, Fri Oct 18 21:04:12 2019 UTC revision 33148 by niro, Fri Oct 18 22:07:55 2019 UTC
    # Line 9  SPLIT_PACKAGES="xorg-server xephyr xdmx Line 9  SPLIT_PACKAGES="xorg-server xephyr xdmx
    9  PCAT="x11-base"  PCAT="x11-base"
    10  HOMEPAGE="http://xorg.freedesktop.org"  HOMEPAGE="http://xorg.freedesktop.org"
    11    
     # mesa sources are needed to compile opengl extensions  
     MESA_PVER="19.2.1"  
     MESA_SRCFILE="mesa-${MESA_PVER/_/-}.tar.xz"  
     MESA_SRCDIR="${BUILDDIR}/mesa-${MESA_PVER/_/-}"  
       
    12  PROVIDE="virtual/x11"  PROVIDE="virtual/x11"
    13    
    14  # see hw/xfree86/common/xf86Module.h for ABI versions  # see hw/xfree86/common/xf86Module.h for ABI versions
    # Line 43  COMMON_DEPEND=">= x11-libs/libXfont2-2.0 Line 38  COMMON_DEPEND=">= x11-libs/libXfont2-2.0
    38  LIBXEXT_DEPEND=">= x11-libs/libXext-1.3"  LIBXEXT_DEPEND=">= x11-libs/libXext-1.3"
    39  LIBX11_DEPEND=">= x11-libs/libX11-1.6"  LIBX11_DEPEND=">= x11-libs/libX11-1.6"
    40  LIBXI_DEPEND=">= x11-libs/libXi-1.7"  LIBXI_DEPEND=">= x11-libs/libXi-1.7"
    41  MESA_DEPEND="== media-libs/mesa-${MESA_PVER}"  MESA_DEPEND="== media-libs/mesa-19.2"
    42  EPOXY_DEPEND=">= media-libs/libepoxy-1.4"  EPOXY_DEPEND=">= media-libs/libepoxy-1.4"
    43    
    44  XORG_DEPEND="${COMMON_DEPEND}  XORG_DEPEND="${COMMON_DEPEND}
    # Line 104  sminclude xorg mtools Line 99  sminclude xorg mtools
    99    
    100  SRC_URI=( ${SRC_URI[*]}  SRC_URI=( ${SRC_URI[*]}
    101   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
      ftp://ftp.freedesktop.org/pub/mesa/${MESA_PVER}/${MESA_SRCFILE}  
      ftp://ftp.freedesktop.org/pub/mesa/${MESA_SRCFILE}  
      mirror://mesa/${MESA_SRCFILE}  
    102   mirror://${PNAME}/xvfb-run   mirror://${PNAME}/xvfb-run
    103   mirror://${PNAME}/xvfb-run.1   mirror://${PNAME}/xvfb-run.1
    104   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
    # Line 174  pkg_setup() Line 166  pkg_setup()
    166  src_prepare()  src_prepare()
    167  {  {
    168   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
      munpack ${MESA_SRCFILE} || die  
    169   cd ${SRCDIR}   cd ${SRCDIR}
    170    
    171   # adopted from redhat; use a black background   # adopted from redhat; use a black background
    # Line 204  src_compile() Line 195  src_compile()
    195   cd ${SRCDIR}   cd ${SRCDIR}
    196    
    197   xorg_src_configure \   xorg_src_configure \
      --with-mesa-source=${MESA_SRCDIR} \  
    198   --sysconfdir=/etc \   --sysconfdir=/etc \
    199   --localstatedir=/var \   --localstatedir=/var \
    200   --libexecdir=/usr/$(mlibdir)/${PNAME} \   --libexecdir=/usr/$(mlibdir)/${PNAME} \
    Legend:
    Removed from v.33147  
    changed lines
      Added in v.33148