Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (07a052689f916bb438a82281741a719ff4b38dc3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (07a052689f916bb438a82281741a719ff4b38dc3)
  • Date: Sun, 16 Apr 2017 06:48:32 +0000

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

devel/llvm/BUILD | 4 -
devel/llvm/HISTORY | 3 +
graphics-libs/mesalib/DEPENDS | 94
+++++++++++++++++++-----------------------
graphics-libs/mesalib/HISTORY | 7 +++
4 files changed, 55 insertions(+), 53 deletions(-)

New commits:
commit 07a052689f916bb438a82281741a719ff4b38dc3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mesalib: Update Gallium driver list

Remove unknown Gallium drivers llvmpipe and radeon.
Add new Gallium drivers ilo, freedreno, vc4, etnaviv, and imx

commit d7564fbd32fbbcc3e651271b5c700cae2087b251
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mesalib: 17+ needs LIBDRM_AMD built in libdrm

Which requires llvm for 'radv', so llvm is no longer optional.
Always enable shared GL API.

Fixes these errors:
checking for libdrm_amdgpu >= 2.4.63... no
configure: error: Package requirements (libdrm_amdgpu >= 2.4.63) were not
met:

No package 'libdrm_amdgpu' found

configure: error: shared GLAPI required when building two or more of
the following APIs - opengl, gles1 gles2

commit e38f7c68d09262586f7a0d4a681abf89bf5d77c5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

llvm: Truly disable PIC with disable_pic(force)

Was still getting this error when compiling on x86_64:
[ 17%] Building CXX object
lib/MC/CMakeFiles/LLVMMC.dir/MCAsmStreamer.cpp.o
<command-line>:0:5: error: expected ',' or '...' before numeric constant
/usr/src/llvm-4.0.0.src/include/llvm/MC/MCObjectFileInfo.h:191:52: note:
in expansion of macro 'PIC'
void InitMCObjectFileInfo(const Triple &TT, bool PIC, CodeModel::Model
CM,
^~~
make[2]: *** [lib/MC/CMakeFiles/LLVMMC.dir/build.make:231:
lib/MC/CMakeFiles/LLVMMC.dir/MCAsmStreamer.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:2968:
lib/MC/CMakeFiles/LLVMMC.dir/all] Error 2
make: *** [Makefile:150: all] Error 2

diff --git a/devel/llvm/BUILD b/devel/llvm/BUILD
index 5610901..a083984 100755
--- a/devel/llvm/BUILD
+++ b/devel/llvm/BUILD
@@ -1,5 +1,5 @@
-# "PIC" is used as an identifier
-CXXFLAGS="${CXXFLAGS/-DPIC }" &&
+disable_pic force &&
+
# LLVM_TARGETS
OPTS+=" -DLLVM_TARGETS_TO_BUILD=`echo ${LLVM_TARGETS} | sed 's/ /;/g'`" &&
# Not restricting targets, so that mesalib gets R600.
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 4b9d9aa..50395fe 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,6 @@
+2017-04-15 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Truly disable PIC with disable_pic(force).
+
2017-03-13 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 4.0.0

diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index ca73aa0..0f7ccf2 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -6,7 +6,11 @@ depends bison &&
depends flex &&
depends gettext &&
depends dri2proto &&
-depends libdrm &&
+depends -sub 'AMD' libdrm &&
+depends llvm '--enable-lvm --enable-egl' &&
+depends LIBELF &&
+depends mako &&
+depends python &&
depends util-macros &&
depends expat &&
depends libxdamage &&
@@ -32,62 +36,50 @@ case ${MESALIB_BUILD} in
"--enable-sysfs" \
"Use a device manager instead of sysfs" &&

- optional_depends llvm \
- "--enable-llvm" \
- "--disable-llvm" \
- "for Gallium drivers" &&
+ local AVAILABLE_GALLIUM="i915 ilo nouveau r300 r600 radeonsi freedreno
svga swrast vc4 virgl etnaviv imx" &&

- if is_depends_enabled "${SPELL}" "llvm"; then
- list_add MESALIB_OPTS "--enable-egl" &&
+ list_remove MESALIB_GALLIUM 'llvmpipe' &&
+ list_remove MESALIB_GALLIUM 'radeon' &&

- depends LIBELF &&
- depends mako &&
- depends python &&
+ config_query_multi MESALIB_GALLIUM \
+ "What Gallium3D drivers would you like to build?" \
+ all ${AVAILABLE_GALLIUM} &&
+ if list_find "${MESALIB_GALLIUM}" "all"; then
+ MESALIB_GALLIUM=${AVAILABLE_GALLIUM}
+ fi &&

- local AVAILABLE_GALLIUM="i915 llvmpipe nouveau r300 r600 radeon radeonsi
softpipe svga swrast virgl" &&
- config_query_multi MESALIB_GALLIUM \
- "What Gallium3D drivers woulld you like to build?" \
- all ${AVAILABLE_GALLIUM} &&
- if list_find "${MESALIB_GALLIUM}" "all"; then
- MESALIB_GALLIUM=${AVAILABLE_GALLIUM}
- fi &&
+ # remove obsolete fbdev option
+ list_remove MESA_EGL fbdev &&
+ config_query_multi MESA_EGL "which EGL platforms?" drm wayland x11

- # remove obsolete fbdev option
- list_remove MESA_EGL fbdev &&
- config_query_multi MESA_EGL "which EGL platforms?" drm wayland x11
+ if list_find "${MESA_EGL}" "wayland"; then
+ list_remove MESALIB_OPTS "--disable-shared-glapi" &&
+ list_remove MESALIB_OPTS "--disable-gbm" &&
+ list_remove MESALIB_OPTS "--disable-gles2" &&
+ list_add MESALIB_OPTS "--enable-shared-glapi --enable-gbm
--enable-gles2" &&
+ depends wayland
+ else
+ list_remove MESALIB_OPTS '--disable-shared-glapi' &&
+ list_add MESALIB_OPTS '--enable-shared-glapi'

- if list_find "${MESA_EGL}" "wayland"; then
- list_remove MESALIB_OPTS "--disable-shared-glapi" &&
- list_remove MESALIB_OPTS "--disable-gbm" &&
- list_remove MESALIB_OPTS "--disable-gles2" &&
- list_add MESALIB_OPTS "--enable-shared-glapi --enable-gbm
--enable-gles2" &&
- depends wayland
- else
- config_query_option MESALIB_OPTS "enable shared GLapi" n \
- "--enable-shared-glapi" "--disable-shared-glapi" &&
- config_query_option MESALIB_OPTS "enable Generic Buffer Management?" n
\
- "--enable-gbm" "--disable-gbm"
- config_query_option MESALIB_OPTS "enable support for OpenGL ES 2.x
API?" n \
- "--enable-gles2" "--disable-gles2"
- fi
+ config_query_option MESALIB_OPTS "enable Generic Buffer Management?" n \
+ "--enable-gbm" "--disable-gbm"
+ config_query_option MESALIB_OPTS "enable support for OpenGL ES 2.x API?"
n \
+ "--enable-gles2" "--disable-gles2"
+ fi

- if list_find "${MESALIB_GALLIUM}" "i915"; then
- sub_depends libdrm INTEL
- fi &&
- if list_find "${MESALIB_GALLIUM}" "nouveau"; then
- sub_depends libdrm NOUVEAU
- fi &&
- if (list_find "${MESALIB_GALLIUM}" "r300") ||
- (list_find "${MESALIB_GALLIUM}" "r600") ||
- (list_find "${MESALIB_GALLIUM}" "radeon"); then
- sub_depends libdrm RADEON
- fi &&
- if list_find "${MESALIB_GALLIUM}" "radeonsi"; then
- sub_depends libdrm AMD
- fi
- else
- config_query_option MESALIB_OPTS "enable EGL library?" y \
- "--enable-egl --enable-gbm" "--disable-egl"
+ if list_find "${MESALIB_GALLIUM}" "i915"; then
+ sub_depends libdrm INTEL
+ fi &&
+ if list_find "${MESALIB_GALLIUM}" "nouveau"; then
+ sub_depends libdrm NOUVEAU
+ fi &&
+ if (list_find "${MESALIB_GALLIUM}" "r300") ||
+ (list_find "${MESALIB_GALLIUM}" "r600"); then
+ sub_depends libdrm RADEON
+ fi &&
+ if list_find "${MESALIB_GALLIUM}" "radeonsi"; then
+ sub_depends libdrm AMD
fi
;;
*)
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index dd29ea1..36a65b3 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,10 @@
+2017-04-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: 17+ needs LIBDRM_AMD built in libdrm
+ Which requires llvm for 'radv', so llvm is no longer optional.
+ Always enable shared GL API.
+ Remove unknown Gallium drivers llvmpipe and radeon.
+ Add new Gallium drivers ilo, freedreno, vc4, etnaviv, and imx.
+
2017-04-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 17.0.3





Archive powered by MHonArc 2.6.24.

Top of Page