Update version to 18.0.0-rc1

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
automake: small cleanup after the meson.build inclusion
2018-01-23 16:39:33 +00:00 · 2018-01-23 14:25:34 +00:00 · 2018-01-23 14:25:34 +00:00 · 2018-01-23 14:25:32 +00:00
7 changed files with 6 additions and 7 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-17.4.0-devel
+18.0-0-rc1
--- a/src/compiler/Makefile.am
+++ b/src/compiler/Makefile.am
@@ -65,7 +65,6 @@ EXTRA_DIST = \
 	nir/meson.build \
 	meson.build
 MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
 PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -46,4 +46,4 @@ ir3_compiler_LDADD = \
 	$(GALLIUM_COMMON_LIB_DEPS) \
 	$(FREEDRENO_LIBS)
-EXTRA_DIST = meson.build
+EXTRA_DIST += meson.build
--- a/src/gallium/drivers/i915/Makefile.am
+++ b/src/gallium/drivers/i915/Makefile.am
@@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libi915.la
 libi915_la_SOURCES = $(C_SOURCES)
-EXTRA_DIST = meson.build
+EXTRA_DIST = TODO meson.build
--- a/src/gallium/drivers/vc5/Makefile.sources
+++ b/src/gallium/drivers/vc5/Makefile.sources
@@ -29,7 +29,6 @@ VC5_PER_VERSION_SOURCES = \
 	v3dx_context.h \
 	v3dx_format_table.c \
 	v3dx_simulator.c \
 	v3dx_simulator.h \
 	vc5_draw.c \
 	vc5_emit.c \
 	vc5_rcl.c \
--- a/src/intel/Makefile.vulkan.am
+++ b/src/intel/Makefile.vulkan.am
@@ -65,6 +65,7 @@ CLEANFILES += \
 EXTRA_DIST += \
 	$(top_srcdir)/include/vulkan/vk_icd.h \
 	vulkan/anv_entrypoints_gen.py \
 	vulkan/anv_extensions_gen.py \
 	vulkan/anv_extensions.py \
 	vulkan/anv_icd.py \
 	vulkan/TODO
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -105,7 +105,6 @@ BUILT_SOURCES = $(i965_oa_GENERATED_FILES)
 CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST = \
 	meson.build \
 	brw_oa_hsw.xml \
 	brw_oa_bdw.xml \
 	brw_oa_chv.xml \
@@ -118,7 +117,8 @@ EXTRA_DIST = \
 	brw_oa_glk.xml \
 	brw_oa_cflgt2.xml \
 	brw_oa_cflgt3.xml \
-	brw_oa.py 
+	brw_oa.py \
 	meson.build
 # Note: we avoid using a multi target rule here and outputting both the
 # .c and .h files in one go so we don't hit problems with parallel
Author	SHA1	Message	Date
Emil Velikov	e91e68d6a8	Update version to 18.0.0-rc1 Signed-off-by: Emil Velikov <emil.velikov@collabora.com>	2018-01-23 16:39:33 +00:00
Emil Velikov	a9db8ac935	automake: small cleanup after the meson.build inclusion Namely extend the EXTRA_DIST list, instead of re-assigning it and bring back a file dropped by mistake. Fixes: `436ed65d38` ("autotools: include meson build files in tarball") Signed-off-by: Emil Velikov <emil.velikov@collabora.com>	2018-01-23 14:25:34 +00:00
Emil Velikov	41e48eac87	automake: anv: ship anv_extensions_gen.py in the tarball Fixes: `dd088d4bec` ("anv/extensions: Generate a header file with extension tables") Signed-off-by: Emil Velikov <emil.velikov@collabora.com>	2018-01-23 14:25:34 +00:00
Emil Velikov	90002ba41e	automake: vc5: remove non-applicable v3dx_simulator.h Signed-off-by: Emil Velikov <emil.velikov@collabora.com>	2018-01-23 14:25:32 +00:00
`@@ -30,4 +30,4 @@ noinst_LTLIBRARIES = libi915.la`

	`libi915_la_SOURCES = $(C_SOURCES)`	`libi915_la_SOURCES = $(C_SOURCES)`

	`EXTRA_DIST = meson.build`	`EXTRA_DIST = TODO meson.build`