mesalib: version bump 7.8.2 -> 8.0.3

demos are now a separate package

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

1 files changed, 60 insertions, 269 deletions

diff --git a/rules/mesalib.make b/rules/mesalib.make
index 253ab9888..7c1bf4103 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -19,187 +19,108 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
 #
 # Paths and names
 #
-MESALIB_VERSION	:= 7.8.2
-MESALIB_MD5	:= 6be2d343a0089bfd395ce02aaf8adb57
+MESALIB_VERSION	:= 8.0.3
+MESALIB_MD5	:= cc5ee15e306b8c15da6a478923797171
 MESALIB		:= MesaLib-$(MESALIB_VERSION)
 MESALIB_SUFFIX	:= tar.bz2
+MESALIB_URL	:= ftp://ftp.freedesktop.org/pub/mesa/$(MESALIB_VERSION)/$(MESALIB).$(MESALIB_SUFFIX)
 MESALIB_SOURCE	:= $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
 MESALIB_DIR	:= $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
 
-MESALIB_URL	:= \
-	$(call ptx/mirror, SF, mesa3d/$(MESALIB).$(MESALIB_SUFFIX)) \
-	ftp://ftp.freedesktop.org/pub/mesa/7.8.2/$(MESALIB).$(MESALIB_SUFFIX)
-
-MESADEMOS		:= MesaDemos-$(MESALIB_VERSION)
-MESADEMOS_MD5		:= 757d9e2e06f48b1a52848be9b0307ced
-MESADEMOS_SOURCE	:= $(SRCDIR)/$(MESADEMOS).$(MESALIB_SUFFIX)
-MESADEMOS_DIR		:= $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
-
-MESADEMOS_URL		:= \
-	$(call ptx/mirror, SF, mesa3d/$(MESADEMOS).$(MESALIB_SUFFIX)) \
-	ftp://ftp.freedesktop.org/pub/mesa/7.8.2/$(MESADEMOS).$(MESALIB_SUFFIX)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(MESALIB_SOURCE):
-	@$(call targetinfo)
-	@$(call get, MESALIB)
-
-$(MESADEMOS_SOURCE):
-	@$(call targetinfo)
-	@$(call get, MESADEMOS)
-
-$(STATEDIR)/mesalib.get:
-	@$(call targetinfo)
-	@$(call world/get, MESALIB)
-	@$(call world/check_src, MESALIB)
-ifdef PTXCONF_MESALIB_TOOLS
-	@$(call check_src, MESADEMOS)
-endif
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-ifdef PTXCONF_MESALIB_TOOLS
-$(STATEDIR)/mesalib.get: $(MESADEMOS_SOURCE)
-endif
-
-$(STATEDIR)/mesalib.extract:
-	@$(call targetinfo)
-	@$(call clean, $(MESALIB_DIR))
-	@$(call extract, MESALIB)
-ifdef PTXCONF_MESALIB_TOOLS
-	@$(call extract, MESADEMOS)
-endif
-	@$(call patchin, MESALIB, $(MESALIB_DIR))
-	@$(call touch)
-
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-MESALIB_COMPILE_ENV := $(CROSS_ENV_CC_FOR_BUILD)
+MESALIB_CONF_ENV := \
+	ac_cv_prog_PYTHON2=$(PTXDIST_TOPDIR)/bin/python
 
-MESALIB_DRIVERS-$(PTXCONF_MESALIB_DRIVER_XLIB)		+= xlib
-MESALIB_DRIVERS-$(PTXCONF_MESALIB_DRIVER_DRI)		+= dri
-MESALIB_DRIVERS-$(PTXCONF_MESALIB_DRIVER_OSMESA)	+= osmesa
-
-ifndef PTXCONF_ARCH_ARM
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_I810)		+= i810
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_I965)		+= i965
+ifdef PTXCONF_ARCH_X86
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_I915)		+= i915
+MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_I965)		+= i965
 endif
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_SWRAST)	+= swrast
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_MACH64)	+= mach64
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_MGA)		+= mga
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R128)		+= r128
+MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_NOUVEAU)	+= nouveau
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R200)		+= r200
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R300)		+= r300
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R300)		+= r600
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_RADEON)	+= radeon
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_S3V)		+= s3v
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_SAVAGE)	+= savage
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_SIS)		+= sis
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_TDFX)		+= tdfx
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_TRIDENT)	+= trident
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_UNICHROME)	+= unichrome
-MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_FFB)		+= ffb
+MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_SWRAST)	+= swrast
+
+ifdef PTXCONF_ARCH_X86
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_I915)	+= i915
+endif
+ifndef PTXCONF_ARCH_X86 # needs llvm
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_R300)	+= r300
+endif
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_R600)	+= r600
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_NOUVEAU)	+= nouveau
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_SWRAST)	+= swrast
 
-MESALIB_STATE_TRACKERS-$(PTXCONF_MESALIB_DRIVER_XLIB)	+= glx
-MESALIB_STATE_TRACKERS-$(PTXCONF_MESALIB_DRIVER_DRI)	+= dri
-# circular dependency with xorg
-#MESALIB_STATE_TRACKERS-$(PTXCONF_MESALIB_DRIVER_DRI)	+= xorg
+MESALIB_DRI_LIBS-y += $(MESALIB_DRI_DRIVERS-y) $(MESALIB_GALLIUM_DRIVERS-y)
 
-MESALIB_AUTOCONF   := \
+MESALIB_CONF_TOOL	:= autoconf
+MESALIB_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-static \
 	--enable-shared \
 	--disable-debug \
+	--disable-mangling \
+	--disable-texture-float \
 	--disable-asm \
 	--enable-pic \
 	--disable-selinux \
-	--enable-xcb \
-	--disable-glx-tls \
+	--enable-opengl \
+	--disable-gles1 \
+	--disable-gles2 \
+	--disable-openvg \
+	--$(call ptx/endis, PTXCONF_MESALIB_DRI)-dri \
+	--$(call ptx/endis, PTXCONF_MESALIB_GLX)-glx \
+	--$(call ptx/endis, PTXCONF_MESALIB_OSMESA)-osmesa \
+	--disable-egl \
+	--disable-xorg \
+	--disable-xa \
+	--disable-d3d1x \
+	--disable-gbm \
+	--disable-xvmc \
+	--disable-vdpau \
+	--disable-va \
+	--$(call ptx/endis, PTXCONF_MESALIB_XLIB_GLX)-xlib-glx \
+	--disable-gallium-egl \
+	--disable-gallium-gbm \
+	--disable-shared-glapi \
 	--enable-driglx-direct \
+	--disable-shared-dricore \
+	--$(call ptx/endis,PTXCONF_XORG_SERVER_OPT_GLX_TLS)-glx-tls \
+	--disable-gallium-g3dvl \
 	--enable-glu \
-	--disable-glw \
-	--disable-motif \
-	--disable-glut \
-	--disable-egl \
-	--with-driver=$(subst $(space),$(comma),$(MESALIB_DRIVERS-y)) \
-	--with-dri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y))
+	--disable-gallium-llvm \
+	--with-gallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \
+	--with-dri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \
+	--with-expat=$(SYSROOT)/usr
+
 
 # the 32/64 bit options result in CFLAGS -> -m32 and -m64 which seem
 # only to be available on x86
 
-ifdef PTXCONF_MESALIB_DRI_GALLIUM
-MESALIB_AUTOCONF += \
-	--enable-gallium \
-	--with-state-trackers=$(subst $(space),$(comma),$(MESALIB_STATE_TRACKERS-y))
-else
-MESALIB_AUTOCONF += \
-	--disable-gallium \
-	--without-state-trackers
-endif
-
 ifdef PTXCONF_ARCH_X86
-MESALIB_AUTOCONF += \
+MESALIB_CONF_OPT += \
 	--enable-32-bit \
 	--disable-64-bit
-
-ifdef PTXCONF_MESALIB_DRI_INTEL_GALLIUM
-MESALIB_AUTOCONF += --enable-gallium-intel
-else
-MESALIB_AUTOCONF += --disable-gallium-intel
-endif
-
-endif
-
-ifdef PTXCONF_ARCH_ARM
-MESALIB_AUTOCONF += --disable-gallium-intel
-endif
-
-ifdef PTXCONF_MESALIB_DRIVER_OSMESA
-MESALIB_AUTOCONF += --disable-gl-osmesa
-else
-MESALIB_AUTOCONF += --enable-gl-osmesa
 endif
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
+MESALIB_MAKE_OPT := HOST_CC=$(HOSTCC)
+
 $(STATEDIR)/mesalib.compile:
 	@$(call targetinfo)
-	@cp $(PTXCONF_SYSROOT_HOST)/bin/mesa/* $(MESALIB_DIR)/src/glsl/apps
+	cp $(PTXCONF_SYSROOT_HOST)/bin/mesa/* $(MESALIB_DIR)/src/glsl/
 	@$(call compile, MESALIB)
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/mesalib.install:
-	@$(call targetinfo)
-	@$(call install, MESALIB)
-	@mkdir -p $(MESALIB_PKGDIR)/usr/bin/
-ifdef PTXCONF_MESALIB_TOOLS
-	@cd $(MESALIB_DIR)/progs/xdemos/ && find -type f -perm /111 | \
-		xargs install -m 755 -D -t $(MESALIB_PKGDIR)/usr/bin/
-endif
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-MESALIB_GL_VERSION-$(PTXCONF_MESALIB_DRIVER_DRI)  := 1.2
-MESALIB_GL_VERSION-$(PTXCONF_MESALIB_DRIVER_XLIB) := 1.5.07.8.2
-
 $(STATEDIR)/mesalib.targetinstall:
 	@$(call targetinfo)
 
@@ -209,146 +130,16 @@ $(STATEDIR)/mesalib.targetinstall:
 	@$(call install_fixup, mesalib,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
 	@$(call install_fixup, mesalib,DESCRIPTION,missing)
 
-ifdef PTXCONF_MESALIB_DRIVER_DRI
-
-ifndef PTXCONF_ARCH_ARM
-ifdef PTXCONF_MESALIB_DRI_I915
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/i915_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_I810
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/i810_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_I965
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/i965_dri.so)
-endif
-endif
-ifdef PTXCONF_MESALIB_DRI_SWRAST
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/swrast_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_MACH64
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/mach64_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_MGA
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/mga_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_R128
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/r128_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_R200
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/r200_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_R300
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/r300_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_RADEON
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/radeon_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_S3V
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/s3v_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_SAVAGE
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/savage_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_SIS
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/sis_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_TDFX
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/tdfx_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_TRIDENT
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/trident_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_UNICHROME
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/unichrome_dri.so)
-endif
-ifdef PTXCONF_MESALIB_DRI_FFB
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/ffb_dri.so)
-endif
-
+ifdef PTXCONF_MESALIB_DRI
+	@$(foreach lib, $(MESALIB_DRI_LIBS-y), \
+		$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/dri/$(lib)_dri.so);)
 endif
 
-ifdef PTXCONF_MESALIB_TOOLS_CORENDER
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/corender)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLSYNC
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glsync)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLTHREADS
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glthreads)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXCONTEXTS
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxcontexts)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXDEMO
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxdemo)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXGEARS
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxgears)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXGEARS_FBCONFIG
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxgears_fbconfig)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXGEARS_PIXMAP
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxgears_pixmap)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXHEADS
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxheads)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXINFO
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxinfo)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXPBDEMO
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxpbdemo)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXPIXMAP
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxpixmap)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXSNOOP
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxsnoop)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_GLXSWAPCONTROL
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/glxswapcontrol)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_MANYWIN
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/manywin)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_OFFSET
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/offset)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_OVERLAY
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/overlay)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_PBDEMO
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/pbdemo)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_PBINFO
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/pbinfo)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_SHAREDTEX
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/sharedtex)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_SHAREDTEX_MT
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/sharedtex_mt)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_TEXTURE_FROM_PIXMAP
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/texture_from_pixmap)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_WINCOPY
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/wincopy)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_XFONT
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/xfont)
-endif
-ifdef PTXCONF_MESALIB_TOOLS_XROTFONTDEMO
-	@$(call install_copy, mesalib, 0, 0, 0755, -, /usr/bin/xrotfontdemo)
-endif
-
-ifndef PTXCONF_MESALIB_DRIVER_OSMESA
 	@$(call install_lib, mesalib, 0, 0, 0644, libGL)
-endif
-
 	@$(call install_lib, mesalib, 0, 0, 0644, libGLU)
+ifdef PTXCONF_MESALIB_OSMESA
 	@$(call install_lib, mesalib, 0, 0, 0644, libOSMesa)
+endif
 
 	@$(call install_finish, mesalib)