c8
imports/c8/mesa-demos-8.4.0-5.20181118git1830dcb.el8
commit
2ad7703dc5
@ -0,0 +1,2 @@
|
||||
SOURCES/mesa-demos-20181118.tar.bz2
|
||||
SOURCES/xdriinfo-1.0.4.tar.bz2
|
@ -0,0 +1,2 @@
|
||||
e2cdd2260f18badda6f80d4baa6ebc30225b0c7e SOURCES/mesa-demos-20181118.tar.bz2
|
||||
723482b3fc627d7cc6124fec43dd1c21d102daaa SOURCES/xdriinfo-1.0.4.tar.bz2
|
@ -0,0 +1,19 @@
|
||||
diff -up mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd/src/demos/Makefile.am.legal mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd/src/demos/Makefile.am
|
||||
--- mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd/src/demos/Makefile.am.legal 2013-01-08 11:24:38.805867866 -0500
|
||||
+++ mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd/src/demos/Makefile.am 2013-01-08 11:24:44.975870107 -0500
|
||||
@@ -65,7 +65,6 @@ bin_PROGRAMS = \
|
||||
multiarb \
|
||||
paltex \
|
||||
pixeltest \
|
||||
- pointblast \
|
||||
projtex \
|
||||
ray \
|
||||
readpix \
|
||||
@@ -74,7 +73,6 @@ bin_PROGRAMS = \
|
||||
shadowtex \
|
||||
singlebuffer \
|
||||
spectex \
|
||||
- spriteblast \
|
||||
stex3d \
|
||||
teapot \
|
||||
terrain \
|
@ -0,0 +1,13 @@
|
||||
diff -up mesa-demos-8.1.0/configure.ac.jx mesa-demos-8.1.0/configure.ac
|
||||
--- mesa-demos-8.1.0/configure.ac.jx 2013-02-24 05:49:47.000000000 -0500
|
||||
+++ mesa-demos-8.1.0/configure.ac 2013-03-27 14:41:42.493936005 -0400
|
||||
@@ -267,6 +267,9 @@ cygwin*)
|
||||
;;
|
||||
esac
|
||||
|
||||
+dnl i am somewhat surprised this works
|
||||
+DEMO_LIBS="-Wl,--as-needed $DEMO_LIBS"
|
||||
+
|
||||
AC_SUBST([DEMO_CFLAGS])
|
||||
AC_SUBST([DEMO_LIBS])
|
||||
AC_SUBST([EGL_CFLAGS])
|
@ -0,0 +1,22 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Usage: ./make-git-snapshot.sh [COMMIT]
|
||||
#
|
||||
# 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.
|
||||
|
||||
DIRNAME=mesa-demos-$( date +%Y%m%d )
|
||||
|
||||
echo REF ${REF:+--reference $REF}
|
||||
echo DIRNAME $DIRNAME
|
||||
echo HEAD ${1:-HEAD}
|
||||
|
||||
rm -rf $DIRNAME
|
||||
|
||||
git clone ${REF:+--reference $REF} \
|
||||
git://git.freedesktop.org/git/mesa/demos $DIRNAME
|
||||
|
||||
GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
|
||||
| bzip2 > $DIRNAME.tar.bz2
|
||||
|
||||
# rm -rf $DIRNAME
|
@ -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);
|
@ -0,0 +1,242 @@
|
||||
%global gitdate 20181118
|
||||
%global gitcommit 1830dcb6e48c88f16d328dc4fc9fa32fe3b4956e
|
||||
%global shortcommit %(c=%{gitcommit}; echo ${c:0:7})
|
||||
%global xdriinfo xdriinfo-1.0.4
|
||||
%global demodir %{_libdir}/mesa
|
||||
|
||||
Summary: Mesa demos
|
||||
Name: mesa-demos
|
||||
Version: 8.4.0
|
||||
Release: 5.%{gitdate}git%{shortcommit}%{?dist}
|
||||
License: MIT
|
||||
URL: http://www.mesa3d.org
|
||||
#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
|
||||
# Fix xdriinfo not working with libglvnd
|
||||
Patch2: xdriinfo-1.0.4-glvnd.patch
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkgconfig autoconf automake libtool
|
||||
BuildRequires: freeglut-devel
|
||||
BuildRequires: mesa-libGL-devel
|
||||
BuildRequires: mesa-libEGL-devel
|
||||
BuildRequires: mesa-libGLES-devel
|
||||
BuildRequires: mesa-libgbm-devel
|
||||
BuildRequires: libGLU-devel
|
||||
BuildRequires: libXext-devel
|
||||
BuildRequires: glew-devel
|
||||
BuildRequires: wayland-devel
|
||||
BuildRequires: freetype-devel
|
||||
|
||||
%description
|
||||
This package provides some demo applications for testing Mesa.
|
||||
|
||||
%package -n glx-utils
|
||||
Summary: GLX utilities
|
||||
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
|
||||
Provides: eglinfo es2_info
|
||||
|
||||
%description -n egl-utils
|
||||
The egl-utils package provides the eglinfo and es2_info utilities.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{gitdate} -b1
|
||||
%patch0 -p1 -b .legal
|
||||
%patch1 -p1 -b .asneeded
|
||||
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 -vfi
|
||||
%configure \
|
||||
--bindir=%{demodir} \
|
||||
--with-system-data-files \
|
||||
--enable-x11 \
|
||||
--enable-wayland \
|
||||
--enable-gbm \
|
||||
--enable-egl \
|
||||
--enable-gles2 \
|
||||
--enable-libdrm \
|
||||
--enable-freetype2
|
||||
make %{?_smp_mflags}
|
||||
|
||||
pushd ../%{xdriinfo}
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
popd
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
pushd ../%{xdriinfo}
|
||||
make %{?_smp_mflags} install DESTDIR=%{buildroot}
|
||||
popd
|
||||
|
||||
install -m 0755 src/xdemos/glxgears %{buildroot}%{_bindir}
|
||||
install -m 0755 src/xdemos/glxinfo %{buildroot}%{_bindir}
|
||||
%if 0%{?__isa_bits} != 0
|
||||
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
|
||||
%{demodir}
|
||||
%{_datadir}/%{name}/
|
||||
|
||||
%files -n glx-utils
|
||||
%{_bindir}/glxinfo*
|
||||
%{_bindir}/glxgears
|
||||
%{_bindir}/xdriinfo
|
||||
%{_datadir}/man/man1/xdriinfo.1*
|
||||
|
||||
%files -n egl-utils
|
||||
%{_bindir}/eglinfo
|
||||
%{_bindir}/es2_info
|
||||
|
||||
%changelog
|
||||
* Thu Jun 11 2020 Adam Jackson <ajax@redhat.com> - 8.4.0-5.20181118git1830dcb
|
||||
- Rebuild for RHEL 8.3
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.0-4.20181118git1830dcb
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.0-3.20181118git1830dcb
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Nov 19 2018 Lyude Paul <lyude@redhat.com> - 8.4.0-2.20181118git1830dcb
|
||||
- Start using proper git version strings for rawhide
|
||||
- Enabling building of wayland and freetype demos
|
||||
|
||||
* Sun Nov 18 2018 Lyude Paul <lyude@redhat.com> - 8.4.0-1
|
||||
- New git snapshot
|
||||
|
||||
* Thu Aug 23 2018 Nicolas Chauvet <kwizart@gmail.com> - 8.3.0-12
|
||||
- Rebuilt for glew 2.1.0
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Oct 27 2017 Adam Jackson <ajax@redhat.com> - 8.3.0-9
|
||||
- New git snapshot
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Mon Mar 13 2017 Hans de Goede <hdegoede@redhat.com> - 8.3.0-6
|
||||
- Fix xdriinfo not working with libglvnd (rhbz#1429894)
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue Jan 10 2017 Orion Poplawski <orion@cora.nwra.com> - 8.3.0-4
|
||||
- Rebuild for glew 2.0.0
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu Jan 14 2016 Adam Jackson <ajax@redhat.com> - 8.3.0-2
|
||||
- Rebuild for glew 1.13
|
||||
|
||||
* Fri Dec 18 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 8.3.0-1
|
||||
- 8.3.0
|
||||
|
||||
* Thu Dec 03 2015 Adam Jackson <ajax@redhat.com> 8.2.0-5
|
||||
- New git snap
|
||||
- Add EGL/GLES buildreqs and egl-utils subpackage
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.2.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 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 <rel-eng@lists.fedoraproject.org> - 8.2.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jul 05 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 8.2.0-1
|
||||
- 8.2.0 upstream release
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.1.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sun Nov 17 2013 Dave Airlie <airlied@redhat.com> - 8.1.0-5
|
||||
- rebuilt for glew 1.10
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.1.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Wed Mar 27 2013 Adam Jackson <ajax@redhat.com> 8.1.0-3
|
||||
- Build with --as-needed so glxinfo doesn't needlessly drag in GLEW
|
||||
|
||||
* Wed Feb 27 2013 Adam Jackson <ajax@redhat.com> 8.1.0-2
|
||||
- Copy glxinfo to glxinfo%%{__isa_bits}, to allow people to check that their
|
||||
compatibility drivers are working.
|
||||
|
||||
* Sun Feb 24 2013 Dave Airlie <airlied@redhat.com> 8.1.0-1
|
||||
- package upstream demos release 8.1.0 (mainly for new glxinfo)
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.0.1-2.20121218git6eef979
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Tue Jan 8 2013 Tom Callaway <spot@fedoraproject.org> - 8.0.1-1.20121218git6eef979
|
||||
- update to 8.0.1 (git checkout from 20121218)
|
||||
- update xdriinfo to 1.0.4
|
||||
- remove non-free files (bz892925)
|
||||
|
||||
* Thu Dec 13 2012 Adam Jackson <ajax@redhat.com> - 7.10-9.20101028
|
||||
- Rebuild for glew 1.9.0
|
||||
|
||||
* Fri Jul 27 2012 Kalev Lember <kalevlember@gmail.com> - 7.10-8.20101028
|
||||
- Rebuilt for GLEW soname bump
|
||||
|
||||
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.10-7.20101028
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.10-6.20101028
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Jun 20 2011 ajax@redhat.com - 7.10-5.20101028
|
||||
- Rebuild for new glew soname
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.10-4.20101028
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Mon Nov 01 2010 Adam Jackson <ajax@redhat.com> 7.10-3.20101028
|
||||
- Install rgba images too (#640688)
|
||||
|
||||
* Sat Oct 30 2010 Dave Airlie <airlied@redhat.com> 7.10-2.20101028
|
||||
- fix install of gears/info (#647947)
|
||||
|
||||
* Thu Oct 28 2010 Adam Jackson <ajax@redhat.com> 7.10-1.20101028
|
||||
- Today's git snapshot
|
||||
- Arbitrary EVR bump to be newer than when the mesa source package dropped
|
||||
the demos subpackage.
|
||||
|
||||
* Tue Jun 15 2010 Jerome Glisse <jglisse@redhat.com> 7.7
|
||||
- Initial build.
|
Loading…
Reference in new issue