157752 2006-12-10 11:44 0000 media-sound/amarok-1.4.4-r2 device mtp support: errors with non-ASCII text 2006-12-22 08:06:44 0000 1 1 1 Unclassified Gentoo Linux Applications unspecified x86 Linux RESOLVED FIXED http://bugs.kde.org/show_bug.cgi?id=129801 P2 normal --- 1 grmcdorman@gmail.com flameeyes@gentoo.org sound@gentoo.org grmcdorman@gmail.com 2006-12-10 11:44:39 0000 When transferring tracks to a media device [MP3 player] with non-ASCII characters - i.e. characters outside of the 0-FF standard ASCII range - Amarok will either create incorrect strings or fail to transfer the affected file. Similarly, in the list of device tracks, strings containing these characters do not display correctly. For example, grmcdorman@gmail.com 2006-12-10 11:44:39 0000 When transferring tracks to a media device [MP3 player] with non-ASCII characters - i.e. characters outside of the 0-FF standard ASCII range - Amarok will either create incorrect strings or fail to transfer the affected file. Similarly, in the list of device tracks, strings containing these characters do not display correctly. For example, ç (c-cedilla) will display as ç (tilde-capital A, section). Tracks with 'é' in the resulting media device filename will not transfer at all. Inspecting the source, it looks like 'mtpmediadevice.cpp' is converting strings to UTF8 where Latin1, presumably, should be used. It is not immediately clear from the source where the reverse conversion would apply. The libmtp documentation does not specify which charset should be used, but it does appear that Latin1, not UTF8, should be used. The media device being used is a Creative Zen MicroPhoto. This applies to amarok 1.4.4 R2 ebuild. flameeyes@gentoo.org 2006-12-10 11:57:56 0000 Please report upstream. grmcdorman@gmail.com 2006-12-10 12:25:07 0000 FYI, I poked around in bugs.kde.org; this is apparently fixed in the amarok SVN repository (see, e.g, http://bugs.kde.org/show_bug.cgi?id=129801). I've generated a patch based on that and am trying it out now. If it works, I will not submit a bug to KDE (and will attach a patch here). grmcdorman@gmail.com 2006-12-10 12:42:46 0000 Created an attachment (id=103756) Backport of Amarok SVN fixes for MTP charset problems Confirmed: the current Amarok SVN does not have the issue, as per http://bugs.kde.org/show_bug.cgi?id=129801. The attached patch is a backport of the current SVN stream to 1.4.4. flameeyes@gentoo.org 2006-12-10 13:46:12 0000 Please just give me the SVN revision or attach the patch in unified format (diff -u). grmcdorman@gmail.com 2006-12-10 16:52:40 0000 Created an attachment (id=103768) Unified diff version of patch Sorry, I was not aware that patches were required in unified format. This is the full output of svn info on the file (unfortunately I'm not conversant with svn, so I don't know if this is what you need). If it's any help, I just checked out the svn tree today. Path: mtpmediadevice.cpp Name: mtpmediadevice.cpp URL: svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/amarok/src/mediadevice/mtp/mtpmediadevice.cpp Repository Root: svn://anonsvn.kde.org/home/kde Repository UUID: 283d02a7-25f6-0310-bc7c-ecb5cbfe19da Revision: 612302 Node Kind: file Schedule: normal Last Changed Author: kelk Last Changed Rev: 611972 Last Changed Date: 2006-12-10 01:02:33 -0500 (Sun, 10 Dec 2006) Text Last Updated: 2006-12-10 15:14:05 -0500 (Sun, 10 Dec 2006) Properties Last Updated: 2006-12-10 15:14:05 -0500 (Sun, 10 Dec 2006) Checksum: a2eab81e4e02b9ff89e691ab31fa627a flameeyes@gentoo.org 2006-12-19 04:51:33 0000 I was waiting for Luis to add libkarma to the tree to do just one bump adding this and Rio Karma support, but I'll just apply this tonight now. flameeyes@gentoo.org 2006-12-22 08:06:44 0000 Fixed now in -r3. 103756 2006-12-10 12:42 0000 Backport of Amarok SVN fixes for MTP charset problems patch text/plain KioqIGFtYXJvay0xLjQuNC9hbWFyb2svc3JjL21lZGlhZGV2aWNlL210cC9tdHBtZWRpYWRldmlj ZS5jcHAub3JpZwkyMDA2LTEwLTI2IDE2OjQwOjIwLjAwMDAwMDAwMCAtMDQwMAotLS0gYW1hcm9r LTEuNC40L2FtYXJvay9zcmMvbWVkaWFkZXZpY2UvbXRwL210cG1lZGlhZGV2aWNlLmNwcAkyMDA2 LTEyLTEwIDE1OjE4OjQ5LjAwMDAwMDAwMCAtMDUwMAoqKioqKioqKioqKioqKioKKioqIDMyMywz MzYgKioqKgogICAgICBkZWJ1ZygpIDw8ICJQYXJlbnQgaWQgOiAiIDw8IHBhcmVudF9pZCA8PCBl bmRsOwogIAogICAgICBtX2NyaXRpY2FsX211dGV4LmxvY2soKTsKISAgICAgZGVidWcoKSA8PCAi U2VuZGluZyB0cmFjay4uLiAiIDw8IGJ1bmRsZS51cmwoKS5wYXRoKCkudXRmOCgpIDw8IGVuZGw7 CiAgICAgIGludCByZXQgPSBMSUJNVFBfU2VuZF9UcmFja19Gcm9tX0ZpbGUoCiEgICAgICAgICBt X2RldmljZSwgYnVuZGxlLnVybCgpLnBhdGgoKS51dGY4KCksIHRyYWNrbWV0YSwKISAjaWZkZWYg TElCTVRQX0NBTExCQUNLUwohICAgICAgICAgcHJvZ3Jlc3NDYWxsYmFjaywgdGhpcywgcGFyZW50 X2lkICAvLyBjYWxsYmFja3Mgb25seSBpbiBsaWJtdHAgPj0gMC4wLjE1CiEgI2Vsc2UKISAgICAg ICAgIDAsIDAsIHBhcmVudF9pZAohICNlbmRpZgogICAgICApOwogICAgICBtX2NyaXRpY2FsX211 dGV4LnVubG9jaygpOwogIAotLS0gMzIzLDMzMiAtLS0tCiAgICAgIGRlYnVnKCkgPDwgIlBhcmVu dCBpZCA6ICIgPDwgcGFyZW50X2lkIDw8IGVuZGw7CiAgCiAgICAgIG1fY3JpdGljYWxfbXV0ZXgu bG9jaygpOwohICAgICBkZWJ1ZygpIDw8ICJTZW5kaW5nIHRyYWNrLi4uICIgPDwgYnVuZGxlLnVy bCgpLnBhdGgoKS5sYXRpbjEoKSA8PCBlbmRsOwogICAgICBpbnQgcmV0ID0gTElCTVRQX1NlbmRf VHJhY2tfRnJvbV9GaWxlKAohICAgICAgICAgbV9kZXZpY2UsIGJ1bmRsZS51cmwoKS5wYXRoKCku bGF0aW4xKCksIHRyYWNrbWV0YSwKISAgICAgICAgIHByb2dyZXNzQ2FsbGJhY2ssIHRoaXMsIHBh cmVudF9pZAogICAgICApOwogICAgICBtX2NyaXRpY2FsX211dGV4LnVubG9jaygpOwogIAoqKioq KioqKioqKioqKioKKioqIDEzMTksMTMyNSAqKioqCiAgICAgICAgICB3aGlsZSggcGxheWxpc3Rz ICE9IDAgKQogICAgICAgICAgewogICAgICAgICAgICAgIE10cE1lZGlhSXRlbSAqcGxheWxpc3Qg PSBuZXcgTXRwTWVkaWFJdGVtKCBtX3BsYXlsaXN0SXRlbSwgdGhpcyApOwohICAgICAgICAgICAg IHBsYXlsaXN0LT5zZXRUZXh0KCAwLCBwbGF5bGlzdHMtPm5hbWUgKTsKICAgICAgICAgICAgICBw bGF5bGlzdC0+c2V0VHlwZSggTWVkaWFJdGVtOjpQTEFZTElTVCApOwogICAgICAgICAgICAgIHBs YXlsaXN0LT5zZXRQbGF5bGlzdCggbmV3IE10cFBsYXlsaXN0KCkgKTsKICAgICAgICAgICAgICBw bGF5bGlzdC0+cGxheWxpc3QoKS0+c2V0SWQoIHBsYXlsaXN0cy0+cGxheWxpc3RfaWQgKTsKLS0t IDEzMTUsMTMyMSAtLS0tCiAgICAgICAgICB3aGlsZSggcGxheWxpc3RzICE9IDAgKQogICAgICAg ICAgewogICAgICAgICAgICAgIE10cE1lZGlhSXRlbSAqcGxheWxpc3QgPSBuZXcgTXRwTWVkaWFJ dGVtKCBtX3BsYXlsaXN0SXRlbSwgdGhpcyApOwohICAgICAgICAgICAgIHBsYXlsaXN0LT5zZXRU ZXh0KCAwLCBRU3RyaW5nOjpmcm9tVXRmOCggcGxheWxpc3RzLT5uYW1lICkgKTsKICAgICAgICAg ICAgICBwbGF5bGlzdC0+c2V0VHlwZSggTWVkaWFJdGVtOjpQTEFZTElTVCApOwogICAgICAgICAg ICAgIHBsYXlsaXN0LT5zZXRQbGF5bGlzdCggbmV3IE10cFBsYXlsaXN0KCkgKTsKICAgICAgICAg ICAgICBwbGF5bGlzdC0+cGxheWxpc3QoKS0+c2V0SWQoIHBsYXlsaXN0cy0+cGxheWxpc3RfaWQg KTsKKioqKioqKioqKioqKioqCioqKiAxMzcxLDEzODUgKioqKgogICAgICBNZXRhQnVuZGxlICpi dW5kbGUgPSBuZXcgTWV0YUJ1bmRsZSgpOwogIAogICAgICBpZiggdHJhY2stPmdlbnJlICE9IDAg KQohICAgICAgICAgYnVuZGxlLT5zZXRHZW5yZSggQXRvbWljU3RyaW5nKCBxc3RyZHVwKCB0cmFj ay0+Z2VucmUgKSApICk7CiAgICAgIGlmKCB0cmFjay0+YXJ0aXN0ICE9IDAgKQohICAgICAgICAg YnVuZGxlLT5zZXRBcnRpc3QoIEF0b21pY1N0cmluZyggcXN0cmR1cCggdHJhY2stPmFydGlzdCAp ICkgKTsKICAgICAgaWYoIHRyYWNrLT5hbGJ1bSAhPSAwICkKISAgICAgICAgIGJ1bmRsZS0+c2V0 QWxidW0oIEF0b21pY1N0cmluZyggcXN0cmR1cCggdHJhY2stPmFsYnVtICkgKSApOwogICAgICBp ZiggdHJhY2stPnRpdGxlICE9IDAgKQohICAgICAgICAgYnVuZGxlLT5zZXRUaXRsZSggQXRvbWlj U3RyaW5nKCBxc3RyZHVwKCB0cmFjay0+dGl0bGUgKSApICk7CiAgICAgIGlmKCB0cmFjay0+Zmls ZW5hbWUgIT0gMCApCiEgICAgICAgICBidW5kbGUtPnNldFBhdGgoIEF0b21pY1N0cmluZyggcXN0 cmR1cCggdHJhY2stPmZpbGVuYW1lICkgKSApOwogIAogICAgICAvLyB0cmFuc2xhdGUgY29kZWNz IHRvIGZpbGUgdHlwZXMKICAgICAgaWYoIHRyYWNrLT5maWxldHlwZSA9PSBMSUJNVFBfRklMRVRZ UEVfTVAzICkKLS0tIDEzNjcsMTM4MSAtLS0tCiAgICAgIE1ldGFCdW5kbGUgKmJ1bmRsZSA9IG5l dyBNZXRhQnVuZGxlKCk7CiAgCiAgICAgIGlmKCB0cmFjay0+Z2VucmUgIT0gMCApCiEgICAgICAg ICBidW5kbGUtPnNldEdlbnJlKCBBdG9taWNTdHJpbmcoIFFTdHJpbmc6OmZyb21VdGY4KCB0cmFj ay0+Z2VucmUgKSApICk7CiAgICAgIGlmKCB0cmFjay0+YXJ0aXN0ICE9IDAgKQohICAgICAgICAg YnVuZGxlLT5zZXRBcnRpc3QoIEF0b21pY1N0cmluZyggUVN0cmluZzo6ZnJvbVV0ZjgoIHRyYWNr LT5hcnRpc3QgKSApICk7CiAgICAgIGlmKCB0cmFjay0+YWxidW0gIT0gMCApCiEgICAgICAgICBi dW5kbGUtPnNldEFsYnVtKCBBdG9taWNTdHJpbmcoIFFTdHJpbmc6OmZyb21VdGY4KCB0cmFjay0+ YWxidW0gKSApICk7CiAgICAgIGlmKCB0cmFjay0+dGl0bGUgIT0gMCApCiEgICAgICAgICBidW5k bGUtPnNldFRpdGxlKCBBdG9taWNTdHJpbmcoIFFTdHJpbmc6OmZyb21VdGY4KCB0cmFjay0+dGl0 bGUgKSApICk7CiAgICAgIGlmKCB0cmFjay0+ZmlsZW5hbWUgIT0gMCApCiEgICAgICAgICBidW5k bGUtPnNldFBhdGgoIEF0b21pY1N0cmluZyggUVN0cmluZzo6ZnJvbVV0ZjgoIHRyYWNrLT5maWxl bmFtZSApICkgKTsKICAKICAgICAgLy8gdHJhbnNsYXRlIGNvZGVjcyB0byBmaWxlIHR5cGVzCiAg ICAgIGlmKCB0cmFjay0+ZmlsZXR5cGUgPT0gTElCTVRQX0ZJTEVUWVBFX01QMyApCioqKioqKioq KioqKioqKgoqKiogMTM5MiwxMzk4ICoqKioKICAgICAgICAgIGJ1bmRsZS0+c2V0RmlsZVR5cGUo IE1ldGFCdW5kbGU6Om90aGVyICk7CiAgCiAgICAgIGlmKCB0cmFjay0+ZGF0ZSAhPSAwICkKISAg ICAgICAgIGJ1bmRsZS0+c2V0WWVhciggUVN0cmluZyggcXN0cmR1cCggdHJhY2stPmRhdGUgKSAp Lm1pZCggMCwgNCApLnRvVUludCgpICk7CiAgICAgIGlmKCB0cmFjay0+dHJhY2tudW1iZXIgPiAw ICkKICAgICAgICAgIGJ1bmRsZS0+c2V0VHJhY2soIHRyYWNrLT50cmFja251bWJlciApOwogICAg ICBpZiggdHJhY2stPmR1cmF0aW9uID4gMCApCi0tLSAxMzg4LDEzOTQgLS0tLQogICAgICAgICAg YnVuZGxlLT5zZXRGaWxlVHlwZSggTWV0YUJ1bmRsZTo6b3RoZXIgKTsKICAKICAgICAgaWYoIHRy YWNrLT5kYXRlICE9IDAgKQohICAgICAgICAgYnVuZGxlLT5zZXRZZWFyKCBRU3RyaW5nKCBRU3Ry aW5nOjpmcm9tVXRmOCggdHJhY2stPmRhdGUgKSApLm1pZCggMCwgNCApLnRvVUludCgpICk7CiAg ICAgIGlmKCB0cmFjay0+dHJhY2tudW1iZXIgPiAwICkKICAgICAgICAgIGJ1bmRsZS0+c2V0VHJh Y2soIHRyYWNrLT50cmFja251bWJlciApOwogICAgICBpZiggdHJhY2stPmR1cmF0aW9uID4gMCAp Cg== 103768 2006-12-10 16:52 0000 Unified diff version of patch patch text/plain LS0tIGFtYXJvay0xLjQuNC9hbWFyb2svc3JjL21lZGlhZGV2aWNlL210cC9tdHBtZWRpYWRldmlj ZS5jcHAub3JpZwkyMDA2LTEwLTI2IDE2OjQwOjIwLjAwMDAwMDAwMCAtMDQwMAorKysgYW1hcm9r LTEuNC40L2FtYXJvay9zcmMvbWVkaWFkZXZpY2UvbXRwL210cG1lZGlhZGV2aWNlLmNwcAkyMDA2 LTEyLTEwIDE1OjE4OjQ5LjAwMDAwMDAwMCAtMDUwMApAQCAtMzIzLDE0ICszMjMsMTAgQEAKICAg ICBkZWJ1ZygpIDw8ICJQYXJlbnQgaWQgOiAiIDw8IHBhcmVudF9pZCA8PCBlbmRsOwogCiAgICAg bV9jcml0aWNhbF9tdXRleC5sb2NrKCk7Ci0gICAgZGVidWcoKSA8PCAiU2VuZGluZyB0cmFjay4u LiAiIDw8IGJ1bmRsZS51cmwoKS5wYXRoKCkudXRmOCgpIDw8IGVuZGw7CisgICAgZGVidWcoKSA8 PCAiU2VuZGluZyB0cmFjay4uLiAiIDw8IGJ1bmRsZS51cmwoKS5wYXRoKCkubGF0aW4xKCkgPDwg ZW5kbDsKICAgICBpbnQgcmV0ID0gTElCTVRQX1NlbmRfVHJhY2tfRnJvbV9GaWxlKAotICAgICAg ICBtX2RldmljZSwgYnVuZGxlLnVybCgpLnBhdGgoKS51dGY4KCksIHRyYWNrbWV0YSwKLSNpZmRl ZiBMSUJNVFBfQ0FMTEJBQ0tTCi0gICAgICAgIHByb2dyZXNzQ2FsbGJhY2ssIHRoaXMsIHBhcmVu dF9pZCAgLy8gY2FsbGJhY2tzIG9ubHkgaW4gbGlibXRwID49IDAuMC4xNQotI2Vsc2UKLSAgICAg ICAgMCwgMCwgcGFyZW50X2lkCi0jZW5kaWYKKyAgICAgICAgbV9kZXZpY2UsIGJ1bmRsZS51cmwo KS5wYXRoKCkubGF0aW4xKCksIHRyYWNrbWV0YSwKKyAgICAgICAgcHJvZ3Jlc3NDYWxsYmFjaywg dGhpcywgcGFyZW50X2lkCiAgICAgKTsKICAgICBtX2NyaXRpY2FsX211dGV4LnVubG9jaygpOwog CkBAIC0xMzE5LDcgKzEzMTUsNyBAQAogICAgICAgICB3aGlsZSggcGxheWxpc3RzICE9IDAgKQog ICAgICAgICB7CiAgICAgICAgICAgICBNdHBNZWRpYUl0ZW0gKnBsYXlsaXN0ID0gbmV3IE10cE1l ZGlhSXRlbSggbV9wbGF5bGlzdEl0ZW0sIHRoaXMgKTsKLSAgICAgICAgICAgIHBsYXlsaXN0LT5z ZXRUZXh0KCAwLCBwbGF5bGlzdHMtPm5hbWUgKTsKKyAgICAgICAgICAgIHBsYXlsaXN0LT5zZXRU ZXh0KCAwLCBRU3RyaW5nOjpmcm9tVXRmOCggcGxheWxpc3RzLT5uYW1lICkgKTsKICAgICAgICAg ICAgIHBsYXlsaXN0LT5zZXRUeXBlKCBNZWRpYUl0ZW06OlBMQVlMSVNUICk7CiAgICAgICAgICAg ICBwbGF5bGlzdC0+c2V0UGxheWxpc3QoIG5ldyBNdHBQbGF5bGlzdCgpICk7CiAgICAgICAgICAg ICBwbGF5bGlzdC0+cGxheWxpc3QoKS0+c2V0SWQoIHBsYXlsaXN0cy0+cGxheWxpc3RfaWQgKTsK QEAgLTEzNzEsMTUgKzEzNjcsMTUgQEAKICAgICBNZXRhQnVuZGxlICpidW5kbGUgPSBuZXcgTWV0 YUJ1bmRsZSgpOwogCiAgICAgaWYoIHRyYWNrLT5nZW5yZSAhPSAwICkKLSAgICAgICAgYnVuZGxl LT5zZXRHZW5yZSggQXRvbWljU3RyaW5nKCBxc3RyZHVwKCB0cmFjay0+Z2VucmUgKSApICk7Cisg ICAgICAgIGJ1bmRsZS0+c2V0R2VucmUoIEF0b21pY1N0cmluZyggUVN0cmluZzo6ZnJvbVV0Zjgo IHRyYWNrLT5nZW5yZSApICkgKTsKICAgICBpZiggdHJhY2stPmFydGlzdCAhPSAwICkKLSAgICAg ICAgYnVuZGxlLT5zZXRBcnRpc3QoIEF0b21pY1N0cmluZyggcXN0cmR1cCggdHJhY2stPmFydGlz dCApICkgKTsKKyAgICAgICAgYnVuZGxlLT5zZXRBcnRpc3QoIEF0b21pY1N0cmluZyggUVN0cmlu Zzo6ZnJvbVV0ZjgoIHRyYWNrLT5hcnRpc3QgKSApICk7CiAgICAgaWYoIHRyYWNrLT5hbGJ1bSAh PSAwICkKLSAgICAgICAgYnVuZGxlLT5zZXRBbGJ1bSggQXRvbWljU3RyaW5nKCBxc3RyZHVwKCB0 cmFjay0+YWxidW0gKSApICk7CisgICAgICAgIGJ1bmRsZS0+c2V0QWxidW0oIEF0b21pY1N0cmlu ZyggUVN0cmluZzo6ZnJvbVV0ZjgoIHRyYWNrLT5hbGJ1bSApICkgKTsKICAgICBpZiggdHJhY2st PnRpdGxlICE9IDAgKQotICAgICAgICBidW5kbGUtPnNldFRpdGxlKCBBdG9taWNTdHJpbmcoIHFz dHJkdXAoIHRyYWNrLT50aXRsZSApICkgKTsKKyAgICAgICAgYnVuZGxlLT5zZXRUaXRsZSggQXRv bWljU3RyaW5nKCBRU3RyaW5nOjpmcm9tVXRmOCggdHJhY2stPnRpdGxlICkgKSApOwogICAgIGlm KCB0cmFjay0+ZmlsZW5hbWUgIT0gMCApCi0gICAgICAgIGJ1bmRsZS0+c2V0UGF0aCggQXRvbWlj U3RyaW5nKCBxc3RyZHVwKCB0cmFjay0+ZmlsZW5hbWUgKSApICk7CisgICAgICAgIGJ1bmRsZS0+ c2V0UGF0aCggQXRvbWljU3RyaW5nKCBRU3RyaW5nOjpmcm9tVXRmOCggdHJhY2stPmZpbGVuYW1l ICkgKSApOwogCiAgICAgLy8gdHJhbnNsYXRlIGNvZGVjcyB0byBmaWxlIHR5cGVzCiAgICAgaWYo IHRyYWNrLT5maWxldHlwZSA9PSBMSUJNVFBfRklMRVRZUEVfTVAzICkKQEAgLTEzOTIsNyArMTM4 OCw3IEBACiAgICAgICAgIGJ1bmRsZS0+c2V0RmlsZVR5cGUoIE1ldGFCdW5kbGU6Om90aGVyICk7 CiAKICAgICBpZiggdHJhY2stPmRhdGUgIT0gMCApCi0gICAgICAgIGJ1bmRsZS0+c2V0WWVhcigg UVN0cmluZyggcXN0cmR1cCggdHJhY2stPmRhdGUgKSApLm1pZCggMCwgNCApLnRvVUludCgpICk7 CisgICAgICAgIGJ1bmRsZS0+c2V0WWVhciggUVN0cmluZyggUVN0cmluZzo6ZnJvbVV0ZjgoIHRy YWNrLT5kYXRlICkgKS5taWQoIDAsIDQgKS50b1VJbnQoKSApOwogICAgIGlmKCB0cmFjay0+dHJh Y2tudW1iZXIgPiAwICkKICAgICAgICAgYnVuZGxlLT5zZXRUcmFjayggdHJhY2stPnRyYWNrbnVt YmVyICk7CiAgICAgaWYoIHRyYWNrLT5kdXJhdGlvbiA+IDAgKQo=