diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-06-15 13:38:09 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-06-15 13:38:09 +0100 |
| commit | db70871b2044b9bfde346d6f4027dafb0a013c4c (patch) | |
| tree | 34548aee54e5458d3754bd8c8f987acdb5ee444c /media-tv/v4l-utils | |
| parent | 1c382dc5dbc52576ac2300fee0498af8af44e7b4 (diff) | |
gentoo auto-resync : 15:06:2023 - 13:38:09
Diffstat (limited to 'media-tv/v4l-utils')
| -rw-r--r-- | media-tv/v4l-utils/Manifest | 4 | ||||
| -rw-r--r-- | media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-include.patch | 11 | ||||
| -rw-r--r-- | media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-lfs.patch | 51 | ||||
| -rw-r--r-- | media-tv/v4l-utils/v4l-utils-1.24.1.ebuild | 5 |
4 files changed, 70 insertions, 1 deletions
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest index a59b2ed1f837..06bacca128f9 100644 --- a/media-tv/v4l-utils/Manifest +++ b/media-tv/v4l-utils/Manifest @@ -1,6 +1,8 @@ AUX v4l-utils-1.22.1-no-stack-protector-bpf.patch 1010 BLAKE2B aa8475fd643b1736fe3ad41c77d2debf0fe19f501d8edc56562d39d3dfabea7910e324fdab3951e6bb0a6cdb22bfaea002824189e0189bdec4d66a5b3feda470 SHA512 b0737955b566354b047b296822ed1ba0f573ebd1667d9455d6a08e5f839920f08a1e8b0d98f2515fa93f11ff7f22e5ed7044b8f96b632803260349a3a6e3cf67 +AUX v4l-utils-1.24.1-musl-include.patch 228 BLAKE2B 9eecd67c3687271c47e6a80ba2061d95f4167e52cb78213d9599cfa07f45fe396dd33d4c0ca6c910515d53f4755080c619e97cff1e907e29c9f72bab2c4b40d1 SHA512 f801227dac6735d811bc5d4b77150a3f0b1c661db0373848f60bbc6842d1f488f8baadc20dbb39c469ad09e151afcfa10421f35f4c0d185a67606246e5ec86e0 +AUX v4l-utils-1.24.1-musl-lfs.patch 1555 BLAKE2B 1aa5939aa02a3eb7a22a12f0a7db0b0c720eeeb07793099c86af39e6f014c0c7cf5ba97ed1fac1ca1acd9d2ef6d8b2fb531207b03a1c16df79e11fdabbde9d73 SHA512 228f14ea086ad88e5011a5c4518eb70c187cb829d8ea6be97e292e9b96018fe19690bf3ab26e248f1a5a691702027c01f629b75bbe59395104ca2af898bd6346 DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170 DIST v4l-utils-1.24.1.tar.bz2 2238340 BLAKE2B 1702918699d47b17467e012c2b1875c58851175c1007351a3b40d0b0fa40437eb695efa9e21afe3351f66780899d45798eef7f23c90a4831bface70a245b8a54 SHA512 1e82ba125285e875bf4a216adedab9147009e6af1aadd79a3a1770231d3c96ec29245b33e75f69a9ce1b25011e71746db242c778ac3369148de1e9de2e318663 EBUILD v4l-utils-1.22.1-r1.ebuild 2877 BLAKE2B 7733fd090122d2661d314ef6db9841913229166bfb4e13e92414e2c29ef23fb0f162d71f8c69182ea2b297a7dc9880e9f26643932fdfaa146afddfb64d77c738 SHA512 28bb40f504b770cf79785bc843625a0ffc075ba7235db65c257ec5cc2a41145e83b666fb7df68cd22a5c34f488db4d89b2a016ab32fe14a28189ce1d23269fc7 -EBUILD v4l-utils-1.24.1.ebuild 2814 BLAKE2B 7faecba082e76cc225f186c56e0c3c17ab56faca39608aa2f9fdc946cae70336b765188d411d560e4bded16b868724ee05f241a121a484a0ca82c719b793c120 SHA512 ba6254952e06ec72ddb9a9d44782a1d137249a320f150e24687309f4fa575c320ab8519599a043152a0dbd166752fb6dcdb593d66bc2b7a0437c10fe4eaeefe2 +EBUILD v4l-utils-1.24.1.ebuild 2909 BLAKE2B 4b71eefd91b37d32701d4fb3a9d3b72b040c1f42e2e0f31c91e5233da8fd81caaf20b9aaf6747d8c56f478072288fd00c8a9b9baae2ee0f5f7e2fa554af79f91 SHA512 9fe5c4467e60c9dd40a476a3e7b98202d4565cfc463a512191c5671bef68e593fe2ed19847c9feeb3f2798cb7d54dff7017270967037d83bac17fd82fe7fde8a MISC metadata.xml 323 BLAKE2B 79c864de29f9e92372f16bc835f1d260bc7de2c2c809c625806cc18611c50d992abc69de9b8754afa683fabd6a9422e4eb619d87490d4cf5ae1142f05af3557f SHA512 89ec71cc2961d7a6787e4d0e95c959823d1068602ea6cbeac7065ffe926e6c218ad7984c32271131e2624f49f314507cccf1a639e68e3669481d979dcc50bdc7 diff --git a/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-include.patch b/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-include.patch new file mode 100644 index 000000000000..8738f272aaed --- /dev/null +++ b/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-include.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/908380 +--- a/utils/common/media-info.h ++++ b/utils/common/media-info.h +@@ -5,6 +5,7 @@ + + #ifndef _MEDIA_INFO_H + #define _MEDIA_INFO_H ++#include <sys/types.h> + + enum media_type { + MEDIA_TYPE_CANT_STAT, diff --git a/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-lfs.patch b/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-lfs.patch new file mode 100644 index 000000000000..196b7430ca5c --- /dev/null +++ b/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-lfs.patch @@ -0,0 +1,51 @@ +https://git.linuxtv.org/v4l-utils.git/commit/?id=5d7d99cd11acaaa3bdcb290f92012005dca58b1e + +From 5d7d99cd11acaaa3bdcb290f92012005dca58b1e Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <ps.report@gmx.net> +Date: Fri, 31 Mar 2023 23:35:02 +0200 +Subject: v4l2-tracer: wrap open64/mmap64 functions only if linux && __GLIBC__ + +Wrap open64/mmap64 functions only if linux && __GLIBC__, as done +in lib/libv4l1/v4l1comapt.c and lib/libv4l2/v4l2convert.c since +commit 'libv4l: Wrap LFS64 functions only if linux && __GLIBC__' +(403a4e2697a1ff96fe2fa16589039595f21cadf0), should fix musl libc +compile. + +Signed-off-by: Peter Seiderer <ps.report@gmx.net> +Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> +--- a/utils/v4l2-tracer/libv4l2tracer.cpp ++++ b/utils/v4l2-tracer/libv4l2tracer.cpp +@@ -83,6 +83,7 @@ int open(const char *path, int oflag, ...) + return fd; + } + ++#if defined(linux) && defined(__GLIBC__) + int open64(const char *path, int oflag, ...) + { + errno = 0; +@@ -110,6 +111,7 @@ int open64(const char *path, int oflag, ...) + + return fd; + } ++#endif + + int close(int fd) + { +@@ -156,6 +158,7 @@ void *mmap(void *addr, size_t len, int prot, int flags, int fildes, off_t off) + return buf_address_pointer; + } + ++#if defined(linux) && defined(__GLIBC__) + void *mmap64(void *addr, size_t len, int prot, int flags, int fildes, off_t off) + { + errno = 0; +@@ -170,6 +173,7 @@ void *mmap64(void *addr, size_t len, int prot, int flags, int fildes, off_t off) + + return buf_address_pointer; + } ++#endif + + int munmap(void *start, size_t length) + { +-- +cgit v1.2.1 diff --git a/media-tv/v4l-utils/v4l-utils-1.24.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.24.1.ebuild index b04a84c6a468..3d4eaac93b9a 100644 --- a/media-tv/v4l-utils/v4l-utils-1.24.1.ebuild +++ b/media-tv/v4l-utils/v4l-utils-1.24.1.ebuild @@ -45,6 +45,11 @@ BDEPEND=" # Not really prebuilt but BPF objects make our QA checks go crazy. QA_PREBUILT="*/rc_keymaps/protocols/*.o" +PATCHES=( + "${FILESDIR}"/${PN}-1.24.1-musl-include.patch + "${FILESDIR}"/${P}-musl-lfs.patch +) + check_llvm() { if [[ ${MERGE_TYPE} != binary ]] && use bpf; then local clang=${ac_cv_prog_CLANG:-${CLANG:-clang}} |