pool/Mesa
SHA256
8
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- n_glesv1_cm-glesv2.patch

Browse Source 
* reenables build of GLESv1_CM and GLESv2 ...
- readded pkgconfig files for GLESv1_CM and GLESv2 to filelists
- removed again virtual provides for 
  * pkgconfig(glesv1_cm)
  * pkgconfig(glesv2)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=841
This commit is contained in:
Stefan Dirsch
2019-06-13 09:44:09 +00:00
committed by Git OBS Bridge
parent f320c0ae39
commit be66567c61
5 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Mesa-drivers.changes
View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Jun 13 09:34:13 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- n_glesv1_cm-glesv2.patch
* reenables build of GLESv1_CM and GLESv2 ...
- readded pkgconfig files for GLESv1_CM and GLESv2 to filelists
- removed again virtual provides for
* pkgconfig(glesv1_cm)
* pkgconfig(glesv2)
-------------------------------------------------------------------
Wed Jun 12 03:51:43 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>

6
Mesa-drivers.spec
View File

@@ -131,6 +131,7 @@ Source7: Mesa.keyring
# never to be upstreamed
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch
Patch60: n_glesv1_cm-glesv2.patch
BuildRequires: bison
BuildRequires: fdupes
@@ -393,7 +394,6 @@ Requires: pkgconfig(egl)
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
Provides: pkgconfig(glesv1_cm)
%description libGLESv1_CM-devel
OpenGL|ES is an API for full-function 2D and 3D
@@ -434,7 +434,6 @@ Requires: pkgconfig(egl)
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
Provides: pkgconfig(glesv2)
%description libGLESv2-devel
OpenGL|ES is an API for full-function 2D and 3D
@@ -732,6 +731,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%patch54 -p1
%patch58 -p1
%patch60 -p1
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
# disabling libglvnd build; ugly ...
@@ -1004,6 +1004,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv1_CM.so
%endif
%{_libdir}/pkgconfig/glesv1_cm.pc
%files libGLESv2-2
%if 0%{?libglvnd} == 0
@@ -1015,6 +1016,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv2.so
%endif
%{_libdir}/pkgconfig/glesv2.pc
%files libGLESv3-devel
%{_includedir}/GLES3

10
Mesa.changes
View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Jun 13 09:34:13 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- n_glesv1_cm-glesv2.patch
* reenables build of GLESv1_CM and GLESv2 ...
- readded pkgconfig files for GLESv1_CM and GLESv2 to filelists
- removed again virtual provides for
* pkgconfig(glesv1_cm)
* pkgconfig(glesv2)
-------------------------------------------------------------------
Wed Jun 12 03:51:43 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>

6
Mesa.spec
View File

@@ -130,6 +130,7 @@ Source7: Mesa.keyring
# never to be upstreamed
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch
Patch60: n_glesv1_cm-glesv2.patch
BuildRequires: bison
BuildRequires: fdupes
@@ -392,7 +393,6 @@ Requires: pkgconfig(egl)
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
Provides: pkgconfig(glesv1_cm)
%description libGLESv1_CM-devel
OpenGL|ES is an API for full-function 2D and 3D
@@ -433,7 +433,6 @@ Requires: pkgconfig(egl)
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
Provides: pkgconfig(glesv2)
%description libGLESv2-devel
OpenGL|ES is an API for full-function 2D and 3D
@@ -731,6 +730,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%patch54 -p1
%patch58 -p1
%patch60 -p1
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
# disabling libglvnd build; ugly ...
@@ -1003,6 +1003,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv1_CM.so
%endif
%{_libdir}/pkgconfig/glesv1_cm.pc
%files libGLESv2-2
%if 0%{?libglvnd} == 0
@@ -1014,6 +1015,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv2.so
%endif
%{_libdir}/pkgconfig/glesv2.pc
%files libGLESv3-devel
%{_includedir}/GLES3

11
n_glesv1_cm-glesv2.patch Normal file
View File

@@ -0,0 +1,11 @@
--- mesa/src/mapi/meson.build.orig 2019-06-13 11:14:34.705848000 +0200
+++ mesa/src/mapi/meson.build 2019-06-13 11:21:00.995161000 +0200
@@ -35,7 +35,7 @@ if with_shared_glapi
else
libglapi = []
endif
-if not with_glvnd
+if with_glvnd
if with_gles1
subdir('es1api')
endif