From 14f81b5023a80a350cf9a9a9f33e46e1df627af0 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 05:21:44 +0000 Subject: import mesa-demos-8.3.0-10.el7 --- diff --git a/.gitignore b/.gitignore index e1698d8..f43d858 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/mesa-demos-8.2.0.tar.bz2 +SOURCES/mesa-demos-20171027.tar.bz2 SOURCES/xdriinfo-1.0.4.tar.bz2 diff --git a/.mesa-demos.metadata b/.mesa-demos.metadata index dd7979c..bbb0bc6 100644 --- a/.mesa-demos.metadata +++ b/.mesa-demos.metadata @@ -1,2 +1,2 @@ -e1a66ac63eebba4f950f95d830f34a6005167116 SOURCES/mesa-demos-8.2.0.tar.bz2 +24665d677c1767e1782acdc713686ad627abd05c SOURCES/mesa-demos-20171027.tar.bz2 723482b3fc627d7cc6124fec43dd1c21d102daaa SOURCES/xdriinfo-1.0.4.tar.bz2 diff --git a/SOURCES/0001-egl-Remove-demos-using-EGL_MESA_screen_surface.patch b/SOURCES/0001-egl-Remove-demos-using-EGL_MESA_screen_surface.patch deleted file mode 100644 index 09fd493..0000000 --- a/SOURCES/0001-egl-Remove-demos-using-EGL_MESA_screen_surface.patch +++ /dev/null @@ -1,264 +0,0 @@ -diff -up mesa-demos-8.2.0/src/egl/eglut/eglut.c.jx mesa-demos-8.2.0/src/egl/eglut/eglut.c ---- mesa-demos-8.2.0/src/egl/eglut/eglut.c.jx 2012-06-25 11:34:58.000000000 -0400 -+++ mesa-demos-8.2.0/src/egl/eglut/eglut.c 2016-04-27 13:36:48.089527063 -0400 -@@ -76,8 +76,7 @@ _eglutNow(void) - static void - _eglutDestroyWindow(struct eglut_window *win) - { -- if (_eglut->surface_type != EGL_PBUFFER_BIT && -- _eglut->surface_type != EGL_SCREEN_BIT_MESA) -+ if (_eglut->surface_type != EGL_PBUFFER_BIT) - eglDestroySurface(_eglut->dpy, win->surface); - - _eglutNativeFiniWindow(win); -@@ -175,7 +174,6 @@ _eglutCreateWindow(const char *title, in - win->config, win->native.u.pixmap, NULL); - break; - case EGL_PBUFFER_BIT: -- case EGL_SCREEN_BIT_MESA: - win->surface = win->native.u.surface; - break; - default: -@@ -289,9 +287,7 @@ eglutDestroyWindow(int win) - if (window->index != win) - return; - -- /* XXX it causes some bug in st/egl KMS backend */ -- if ( _eglut->surface_type != EGL_SCREEN_BIT_MESA) -- eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); -+ eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); - - _eglutDestroyWindow(_eglut->current); - } -diff -up mesa-demos-8.2.0/src/egl/eglut/eglut_screen.c.jx mesa-demos-8.2.0/src/egl/eglut/eglut_screen.c -diff -up mesa-demos-8.2.0/src/egl/eglut/Makefile.am.jx mesa-demos-8.2.0/src/egl/eglut/Makefile.am ---- mesa-demos-8.2.0/src/egl/eglut/Makefile.am.jx 2012-06-25 11:34:58.000000000 -0400 -+++ mesa-demos-8.2.0/src/egl/eglut/Makefile.am 2016-04-27 13:36:48.089527063 -0400 -@@ -33,17 +33,12 @@ if HAVE_WAYLAND - eglut_wayland = libeglut_wayland.la - endif - --noinst_LTLIBRARIES = libeglut_screen.la $(eglut_x11) $(eglut_wayland) -+noinst_LTLIBRARIES = $(eglut_x11) $(eglut_wayland) - endif - --libeglut_screen_la_SOURCES = \ -- eglut.c \ -- eglut.h \ -- eglutint.h \ -- eglut_screen.c -- - libeglut_x11_la_SOURCES = \ - eglut.c \ -+ eglut.h \ - eglutint.h \ - eglut_x11.c - libeglut_x11_la_CFLAGS = $(X11_CFLAGS) $(EGL_CFLAGS) -@@ -52,6 +47,7 @@ libeglut_x11_la_LIBADD = $(X11_LIBS) $(E - - libeglut_wayland_la_SOURCES = \ - eglut.c \ -+ eglut.h \ - eglutint.h \ - eglut_wayland.c - -diff -up mesa-demos-8.2.0/src/egl/opengl/demo1.c.jx mesa-demos-8.2.0/src/egl/opengl/demo1.c -diff -up mesa-demos-8.2.0/src/egl/opengl/demo2.c.jx mesa-demos-8.2.0/src/egl/opengl/demo2.c -diff -up mesa-demos-8.2.0/src/egl/opengl/demo3.c.jx mesa-demos-8.2.0/src/egl/opengl/demo3.c -diff -up mesa-demos-8.2.0/src/egl/opengl/eglinfo.c.jx mesa-demos-8.2.0/src/egl/opengl/eglinfo.c ---- mesa-demos-8.2.0/src/egl/opengl/eglinfo.c.jx 2012-06-25 11:34:58.000000000 -0400 -+++ mesa-demos-8.2.0/src/egl/opengl/eglinfo.c 2016-04-27 13:36:48.091527077 -0400 -@@ -93,10 +93,6 @@ PrintConfigs(EGLDisplay d) - strcat(surfString, "pb,"); - if (surfaces & EGL_PIXMAP_BIT) - strcat(surfString, "pix,"); --#ifdef EGL_MESA_screen_surface -- if (surfaces & EGL_SCREEN_BIT_MESA) -- strcat(surfString, "scrn,"); --#endif - if (strlen(surfString) > 0) - surfString[strlen(surfString) - 1] = 0; - -@@ -117,45 +113,6 @@ PrintConfigs(EGLDisplay d) - } - - --/** -- * Print table of all available configurations. -- */ --static void --PrintModes(EGLDisplay d) --{ --#ifdef EGL_MESA_screen_surface -- const char *extensions = eglQueryString(d, EGL_EXTENSIONS); -- if (strstr(extensions, "EGL_MESA_screen_surface")) { -- EGLScreenMESA screens[MAX_SCREENS]; -- EGLint numScreens = 1, scrn; -- EGLModeMESA modes[MAX_MODES]; -- -- eglGetScreensMESA(d, screens, MAX_SCREENS, &numScreens); -- printf("Number of Screens: %d\n\n", numScreens); -- -- for (scrn = 0; scrn < numScreens; scrn++) { -- EGLint numModes, i; -- -- eglGetModesMESA(d, screens[scrn], modes, MAX_MODES, &numModes); -- -- printf("Screen %d Modes:\n", scrn); -- printf(" id width height refresh name\n"); -- printf("-----------------------------------------\n"); -- for (i = 0; i < numModes; i++) { -- EGLint id, w, h, r; -- const char *str; -- eglGetModeAttribMESA(d, modes[i], EGL_MODE_ID_MESA, &id); -- eglGetModeAttribMESA(d, modes[i], EGL_WIDTH, &w); -- eglGetModeAttribMESA(d, modes[i], EGL_HEIGHT, &h); -- eglGetModeAttribMESA(d, modes[i], EGL_REFRESH_RATE_MESA, &r); -- str = eglQueryModeStringMESA(d, modes[i]); -- printf("0x%02x %5d %5d %.3f %s\n", id, w, h, r / 1000.0, str); -- } -- } -- } --#endif --} -- - static void - PrintExtensions(EGLDisplay d) - { -@@ -215,8 +172,6 @@ main(int argc, char *argv[]) - - PrintConfigs(d); - -- PrintModes(d); -- - eglTerminate(d); - - return 0; -diff -up mesa-demos-8.2.0/src/egl/opengles1/Makefile.am.jx mesa-demos-8.2.0/src/egl/opengles1/Makefile.am ---- mesa-demos-8.2.0/src/egl/opengles1/Makefile.am.jx 2012-06-25 11:34:58.000000000 -0400 -+++ mesa-demos-8.2.0/src/egl/opengles1/Makefile.am 2016-04-27 13:36:48.091527077 -0400 -@@ -41,19 +41,15 @@ if HAVE_GLESV1 - noinst_PROGRAMS = \ - bindtex \ - clear \ -- drawtex_screen \ - drawtex_x11 \ - eglfbdev \ - es1_info \ -- gears_screen \ - gears_x11 \ - msaa \ - pbuffer\ - render_tex \ - texture_from_pixmap \ -- torus_screen \ - torus_x11 \ -- tri_screen \ - tri_x11 \ - two_win - endif -@@ -71,21 +67,11 @@ two_win_LDADD = $(X11_LIBS) - clear_LDADD = ../eglut/libeglut_x11.la $(EGL_LIBS) $(X11_LIBS) - clear_LDFLAGS = - --drawtex_screen_SOURCES = drawtex.c --gears_screen_SOURCES = gears.c --torus_screen_SOURCES = torus.c --tri_screen_SOURCES = tri.c -- - drawtex_x11_SOURCES = drawtex.c - gears_x11_SOURCES = gears.c - torus_x11_SOURCES = torus.c - tri_x11_SOURCES = tri.c - --drawtex_screen_LDADD = ../eglut/libeglut_screen.la --gears_screen_LDADD = ../eglut/libeglut_screen.la --torus_screen_LDADD = ../eglut/libeglut_screen.la --tri_screen_LDADD = ../eglut/libeglut_screen.la -- - drawtex_x11_LDADD = ../eglut/libeglut_x11.la - gears_x11_LDADD = ../eglut/libeglut_x11.la - torus_x11_LDADD = ../eglut/libeglut_x11.la -diff -up mesa-demos-8.2.0/src/egl/opengles2/Makefile.am.jx mesa-demos-8.2.0/src/egl/opengles2/Makefile.am ---- mesa-demos-8.2.0/src/egl/opengles2/Makefile.am.jx 2012-06-25 11:34:58.000000000 -0400 -+++ mesa-demos-8.2.0/src/egl/opengles2/Makefile.am 2016-04-27 13:41:47.607616951 -0400 -@@ -37,7 +37,6 @@ if HAVE_EGL - if HAVE_GLESV2 - bin_PROGRAMS = \ - es2_info \ -- es2gears_screen \ - es2gears_x11 \ - es2tri - if HAVE_WAYLAND -@@ -49,12 +48,8 @@ endif - es2_info_LDADD = $(X11_LIBS) - es2tri_LDADD = $(X11_LIBS) - --es2gears_screen_SOURCES = es2gears.c -- - es2gears_x11_SOURCES = es2gears.c - --es2gears_screen_LDADD = ../eglut/libeglut_screen.la -- - es2gears_x11_LDADD = ../eglut/libeglut_x11.la - - es2gears_wayland_SOURCES = es2gears.c -diff -up mesa-demos-8.2.0/src/egl/opengl/Makefile.am.jx mesa-demos-8.2.0/src/egl/opengl/Makefile.am ---- mesa-demos-8.2.0/src/egl/opengl/Makefile.am.jx 2012-06-25 11:34:58.000000000 -0400 -+++ mesa-demos-8.2.0/src/egl/opengl/Makefile.am 2016-04-27 13:36:48.090527070 -0400 -@@ -51,20 +51,12 @@ endif - - if HAVE_EGL - noinst_PROGRAMS = \ -- demo1 \ -- demo2 \ -- demo3 \ - eglinfo \ -- eglgears_screen \ -- egltri_screen \ - peglgears \ - $(EGL_DRM_DEMOS) \ - $(EGL_X11_DEMOS) - endif - --egltri_screen_SOURCES = egltri.c --eglgears_screen_SOURCES = eglgears.c -- - egltri_x11_SOURCES = egltri.c - eglgears_x11_SOURCES = eglgears.c - -@@ -73,9 +65,6 @@ egltri_x11_LDFLAGS = $(AM_LDFLAGS) $(X11 - xeglgears_LDFLAGS = $(AM_LDFLAGS) $(X11_LIBS) - xeglthreads_LDFLAGS = $(AM_LDFLAGS) $(X11_LIBS) -pthread - --eglgears_screen_LDADD = ../eglut/libeglut_screen.la --egltri_screen_LDADD = ../eglut/libeglut_screen.la -- - eglgears_x11_LDADD = ../eglut/libeglut_x11.la - egltri_x11_LDADD = ../eglut/libeglut_x11.la - -diff -up mesa-demos-8.2.0/src/egl/openvg/Makefile.am.jx mesa-demos-8.2.0/src/egl/openvg/Makefile.am ---- mesa-demos-8.2.0/src/egl/openvg/Makefile.am.jx 2012-06-25 11:34:58.000000000 -0400 -+++ mesa-demos-8.2.0/src/egl/openvg/Makefile.am 2016-04-27 13:36:48.092527084 -0400 -@@ -50,21 +50,13 @@ endif - if HAVE_EGL - if HAVE_VG - noinst_PROGRAMS = \ -- lion_screen \ -- sp_screen \ - $(EGL_X11_DEMOS) - endif - endif - --lion_screen_SOURCES = lion.c lion-render.c lion-render.h --sp_screen_SOURCES = sp.c -- - lion_x11_SOURCES = lion.c lion-render.c lion-render.h - sp_x11_SOURCES = sp.c - --lion_screen_LDADD = ../eglut/libeglut_screen.la --sp_screen_LDADD = ../eglut/libeglut_screen.la -- - lion_x11_LDADD = ../eglut/libeglut_x11.la - sp_x11_LDADD = ../eglut/libeglut_x11.la - diff --git a/SOURCES/xdriinfo-1.0.4-glvnd.patch b/SOURCES/xdriinfo-1.0.4-glvnd.patch new file mode 100644 index 0000000..0dc4c0a --- /dev/null +++ b/SOURCES/xdriinfo-1.0.4-glvnd.patch @@ -0,0 +1,54 @@ +diff -up xdriinfo-1.0.4/xdriinfo.c~ xdriinfo-1.0.4/xdriinfo.c +--- xdriinfo-1.0.4/xdriinfo.c~ 2009-10-16 23:39:10.000000000 +0200 ++++ xdriinfo-1.0.4/xdriinfo.c 2017-03-13 12:01:53.419636100 +0100 +@@ -101,23 +101,9 @@ int main (int argc, char *argv[]) { + return 1; + } + } +- /* if the argument to the options command is a driver name, we can handle +- * it without opening an X connection */ +- if (func == OPTIONS && screenNum == -1) { +- const char *options = (*GetDriverConfig) (funcArg); +- if (!options) { +- fprintf (stderr, +- "Driver \"%s\" is not installed or does not support configuration.\n", +- funcArg); +- return 1; +- } +- printf ("%s", options); +- if (isatty (STDOUT_FILENO)) +- printf ("\n"); +- return 0; +- } ++ + /* driver command needs a valid screen number */ +- else if (func == DRIVER && screenNum == -1) { ++ if (func == DRIVER && screenNum == -1) { + fprintf (stderr, "Invalid screen number \"%s\".\n", funcArg); + return 1; + } +@@ -135,6 +121,9 @@ int main (int argc, char *argv[]) { + return 1; + } + ++ /* Call glXGetClientString to load vendor libs on glvnd enabled systems */ ++ glXGetClientString (dpy, GLX_EXTENSIONS); ++ + switch (func) { + case NSCREENS: + printf ("%d", nScreens); +@@ -154,7 +143,13 @@ int main (int argc, char *argv[]) { + break; + } + case OPTIONS: { +- const char *name = (*GetScreenDriver) (dpy, screenNum), *options; ++ const char *name, *options; ++ ++ if (screenNum == -1) { ++ name = funcArg; ++ } else { ++ name = (*GetScreenDriver) (dpy, screenNum); ++ } + if (!name) { + fprintf (stderr, "Screen \"%d\" is not direct rendering capable.\n", + screenNum); diff --git a/SPECS/mesa-demos.spec b/SPECS/mesa-demos.spec index 2e9933e..f509830 100644 --- a/SPECS/mesa-demos.spec +++ b/SPECS/mesa-demos.spec @@ -1,34 +1,33 @@ -%global gitdate 20121218 -%global gitcommit 6eef979a5488dab01088412f88374b2ea9d615cd +%global gitdate 20171027 +%global gitcommit 22bc355f1b324b6ea07e063b5f20be757ea7a8e5 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarball mesa-demos %global xdriinfo xdriinfo-1.0.4 %global demodir %{_libdir}/mesa Summary: Mesa demos Name: mesa-demos -Version: 8.2.0 -Release: 3%{?dist} +Version: 8.3.0 +Release: 10%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org -# git clone http://anongit.freedesktop.org/git/mesa/demos.git -# mv demos mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd -# tar --exclude-vcs -cjf mesa-demos-6eef979.tar.bz2 mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd -# Source0: %{tarball}-%{shortcommit}.tar.bz2 -Source0: ftp://ftp.freedesktop.org/pub/mesa/demos/8.2.0/%{tarball}-%{version}.tar.bz2 +#Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 +Source0: mesa-demos-%{gitdate}.tar.bz2 Source1: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2 Source2: mesad-git-snapshot.sh # Patch pointblast/spriteblast out of the Makefile for legal reasons Patch0: mesa-demos-8.0.1-legal.patch Patch1: mesa-demos-as-needed.patch -Patch2: 0001-egl-Remove-demos-using-EGL_MESA_screen_surface.patch +# Fix xdriinfo not working with libglvnd +Patch2: xdriinfo-1.0.4-glvnd.patch BuildRequires: pkgconfig autoconf automake libtool BuildRequires: freeglut-devel -BuildRequires: libGL-devel +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libEGL-devel +BuildRequires: mesa-libGLES-devel +BuildRequires: mesa-libgbm-devel BuildRequires: libGLU-devel BuildRequires: glew-devel -Group: Development/Libraries %description This package provides some demo applications for testing Mesa. @@ -41,18 +40,28 @@ Provides: glxinfo glxinfo%{?__isa_bits} %description -n glx-utils The glx-utils package provides the glxinfo and glxgears utilities. +%package -n egl-utils +Summary: EGL utilities +Group: Development/Libraries +Provides: eglinfo es2_info + +%description -n egl-utils +The egl-utils package provides the eglinfo and es2_info utilities. + %prep -%setup -q -n %{tarball}-%{version} -b1 +%setup -q -n %{name}-%{gitdate} -b1 %patch0 -p1 -b .legal %patch1 -p1 -b .asneeded -%patch2 -p1 -b .jx +pushd ../%{xdriinfo} +%patch2 -p1 +popd # These two files are distributable, but non-free (lack of permission to modify). rm -rf src/demos/pointblast.c rm -rf src/demos/spriteblast.c %build -autoreconf -i +autoreconf -vfi %configure --bindir=%{demodir} --with-system-data-files make %{?_smp_mflags} @@ -74,6 +83,9 @@ install -m 0755 src/xdemos/glxinfo %{buildroot}%{_bindir} install -m 0755 src/xdemos/glxinfo %{buildroot}%{_bindir}/glxinfo%{?__isa_bits} %endif +install -m 0755 src/egl/opengl/eglinfo %{buildroot}%{_bindir} +install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} + %check %files @@ -86,10 +98,51 @@ install -m 0755 src/xdemos/glxinfo %{buildroot}%{_bindir}/glxinfo%{?__isa_bits} %{_bindir}/xdriinfo %{_datadir}/man/man1/xdriinfo.1* +%files -n egl-utils +%{_bindir}/eglinfo +%{_bindir}/es2_info + %changelog -* Wed Apr 27 2016 Adam Jackson - 8.2.0-3 -- Fix package build now that Mesa no longer pretends to advertise - EGL_MESA_screen_surface +* Thu Feb 08 2018 Fedora Release Engineering - 8.3.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Oct 27 2017 Adam Jackson - 8.3.0-9 +- New git snapshot + +* Thu Aug 03 2017 Fedora Release Engineering - 8.3.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 8.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Mar 13 2017 Hans de Goede - 8.3.0-6 +- Fix xdriinfo not working with libglvnd (rhbz#1429894) + +* Fri Feb 10 2017 Fedora Release Engineering - 8.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 10 2017 Orion Poplawski - 8.3.0-4 +- Rebuild for glew 2.0.0 + +* Thu Feb 04 2016 Fedora Release Engineering - 8.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jan 14 2016 Adam Jackson - 8.3.0-2 +- Rebuild for glew 1.13 + +* Fri Dec 18 2015 Igor Gnatenko - 8.3.0-1 +- 8.3.0 + +* Thu Dec 03 2015 Adam Jackson 8.2.0-5 +- New git snap +- Add EGL/GLES buildreqs and egl-utils subpackage + +* Wed Jun 17 2015 Fedora Release Engineering - 8.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Feb 21 2015 Till Maas - 8.2.0-3 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code * Sun Aug 17 2014 Fedora Release Engineering - 8.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild