132945 2006-05-10 13:34 0000 dev-games/clanlib-0.6.5-r3 doesn't compile against dev-libs/DirectFB-0.9.25.1 2006-05-12 19:36:44 0000 1 1 1 Unclassified Gentoo Linux Games unspecified All Linux RESOLVED FIXED P2 normal --- 1 ferret@explodingferret.com games@gentoo.org castan.o@free.fr ferret@explodingferret.com 2006-05-10 13:34:24 0000 Compiling Sources/Display/System/Unix/directfb_target.cpp Sources/Display/System/Unix/display_target.h:19: warning: 'class CL_DisplayTarget' has virtual functions but non-virtual destructor Sources/Display/System/Unix/directfb_target.h:25: warning: 'class CL_DirectFBTarget' has virtual functions but non-virtual destructor Sources/Display/Input/DirectFB/keyboard_directfb.cpp: In member function 'int CL_DirectFBKeyboard::map_directfb_to_cl(DFBInputDeviceKeyIdentifier)': Sources/Display/Input/DirectFB/keyboard_directfb.cpp:246: error: 'DIKI_ALTGR' was not declared in this scope Sources/Display/Input/DirectFB/keyboard_directfb.cpp: In member function 'DFBInputDeviceKeyIdentifier CL_DirectFBKeyboard::map_cl_to_directfb(int)': Sources/Display/Input/DirectFB/keyboard_directfb.cpp:340: error: 'DIKI_ALTGR' was not declared in this scope Sources/Display/Display/Generic/displaycard_generic.h:100: warning: 'class CL_DisplayCard_Generic::CL_FlipDisplayCallback_Generic' has virtual functions but non-virtual destructor make: *** [Libs/Intermediate/keyboard_directfb.o] Error 1 haavardw@ifi.uio.no 2006-05-11 00:57:04 0000 Created an attachment (id=86592) clanlib-0.6.5-r3-directfb.patch The DIKI_ALTGR enum is removed in directfb-0.9.25. This patch checks for the directfb version before using DIKI_ALT_R instead as documented in the directfb release notes. ferret@explodingferret.com 2006-05-11 04:32:19 0000 Applied patch, works, looks good too (other than the logic assuming (correctly) that there wasn't ever a 0.8.25+, 0.7.25+, etc.)). Happy with this. :) haavardw@ifi.uio.no 2006-05-11 10:11:20 0000 Created an attachment (id=86614) clanlib-0.6.5-directfb.patch You are absolutely right (I should never submit quick fixes during coffee breaks at work). Here's my second attempt. vapier@gentoo.org 2006-05-11 20:57:13 0000 Created an attachment (id=86631) clanlib-0.6.5-DirectFB-update.patch still no good ... that patch would use DIKI_ALTGR for 0.10.1 try the attached instead ferret@explodingferret.com 2006-05-12 05:22:22 0000 typo in that patch; D_V should be DFB_V. Otherwise it compiles fine. vapier@gentoo.org 2006-05-12 19:36:44 0000 thanks for reviewing, now in portage 86592 2006-05-11 00:57 0000 clanlib-0.6.5-r3-directfb.patch clanlib-0.6.5-r3-directfb.patch text/plain LS0tIFNvdXJjZXMvRGlzcGxheS9JbnB1dC9EaXJlY3RGQi9rZXlib2FyZF9kaXJlY3RmYi5jcHB+ CTIwMDItMDYtMDcgMjE6MzY6MzMuMDAwMDAwMDAwICswMjAwCisrKyBTb3VyY2VzL0Rpc3BsYXkv SW5wdXQvRGlyZWN0RkIva2V5Ym9hcmRfZGlyZWN0ZmIuY3BwCTIwMDYtMDUtMTEgMDk6NTA6MDYu MzY1NDk0NjkzICswMjAwCkBAIC0xNyw2ICsxNyw3IEBACiAjaWZkZWYgVVNFX0RJUkVDVEZCCiAK ICNpbmNsdWRlIDxkaXJlY3RmYi5oPgorI2luY2x1ZGUgPGRpcmVjdGZiX3ZlcnNpb24uaD4KIAog I2luY2x1ZGUgPHN0ZGxpYi5oPgogI2luY2x1ZGUgPHN0ZGlvLmg+CkBAIC0yNDMsNyArMjQ0LDkg QEAKICAgICBjYXNlIERJS0lfU0hJRlRfUjogICAgIHJldHVybiBDTF9LRVlfUlNISUZUOwogICAg IGNhc2UgRElLSV9BTFRfTDogICAgICAgcmV0dXJuIENMX0tFWV9BTFQ7CiAgICAgY2FzZSBESUtJ X0FMVF9SOiAgICAgICByZXR1cm4gQ0xfS0VZX0FMVDsKKyNpZiBESVJFQ1RGQl9NQUpPUl9WRVJT SU9OID09IDAgJiYgRElSRUNURkJfTUlOT1JfVkVSU0lPTiA8PSA5ICYmIERJUkVDVEZCX01JQ1JP X1ZFUlNJT04gPCAyNQogICAgIGNhc2UgRElLSV9BTFRHUjogICAgICAgcmV0dXJuIENMX0tFWV9B TFRHUjsKKyNlbmRpZgogICAgIGNhc2UgRElLSV9UQUI6ICAgICAgICAgcmV0dXJuIENMX0tFWV9U QUI7CiAgICAgY2FzZSBESUtJX0VOVEVSOiAgICAgICByZXR1cm4gQ0xfS0VZX0VOVEVSOwogICAg IGNhc2UgRElLSV9TUEFDRTogICAgICAgcmV0dXJuIENMX0tFWV9TUEFDRTsKQEAgLTMzNyw3ICsz NDAsMTEgQEAKICAgICBjYXNlIENMX0tFWV9MU0hJRlQ6ICAgIHJldHVybiBESUtJX1NISUZUX0w7 CiAgICAgY2FzZSBDTF9LRVlfUlNISUZUOiAgICByZXR1cm4gRElLSV9TSElGVF9SOwogICAgIGNh c2UgQ0xfS0VZX0FMVDogICAgICAgcmV0dXJuIERJS0lfQUxUX0w7CisjaWYgRElSRUNURkJfTUFK T1JfVkVSU0lPTiA9PSAwICYmIERJUkVDVEZCX01JTk9SX1ZFUlNJT04gPD0gOSAmJiBESVJFQ1RG Ql9NSUNST19WRVJTSU9OIDwgMjUKICAgICBjYXNlIENMX0tFWV9BTFRHUjogICAgIHJldHVybiBE SUtJX0FMVEdSOworI2Vsc2UKKyAgICBjYXNlIENMX0tFWV9BTFRHUjogICAgIHJldHVybiBESUtJ X0FMVF9SOworI2VuZGlmCiAgICAgY2FzZSBDTF9LRVlfVEFCOiAgICAgICByZXR1cm4gRElLSV9U QUI7CiAgICAgY2FzZSBDTF9LRVlfRU5URVI6ICAgICByZXR1cm4gRElLSV9FTlRFUjsKICAgICBj YXNlIENMX0tFWV9TUEFDRTogICAgIHJldHVybiBESUtJX1NQQUNFOwo= 86614 2006-05-11 10:11 0000 clanlib-0.6.5-directfb.patch clanlib-0.6.5-directfb.patch text/plain LS0tIFNvdXJjZXMvRGlzcGxheS9JbnB1dC9EaXJlY3RGQi9rZXlib2FyZF9kaXJlY3RmYi5jcHB+ CTIwMDItMDYtMDcgMjE6MzY6MzMuMDAwMDAwMDAwICswMjAwCisrKyBTb3VyY2VzL0Rpc3BsYXkv SW5wdXQvRGlyZWN0RkIva2V5Ym9hcmRfZGlyZWN0ZmIuY3BwCTIwMDYtMDUtMTEgMDk6NTA6MDYu MzY1NDk0NjkzICswMjAwCkBAIC0xNyw2ICsxNyw3IEBACiAjaWZkZWYgVVNFX0RJUkVDVEZCCiAK ICNpbmNsdWRlIDxkaXJlY3RmYi5oPgorI2luY2x1ZGUgPGRpcmVjdGZiX3ZlcnNpb24uaD4KIAog I2luY2x1ZGUgPHN0ZGxpYi5oPgogI2luY2x1ZGUgPHN0ZGlvLmg+CkBAIC0yNDMsNyArMjQ0LDkg QEAKICAgICBjYXNlIERJS0lfU0hJRlRfUjogICAgIHJldHVybiBDTF9LRVlfUlNISUZUOwogICAg IGNhc2UgRElLSV9BTFRfTDogICAgICAgcmV0dXJuIENMX0tFWV9BTFQ7CiAgICAgY2FzZSBESUtJ X0FMVF9SOiAgICAgICByZXR1cm4gQ0xfS0VZX0FMVDsKKyNpZiBESVJFQ1RGQl9NQUpPUl9WRVJT SU9OID09IDAgJiYgKERJUkVDVEZCX01JTk9SX1ZFUlNJT04gPCA5IHx8IERJUkVDVEZCX01JQ1JP X1ZFUlNJT04gPCAyNSkKICAgICBjYXNlIERJS0lfQUxUR1I6ICAgICAgIHJldHVybiBDTF9LRVlf QUxUR1I7CisjZW5kaWYKICAgICBjYXNlIERJS0lfVEFCOiAgICAgICAgIHJldHVybiBDTF9LRVlf VEFCOwogICAgIGNhc2UgRElLSV9FTlRFUjogICAgICAgcmV0dXJuIENMX0tFWV9FTlRFUjsKICAg ICBjYXNlIERJS0lfU1BBQ0U6ICAgICAgIHJldHVybiBDTF9LRVlfU1BBQ0U7CkBAIC0zMzcsNyAr MzQwLDExIEBACiAgICAgY2FzZSBDTF9LRVlfTFNISUZUOiAgICByZXR1cm4gRElLSV9TSElGVF9M OwogICAgIGNhc2UgQ0xfS0VZX1JTSElGVDogICAgcmV0dXJuIERJS0lfU0hJRlRfUjsKICAgICBj YXNlIENMX0tFWV9BTFQ6ICAgICAgIHJldHVybiBESUtJX0FMVF9MOworI2lmIERJUkVDVEZCX01B Sk9SX1ZFUlNJT04gPT0gMCAmJiAoRElSRUNURkJfTUlOT1JfVkVSU0lPTiA8IDkgfHwgRElSRUNU RkJfTUlDUk9fVkVSU0lPTiA8IDI1KQogICAgIGNhc2UgQ0xfS0VZX0FMVEdSOiAgICAgcmV0dXJu IERJS0lfQUxUR1I7CisjZWxzZQorICAgIGNhc2UgQ0xfS0VZX0FMVEdSOiAgICAgcmV0dXJuIERJ S0lfQUxUX1I7CisjZW5kaWYKICAgICBjYXNlIENMX0tFWV9UQUI6ICAgICAgIHJldHVybiBESUtJ X1RBQjsKICAgICBjYXNlIENMX0tFWV9FTlRFUjogICAgIHJldHVybiBESUtJX0VOVEVSOwogICAg IGNhc2UgQ0xfS0VZX1NQQUNFOiAgICAgcmV0dXJuIERJS0lfU1BBQ0U7Cg== 86631 2006-05-11 20:57 0000 clanlib-0.6.5-DirectFB-update.patch clanlib-0.6.5-DirectFB-update.patch text/plain RGlyZWN0RkIgbm8gbG9uZ2VyIGRlZmluZXMgRFNQRl9SR0IxNSBzaW5jZSBpdCB3YXMgcmVhbGx5 IGp1c3QgYSAKZ2hldHRvIHNob3J0Y3V0IHRvIERTUEZfQVJHQjE1NTUuCgpodHRwOi8vYnVncy5n ZW50b28ub3JnLzc3MDM0Cmh0dHA6Ly93d3cuZGlyZWN0ZmIub3JnL2luZGV4LnBocC92aWV3Y3Zz LmNnaS9EaXJlY3RGQi9pbmNsdWRlL2RpcmVjdGZiLmguZGlmZj9yMT0xLjE5NCZyMj0xLjE5NQoK LS0tIENsYW5MaWItMC42LjUvU291cmNlcy9EaXNwbGF5L0Rpc3BsYXkvRGlyZWN0RkIvdGFyZ2V0 X2RpcmVjdGZiLmNwcAorKysgQ2xhbkxpYi0wLjYuNS9Tb3VyY2VzL0Rpc3BsYXkvRGlzcGxheS9E aXJlY3RGQi90YXJnZXRfZGlyZWN0ZmIuY3BwCkBAIC0xNDcsNyArMTQ3LDcgQEAKICAgICB7CiAg ICAgY2FzZSBEU1BGX0E4OgogICAgICAgcmV0dXJuIDA7Ci0gICAgY2FzZSBEU1BGX1JHQjE1Ogor ICAgIGNhc2UgRFNQRl9BUkdCMTU1NToKICAgICAgIHJldHVybiAweDAwN2MwMDsKICAgICBjYXNl IERTUEZfUkdCMTY6CiAgICAgICByZXR1cm4gMHgwMGY4MDA7CkBAIC0xNzAsNyArMTY4LDcgQEAK ICAgICB7CiAgICAgY2FzZSBEU1BGX0E4OgogICAgICAgcmV0dXJuIDA7Ci0gICAgY2FzZSBEU1BG X1JHQjE1OgorICAgIGNhc2UgRFNQRl9BUkdCMTU1NToKICAgICAgIHJldHVybiAweDAwMDNlMDsK ICAgICBjYXNlIERTUEZfUkdCMTY6CiAgICAgICByZXR1cm4gMHgwMDA3ZTA7CkBAIC0xOTMsNyAr MTg5LDcgQEAKICAgICB7CiAgICAgY2FzZSBEU1BGX0E4OgogICAgICAgcmV0dXJuIDA7Ci0gICAg Y2FzZSBEU1BGX1JHQjE1OgorICAgIGNhc2UgRFNQRl9BUkdCMTU1NToKICAgICBjYXNlIERTUEZf UkdCMTY6CiAgICAgICByZXR1cm4gMHgwMDAwMWY7CiAgICAgY2FzZSBEU1BGX1JHQjI0OgpAQCAt MjE1LDcgKzIxMCw3IEBACiAgICAgewogICAgIGNhc2UgRFNQRl9BODoKICAgICAgIHJldHVybiAw eGZmOwotICAgIGNhc2UgRFNQRl9SR0IxNToKKyAgICBjYXNlIERTUEZfQVJHQjE1NTU6CiAgICAg Y2FzZSBEU1BGX1JHQjE2OgogICAgIGNhc2UgRFNQRl9SR0IyNDoKICAgICBjYXNlIERTUEZfUkdC MzI6CgpUaGUgRElLSV9BTFRHUiBlbnVtIGhhcyBiZWVuIGN1dCBpbiBmYXZvciBvZiBqdXN0IHVz aW5nIERJS0lfQUxUX1IKCmh0dHA6Ly9idWdzLmdlbnRvby5vcmcvMTMyOTQ1CgotLS0gQ2xhbkxp Yi0wLjYuNS9Tb3VyY2VzL0Rpc3BsYXkvSW5wdXQvRGlyZWN0RkIva2V5Ym9hcmRfZGlyZWN0ZmIu Y3BwCisrKyBDbGFuTGliLTAuNi41L1NvdXJjZXMvRGlzcGxheS9JbnB1dC9EaXJlY3RGQi9rZXli b2FyZF9kaXJlY3RmYi5jcHAKQEAgLTE3LDYgKzE3LDkgQEAKICNpZmRlZiBVU0VfRElSRUNURkIK IAogI2luY2x1ZGUgPGRpcmVjdGZiLmg+CisjaW5jbHVkZSA8ZGlyZWN0ZmJfdmVyc2lvbi5oPgor I2RlZmluZSBERkJfVihhLGIsYykgKCgoYSkgPDwgMTYpICsgKChiKSA8PCA4KSArIChjKSkKKyNk ZWZpbmUgREZCX1ZFUlNJT04gREZCX1YoRElSRUNURkJfTUFKT1JfVkVSU0lPTiwgRElSRUNURkJf TUlOT1JfVkVSU0lPTiwgRElSRUNURkJfTUlDUk9fVkVSU0lPTikKIAogI2luY2x1ZGUgPHN0ZGxp Yi5oPgogI2luY2x1ZGUgPHN0ZGlvLmg+CkBAIC0yNDMsNyArMjQ0LDkgQEAKICAgICBjYXNlIERJ S0lfU0hJRlRfUjogICAgIHJldHVybiBDTF9LRVlfUlNISUZUOwogICAgIGNhc2UgRElLSV9BTFRf TDogICAgICAgcmV0dXJuIENMX0tFWV9BTFQ7CiAgICAgY2FzZSBESUtJX0FMVF9SOiAgICAgICBy ZXR1cm4gQ0xfS0VZX0FMVDsKKyNpZiBERkJfVkVSU0lPTiA8IERfVigwLDksMjUpCiAgICAgY2Fz ZSBESUtJX0FMVEdSOiAgICAgICByZXR1cm4gQ0xfS0VZX0FMVEdSOworI2VuZGlmCiAgICAgY2Fz ZSBESUtJX1RBQjogICAgICAgICByZXR1cm4gQ0xfS0VZX1RBQjsKICAgICBjYXNlIERJS0lfRU5U RVI6ICAgICAgIHJldHVybiBDTF9LRVlfRU5URVI7CiAgICAgY2FzZSBESUtJX1NQQUNFOiAgICAg ICByZXR1cm4gQ0xfS0VZX1NQQUNFOwpAQCAtMzM3LDcgKzM0MCwxMSBAQAogICAgIGNhc2UgQ0xf S0VZX0xTSElGVDogICAgcmV0dXJuIERJS0lfU0hJRlRfTDsKICAgICBjYXNlIENMX0tFWV9SU0hJ RlQ6ICAgIHJldHVybiBESUtJX1NISUZUX1I7CiAgICAgY2FzZSBDTF9LRVlfQUxUOiAgICAgICBy ZXR1cm4gRElLSV9BTFRfTDsKKyNpZiBERkJfVkVSU0lPTiA8IERfVigwLDksMjUpCiAgICAgY2Fz ZSBDTF9LRVlfQUxUR1I6ICAgICByZXR1cm4gRElLSV9BTFRHUjsKKyNlbHNlCisgICAgY2FzZSBD TF9LRVlfQUxUR1I6ICAgICByZXR1cm4gRElLSV9BTFRfUjsKKyNlbmRpZgogICAgIGNhc2UgQ0xf S0VZX1RBQjogICAgICAgcmV0dXJuIERJS0lfVEFCOwogICAgIGNhc2UgQ0xfS0VZX0VOVEVSOiAg ICAgcmV0dXJuIERJS0lfRU5URVI7CiAgICAgY2FzZSBDTF9LRVlfU1BBQ0U6ICAgICByZXR1cm4g RElLSV9TUEFDRTsK