[HOpenGL] Patches for HOpenGL-1.01

[Sven Panne]

This is a multi-part message in MIME format.
--------------090908020609020709090008
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Appended are a bunch of patches for HOpenGL-1.01 to catch up with the
latest changes in GLU and the CVS HEAD version of GHC. They provide
minimal fixes for the ubiquitous GLU versionitis and the current Haskell
library reorganization. People which are using only "official" GHCs and
don't have any problems with their GLU setup can happily ignore this
mail...

I don't really want to release Yet Another HOpenGL Version (tm) before a
new GHC is out, so this seems to be the easiest way to keep people on the
bleeding edge happy.

Cheers,
    S.

--------------090908020609020709090008
Content-Type: text/plain;
 name="HOpenGL-1.01.patch"
Content-Transfer-Encoding: base64
Content-Disposition: inline;
 filename="HOpenGL-1.01.patch"

ZGlmZiAtdSAtciBIT3BlbkdMLTEuMDEtb3JpZy9leGFtcGxlcy9taXNjL0JpdFNldC5ocyBI
T3BlbkdMLTEuMDEvZXhhbXBsZXMvbWlzYy9CaXRTZXQuaHMKLS0tIEhPcGVuR0wtMS4wMS1v
cmlnL2V4YW1wbGVzL21pc2MvQml0U2V0LmhzCUZyaSBKYW4gMTQgMTY6MDY6MjAgMjAwMAor
KysgSE9wZW5HTC0xLjAxL2V4YW1wbGVzL21pc2MvQml0U2V0LmhzCU1vbiBNYXIgIDQgMTc6
MzI6MDMgMjAwMgpAQCAtNywyNCArNywyNCBAQAogCiBpbXBvcnQgSXgocmFuZ2VTaXplKQog
aW1wb3J0IE1vbmFkKGxpZnRNKQotaW1wb3J0IElPRXh0cworaW1wb3J0IERhdGEuQXJyYXku
SU8KIAotbmV3dHlwZSBCaXRTZXQgPSBCaXRTZXQgKElPQXJyYXkgSW50IEJvb2wpCituZXd0
eXBlIEJpdFNldCA9IEJpdFNldCAoSU9VQXJyYXkgSW50IEJvb2wpCiAKIGVtcHR5QlMgOjog
SW50IC0+IElPIEJpdFNldAotZW1wdHlCUyBzaXplID0gbGlmdE0gQml0U2V0ICQgbmV3SU9B
cnJheSAoMCwgc2l6ZS0xKSBGYWxzZQorZW1wdHlCUyBzaXplID0gbGlmdE0gQml0U2V0ICQg
bmV3QXJyYXkgKDAsIHNpemUtMSkgRmFsc2UKIAogY2xlYXJCUyA6OiBCaXRTZXQgLT4gSW50
IC0+IElPICgpCi1jbGVhckJTIChCaXRTZXQgYnMpIGkgPSB3cml0ZUlPQXJyYXkgYnMgaSBG
YWxzZQorY2xlYXJCUyAoQml0U2V0IGJzKSBpID0gd3JpdGVBcnJheSBicyBpIEZhbHNlCiAK
IGNsZWFyQWxsQlMgOjogQml0U2V0IC0+IElPICgpCiBjbGVhckFsbEJTIGJzID0gbWFwTV8g
KGNsZWFyQlMgYnMpIFswIC4uIHNpemVCUyBicyAtIDFdCiAKIHNldEJTIDo6IEJpdFNldCAt
PiBJbnQgLT4gSU8gKCkKLXNldEJTIChCaXRTZXQgYnMpIGkgPSB3cml0ZUlPQXJyYXkgYnMg
aSBUcnVlCitzZXRCUyAoQml0U2V0IGJzKSBpID0gd3JpdGVBcnJheSBicyBpIFRydWUKIAog
aXNTZXRCUyA6OiBCaXRTZXQgLT4gSW50IC0+IElPIEJvb2wKLWlzU2V0QlMgKEJpdFNldCBi
cykgaSA9IHJlYWRJT0FycmF5IGJzIGkKK2lzU2V0QlMgKEJpdFNldCBicykgaSA9IHJlYWRB
cnJheSBicyBpCiAKIHNpemVCUyA6OiBCaXRTZXQgLT4gSW50Ci1zaXplQlMgKEJpdFNldCBi
cykgPSByYW5nZVNpemUgKGJvdW5kc0lPQXJyYXkgYnMpCitzaXplQlMgKEJpdFNldCBicykg
PSByYW5nZVNpemUgKGJvdW5kcyBicykKZGlmZiAtdSAtciBIT3BlbkdMLTEuMDEtb3JpZy9l
eGFtcGxlcy9taXNjL0ZQU0NvdW50ZXIuaHMgSE9wZW5HTC0xLjAxL2V4YW1wbGVzL21pc2Mv
RlBTQ291bnRlci5ocwotLS0gSE9wZW5HTC0xLjAxLW9yaWcvZXhhbXBsZXMvbWlzYy9GUFND
b3VudGVyLmhzCVR1ZSBNYXIgMTQgMTI6MDc6NDcgMjAwMAorKysgSE9wZW5HTC0xLjAxL2V4
YW1wbGVzL21pc2MvRlBTQ291bnRlci5ocwlNb24gTWFyICA0IDE3OjMzOjM2IDIwMDIKQEAg
LTksNiArOSw3IEBACiAKIGltcG9ydCBJT0V4dHMKIGltcG9ydCBUaW1lCitpbXBvcnQgRGF0
YS5BcnJheS5JTwogCiBkYXRhIEZQU0NvdW50ZXIgPQogICAgRlBTQ291bnRlciAoSU9SZWYg
SW50KSAgICAgICAgICAgICAgIC0tIDAtYmFzZWQgY291bnRlciBmb3IgYXZlcmFnaW5nCkBA
IC0yMCwxOCArMjEsMTggQEAKICAgIC0tIFRoZSBpbml0aWFsIHZhbHVlIGlzIGFzIHdyb25n
IGFzIGFueSBvdGhlciwgYnV0IGl0IGlzCiAgICAtLSBhdXRvbWF0aWNhbGx5IGNvcnJlY3Rl
ZCBhZnRlciBhIHdyYXAtYXJvdW5kLgogICAgY3QgPC0gZ2V0Q2xvY2tUaW1lCi0gICBlbGFw
c2VkVGltZXMgPC0gbmV3SU9BcnJheSAoMSwgbnVtVXBkYXRlcykgY3QKKyAgIGVsYXBzZWRU
aW1lcyA8LSBuZXdBcnJheSAoMSwgbnVtVXBkYXRlcykgY3QKICAgIHJldHVybiAkIEZQU0Nv
dW50ZXIgY291bnRlciBlbGFwc2VkVGltZXMKIAogZ2V0RlBTIDo6IEZQU0NvdW50ZXIgLT4g
SU8gRmxvYXQKIGdldEZQUyAoRlBTQ291bnRlciBjb3VudGVyIGVsYXBzZWRUaW1lcykgPSBk
bwotICAgbGV0IChsbywgaGkpICAgPSBib3VuZHNJT0FycmF5IGVsYXBzZWRUaW1lcworICAg
bGV0IChsbywgaGkpICAgPSBib3VuZHMgZWxhcHNlZFRpbWVzCiAgICAgICAgbnVtVXBkYXRl
cyA9IGhpIC0gbG8gKyAxCiAgICBjb3VudCA8LSByZWFkSU9SZWYgY291bnRlcgotICAgb2xk
RWxhcHNlZCA8LSByZWFkSU9BcnJheSBlbGFwc2VkVGltZXMgKGNvdW50ICsgbG8pCisgICBv
bGRFbGFwc2VkIDwtIHJlYWRBcnJheSBlbGFwc2VkVGltZXMgKGNvdW50ICsgbG8pCiAgICBu
ZXdFbGFwc2VkIDwtIGdldENsb2NrVGltZQogICAgd3JpdGVJT1JlZiBjb3VudGVyICgoY291
bnQgKyAxKSBgbW9kYCBudW1VcGRhdGVzKQotICAgd3JpdGVJT0FycmF5IGVsYXBzZWRUaW1l
cyAoY291bnQgKyBsbykgbmV3RWxhcHNlZAorICAgd3JpdGVBcnJheSBlbGFwc2VkVGltZXMg
KGNvdW50ICsgbG8pIG5ld0VsYXBzZWQKICAgIHJldHVybiAkIGZyb21JbnRlZ3JhbCBudW1V
cGRhdGVzIC8KICAgICAgICAgICAgIG1heCAodGltZURpZmZJblNlY3MgKGRpZmZDbG9ja1Rp
bWVzIG5ld0VsYXBzZWQgb2xkRWxhcHNlZCkpCiAgICAgICAgICAgICAgICAgMS4wZS00ICAg
LS0gc2FmZXR5CmRpZmYgLXUgLXIgSE9wZW5HTC0xLjAxLW9yaWcvZXhhbXBsZXMvbWlzYy9Q
YWNrTGliLmhzIEhPcGVuR0wtMS4wMS9leGFtcGxlcy9taXNjL1BhY2tMaWIuaHMKLS0tIEhP
cGVuR0wtMS4wMS1vcmlnL2V4YW1wbGVzL21pc2MvUGFja0xpYi5ocwlTdW4gSnVuIDExIDE2
OjQzOjQzIDIwMDAKKysrIEhPcGVuR0wtMS4wMS9leGFtcGxlcy9taXNjL1BhY2tMaWIuaHMJ
TW9uIE1hciAgNCAxNzoxODoyNCAyMDAyCkBAIC0xNyw3ICsxNyw3IEBACiBpbXBvcnQgTGlz
dChpc1ByZWZpeE9mLCBudWIpCiBpbXBvcnQgTW9uYWQobGlmdE0sIHdoZW4sIHVubGVzcykK
IGltcG9ydCBEaXJlY3RvcnkoZ2V0RGlyZWN0b3J5Q29udGVudHMpCi1pbXBvcnQgSU9FeHRz
KGhTZXRCaW5hcnlNb2RlKSAgIC0tIHNlZSBjb21tZW50IGluIGZyb250IG9mIG9wZW5CaW5h
cnlGaWxlCitpbXBvcnQgR0hDLkhhbmRsZShoU2V0QmluYXJ5TW9kZSkgICAtLSBzZWUgY29t
bWVudCBpbiBmcm9udCBvZiBvcGVuQmluYXJ5RmlsZQogCiB7LQogLS0gREVCVUdHSU5HIE9O
TFkKZGlmZiAtdSAtciBIT3BlbkdMLTEuMDEtb3JpZy9saWIvR0xVVF9DQkdsb2JhbC5nYy5p
biBIT3BlbkdMLTEuMDEvbGliL0dMVVRfQ0JHbG9iYWwuZ2MuaW4KLS0tIEhPcGVuR0wtMS4w
MS1vcmlnL2xpYi9HTFVUX0NCR2xvYmFsLmdjLmluCVRodSBNYXIgMTYgMTE6NTY6NDYgMjAw
MAorKysgSE9wZW5HTC0xLjAxL2xpYi9HTFVUX0NCR2xvYmFsLmdjLmluCU1vbiBNYXIgIDQg
MTY6Mjk6NDEgMjAwMgpAQCAtMjksNyArMjksNyBAQAogCiBpbXBvcnQgUHJlbHVkZSBoaWRp
bmcgKEVpdGhlcihMZWZ0KSkKIAotaW1wb3J0IElPRXh0cyhmaXhJTywgZnJlZUhhc2tlbGxG
dW5jdGlvblB0cikKK2ltcG9ydCBJT0V4dHMoZml4SU8pCiBpbXBvcnQgR0xfRElTCiBpbXBv
cnQgR0xfQmFzaWNUeXBlcyhXaW5kb3dQb3NpdGlvbiguLikpCiBpbXBvcnQgR0xVVF9DYWxs
YmFja1V0aWxzKEdsb2JhbENhbGxiYWNrKC4uKSwgZ0Z1bmMpCmRpZmYgLXUgLXIgSE9wZW5H
TC0xLjAxLW9yaWcvbGliL0dMVVRfQ2FsbGJhY2tVdGlscy5ocyBIT3BlbkdMLTEuMDEvbGli
L0dMVVRfQ2FsbGJhY2tVdGlscy5ocwotLS0gSE9wZW5HTC0xLjAxLW9yaWcvbGliL0dMVVRf
Q2FsbGJhY2tVdGlscy5ocwlXZWQgTWFyIDE1IDE0OjA1OjMzIDIwMDAKKysrIEhPcGVuR0wt
MS4wMS9saWIvR0xVVF9DYWxsYmFja1V0aWxzLmhzCU1vbiBNYXIgIDQgMTY6Mjk6NTMgMjAw
MgpAQCAtMjUsNyArMjUsNyBAQAogICAgR2xvYmFsQ2FsbGJhY2soLi4pLCAgICBnRnVuYwog
KSB3aGVyZQogCi1pbXBvcnQgSU9FeHRzKElPUmVmLCBuZXdJT1JlZiwgcmVhZElPUmVmLCB3
cml0ZUlPUmVmLCBmcmVlSGFza2VsbEZ1bmN0aW9uUHRyKQoraW1wb3J0IElPRXh0cyhJT1Jl
ZiwgbmV3SU9SZWYsIHJlYWRJT1JlZiwgd3JpdGVJT1JlZikKIGltcG9ydCBNYXliZShpc0p1
c3QpCiBpbXBvcnQgR0xfRElTCiBpbXBvcnQgR0xVVF9XaW5kb3coV2luZG93LCBnZXRXaW5k
b3cpCmRpZmYgLXUgLXIgSE9wZW5HTC0xLjAxLW9yaWcvbGliL0dMVVRfTWVudS5nYyBIT3Bl
bkdMLTEuMDEvbGliL0dMVVRfTWVudS5nYwotLS0gSE9wZW5HTC0xLjAxLW9yaWcvbGliL0dM
VVRfTWVudS5nYwlTdW4gT2N0IDI4IDE2OjE2OjMwIDIwMDEKKysrIEhPcGVuR0wtMS4wMS9s
aWIvR0xVVF9NZW51LmdjCU1vbiBNYXIgIDQgMTY6Mjk6MDkgMjAwMgpAQCAtMjcsNyArMjcs
NyBAQAogICAgTWVudUFjdGlvbiwgTWVudUl0ZW0oLi4pLCBhdHRhY2hNZW51CiApIHdoZXJl
CiAKLWltcG9ydCBJT0V4dHMoSU9SZWYsIG5ld0lPUmVmLCByZWFkSU9SZWYsIHdyaXRlSU9S
ZWYsIGZyZWVIYXNrZWxsRnVuY3Rpb25QdHIpCitpbXBvcnQgSU9FeHRzKElPUmVmLCBuZXdJ
T1JlZiwgcmVhZElPUmVmLCB3cml0ZUlPUmVmKQogaW1wb3J0IE1vbmFkKHVubGVzcykKIGlt
cG9ydCBHTF9ESVMKIGltcG9ydCBHTFVUX0NCV2luZG93KE1vdXNlQnV0dG9uLCBtYXJzaGFs
bF9Nb3VzZUJ1dHRvbikKZGlmZiAtdSAtciBIT3BlbkdMLTEuMDEtb3JpZy9saWIvR0xVX05V
UkJTLmdjLmluIEhPcGVuR0wtMS4wMS9saWIvR0xVX05VUkJTLmdjLmluCi0tLSBIT3BlbkdM
LTEuMDEtb3JpZy9saWIvR0xVX05VUkJTLmdjLmluCVRodSBOb3YgIDEgMTg6MDY6NTUgMjAw
MQorKysgSE9wZW5HTC0xLjAxL2xpYi9HTFVfTlVSQlMuZ2MuaW4JTW9uIE1hciAgNCAxNzow
MDoxNSAyMDAyCkBAIC0yMTIsNyArMjEyLDcgQEAKIAogQEdMVV8xXzNAJWVudW0gTnVyYnNN
b2RlIChFcSxPcmQpIEdMZmxvYXQgWwogQEdMVV8xXzNAJSAgIEdMVV9OVVJCU19SRU5ERVJF
UiwKLUBHTFVfMV8zQCUgICBHTFVfTlVSQlNfVEVTU0VMQVRPUgorQEdMVV8xXzNAJSAgIEdM
VV9OVVJCU19URVNTRUxMQVRPUgogQEdMVV8xXzNAJSBdCiAKIG51cmJzUHJvcGVydHkgOjog
TnVyYnNPYmogLT4gTnVyYnNQcm9wZXJ0eSAtPiBJTyAoKQpkaWZmIC11IC1yIEhPcGVuR0wt
MS4wMS1vcmlnL2xpYi9HTFVfUXVhZHJpY3MuZ2MgSE9wZW5HTC0xLjAxL2xpYi9HTFVfUXVh
ZHJpY3MuZ2MKLS0tIEhPcGVuR0wtMS4wMS1vcmlnL2xpYi9HTFVfUXVhZHJpY3MuZ2MJVGh1
IE5vdiAgMSAxODowNzozMSAyMDAxCisrKyBIT3BlbkdMLTEuMDEvbGliL0dMVV9RdWFkcmlj
cy5nYwlNb24gTWFyICA0IDE2OjI5OjE2IDIwMDIKQEAgLTMwLDcgKzMwLDcgQEAKICAgIHNw
aGVyZSwgY3lsaW5kZXIsIGRpc2ssIHBhcnRpYWxEaXNrCiApIHdoZXJlCiAKLWltcG9ydCBJ
T0V4dHMoZml4SU8sIElPUmVmLCBuZXdJT1JlZiwgcmVhZElPUmVmLCB3cml0ZUlPUmVmLCBm
cmVlSGFza2VsbEZ1bmN0aW9uUHRyKQoraW1wb3J0IElPRXh0cyhmaXhJTywgSU9SZWYsIG5l
d0lPUmVmLCByZWFkSU9SZWYsIHdyaXRlSU9SZWYpCiBpbXBvcnQgTW9uYWQod2hlbiwgdW5s
ZXNzKQogaW1wb3J0IEdMX0RJUwogaW1wb3J0IEdMX0Jhc2ljVHlwZXMoR0xkb3VibGUsIEdM
aW50LCBHTGVudW0sIEdMYm9vbGVhbiwgbWFyc2hhbGxfR0xib29sZWFuKQpkaWZmIC11IC1y
IEhPcGVuR0wtMS4wMS1vcmlnL2xpYi9HTF9FcnJvcnMuZ2MgSE9wZW5HTC0xLjAxL2xpYi9H
TF9FcnJvcnMuZ2MKLS0tIEhPcGVuR0wtMS4wMS1vcmlnL2xpYi9HTF9FcnJvcnMuZ2MJU3Vu
IE5vdiAxMSAxODozMTo1OSAyMDAxCisrKyBIT3BlbkdMLTEuMDEvbGliL0dMX0Vycm9ycy5n
YwlNb24gTWFyICA0IDE1OjMyOjE0IDIwMDIKQEAgLTUzLDcgKzUzLDcgQEAKICUgICBHTFVf
TlVSQlNfRVJST1IzMSwgICAgR0xVX05VUkJTX0VSUk9SMzIsICAgR0xVX05VUkJTX0VSUk9S
MzMsCiAlICAgR0xVX05VUkJTX0VSUk9SMzQsICAgIEdMVV9OVVJCU19FUlJPUjM1LCAgIEdM
VV9OVVJCU19FUlJPUjM2LAogJSAgIEdMVV9OVVJCU19FUlJPUjM3LCAgICBHTFVfSU5WQUxJ
RF9FTlVNLCAgICBHTFVfSU5WQUxJRF9WQUxVRSwKLSUgICBHTFVfT1VUX09GX01FTU9SWSwg
ICAgR0xVX0lOQ09NUEFUSUJMRV9HTF9WRVJTSU9OCislICAgR0xVX09VVF9PRl9NRU1PUlkK
ICUgXQogCiAtLSBTaWxseSBsaW5lLCBiZWNhdXNlIHNvbWUgR3JlZW4gQ2FyZCB2ZXJzaW9u
cyBzdHVtYmxlIG92ZXIgYSBkaXJlY3RpdmUgYXQgRU9GCmRpZmYgLXUgLXIgSE9wZW5HTC0x
LjAxLW9yaWcvbGliL0dMX0ZGSS5ocy5pbiBIT3BlbkdMLTEuMDEvbGliL0dMX0ZGSS5ocy5p
bgotLS0gSE9wZW5HTC0xLjAxLW9yaWcvbGliL0dMX0ZGSS5ocy5pbglTYXQgSnVsICA4IDIz
OjI3OjEwIDIwMDAKKysrIEhPcGVuR0wtMS4wMS9saWIvR0xfRkZJLmhzLmluCU1vbiBNYXIg
IDQgMTc6MDU6NDUgMjAwMgpAQCAtMTgsOCArMTgsMTQgQEAKIEZvdW5kYXRpb24sIEluYy4s
IDU5IFRlbXBsZSBQbGFjZSwgU3VpdGUgMzMwLCBCb3N0b24sIE1BICAwMjExMS0xMzA3ICBV
U0EKIC19CiAKLUBIQVNfU1RPUkFCTEVAbW9kdWxlIEdMX0ZGSSAoIG1vZHVsZSBGb3JlaWdu
ICkgd2hlcmUKK0BIQVNfU1RPUkFCTEVAbW9kdWxlIEdMX0ZGSSAoIG1vZHVsZSBGb3JlaWdu
LCBtb2R1bGUgQWRkciwgbW9kdWxlIEZvcmVpZ25PYmosCitASEFTX1NUT1JBQkxFQCAgICAg
ICAgICAgICAgICBmcmVlSGFza2VsbEZ1bmN0aW9uUHRyLCBtYWtlU3RhYmxlUHRyICkgd2hl
cmUKIEBIQVNfU1RPUkFCTEVAaW1wb3J0IEZvcmVpZ24KK0BIQVNfU1RPUkFCTEVAaW1wb3J0
IEFkZHIKK0BIQVNfU1RPUkFCTEVAaW1wb3J0IEZvcmVpZ25PYmoKK0BIQVNfU1RPUkFCTEVA
Zm9yZWlnbiBpbXBvcnQgImZyZWVIYXNrZWxsRnVuY3Rpb25QdHIiIHVuc2FmZQorQEhBU19T
VE9SQUJMRUAgICBmcmVlSGFza2VsbEZ1bmN0aW9uUHRyIDo6IEFkZHIgLT4gSU8gKCkKK0BI
QVNfU1RPUkFCTEVAbWFrZVN0YWJsZVB0ciA9IG5ld1N0YWJsZVB0cgogCiBASEFTX1NUT1JB
QkxFQCB7LQogbW9kdWxlIEdMX0ZGSSAoCg==
--------------090908020609020709090008--