Merge lp:~kphillisjr/piglit/debian-packaging into lp:~xorg-edgers/piglit/debian-packaging

Proposed by Ken Phillis Jr
Status: Merged
Merged at revision: 22
Proposed branch: lp:~kphillisjr/piglit/debian-packaging
Merge into: lp:~xorg-edgers/piglit/debian-packaging
Diff against target: 26 lines (+4/-1)
2 files modified
control (+3/-0)
rules (+1/-1)
To merge this branch: bzr merge lp:~kphillisjr/piglit/debian-packaging
Reviewer Review Type Date Requested Status
Ken Phillis Jr (community) Approve
Tormod Volden (community) Needs Fixing
Review via email:

Description of the change

Minor changes to build script to enable features that should be enabled due to libwaffle having the feature enabled. For details, see the following list on examples:
* OpenGL Using EGL Contexts with X11: ( this is in contrast to OpenGL using glx )
PIGLIT_PLATFORM=x11_egl /usr/share/piglit/tests/quick-driver.tests results/quick-driver

* OpenGL ES 2: /usr/share/piglit/tests/all_es2.tests results/all-es2

* OpenGL ES 1: /usr/share/piglit/tests/all_es1.tests results/all-es1

* EGL: /usr/share/piglit/tests/all_egl.tests results/all-egl

To post a comment you must log in.
Revision history for this message
Tormod Volden (tormodvolden) wrote :

Thanks, looks good! Did you already talk to Robert or Rico about this? Otherwise I will merge it in a few days.

review: Approve
Revision history for this message
Tormod Volden (tormodvolden) wrote :

I don't know if you talked to Rico but he applied it and apparently it broke the build <> (essentially "error: 'EGL_OPENGL_ES3_BIT_KHR' undeclared") so he reverted it. I don't know if some code is too old or if more dependencies need adding.

review: Needs Fixing
Revision history for this message
Ken Phillis Jr (kphillisjr) wrote :

I know that this is a combination of things that was brought on by the fact that the package was not built with this enabled in the first pace... Anyways, here's a break down...

Part 1) Major changes in piglit that where added in the last week that would have triggered a build failure 3 days ago if you had this enabled originally... - egl-create-context-verify-gl-flavor: Test GLES3

Part 2) Outdated headers. - Mesa git repository - egl: Import eglext.h revision 19332

Part 3) Quick fix... just update the /usr/include/EGL/eglext.h with the latest one from the website since this works exactly like glext.

Revision history for this message
Ken Phillis Jr (kphillisjr) wrote :

I went ahead and made a small patch that should help with fixing this... see the following for details:

Revision history for this message
Ken Phillis Jr (kphillisjr) wrote :

Just a small update. There's a patch to address this issue that will be released soon into the main piglit tree... details can be found at....

Revision history for this message
Ken Phillis Jr (kphillisjr) wrote :

there should be no major build problems with piglit now seeing as how the two main fixes for egl are now in the main tree for piglit....

egl: Fix typo in previous commit

egl_khr_create_context: Fix build error with old eglext.h

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'control'
2--- control 2012-10-11 16:29:50 +0000
3+++ control 2012-11-22 04:25:22 +0000
4@@ -11,6 +11,9 @@
5 libpng-dev,
6 python-numpy,
7 libgl1-mesa-dev,
8+ libegl1-mesa-dev,
9+ libgles1-mesa-dev,
10+ libgles2-mesa-dev,
11 libxrender-dev,
12 libwaffle-1-dev,
13 x11proto-gl-dev,
15=== modified file 'rules'
16--- rules 2012-08-08 21:59:56 +0000
17+++ rules 2012-11-22 04:25:22 +0000
18@@ -10,7 +10,7 @@
19 #export DH_VERBOSE=1
21 override_dh_auto_configure:
22- dh_auto_configure -- -DCMAKE_SKIP_RPATH=true
25 %:
26 dh $@ --builddirectory=build/


People subscribed via source and target branches