rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

- removed n_Define-GLAPIVAR-separate-from-GLAPI.patch

Browse Source 
* bits moved to libGLw's n_Use-newly-introduced-GLAPIVAR-for-variables.patch
    (boo#1082297)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=706
This commit is contained in:
Stefan Dirsch 2018-02-23 11:12:25 +00:00 committed by Git OBS Bridge
parent d920707302
commit 5d5a714763
5 changed files with 18 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mesa-drivers.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 23 10:51:04 UTC 2018 - sndirsch@suse.com
- removed n_Define-GLAPIVAR-separate-from-GLAPI.patch
* bits moved to libGLw's n_Use-newly-introduced-GLAPIVAR-for-variables.patch
(boo#1082297)
-------------------------------------------------------------------
Mon Feb 19 23:24:22 UTC 2018 - schwab@suse.de

7
Mesa-drivers.spec
View File

@ -140,8 +140,6 @@ Patch13: u_mesa-8.0.1-fix-16bpp.patch
Patch15: u_mesa-8.0-llvmpipe-shmget.patch
# never to be upstreamed
Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
# never to be upstreamed
Patch21: n_Define-GLAPIVAR-separate-from-GLAPI.patch
# currently needed for libglvnd support
Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch
Patch32: archlinux_glvnd-fix-gl-dot-pc.patch
@ -473,8 +471,8 @@ applications using the OpenGL|ES 3.x APIs.
%package -n libOSMesa8
Summary: Mesa Off-screen rendering extension
Group: System/Libraries
# Wrongly named package shipped .so.8
Group: System/Libraries
Obsoletes: libOSMesa9 < %{version}
Provides: libOSMesa9 = %{version}
@ -608,8 +606,8 @@ implementation of Mesa.
%package -n Mesa-libd3d
Summary: Mesa Direct3D9 state tracker
Group: System/Libraries
# Manually provide d3d library (bnc#918294)
Group: System/Libraries
%ifarch x86_64 s390x ppc64le aarch64 riscv64
Provides: d3dadapter9.so.1()(64bit)
%else
@ -760,7 +758,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
#%patch13 -p1
%patch12 -p1
%patch18 -p1
%patch21 -p1
%if 0%{?libglvnd}
%patch31 -p1

7
Mesa.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 23 10:51:04 UTC 2018 - sndirsch@suse.com
- removed n_Define-GLAPIVAR-separate-from-GLAPI.patch
* bits moved to libGLw's n_Use-newly-introduced-GLAPIVAR-for-variables.patch
(boo#1082297)
-------------------------------------------------------------------
Mon Feb 19 23:24:22 UTC 2018 - schwab@suse.de

7
Mesa.spec
View File

@ -139,8 +139,6 @@ Patch13: u_mesa-8.0.1-fix-16bpp.patch
Patch15: u_mesa-8.0-llvmpipe-shmget.patch
# never to be upstreamed
Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
# never to be upstreamed
Patch21: n_Define-GLAPIVAR-separate-from-GLAPI.patch
# currently needed for libglvnd support
Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch
Patch32: archlinux_glvnd-fix-gl-dot-pc.patch
@ -472,8 +470,8 @@ applications using the OpenGL|ES 3.x APIs.
%package -n libOSMesa8
Summary: Mesa Off-screen rendering extension
Group: System/Libraries
# Wrongly named package shipped .so.8
Group: System/Libraries
Obsoletes: libOSMesa9 < %{version}
Provides: libOSMesa9 = %{version}
@ -607,8 +605,8 @@ implementation of Mesa.
%package -n Mesa-libd3d
Summary: Mesa Direct3D9 state tracker
Group: System/Libraries
# Manually provide d3d library (bnc#918294)
Group: System/Libraries
%ifarch x86_64 s390x ppc64le aarch64 riscv64
Provides: d3dadapter9.so.1()(64bit)
%else
@ -759,7 +757,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
#%patch13 -p1
%patch12 -p1
%patch18 -p1
%patch21 -p1
%if 0%{?libglvnd}
%patch31 -p1

40
n_Define-GLAPIVAR-separate-from-GLAPI.patch
View File

@ -1,40 +0,0 @@
From: Egbert Eich <eich@suse.de>
Date: Fri Mar 11 13:29:43 2016 +0100
Subject: [PATCH]Define GLAPIVAR separate from GLAPI
Patch-mainline: never
Git-commit: 88dda160564c8c23cb533b0eb258404f1687a2e8
References: bsc#
Signed-off-by: Egbert Eich <eich@suse.com>
GLAPI doesn't contain 'extern' in some environments.
This is needed for variables (GLw).
Signed-off-by: Egbert Eich <eich@suse.de>
---
Mesa-10.0.3/include/GL/gl.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/include/GL/gl.h b/Mesa-10.0.3/include/GL/gl.h
index b484b96..5189008 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -59,6 +59,7 @@
#elif (defined(__GNUC__) && __GNUC__ >= 4) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
# define GLAPI __attribute__((visibility("default")))
# define GLAPIENTRY
+# define GLAPIVAR extern GLAPI
#endif /* WIN32 && !CYGWIN */
/*
@@ -80,6 +81,10 @@
#define GLAPI extern
#endif
+#ifndef GLAPIVAR
+#define GLAPIVAR extern
+#endif
+
#ifndef GLAPIENTRY
#define GLAPIENTRY
#endif