From f5c756cfd11b6f27439f8f945e1e40f82276581e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 5 Dec 2013 10:24:55 +0400 Subject: [PATCH] Revert "Mesa 10.0 release branch git snapshot" This reverts commit fee912ca116cc902cfbde9d08396f5d38c09fdc6. Signed-off-by: Igor Gnatenko --- .gitignore | 1 - make-git-snapshot.sh | 4 ++-- mesa.spec | 13 +++++++------ nv50-fix-build.patch | 6 +++--- sanitize-tarball.sh | 22 +++++++++++++++------- sources | 2 +- 6 files changed, 28 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index c8d2da9..378e862 100644 --- a/.gitignore +++ b/.gitignore @@ -59,4 +59,3 @@ mesa-20100720.tar.bz2 /mesa-20131113.tar.xz /mesa-20131114.tar.xz /mesa-20131128.tar.xz -/mesa-20131205.tar.xz diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh index 57c3db3..e393eb3 100755 --- a/make-git-snapshot.sh +++ b/make-git-snapshot.sh @@ -15,11 +15,11 @@ DIRNAME=mesa-$( date +%Y%m%d ) echo REF ${REF:+--reference $REF} echo DIRNAME $DIRNAME -echo HEAD ${1:-10.0} +echo HEAD ${1:-9.2} rm -rf $DIRNAME -git clone --depth 1 ${REF:+--reference $REF} --branch 10.0 \ +git clone --depth 1 ${REF:+--reference $REF} --branch 9.2 \ git://git.freedesktop.org/git/mesa/mesa $DIRNAME GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ diff --git a/mesa.spec b/mesa.spec index 6134f3f..e941de1 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,12 +48,12 @@ %define _default_patch_fuzz 2 -%define gitdate 20131205 +%define gitdate 20131128 #% define snapshot Summary: Mesa graphics libraries Name: mesa -Version: 10.0 +Version: 9.2.4 Release: 1.%{gitdate}%{?dist} License: MIT Group: System Environment/Libraries @@ -299,7 +299,7 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1 #patch12 -p1 -b .16bpp %patch15 -p1 -b .hwfloat -#patch16 -p1 -b .vdpau +%patch16 -p1 -b .vdpau %patch20 -p1 -b .egbe %if 0%{with_private_llvm} @@ -480,11 +480,15 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?with_vmware} %{_libdir}/dri/vmwgfx_dri.so %endif +%{_libdir}/libdricore*.so* %endif # this is funky; it doesn't get built for gallium drivers, so it doesn't # exist on s390x where swrast is llvmpipe, but does exist on s390 where # swrast is classic mesa. this seems like a bug? in that it probably # means the gallium drivers are linking dricore statically? fixme. +%ifarch s390 +%{_libdir}/libdricore*.so* +%endif %{_libdir}/dri/swrast_dri.so %if %{with_hardware} @@ -596,9 +600,6 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Thu Dec 05 2013 Dave Airlie 10.0-1.20131205 -- mesa 10.0 release branch git snapshot - * Thu Nov 28 2013 Igor Gnatenko - 9.2.4-1.20131128 - 9.2.4 upstream release diff --git a/nv50-fix-build.patch b/nv50-fix-build.patch index 0ff424b..81862f3 100644 --- a/nv50-fix-build.patch +++ b/nv50-fix-build.patch @@ -1,6 +1,6 @@ -diff -up mesa-20130213/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp.rtti mesa-20130213/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp ---- mesa-20130213/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp.rtti 2013-02-13 18:08:17.533677028 +1000 -+++ mesa-20130213/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp 2013-02-13 18:08:20.496752128 +1000 +diff -up mesa-20130213/src/gallium/drivers/nv50/codegen/nv50_ir.cpp.rtti mesa-20130213/src/gallium/drivers/nv50/codegen/nv50_ir.cpp +--- mesa-20130213/src/gallium/drivers/nv50/codegen/nv50_ir.cpp.rtti 2013-02-13 18:08:17.533677028 +1000 ++++ mesa-20130213/src/gallium/drivers/nv50/codegen/nv50_ir.cpp 2013-02-13 18:08:20.496752128 +1000 @@ -716,7 +716,7 @@ Instruction::clone(ClonePolicy if (!i) i = new_Instruction(pol.context(), op, dType); diff --git a/sanitize-tarball.sh b/sanitize-tarball.sh index ecaa861..54b2d0c 100755 --- a/sanitize-tarball.sh +++ b/sanitize-tarball.sh @@ -20,9 +20,14 @@ pushd $dirname cat > src/gallium/auxiliary/vl/vl_mpeg12_decoder.c << EOF #include "vl_mpeg12_decoder.h" -struct pipe_video_codec * -vl_create_mpeg12_decoder(struct pipe_context *pipe, - const struct pipe_video_codec *templat) +struct pipe_video_decoder * +vl_create_mpeg12_decoder(struct pipe_context *context, + enum pipe_video_profile profile, + enum pipe_video_entrypoint entrypoint, + enum pipe_video_chroma_format chroma_format, + unsigned width, unsigned height, + unsigned max_references, + bool expect_chunked_decode) { return NULL; } @@ -31,14 +36,17 @@ EOF cat > src/gallium/auxiliary/vl/vl_decoder.c << EOF #include "vl_decoder.h" bool vl_profile_supported(struct pipe_screen *screen, - enum pipe_video_profile profile, - enum pipe_video_entrypoint entrypoint) + enum pipe_video_profile profile) { return false; } -struct pipe_video_codec * +struct pipe_video_decoder * vl_create_decoder(struct pipe_context *pipe, - const struct pipe_video_codec *templat) + enum pipe_video_profile profile, + enum pipe_video_entrypoint entrypoint, + enum pipe_video_chroma_format chroma_format, + unsigned width, unsigned height, unsigned max_references, + bool expect_chunked_decode) { return NULL; } diff --git a/sources b/sources index f3dbe2e..f4bcce4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40ff491ed19685af8d5974e7ac7b81ca mesa-20131205.tar.xz +0f501dfd50b6094774b0d564d745a285 mesa-20131128.tar.xz