Bug#635764: [PATCH] Add mesa-utils-extra package
Add a package with OpenGL ES 1.1 and OpenGL ES 2.0 test applications
Package mostly from ubuntu.
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
debian/changelog | 6 ++++++
debian/control | 26 +++++++++++++-------------
debian/es2_info.1 | 21 +++++++++++++++++++++
debian/es2gears.1 | 14 ++++++++++++++
debian/es2tri.1 | 14 ++++++++++++++
debian/mesa-utils-extra.install | 11 +++++++++++
debian/mesa-utils-extra.manpages | 3 +++
debian/mesa-utils.install | 4 ++++
src/egl/opengles1/Makefile.am | 12 +++++++-----
src/egl/opengles2/Makefile.am | 2 +-
src/egl/opengles2/es2_info.c | 1 +
11 files changed, 95 insertions(+), 19 deletions(-)
create mode 100644 debian/es2_info.1
create mode 100644 debian/es2gears.1
create mode 100644 debian/es2tri.1
create mode 100644 debian/mesa-utils-extra.install
create mode 100644 debian/mesa-utils-extra.manpages
create mode 100644 debian/mesa-utils.install
create mode 120000 src/egl/opengles2/es2_info.c
diff --git a/debian/changelog b/debian/changelog
index 3184810..f0a8e88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa-demos (8.0.1-3) unstable; urgency=low
+
+ * Add mesa-utils-extra packages like in ubuntu
+
+ -- Riku Voipio <riku.voipio@linaro.org> Sat, 30 Jul 2011 13:07:53 +0300
+
mesa-demos (8.0.1-2) unstable; urgency=low
* Upload to unstable.
diff --git a/debian/control b/debian/control
index 613fb41..71a8ffa 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ Build-Depends: debhelper (>= 7.2.7),
libgl1-mesa-dev,
libglew1.5-dev,
libglu1-mesa-dev,
-# libegl1-mesa-dev,
-# libgles1-mesa-dev,
-# libgles2-mesa-dev,
+ libegl1-mesa-dev,
+ libgles1-mesa-dev,
+ libgles2-mesa-dev,
Homepage: http://mesa3d.org/
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/mesa-demos.git
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/mesa-demos.git
@@ -31,13 +31,13 @@ Description: Miscellaneous Mesa GL utilities
This package provides several basic GL utilities built by Mesa, including
glxinfo and glxgears.
-#Package: mesa-utils-extra
-#Section: x11
-#Priority: optional
-#Architecture: any
-#Depends:
-# ${shlibs:Depends},
-# ${misc:Depends},
-#Description: Miscellaneous Mesa utilies (opengles, egl)
-# This package provides several basic utilities built from Mesa, including
-# eglgears, eglinfo, glesgears
+Package: mesa-utils-extra
+Section: x11
+Priority: optional
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Description: Miscellaneous Mesa utilies (opengles, egl)
+ This package provides several basic utilities built from Mesa, including
+ es2gears, es2_info and es2tri
diff --git a/debian/es2_info.1 b/debian/es2_info.1
new file mode 100644
index 0000000..43387d0
--- /dev/null
+++ b/debian/es2_info.1
@@ -0,0 +1,21 @@
+.TH es2_info 1 "2011-02-01"
+.SH NAME
+es2_info \- list OpenGL ES extensions
+.SH SYNOPSIS
+.B es2_info
+.RI [ options ]
+.SH DESCRIPTION
+The \fIes2_info\fP program shows information about the supported OpenGL ES
+extensions.
+.SH OPTIONS
+.TP 8
+.B \-display \fIdisplay\fP
+Specify the X display to run on.
+.TP 8
+.B \-h
+Print usage information.
+.SH AUTHOR
+es2_info was written by Tunsgten Graphics.
+.PP
+This manual page was written by Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>,
+for the Debian project (but may be used by others).
diff --git a/debian/es2gears.1 b/debian/es2gears.1
new file mode 100644
index 0000000..e6da576
--- /dev/null
+++ b/debian/es2gears.1
@@ -0,0 +1,14 @@
+.TH es2gears 1 "2011-02-01"
+.SH NAME
+es2gears \- ``gears'' demo for GLES2
+.SH SYNOPSIS
+.B es2gears
+.SH DESCRIPTION
+The \fIes2gears\fP program is a port of the ``gears'' demo to GLES2. It displays
+a set of rotating gears and prints out the frame rate at regular intervals. It
+has become quite popular as basic benchmarking tool.
+.SH AUTHOR
+glxgears was written by Brian Paul <brian.paul@tungstengraphics.com>.
+.PP
+This manual page was written by Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>,
+for the Debian project (but may be used by others).
diff --git a/debian/es2tri.1 b/debian/es2tri.1
new file mode 100644
index 0000000..e5240e7
--- /dev/null
+++ b/debian/es2tri.1
@@ -0,0 +1,14 @@
+.TH es2tri 1 "2011-02-01"
+.SH NAME
+es2tri \- a draw demonstration using X/EGL and OpenGL ES 2.x
+.SH SYNOPSIS
+.B es2tri
+.SH DESCRIPTION
+The \fIes2tri\fP program demonstrate the usage of X/EGL and OpenGL ES 2.x by
+drawing a triangle at the screen. This program is most useful when studied
+in its source code form.
+.SH AUTHOR
+es2tri was written by Tungsten Graphics.
+.PP
+This manual page was written by Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>,
+for the Debian project (but may be used by others).
diff --git a/debian/mesa-utils-extra.install b/debian/mesa-utils-extra.install
new file mode 100644
index 0000000..fbb6fdb
--- /dev/null
+++ b/debian/mesa-utils-extra.install
@@ -0,0 +1,11 @@
+usr/bin/es2_info
+usr/bin/es2gears
+usr/bin/tri
+usr/bin/es1_info
+usr/bin/gears_screen
+usr/bin/gears_x11
+usr/bin/torus_screen
+usr/bin/torus_x11
+usr/bin/tri_screen
+usr/bin/tri_x11
+
diff --git a/debian/mesa-utils-extra.manpages b/debian/mesa-utils-extra.manpages
new file mode 100644
index 0000000..31ebcf1
--- /dev/null
+++ b/debian/mesa-utils-extra.manpages
@@ -0,0 +1,3 @@
+debian/es2_info.1
+debian/es2gears.1
+debian/es2tri.1
diff --git a/debian/mesa-utils.install b/debian/mesa-utils.install
new file mode 100644
index 0000000..4d4d07e
--- /dev/null
+++ b/debian/mesa-utils.install
@@ -0,0 +1,4 @@
+usr/bin/glxdemo
+usr/bin/glxgears
+usr/bin/glxheads
+usr/bin/glxinfo
diff --git a/src/egl/opengles1/Makefile.am b/src/egl/opengles1/Makefile.am
index 90d592d..2d88b5a 100644
--- a/src/egl/opengles1/Makefile.am
+++ b/src/egl/opengles1/Makefile.am
@@ -42,18 +42,20 @@ noinst_PROGRAMS = \
bindtex \
drawtex_screen \
drawtex_x11 \
- es1_info \
- gears_screen \
- gears_x11 \
msaa \
pbuffer\
render_tex \
texture_from_pixmap \
+ two_win
+
+bin_PROGRAMS = \
+ es1_info \
+ gears_screen \
+ gears_x11 \
torus_screen \
torus_x11 \
tri_screen \
- tri_x11 \
- two_win
+ tri_x11
endif
endif
diff --git a/src/egl/opengles2/Makefile.am b/src/egl/opengles2/Makefile.am
index d3dab3f..33dfc12 100644
--- a/src/egl/opengles2/Makefile.am
+++ b/src/egl/opengles2/Makefile.am
@@ -38,7 +38,7 @@ AM_LDFLAGS = \
if HAVE_EGL
if HAVE_GLESV2
-noinst_PROGRAMS = \
+bin_PROGRAMS = \
es2_info \
es2gears \
tri
diff --git a/src/egl/opengles2/es2_info.c b/src/egl/opengles2/es2_info.c
new file mode 120000
index 0000000..bde3140
--- /dev/null
+++ b/src/egl/opengles2/es2_info.c
@@ -0,0 +1 @@
+../opengles1/es1_info.c
\ No newline at end of file
--
1.7.4.1
Reply to: