Thu Nov 23 16:19:41 2023 UTC ()
alsa-lib: fix endianness patch for Solaris


(wiz)
diff -r1.38 -r1.39 pkgsrc/audio/alsa-lib/distinfo
diff -r1.10 -r1.11 pkgsrc/audio/alsa-lib/patches/patch-ae
cvs diff -r1.38 -r1.39 pkgsrc/audio/alsa-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/alsa-lib/distinfo 2023/11/23 16:15:04 1.38
+++ pkgsrc/audio/alsa-lib/distinfo 2023/11/23 16:19:41 1.39
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.38 2023/11/23 16:15:04 ryoon Exp $ 1$NetBSD: distinfo,v 1.39 2023/11/23 16:19:41 wiz Exp $
2 2
3BLAKE2s (alsa-lib-1.2.10.tar.bz2) = 25ee95e555f6dd9f790eefc6da792b0744f123a281327dc70d20cc3cffe5d80b 3BLAKE2s (alsa-lib-1.2.10.tar.bz2) = 25ee95e555f6dd9f790eefc6da792b0744f123a281327dc70d20cc3cffe5d80b
4SHA512 (alsa-lib-1.2.10.tar.bz2) = 4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939 4SHA512 (alsa-lib-1.2.10.tar.bz2) = 4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939
5Size (alsa-lib-1.2.10.tar.bz2) = 1107007 bytes 5Size (alsa-lib-1.2.10.tar.bz2) = 1107007 bytes
6SHA1 (patch-ad) = 79a0f048751899247ec12990cd02332b977af248 6SHA1 (patch-ad) = 79a0f048751899247ec12990cd02332b977af248
7SHA1 (patch-ae) = aa730a8e5b5ed9c12564e05937bfc81c94d53e91 7SHA1 (patch-ae) = e652f7c0230d6a22042fedd0f7c0189f68dc0984
8SHA1 (patch-af) = 257b06f10616c04c2724e30777b027e5e7e443f9 8SHA1 (patch-af) = 257b06f10616c04c2724e30777b027e5e7e443f9
9SHA1 (patch-ah) = 37079a0b99fba9bd16b2318c9a17359d9c4edb54 9SHA1 (patch-ah) = 37079a0b99fba9bd16b2318c9a17359d9c4edb54
10SHA1 (patch-aq) = 29fc896b2acad44e5fa9619aca1df5dddd76fa5e 10SHA1 (patch-aq) = 29fc896b2acad44e5fa9619aca1df5dddd76fa5e
11SHA1 (patch-bg) = b726769272dd214e67f2407ed5a0199189540557 11SHA1 (patch-bg) = b726769272dd214e67f2407ed5a0199189540557
12SHA1 (patch-bi) = 4c60911fe949b858abca9ebecdefc794b008b1c6 12SHA1 (patch-bi) = 4c60911fe949b858abca9ebecdefc794b008b1c6
13SHA1 (patch-bj) = 59f94d9b54386aa7d1a7edd7ec329211184a8c94 13SHA1 (patch-bj) = 59f94d9b54386aa7d1a7edd7ec329211184a8c94
14SHA1 (patch-configure.ac) = cc034d07eab13caa5ff8748e8eea37ae9dd367f5 14SHA1 (patch-configure.ac) = cc034d07eab13caa5ff8748e8eea37ae9dd367f5
15SHA1 (patch-include_error.h) = 9e92d4a51badda1d46305d1e5e36b8197788aa89 15SHA1 (patch-include_error.h) = 9e92d4a51badda1d46305d1e5e36b8197788aa89
16SHA1 (patch-include_output.h) = 0a073b53c40293aa7cfa250586c087084002eefe 16SHA1 (patch-include_output.h) = 0a073b53c40293aa7cfa250586c087084002eefe
17SHA1 (patch-include_sound_uapi_asound.h) = 051616bbbab3339d20818ddb40cde8502295a026 17SHA1 (patch-include_sound_uapi_asound.h) = 051616bbbab3339d20818ddb40cde8502295a026
18SHA1 (patch-src_conf.c) = 6f8887c2831de6fb2d58b098e6894278ee145560 18SHA1 (patch-src_conf.c) = 6f8887c2831de6fb2d58b098e6894278ee145560
19SHA1 (patch-src_conf_alsa.conf) = 1a3d2a0ce15b2f903095bc7103c7765fcd6270c0 19SHA1 (patch-src_conf_alsa.conf) = 1a3d2a0ce15b2f903095bc7103c7765fcd6270c0
20SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865 20SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865
cvs diff -r1.10 -r1.11 pkgsrc/audio/alsa-lib/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/audio/alsa-lib/patches/patch-ae 2023/11/23 16:15:04 1.10
+++ pkgsrc/audio/alsa-lib/patches/patch-ae 2023/11/23 16:19:41 1.11
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-ae,v 1.10 2023/11/23 16:15:04 ryoon Exp $ 1$NetBSD: patch-ae,v 1.11 2023/11/23 16:19:41 wiz Exp $
2 2
3 - Don't assert GNU ld on Solaris, where it might not be true. 3 - Don't assert GNU ld on Solaris, where it might not be true.
4 - Add endian compat. 4 - Add endian compat.
5 5
6--- include/local.h.orig 2023-05-04 07:16:16.000000000 +0000 6--- include/local.h.orig 2023-09-01 15:35:48.000000000 +0000
7+++ include/local.h 7+++ include/local.h
8@@ -45,6 +45,15 @@ 8@@ -34,6 +34,15 @@
9 #endif 9 #include <endian.h>
10 #ifndef __BIG_ENDIAN 10 #elif defined(HAVE_SYS_ENDIAN_H)
11 #define __BIG_ENDIAN BIG_ENDIAN 11 #include <sys/endian.h>
12+#elif defined(__sun) 12+#elif defined(__sun)
13+#include <sys/byteorder.h> 13+#include <sys/byteorder.h>
14+#define __LITTLE_ENDIAN 1234 14+#define __LITTLE_ENDIAN 1234
15+#define __BIG_ENDIAN 4321 15+#define __BIG_ENDIAN 4321
16+#ifdef _BIG_ENDIAN 16+#ifdef _BIG_ENDIAN
17+#define __BYTE_ORDER __BIG_ENDIAN 17+#define __BYTE_ORDER __BIG_ENDIAN
18+#else 18+#else
19+#define __BYTE_ORDER __LITTLE_ENDIAN 19+#define __BYTE_ORDER __LITTLE_ENDIAN
20+#endif 20+#endif
 21 #else
 22 #error Header defining endianness not defined
21 #endif 23 #endif
22 #include <stdarg.h> 24@@ -279,7 +288,9 @@ extern snd_lib_error_handler_t snd_err_m
23 #include <poll.h> 
24@@ -274,7 +283,9 @@ extern snd_lib_error_handler_t snd_err_m 
25  25
26 /* 26 /*
27 */ 27 */
28+#ifndef __sun 28+#ifndef __sun
29 #define HAVE_GNU_LD 29 #define HAVE_GNU_LD
30+#endif 30+#endif
31 #define HAVE_ELF 31 #define HAVE_ELF
32 #define HAVE_ASM_PREVIOUS_DIRECTIVE 32 #define HAVE_ASM_PREVIOUS_DIRECTIVE
33  33