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

[Ken Phillis Jr]

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 piglit-run.py /usr/share/piglit/tests/quick-driver.tests results/quick-driver

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

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

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

[Tormod Volden (tormodvolden)]

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

review: Approve

[Tormod Volden (tormodvolden)]

I don't know if you talked to Rico but he applied it and apparently it broke the build <https://launchpadlibrarian.net/123732087/buildlog_ubuntu-raring-i386.piglit_1.0.0~git20121122.1103e66-0edgers~raring1_FAILEDTOBUILD.txt.gz> (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

[Ken Phillis Jr (kphillisjr)]

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...
Freedesktop.org - egl-create-context-verify-gl-flavor: Test GLES3
http://cgit.freedesktop.org/piglit/commit/?id=0b2ee04dafba1479518b8b6a6433351733ea997d

Part 2) Outdated headers.
Freedesktop.org - Mesa git repository - egl: Import eglext.h revision 19332
http://cgit.freedesktop.org/mesa/mesa/commit/include/EGL/eglext.h?id=d654afd89211f15a2d7ea4c7de66b9c7f5dc8ea1

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.
http://www.khronos.org/registry/egl/

[Ken Phillis Jr (kphillisjr)]

I went ahead and made a small patch that should help with fixing this... see the following for details:
http://bazaar.launchpad.net/~kphillisjr/piglit/trunk/revision/3391

[Ken Phillis Jr (kphillisjr)]

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....
http://lists.freedesktop.org/archives/piglit/2012-November/003910.html

[Ken Phillis Jr (kphillisjr)]

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
http://cgit.freedesktop.org/piglit/commit/?id=5cd8181f9724a5fd90f8a969a16235e31ae3f81d

egl_khr_create_context: Fix build error with old eglext.h
http://cgit.freedesktop.org/piglit/commit/?id=76e74cb6cb356e8796c536a604bea6418756f32d

review: Approve

=== modified file 'control'
--- control	2012-10-11 16:29:50 +0000
+++ control	2012-11-22 04:25:22 +0000
@@ -11,6 +11,9 @@
  libpng-dev,
  python-numpy,
  libgl1-mesa-dev,
+ libegl1-mesa-dev,
+ libgles1-mesa-dev,
+ libgles2-mesa-dev,
  libxrender-dev,
  libwaffle-1-dev,
  x11proto-gl-dev,

=== modified file 'rules'
--- rules	2012-08-08 21:59:56 +0000
+++ rules	2012-11-22 04:25:22 +0000
@@ -10,7 +10,7 @@
 #export DH_VERBOSE=1
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_SKIP_RPATH=true
+	dh_auto_configure -- -DCMAKE_SKIP_RPATH=true -DPIGLIT_BUILD_GLES1_TESTS=true -DPIGLIT_BUILD_GLES2_TESTS=true
 
 %:
 	dh  $@ --builddirectory=build/