mesa-demos: Changes to 'debian-unstable'
debian/changelog | 11 +++++++++++
debian/control | 26 +++++++++++++-------------
debian/es2_info.1 | 21 +++++++++++++++++++++
debian/es2gears.1 | 14 ++++++++++++++
debian/es2tri.1 | 14 ++++++++++++++
debian/install | 4 ----
debian/mesa-utils-extra.install | 4 ++++
debian/mesa-utils-extra.links | 1 +
debian/mesa-utils-extra.manpages | 3 +++
debian/mesa-utils.install | 4 ++++
src/egl/opengles2/es2_info.c | 1 +
11 files changed, 86 insertions(+), 17 deletions(-)
New commits:
commit 6b0479e9496f2091b1212e798545457ec4bba294
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Fri May 31 15:28:27 2013 -0400
Install es2gears_x11 and es2gears_screen
Also create an es2gears symlink pointing to es2gears_x11 for general usage.
Signed-off-by: Robert Hooker <robert.hooker@canonical.com>
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
diff --git a/debian/changelog b/debian/changelog
index 842243f..a4bb33a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ mesa-demos (8.1.0-1) UNRELEASED; urgency=low
* Add package mesa-utils-extra containing the EGL/GLES2 demos.
(Closes: #635764)
+ [ Robert Hooker ]
+ * Install es2gears_x11 and es2gears_screen, create es2gears symlink
+ pointing to es2gears_x11 for general usage.
+
-- Sven Joachim <svenjoac@gmx.de> Wed, 24 Apr 2013 17:48:21 +0200
mesa-demos (8.0.1-2) unstable; urgency=low
diff --git a/debian/mesa-utils-extra.install b/debian/mesa-utils-extra.install
index 4592e03..491aba4 100644
--- a/debian/mesa-utils-extra.install
+++ b/debian/mesa-utils-extra.install
@@ -1,3 +1,4 @@
usr/bin/es2_info
-usr/bin/es2gears
+usr/bin/es2gears_x11
+usr/bin/es2gears_screen
usr/bin/es2tri
diff --git a/debian/mesa-utils-extra.links b/debian/mesa-utils-extra.links
new file mode 100644
index 0000000..288bf06
--- /dev/null
+++ b/debian/mesa-utils-extra.links
@@ -0,0 +1 @@
+/usr/bin/es2gears_x11 /usr/bin/es2gears
commit d0606bd536c845bfe77adc69144e8b0cc3097014
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri May 31 15:24:47 2013 -0400
debian: Fix typo in es2_info manpage
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
diff --git a/debian/changelog b/debian/changelog
index 0d785f3..842243f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ mesa-demos (8.1.0-1) UNRELEASED; urgency=low
* New upstream release (Closes: #706022).
* Build-depend on libglew-dev rather than libglew1.5-dev.
+ [ Andreas Boll ]
+ * Fix typo in es2_info man page.
+
[ Riku Voipio ]
* Add package mesa-utils-extra containing the EGL/GLES2 demos.
(Closes: #635764)
diff --git a/debian/es2_info.1 b/debian/es2_info.1
index 43387d0..3c49331 100644
--- a/debian/es2_info.1
+++ b/debian/es2_info.1
@@ -15,7 +15,7 @@ Specify the X display to run on.
.B \-h
Print usage information.
.SH AUTHOR
-es2_info was written by Tunsgten Graphics.
+es2_info 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).
commit c9fe03209fd7911392769cdee9436e1621a206ab
Author: Riku Voipio <riku.voipio@iki.fi>
Date: Fri May 31 15:24:27 2013 -0400
debian: Add mesa-utils-extra package
Add a package with OpenGL ES 2.0 test applications
Package mostly from ubuntu.
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
diff --git a/debian/changelog b/debian/changelog
index 569cdc4..0d785f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ mesa-demos (8.1.0-1) UNRELEASED; urgency=low
* New upstream release (Closes: #706022).
* Build-depend on libglew-dev rather than libglew1.5-dev.
+ [ Riku Voipio ]
+ * Add package mesa-utils-extra containing the EGL/GLES2 demos.
+ (Closes: #635764)
+
-- Sven Joachim <svenjoac@gmx.de> Wed, 24 Apr 2013 17:48:21 +0200
mesa-demos (8.0.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6af6927..aa4992c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ Build-Depends: debhelper (>= 7.2.7),
libgl1-mesa-dev,
libglew-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/install b/debian/install
deleted file mode 100644
index 4d4d07e..0000000
--- a/debian/install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/glxdemo
-usr/bin/glxgears
-usr/bin/glxheads
-usr/bin/glxinfo
diff --git a/debian/mesa-utils-extra.install b/debian/mesa-utils-extra.install
new file mode 100644
index 0000000..4592e03
--- /dev/null
+++ b/debian/mesa-utils-extra.install
@@ -0,0 +1,3 @@
+usr/bin/es2_info
+usr/bin/es2gears
+usr/bin/es2tri
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/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
Reply to: