--nextPart15213499.CB4vzlI1Ek
Content-Type: text/plain
Content-Transfer-Encoding: 7Bit

The audiocd kioslave FLAC plugin doesn't currently build with a libFLAC 
newer than 1.1.2, due to API changes.  Given libFLAC is now up to 
1.2.1, this isn't very good.

The attached patch adds support for libFLAC > 1.1.2 (while retaining 
support for 1.1.2).

I tried asking on kde-multimedia, and got no reply for or against (it's v. low traffic, so I guess not many subscribers).  cartman (on IRC) suggested I try here.

Should I apply this, and if so should it go into branch?

Alex
--nextPart15213499.CB4vzlI1Ek
Content-Type: text/x-diff; name="flac.diff"
Content-Transfer-Encoding: base64

SW5kZXg6IGtkZWxpYnMvY21ha2UvbW9kdWxlcy9GaW5kRmxhYy5jbWFrZQo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
LSBrZGVsaWJzL2NtYWtlL21vZHVsZXMvRmluZEZsYWMuY21ha2UJKHJldmlzaW9uIDc0OTk2MCkK
KysrIGtkZWxpYnMvY21ha2UvbW9kdWxlcy9GaW5kRmxhYy5jbWFrZQkod29ya2luZyBjb3B5KQpA
QCAtNSw2ICs1LDkgQEAKICMgIEZMQUNfSU5DTFVERV9ESVIgLSB0aGUgRmxhYyBpbmNsdWRlIGRp
cmVjdG9yeQogIyAgRkxBQ19MSUJSQVJJRVMgLSBMaW5rIHRoZXNlIHRvIHVzZSBGbGFjCiAjICBG
TEFDX09HR0ZMQUNfTElCUkFSSUVTIC0gTGluayB0aGVzZSB0byB1c2UgT2dnRmxhYworIworIyBO
byB2ZXJzaW9uIGNoZWNraW5nIGlzIGRvbmUgLSB1c2UgRkxBQ19BUElfVkVSU0lPTl9DVVJSRU5U
IHRvCisjIGNvbmRpdGlvbmFsbHkgY29tcGlsZSB2ZXJzaW9uLWRlcGVuZGVudCBjb2RlCiAKICMg
Q29weXJpZ2h0IChjKSAyMDA2LCBMYXVyZW50IE1vbnRlbCwgPG1vbnRlbEBrZGUub3JnPgogIyBD
b3B5cmlnaHQgKGMpIDIwMDYsIEFsZXhhbmRlciBOZXVuZG9yZiwgPG5ldW5kb3JmQGtkZS5vcmc+
CkBAIC0yMywxOCArMjYsMTYgQEAgRklORF9MSUJSQVJZKEZMQUNfTElCUkFSSUVTIE5BTUVTIEZM
QUMgKQogCiBGSU5EX0xJQlJBUlkoRkxBQ19PR0dfTElCUkFSWSBOQU1FUyBPZ2dGTEFDKQogCi1j
aGVja19saWJyYXJ5X2V4aXN0cyhGTEFDIEZMQUNfX3N0cmVhbV9lbmNvZGVyX3NldF93cml0ZV9j
YWxsYmFjayAiIiBIQVZFX1NUUkVBTV9FTkNPREVSX1dSSVRFX0NBTExCQUNLKQotCiAKIAotSUYo
RkxBQ19JTkNMVURFX0RJUiBBTkQgRkxBQ19MSUJSQVJJRVMgQU5EIEhBVkVfU1RSRUFNX0VOQ09E
RVJfV1JJVEVfQ0FMTEJBQ0spCitJRihGTEFDX0lOQ0xVREVfRElSIEFORCBGTEFDX0xJQlJBUklF
UykKICAgIFNFVChGTEFDX0ZPVU5EIFRSVUUpCiAgICBJRiAoRkxBQ19PR0dfTElCUkFSWSkKICAg
ICAgIFNFVChGTEFDX09HR0ZMQUNfTElCUkFSSUVTICR7RkxBQ19PR0dfTElCUkFSWX0gJHtGTEFD
X0xJQlJBUklFU30pCiAgICBFTkRJRiAoRkxBQ19PR0dfTElCUkFSWSkKLUVMU0UoRkxBQ19JTkNM
VURFX0RJUiBBTkQgRkxBQ19MSUJSQVJJRVMgQU5EIEhBVkVfU1RSRUFNX0VOQ09ERVJfV1JJVEVf
Q0FMTEJBQ0spCitFTFNFKEZMQUNfSU5DTFVERV9ESVIgQU5EIEZMQUNfTElCUkFSSUVTKQogICAg
U0VUKEZMQUNfRk9VTkQgRkFMU0UpCi1FTkRJRihGTEFDX0lOQ0xVREVfRElSIEFORCBGTEFDX0xJ
QlJBUklFUyBBTkQgSEFWRV9TVFJFQU1fRU5DT0RFUl9XUklURV9DQUxMQkFDSykKK0VORElGKEZM
QUNfSU5DTFVERV9ESVIgQU5EIEZMQUNfTElCUkFSSUVTKQogCiBJRihGTEFDX0ZPVU5EKQogICAg
SUYoTk9UIEZsYWNfRklORF9RVUlFVExZKQpJbmRleDoga2RlbXVsdGltZWRpYS9raW9zbGF2ZS9h
dWRpb2NkL3BsdWdpbnMvZmxhYy9lbmNvZGVyZmxhYy5jcHAKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga2RlbXVs
dGltZWRpYS9raW9zbGF2ZS9hdWRpb2NkL3BsdWdpbnMvZmxhYy9lbmNvZGVyZmxhYy5jcHAJKHJl
dmlzaW9uIDc0OTk5NykKKysrIGtkZW11bHRpbWVkaWEva2lvc2xhdmUvYXVkaW9jZC9wbHVnaW5z
L2ZsYWMvZW5jb2RlcmZsYWMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OCw3ICs0OCwxNiBAQCBw
dWJsaWM6CiAgICAgdW5zaWduZWQgbG9uZyBkYXRhOwogfTsKIAotc3RhdGljIEZMQUNfX1N0cmVh
bUVuY29kZXJXcml0ZVN0YXR1cyBXcml0ZUNhbGxiYWNrKGNvbnN0IEZMQUNfX1N0cmVhbUVuY29k
ZXIgKmVuY29kZXIsIGNvbnN0IEZMQUNfX2J5dGUgYnVmZmVyW10sIHVuc2lnbmVkIGJ5dGVzLCB1
bnNpZ25lZCBzYW1wbGVzLCB1bnNpZ25lZCBjdXJyZW50X2ZyYW1lLCB2b2lkICpjbGllbnRfZGF0
YSkKK3N0YXRpYyBGTEFDX19TdHJlYW1FbmNvZGVyV3JpdGVTdGF0dXMgV3JpdGVDYWxsYmFjayhj
b25zdCBGTEFDX19TdHJlYW1FbmNvZGVyICplbmNvZGVyLAorICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEZMQUNfX2J5dGUgYnVmZmVyW10s
CisjaWYgIWRlZmluZWQoRkxBQ19BUElfVkVSU0lPTl9DVVJSRU5UKSB8fCBGTEFDX0FQSV9WRVJT
SU9OX0NVUlJFTlQgPD0gNworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgIHVuc2lnbmVkIGJ5dGVzLAorI2Vsc2UKKyAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzaXplX3QgYnl0ZXMsCisjZW5kaWYKKyAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25l
ZCBzYW1wbGVzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgIHVuc2lnbmVkIGN1cnJlbnRfZnJhbWUsCisgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAqY2xpZW50X2RhdGEpCiB7CiAgICAgRW5j
b2RlckZMQUM6OlByaXZhdGUgKmQgPSAoRW5jb2RlckZMQUM6OlByaXZhdGUqKWNsaWVudF9kYXRh
OwogCkBAIC0xMTAsOSArMTE5LDExIEBAIHVuc2lnbmVkIGxvbmcgRW5jb2RlckZMQUM6OnNpemUo
bG9uZyB0aW0KIGxvbmcgRW5jb2RlckZMQUM6OnJlYWRJbml0KGxvbmcgc2l6ZSkgewogICAgIGtE
ZWJ1Zyg3MTE3KSA8PCAiRW5jb2RlckZMQUM6OnJlYWRJbml0KCkgY2FsbGVkIjsKICAgICBkLT5k
YXRhID0gMDsKKyNpZiAhZGVmaW5lZChGTEFDX0FQSV9WRVJTSU9OX0NVUlJFTlQpIHx8IEZMQUNf
QVBJX1ZFUlNJT05fQ1VSUkVOVCA8PSA3CiAgICAgRkxBQ19fc3RyZWFtX2VuY29kZXJfc2V0X3dy
aXRlX2NhbGxiYWNrKGQtPmVuY29kZXIsIFdyaXRlQ2FsbGJhY2spOwogICAgIEZMQUNfX3N0cmVh
bV9lbmNvZGVyX3NldF9tZXRhZGF0YV9jYWxsYmFjayhkLT5lbmNvZGVyLCBNZXRhZGF0YUNhbGxi
YWNrKTsKICAgICBGTEFDX19zdHJlYW1fZW5jb2Rlcl9zZXRfY2xpZW50X2RhdGEoZC0+ZW5jb2Rl
ciwgZCk7CisjZW5kaWYKIAogICAgIC8vIFRoZSBvcHRpb25zIG1hdGNoIGFwcHJveGltZWx5IHRo
b3NlIG9mIGZsYWMgY29tcHJlc3Npb24tbGV2ZWwtMwogICAgIEZMQUNfX3N0cmVhbV9lbmNvZGVy
X3NldF9kb19taWRfc2lkZV9zdGVyZW8oZC0+ZW5jb2RlciwgdHJ1ZSk7CkBAIC0xMjUsNyArMTM2
LDExIEBAIGxvbmcgRW5jb2RlckZMQUM6OnJlYWRJbml0KGxvbmcgc2l6ZSkgewogICAgIGlmIChz
aXplID4gMCkKICAgICAgICAgRkxBQ19fc3RyZWFtX2VuY29kZXJfc2V0X3RvdGFsX3NhbXBsZXNf
ZXN0aW1hdGUoZC0+ZW5jb2Rlciwgc2l6ZS80KTsKIAorI2lmICFkZWZpbmVkKEZMQUNfQVBJX1ZF
UlNJT05fQ1VSUkVOVCkgfHwgRkxBQ19BUElfVkVSU0lPTl9DVVJSRU5UIDw9IDcKICAgICBGTEFD
X19zdHJlYW1fZW5jb2Rlcl9pbml0KGQtPmVuY29kZXIpOworI2Vsc2UKKyAgICBGTEFDX19zdHJl
YW1fZW5jb2Rlcl9pbml0X3N0cmVhbShkLT5lbmNvZGVyLCBXcml0ZUNhbGxiYWNrLCBOVUxMLCBO
VUxMLCBNZXRhZGF0YUNhbGxiYWNrLCBkKTsKKyNlbmRpZgogICAgIHJldHVybiBkLT5kYXRhOwog
fQogCg==


--nextPart15213499.CB4vzlI1Ek
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Kde-buildsystem mailing list
Kde-buildsystem@kde.org
https://mail.kde.org/mailman/listinfo/kde-buildsystem

--nextPart15213499.CB4vzlI1Ek--