Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/trunk/core/mesa/mesa-20.1.2-r1.smage2

    Diff of /smage/trunk/core/mesa/mesa-20.1.2-r1.smage2

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

    revision 14170 by niro, Mon Jul 6 07:52:51 2020 UTC revision 14175 by niro, Mon Jul 6 10:50:09 2020 UTC
    # Line 22  then Line 22  then
    22   SPLIT_PACKAGES+=" mesa-dev"   SPLIT_PACKAGES+=" mesa-dev"
    23  fi  fi
    24  SPLIT_PACKAGES+=" mesa-xa-tracker"  SPLIT_PACKAGES+=" mesa-xa-tracker"
     if [[ ${ENABLE_DEV_PACKAGES} = 1 ]]  
     then  
      SPLIT_PACKAGES+=" mesa-xa-tracker-dev"  
     fi  
    25  # dri  # dri
    26  SPLIT_PACKAGES+=" mesa-dri-i915"  SPLIT_PACKAGES+=" mesa-dri-i915"
    27  SPLIT_PACKAGES+=" mesa-dri-i965"  SPLIT_PACKAGES+=" mesa-dri-i965"
    # Line 42  SPLIT_PACKAGES+=" mesa-dri-virgl" Line 38  SPLIT_PACKAGES+=" mesa-dri-virgl"
    38  SPLIT_PACKAGES+=" mesa-dri-iris"  SPLIT_PACKAGES+=" mesa-dri-iris"
    39  # vulkan  # vulkan
    40  SPLIT_PACKAGES+=" mesa-vulkan-radeon"  SPLIT_PACKAGES+=" mesa-vulkan-radeon"
    41    if [[ ${ENABLE_DEV_PACKAGES} = 1 ]]
    42    then
    43     SPLIT_PACKAGES+=" mesa-vulkan-radeon-dev"
    44    fi
    45  SPLIT_PACKAGES+=" mesa-vulkan-intel"  SPLIT_PACKAGES+=" mesa-vulkan-intel"
    46    if [[ ${ENABLE_DEV_PACKAGES} = 1 ]]
    47    then
    48     SPLIT_PACKAGES+=" mesa-vulkan-intel-dev"
    49    fi
    50  # vdpau  # vdpau
    51  if [[ ${ENABLE_VDPAU} = 1 ]]  if [[ ${ENABLE_VDPAU} = 1 ]]
    52  then  then
    # Line 75  MESA_DEPEND=">= dev-libs/expat-2.2 Line 79  MESA_DEPEND=">= dev-libs/expat-2.2
    79   >= x11-libs/libXrandr-1.5   >= x11-libs/libXrandr-1.5
    80   >= x11-libs/libdrm-2.4.102   >= x11-libs/libdrm-2.4.102
    81   >= x11-libs/libICE-1   >= x11-libs/libICE-1
    82   >= x11-libs/libglvnd-1.2   >= x11-libs/libglvnd-1.3
    83   >= x11-libs/libxcb-1.14   >= x11-libs/libxcb-1.14
    84   >= x11-libs/libXfixes-5   >= x11-libs/libXfixes-5
    85   >= x11-libs/libXdamage-1   >= x11-libs/libXdamage-1
    # Line 107  MESA_DEV_DEPEND=">= dev-libs/expat-dev-2 Line 111  MESA_DEV_DEPEND=">= dev-libs/expat-dev-2
    111   >= x11-libs/libXxf86vm-dev-1.1   >= x11-libs/libXxf86vm-dev-1.1
    112   >= x11-libs/libXi-dev-1.7   >= x11-libs/libXi-dev-1.7
    113   >= x11-libs/libXmu-dev-1.1   >= x11-libs/libXmu-dev-1.1
    114     >= x11-libs/libXrandr-dev-1.5
    115   >= x11-libs/libdrm-dev-2.4.102   >= x11-libs/libdrm-dev-2.4.102
    116   >= x11-libs/libICE-dev-1   >= x11-libs/libICE-dev-1
    117     >= x11-libs/libglvnd-dev-1.3
    118   >= x11-libs/libxcb-dev-1.14   >= x11-libs/libxcb-dev-1.14
    119   >= x11-libs/libXfixes-dev-5   >= x11-libs/libXfixes-dev-5
    120   >= x11-libs/libXdamage-dev-1   >= x11-libs/libXdamage-dev-1
    # Line 148  SDEPEND="${MESA_DEPEND} Line 154  SDEPEND="${MESA_DEPEND}
    154   >= dev-python/python3-mako-1   >= dev-python/python3-mako-1
    155   >= sys-dev/llvm-${LLVM_PVER}"   >= sys-dev/llvm-${LLVM_PVER}"
    156    
    157    if [[ ${ENABLE_DEV_PACKAGES} = 1 ]]
    158    then
    159     SDEPEND="${SDEPEND}
    160     ${MESA_DEV_DEPEND}"
    161    fi
    162    
    163  sminclude multilib xorg mtools meson cleanutils  sminclude multilib xorg mtools meson cleanutils
    164  msetfeature "!check"  msetfeature "!check"
    165    
    # Line 172  split_info_mesa() Line 184  split_info_mesa()
    184   PROVIDE="virtual/opengl"   PROVIDE="virtual/opengl"
    185  }  }
    186    
    187    split_info_mesa-dev()
    188    {
    189     DESCRIPTION="Dev package for mesa"
    190     DEPEND="== media-libs/mesa-${PVER}
    191     ${MESA_DEV_DEPEND}"
    192    
    193     PROVIDE="virtual/opengl-dev"
    194    }
    195    
    196  split_info_mesa-xa-tracker()  split_info_mesa-xa-tracker()
    197  {  {
    198   DESCRIPTION="Mesa XA state tracker."   DESCRIPTION="Mesa XA state tracker."
    # Line 266  split_info_mesa-vulkan-radeon() Line 287  split_info_mesa-vulkan-radeon()
    287   == ${PCAT}/mesa-xa-tracker-${PVER}"   == ${PCAT}/mesa-xa-tracker-${PVER}"
    288  }  }
    289    
    290    split_info_mesa-vulkan-radeon-dev()
    291    {
    292     DESCRIPTION="Dev package for mesa-vulkan-radeon"
    293     DEPEND="== media-libs/mesa-vulkan-radeon-${PVER}"
    294    }
    295    
    296  split_info_mesa-vulkan-intel()  split_info_mesa-vulkan-intel()
    297  {  {
    298   DESCRIPTION="Mesa Intel Vulkan driver."   DESCRIPTION="Mesa Intel Vulkan driver."
    # Line 273  split_info_mesa-vulkan-intel() Line 300  split_info_mesa-vulkan-intel()
    300   == ${PCAT}/mesa-xa-tracker-${PVER}"   == ${PCAT}/mesa-xa-tracker-${PVER}"
    301  }  }
    302    
    303    split_info_mesa-vulkan-intel-dev()
    304    {
    305     DESCRIPTION="Dev package for mesa-intel-radeon"
    306     DEPEND="== media-libs/mesa-vulkan-intel-${PVER}"
    307    }
    308    
    309  split_info_mesa-vdpau-nouveau()  split_info_mesa-vdpau-nouveau()
    310  {  {
    311   DESCRIPTION="Mesa NVIDIA Nouveau VDPAU driver."   DESCRIPTION="Mesa NVIDIA Nouveau VDPAU driver."
    # Line 351  install_vulkan_driver() Line 384  install_vulkan_driver()
    384   usr/include/vulkan/vulkan_${driver}.h \   usr/include/vulkan/vulkan_${driver}.h \
    385   usr/share/vulkan/icd.d/${driver}_icd\*.json \   usr/share/vulkan/icd.d/${driver}_icd\*.json \
    386   || die   || die
    387    
    388     if [[ ${ENABLE_DEV_PACKAGES} = 1 ]]
    389     then
    390     mdelete -r /usr/include || die
    391     fi
    392    }
    393    
    394    install_vulkan_driver_dev()
    395    {
    396     local driver="$1"
    397     local vulkan_drivers
    398    
    399     DESTDIR=${BINDIR} mninja install || die
    400     zapmost ${BINDIR} \
    401     usr/include/vulkan/vulkan_${driver}.h \
    402     || die
    403  }  }
    404    
    405  install_vdpau_driver()  install_vdpau_driver()
    # Line 483  src_install_mesa() Line 532  src_install_mesa()
    532   mdelete /usr/lib/dri/\*_dri.so || die   mdelete /usr/lib/dri/\*_dri.so || die
    533   fi   fi
    534    
    535    if [[ ${ENABLE_VDPAU} = 1 ]]
    536    then
    537   # remove vdpau-drivers, they are in extra packages   # remove vdpau-drivers, they are in extra packages
    538   mdelete -r /usr/$(mlibdir)/vdpau || die   mdelete -r /usr/$(mlibdir)/vdpau || die
    539   if [[ $(mlibdir) != lib ]]   if [[ $(mlibdir) != lib ]]
    540   then   then
    541   mdelete -r /usr/lib/vdpau || die   mdelete -r /usr/lib/vdpau || die
    542   fi   fi
    543    fi
    544    
    545    if [[ ${ENABLE_VAAPI} = 1 ]]
    546    then
    547   # remove vaapi-drivers, they are in extra packages   # remove vaapi-drivers, they are in extra packages
    548   mdelete /usr/$(mlibdir)/dri/\*_drv_video.so || die   mdelete /usr/$(mlibdir)/dri/\*_drv_video.so || die
    549   if [[ $(mlibdir) != lib ]]   if [[ $(mlibdir) != lib ]]
    550   then   then
    551   mdelete /usr/lib/dri/\*_drv_video.so || die   mdelete /usr/lib/dri/\*_drv_video.so || die
    552   fi   fi
    553    fi
    554    
    555   # remove vulkan drivers, headers, configs   # remove vulkan drivers, headers, configs
    556   mdelete -r /usr/include/vulkan || die   mdelete -r /usr/include/vulkan || die
    # Line 508  src_install_mesa() Line 563  src_install_mesa()
    563   then   then
    564   mlink libGLX_mesa.so.0 /usr/lib/libGLX_indirect.so.0 || die   mlink libGLX_mesa.so.0 /usr/lib/libGLX_indirect.so.0 || die
    565   fi   fi
    566    
    567     if [[ ${ENABLE_DEV_PACKAGES} = 1 ]]
    568     then
    569     mdelete -r /usr/include || die
    570     mdelete -r /usr/$(mlibdir)/pkgconfig
    571     if [[ $(mlibdir) != lib ]]
    572     then
    573     mdelete -r /usr/lib/pkgconfig
    574     fi
    575     fi
    576    }
    577    
    578    src_install_mesa-dev()
    579    {
    580     DESTDIR=${BINDIR} mninja install || die
    581    
    582     # remove all la files
    583     find ${BINDIR} -name \*.la | xargs rm -fv
    584    
    585     zapmost ${BINDIR} \
    586     usr/include \
    587     usr/$(mlibdir)/pkgconfig \
    588     $([[ $(mlibdir) != lib ]] && echo 'usr/lib/pkgconfig') \
    589     || die
    590    
    591     # remove vulkan drivers, headers, configs
    592     mdelete -r /usr/include/vulkan || die
    593  }  }
    594    
    595  src_install_mesa-xa-tracker()  src_install_mesa-xa-tracker()
    # Line 585  src_install_mesa-vulkan-radeon() Line 667  src_install_mesa-vulkan-radeon()
    667   install_vulkan_driver radeon || die   install_vulkan_driver radeon || die
    668  }  }
    669    
    670    src_install_mesa-vulkan-radeon-dev()
    671    {
    672     install_vulkan_driver_dev radeon || die
    673    }
    674    
    675  src_install_mesa-vulkan-intel()  src_install_mesa-vulkan-intel()
    676  {  {
    677   install_vulkan_driver intel || die   install_vulkan_driver intel || die
    678  }  }
    679    
    680    src_install_mesa-vulkan-intel-dev()
    681    {
    682     install_vulkan_driver_dev intel || die
    683    }
    684    
    685  src_install_mesa-vdpau-nouveau()  src_install_mesa-vdpau-nouveau()
    686  {  {
    687   install_vdpau_driver nouveau || die   install_vdpau_driver nouveau || die
    Legend:
    Removed from v.14170  
    changed lines
      Added in v.14175