2 builds issues with xine-lib 1.2.12 (and 1 patch)

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

Hi,

Thanks for the xine-lib release.

I have encountered some issues while building for older distros.

1/ libgcrypt is not detected on EL7 and EL8, which are respectively 
using libgcrypt 1.5.3 and 1.8.5.
Works with Fedora and EL9, which are using libgcrypt 1.9.3 or later.
It seems pkgconfig support was added in 1.9.3, so earlier version may 
need to be checked with a fallback to AM_PATH_LIBGCRYPT ?


2/ Build failure on EL7 with older libcaca 0.99.beta17.
This was introduced when adding compatibility with 0.99.beta20 in 
3f383e. Trivial patch attached.

video_out_caca.c: In function 'caca_update_frame_format':
video_out_caca.c:47:30: error: 'define' undeclared (first use in this 
function)
  #  define caca_create_dither define cucul_create_dither
                               ^
video_out_caca.c:183:23: note: in expansion of macro 'caca_create_dither'
      frame->pixmap_s = caca_create_dither (32, width, height, width * 4,
                        ^
video_out_caca.c:47:30: note: each undeclared identifier is reported 
only once for each function it appears in
  #  define caca_create_dither define cucul_create_dither
                               ^
video_out_caca.c:183:23: note: in expansion of macro 'caca_create_dither'
      frame->pixmap_s = caca_create_dither (32, width, height, width * 4,
                        ^
In file included from video_out_caca.c:40:0:
video_out_caca.c:47:37: error: expected ';' before 'caca_create_dither'
  #  define caca_create_dither define cucul_create_dither
                                      ^
video_out_caca.c:183:23: note: in expansion of macro 'caca_create_dither'
      frame->pixmap_s = caca_create_dither (32, width, height, width * 4,
                        ^
make[3]: *** [xineplug_vo_out_caca_la-video_out_caca.lo] Error 1


Regards,
Xavier

--------------rJFozzcOzP2x2CZ9DHDBK7nC
Content-Type: text/x-patch; charset=UTF-8;
 name="xine-lib-1.2.12-fix_older_libcaca.patch"
Content-Disposition: attachment;
 filename="xine-lib-1.2.12-fix_older_libcaca.patch"
Content-Transfer-Encoding: base64

IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIFhhdmllciBCYWNoZWxvdCA8eGF2aWVyQGJh
Y2hlbG90Lm9yZz4KIyBEYXRlIDE2NDY5MTY0NDYgLTM2MDAKIyAgICAgIFRodSBNYXIgMTAg
MTM6NDc6MjYgMjAyMiArMDEwMAojIE5vZGUgSUQgNjQ4ODA4NWY3NzhkZDgxMTU1NjJjYTMw
OGUyYTYwYjUwMjk1NGRmYwojIFBhcmVudCAgNDEyMTdkNjQ0MGQxZjUyNDc4MTgwZDdlNDc3
YWE3ZTdkZjk1MzUwNwpGaXggYnVpbGQgd2l0aCBvbGRlciBsaWJjYWNhCgpUaGlzIHdhcyBp
bnRyb2R1Y2VkIGluIDNmMzgzZQoKZGlmZiAtciA0MTIxN2Q2NDQwZDEgLXIgNjQ4ODA4NWY3
NzhkIHNyYy92aWRlb19vdXQvdmlkZW9fb3V0X2NhY2EuYwotLS0gYS9zcmMvdmlkZW9fb3V0
L3ZpZGVvX291dF9jYWNhLmMJV2VkIE1hciAwOSAxNToxMjoxNCAyMDIyICswMjAwCisrKyBi
L3NyYy92aWRlb19vdXQvdmlkZW9fb3V0X2NhY2EuYwlUaHUgTWFyIDEwIDEzOjQ3OjI2IDIw
MjIgKzAxMDAKQEAgLTQ0LDcgKzQ0LDcgQEAKICMgIGRlZmluZSBjYWNhX2dldF9jYW52YXNf
aGVpZ2h0IGN1Y3VsX2dldF9jYW52YXNfaGVpZ2h0CiAjICBkZWZpbmUgY2FjYV9mcmVlX2Nh
bnZhcyBjdWN1bF9mcmVlX2NhbnZhcwogIyAgZGVmaW5lIGNhY2FfZGl0aGVyX3QgY3VjdWxf
ZGl0aGVyX3QKLSMgIGRlZmluZSBjYWNhX2NyZWF0ZV9kaXRoZXIgZGVmaW5lIGN1Y3VsX2Ny
ZWF0ZV9kaXRoZXIKKyMgIGRlZmluZSBjYWNhX2NyZWF0ZV9kaXRoZXIgY3VjdWxfY3JlYXRl
X2RpdGhlcgogIyAgZGVmaW5lIGNhY2FfZGl0aGVyX2JpdG1hcCBjdWN1bF9kaXRoZXJfYml0
bWFwCiAjICBkZWZpbmUgY2FjYV9mcmVlX2RpdGhlciBjdWN1bF9mcmVlX2RpdGhlcgogI2Vu
ZGlmCg==

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


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

_______________________________________________
xine-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-devel

--------------rJFozzcOzP2x2CZ9DHDBK7nC--