guibuilder_pel7x64builder0
6 years ago
5 changed files with 1849 additions and 79 deletions
@ -0,0 +1,29 @@ |
|||||||
|
From 7c137cfbffb4962b4e080052ef05cfb2266e758a Mon Sep 17 00:00:00 2001 |
||||||
|
From: Adam Jackson <ajax@redhat.com> |
||||||
|
Date: Tue, 29 May 2018 09:47:35 -0400 |
||||||
|
Subject: [PATCH] pkgconfig: Fix gl.pc when glvnd is enabled |
||||||
|
|
||||||
|
GL_LIB expands to GLX_mesa, but applications should not link against |
||||||
|
that. -lGL is never wrong, just hardcode it. |
||||||
|
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com> |
||||||
|
--- |
||||||
|
src/mesa/gl.pc.in | 2 +- |
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-) |
||||||
|
|
||||||
|
diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in |
||||||
|
index 181724b97b..8c7b7da8d7 100644 |
||||||
|
--- a/src/mesa/gl.pc.in |
||||||
|
+++ b/src/mesa/gl.pc.in |
||||||
|
@@ -7,7 +7,7 @@ Name: gl |
||||||
|
Description: Mesa OpenGL library |
||||||
|
Requires.private: @GL_PC_REQ_PRIV@ |
||||||
|
Version: @PACKAGE_VERSION@ |
||||||
|
-Libs: -L${libdir} -l@GL_LIB@ |
||||||
|
+Libs: -L${libdir} -lGL |
||||||
|
Libs.private: @GL_PC_LIB_PRIV@ |
||||||
|
Cflags: -I${includedir} @GL_PC_CFLAGS@ |
||||||
|
glx_tls: @GLX_TLS@ |
||||||
|
-- |
||||||
|
2.17.0 |
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,39 @@ |
|||||||
|
diff -up mesa-20180530/src/gallium/drivers/r600/Makefile.am.dma mesa-20180530/src/gallium/drivers/r600/Makefile.am |
||||||
|
--- mesa-20180530/src/gallium/drivers/r600/Makefile.am.dma 2018-07-19 10:24:26.110829986 +1000 |
||||||
|
+++ mesa-20180530/src/gallium/drivers/r600/Makefile.am 2018-07-19 10:24:44.569297131 +1000 |
||||||
|
@@ -10,7 +10,8 @@ AM_CFLAGS = \ |
||||||
|
$(GALLIUM_DRIVER_CFLAGS) \ |
||||||
|
$(RADEON_CFLAGS) \ |
||||||
|
$(LIBELF_CFLAGS) \ |
||||||
|
- -I$(top_srcdir)/src/amd/common |
||||||
|
+ -I$(top_srcdir)/src/amd/common \ |
||||||
|
+ -Wstrict-overflow=0 |
||||||
|
|
||||||
|
AM_CXXFLAGS = \ |
||||||
|
$(GALLIUM_DRIVER_CXXFLAGS) \ |
||||||
|
diff -up mesa-20180530/src/gallium/winsys/virgl/drm/Makefile.am.dma mesa-20180530/src/gallium/winsys/virgl/drm/Makefile.am |
||||||
|
--- mesa-20180530/src/gallium/winsys/virgl/drm/Makefile.am.dma 2018-07-19 10:25:13.089018307 +1000 |
||||||
|
+++ mesa-20180530/src/gallium/winsys/virgl/drm/Makefile.am 2018-07-19 10:25:34.775566694 +1000 |
||||||
|
@@ -26,7 +26,8 @@ include $(top_srcdir)/src/gallium/Automa |
||||||
|
AM_CFLAGS = \ |
||||||
|
-I$(top_srcdir)/src/gallium/drivers \ |
||||||
|
$(GALLIUM_WINSYS_CFLAGS) \ |
||||||
|
- $(LIBDRM_CFLAGS) |
||||||
|
+ $(LIBDRM_CFLAGS) \ |
||||||
|
+ -Wstrict-overflow=0 |
||||||
|
|
||||||
|
noinst_LTLIBRARIES = libvirgldrm.la |
||||||
|
|
||||||
|
diff -up mesa-20180530/src/gallium/winsys/virgl/vtest/Makefile.am.dma mesa-20180530/src/gallium/winsys/virgl/vtest/Makefile.am |
||||||
|
--- mesa-20180530/src/gallium/winsys/virgl/vtest/Makefile.am.dma 2018-07-19 10:25:48.521914297 +1000 |
||||||
|
+++ mesa-20180530/src/gallium/winsys/virgl/vtest/Makefile.am 2018-07-19 10:26:05.622346714 +1000 |
||||||
|
@@ -25,7 +25,8 @@ include $(top_srcdir)/src/gallium/Automa |
||||||
|
|
||||||
|
AM_CFLAGS = \ |
||||||
|
-I$(top_srcdir)/src/gallium/drivers \ |
||||||
|
- $(GALLIUM_WINSYS_CFLAGS) |
||||||
|
+ $(GALLIUM_WINSYS_CFLAGS) \ |
||||||
|
+ -Wstrict-overflow=0 |
||||||
|
|
||||||
|
noinst_LTLIBRARIES = libvirglvtest.la |
||||||
|
|
||||||
@ -1,31 +1,28 @@ |
|||||||
#!/bin/sh |
#!/bin/sh |
||||||
|
|
||||||
proto=$1 |
# Usage: ./make-git-snapshot.sh [COMMIT] |
||||||
branch=$2 |
# |
||||||
|
# to make a snapshot of the given tag/branch. Defaults to HEAD. |
||||||
|
# Point env var REF to a local mesa repo to reduce clone time. |
||||||
|
|
||||||
if [ -z "$proto" ]; then |
if [ -e /usr/bin/pxz ]; then |
||||||
echo "Usage: $0 <proto name> [<branch>]" |
XZ=/usr/bin/pxz |
||||||
exit 1 |
else |
||||||
|
XZ=/usr/bin/xz |
||||||
fi |
fi |
||||||
|
|
||||||
dirname=$proto-$( date +%Y%m%d ) |
DIRNAME=mesa-$( date +%Y%m%d ) |
||||||
|
|
||||||
rm -rf $dirname |
echo REF ${REF:+--reference $REF} |
||||||
git clone git://git.freedesktop.org/git/xorg/proto/$proto $dirname |
echo DIRNAME $DIRNAME |
||||||
cd $dirname |
echo HEAD ${1:-18.0} |
||||||
if [ -z "$branch" ]; then |
|
||||||
git log | head -1 |
rm -rf $DIRNAME |
||||||
else |
|
||||||
git checkout $branch |
git clone --depth 1 ${REF:+--reference $REF} --branch 18.0 \ |
||||||
fi |
git://git.freedesktop.org/git/mesa/mesa $DIRNAME |
||||||
sha=`git rev-list --max-count=1 --abbrev-commit HEAD` |
|
||||||
git repack -a -d |
GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ |
||||||
cd .. |
| $XZ > $DIRNAME.tar.xz |
||||||
|
|
||||||
# append sha to dirname |
# rm -rf $DIRNAME |
||||||
mv $dirname $dirname-git$sha |
|
||||||
dirname=$dirname-git$sha |
|
||||||
tarball=$dirname.tar.bz2 |
|
||||||
tar jcf $tarball $dirname |
|
||||||
rm -rf $dirname |
|
||||||
echo "$tarball is now available" |
|
||||||
|
|||||||
Loading…
Reference in new issue