mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-06 05:47:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

community/vlc: fix build with gcc 14

Browse Source 
Ref #16335
This commit is contained in:
Sertonix 2024-08-06 23:22:45 +02:00 committed by Natanael Copa
parent 2ed40a70f3
commit 61a6b18998
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
community/vlc/APKBUILD
View File

@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=vlc pkgname=vlc
pkgver=3.0.21 pkgver=3.0.21
pkgrel=1 pkgrel=2
pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player"
triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins"
pkgusers="vlc" pkgusers="vlc"
@ -106,6 +106,7 @@ source="https://download.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz
check-headless.patch check-headless.patch
disable-sub-autodetect-fuzzy-1-test.patch disable-sub-autodetect-fuzzy-1-test.patch
fribidi_allow_deprecated.patch fribidi_allow_deprecated.patch
musl-ioctl.patch
vlc.initd vlc.initd
vlc.confd vlc.confd
libplacebo-5.patch libplacebo-5.patch
@ -250,6 +251,7 @@ e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576d
22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch 22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch
e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch
8230a83306905cdda07fecdb6cb2b791196034775cc5c8986ab63e97cd3476317544011cbce92948059ac9f7b57ef450cd71820f0f134bc3ab3bed38463a67c3 fribidi_allow_deprecated.patch 8230a83306905cdda07fecdb6cb2b791196034775cc5c8986ab63e97cd3476317544011cbce92948059ac9f7b57ef450cd71820f0f134bc3ab3bed38463a67c3 fribidi_allow_deprecated.patch
a819e270ab4bc54e865057ae3656b710b2ff51e4f4c60c67c7fb296118ba0c83c1be62f1864d0cb9349db1718c44366fc28c6836eb0bc84f3154e18df9609134 musl-ioctl.patch
55e245190b443dde9c7215ea5210612fcca164900a9a4b025ccf0d1e3fc5206d00b52355b256974421e37c609875627f1db19f0f5a084511aec0daf677ecc9d6 vlc.initd 55e245190b443dde9c7215ea5210612fcca164900a9a4b025ccf0d1e3fc5206d00b52355b256974421e37c609875627f1db19f0f5a084511aec0daf677ecc9d6 vlc.initd
d89190dca1b8b2c3faca5863dc6c7e6eb24e05178e6f75ed752fd3c6a73cb8a42d2625b6e56453296b7096ea868be642ecd42745dac20e7f13fc67dd3c3c7c49 vlc.confd d89190dca1b8b2c3faca5863dc6c7e6eb24e05178e6f75ed752fd3c6a73cb8a42d2625b6e56453296b7096ea868be642ecd42745dac20e7f13fc67dd3c3c7c49 vlc.confd
a06b04a8b059dbbef77d27435bd5bec3c26f937390bd112b0843385587e866e617c3dd0e66f99eed5fa4a91bc5f0fd9b5623f65b2f2435a54456dde2aa96209b libplacebo-5.patch a06b04a8b059dbbef77d27435bd5bec3c26f937390bd112b0843385587e866e617c3dd0e66f99eed5fa4a91bc5f0fd9b5623f65b2f2435a54456dde2aa96209b libplacebo-5.patch

24
community/vlc/musl-ioctl.patch Normal file
View File

@ -0,0 +1,24 @@
musl libc has a different interface
--- a/modules/access/v4l2/lib.c
+++ b/modules/access/v4l2/lib.c
@@ -49,7 +49,7 @@ static int (*v4l2_fd_open_cb)(int, int) = fd_open;
//int (*v4l2_open) (const char *, int, ...) = open;
//int (*v4l2_dup) (const char *, int, ...) = dup;
int (*v4l2_close) (int) = close;
-int (*v4l2_ioctl) (int, unsigned long int, ...) = ioctl;
+int (*v4l2_ioctl) (int, int, ...) = ioctl;
ssize_t (*v4l2_read) (int, void *, size_t) = read;
//ssize_t (*v4l2_write) (int, const void *, size_t) = write;
void * (*v4l2_mmap) (void *, size_t, int, int, int, int64_t) = mmap;
--- a/modules/access/v4l2/v4l2.h
+++ b/modules/access/v4l2/v4l2.h
@@ -28,7 +28,7 @@
/* libv4l2 functions */
extern int v4l2_fd_open(int, int);
extern int (*v4l2_close) (int);
-extern int (*v4l2_ioctl) (int, unsigned long int, ...);
+extern int (*v4l2_ioctl) (int, int, ...);
extern ssize_t (*v4l2_read) (int, void *, size_t);
extern void * (*v4l2_mmap) (void *, size_t, int, int, int, int64_t);
extern int (*v4l2_munmap) (void *, size_t);