October 2024 - MPlayer-dev-eng - lists.mplayerhq.hu

[PATCH] Try to adapt to recent compilers such as GCC 14
by Lorenzo 08 Jan '25

08 Jan '25

Hi, with this patch applied it still fails[1] to build on i386 (Debian) for me, with mp_msg.c: In function 'filename_recode': mp_msg.c:73:29: error: passing argument 2 of 'iconv' from incompatible pointer type [-Wincompatible-pointer-types] 73 | if (iconv(inv_msgiconv, (const char **)&filename, &filename_len, | ^~~~~~~~~~~~~~~~~~~~~~~~ | | | const char ** In file included from mp_msg.c:29: /usr/include/iconv.h:49:54: note: expected 'char ** restrict' but argument is of type 'const char **' 49 | extern size_t iconv (iconv_t __cd, char **__restrict __inbuf, | ~~~~~~~~~~~~~~~~~~^~~~~~~ mp_msg.c: In function 'mp_msg_va': mp_msg.c:236:30: error: passing argument 2 of 'iconv' from incompatible pointer type [-Wincompatible-pointer-types] 236 | while (iconv(msgiconv, (const char **)&in, &inlen, &out, &outlen) == -1) { | ^~~~~~~~~~~~~~~~~~ | | | const char ** it also fails the same way on amd64, and it's a regression as with svn38660 it builds fine. Best Regards, Lorenzo [1]https://trac.mplayerhq.hu/ticket/2424

5 10

[PATCH] update the MIME type list in desktop file
by Lorenzo 19 Nov '24

19 Nov '24

Hello, Debian ships a desktop file with an updated list of MIME types; the list was derived from VLC but I cross check it against the list of SMplayer and they are roughly equivalent. Please consider to apply upstream, patch is attached Thanks, Lorenzo

2 1

[PATCH] Secure IPC perms
by Wladmis 19 Nov '24

19 Nov '24

From: "Vladimir D. Seleznev" <vseleznv(a)altlinux.org> shmget(2) is not subject of umask(2), so it's better to use more proper perms for it. --- MPlayer/gui/wm/ws.c | 2 +- MPlayer/libvo/vo_x11.c | 2 +- MPlayer/libvo/vo_xv.c | 2 +- MPlayer/libvo/vo_xvmc.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MPlayer/gui/wm/ws.c b/MPlayer/gui/wm/ws.c index b211db5959..474154fc3c 100644 --- a/MPlayer/gui/wm/ws.c +++ b/MPlayer/gui/wm/ws.c @@ -1357,7 +1357,7 @@ void wsImageCreate(wsWindow *win, int w, int h) mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); } - win->Shminfo.shmid = shmget(IPC_PRIVATE, win->xImage->bytes_per_line * win->xImage->height, IPC_CREAT | 0777); + win->Shminfo.shmid = shmget(IPC_PRIVATE, win->xImage->bytes_per_line * win->xImage->height, IPC_CREAT | 0600); if (win->Shminfo.shmid < 0) { XDestroyImage(win->xImage); diff --git a/MPlayer/libvo/vo_x11.c b/MPlayer/libvo/vo_x11.c index 58e1762de7..6b81980023 100644 --- a/MPlayer/libvo/vo_x11.c +++ b/MPlayer/libvo/vo_x11.c @@ -150,7 +150,7 @@ static void getMyXImage(void) } Shminfo[0].shmid = shmget(IPC_PRIVATE, myximage->bytes_per_line * - myximage->height, IPC_CREAT | 0777); + myximage->height, IPC_CREAT | 0600); if (Shminfo[0].shmid < 0) { XDestroyImage(myximage); diff --git a/MPlayer/libvo/vo_xv.c b/MPlayer/libvo/vo_xv.c index ebc1dbb23d..a3ec393e16 100644 --- a/MPlayer/libvo/vo_xv.c +++ b/MPlayer/libvo/vo_xv.c @@ -279,7 +279,7 @@ static void allocate_xvimage(int foo) &Shminfo[foo]); Shminfo[foo].shmid = - shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); + shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0600); Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0); Shminfo[foo].readOnly = False; diff --git a/MPlayer/libvo/vo_xvmc.c b/MPlayer/libvo/vo_xvmc.c index 48f3ede440..31104f4dd4 100644 --- a/MPlayer/libvo/vo_xvmc.c +++ b/MPlayer/libvo/vo_xvmc.c @@ -203,7 +203,7 @@ static int allocate_xvimage(int xvimage_width,int xvimage_height,int xv_format) if (!xvimage->data_size) goto shmgetfail; - Shminfo.shmid = shmget(IPC_PRIVATE, xvimage->data_size, IPC_CREAT | 0777); + Shminfo.shmid = shmget(IPC_PRIVATE, xvimage->data_size, IPC_CREAT | 0600); if (Shminfo.shmid == -1) goto shmgetfail; Shminfo.shmaddr = (char *) shmat(Shminfo.shmid, 0, 0); -- 2.33.7

3 2

[PATCH] configure: remove -Zomf from flags when checking extern symbol prefix on OS/2
by KO Myung-Hun 04 Oct '24

04 Oct '24

OS/2 nm does work only with aout format. If -Zomf is given, gcc generates OMF object file not aout object file. As a result, nm fails to detect extern symbol prefix. This allows users to pass -Zomf to configure via --extra-cflags and/or --extra-ldfalgs. --- configure | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/configure b/configure index 7a403e0a6..f4c42ad53 100755 --- a/configure +++ b/configure @@ -1699,6 +1699,15 @@ msvc_filter_flags() { done } +os2_aout_filter_flags() { + for f; do + case $f in + -Zomf) ;; + *) echo -n $f" " ;; + esac + done +} + AR_O='$@' CC_O='-o $@' CC_LINK_O='-o $@' @@ -2919,7 +2928,11 @@ echocheck "extern symbol prefix" cat > $TMPC << EOF int ff_extern; EOF +# OS/2 nm does work only with aout format. Remove -Zomf from flags. +os2 && + { saved_filter_flags=$filter_flags; filter_flags=os2_aout_filter_flags; } cc_check -c || die "Symbol mangling check failed." +os2 && filter_flags=$saved_filter_flags sym=$($_nm -P -g $TMPEXE | grep ff_extern) extern_prefix=${sym%%ff_extern*} def_extern_asm="#define EXTERN_ASM $extern_prefix" -- 2.42.0

1 1

[OS/2] ao fixes due to switch from AVFifoBuffer to AVFifi
by Dave Yeo 01 Oct '24

01 Oct '24

Hi, this diff is needed to fix compilation on OS/2. Based on the changes to ao_sdl, http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2024-April/047665.html The other problem I'm not sure how to fix is that the configure check for extern_prefix fails to find the _ prefix due to nm not understanding LX executables. Ideas besides hacking the script? Dave

4 12

[PATCH] Adapts to -std=c11 on OS/2
by KO Myung-Hun 01 Oct '24

01 Oct '24

-std=c11 disables many extensions of OS/2 kLIBC. And this causes many compilation errors such as implicit functions. To enable extensions of OS/2 kLIBC, define _EMX_SOURCE before including any headers. --- libao2/ao_dart.c | 3 +++ libao2/ao_kai.c | 3 +++ libvo/vo_kva.c | 3 +++ stream/cache2.c | 6 ++++++ 4 files changed, 15 insertions(+) diff --git a/libao2/ao_dart.c b/libao2/ao_dart.c index e1df7d32f..bd8ae6cf9 100644 --- a/libao2/ao_dart.c +++ b/libao2/ao_dart.c @@ -20,6 +20,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +// Define to enable extensions of OS/2 kLIBC such as _control87() stuffs. +#define _EMX_SOURCE + #define INCL_DOS #define INCL_DOSERRORS #include <os2.h> diff --git a/libao2/ao_kai.c b/libao2/ao_kai.c index 3cf84b77e..2a3eff5b0 100644 --- a/libao2/ao_kai.c +++ b/libao2/ao_kai.c @@ -20,6 +20,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +// Define to enable extensions of OS/2 kLIBC such as _control87() stuffs. +#define _EMX_SOURCE + #define INCL_DOS #define INCL_DOSERRORS #include <os2.h> diff --git a/libvo/vo_kva.c b/libvo/vo_kva.c index 42b273dd7..8d327fd88 100644 --- a/libvo/vo_kva.c +++ b/libvo/vo_kva.c @@ -20,6 +20,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +// Define to enable extensions of OS/2 kLIBC such as _control87() stuffs. +#define _EMX_SOURCE + #define INCL_WIN #define INCL_GPI #define INCL_DOS diff --git a/stream/cache2.c b/stream/cache2.c index 3ec2732a7..60cc2653a 100644 --- a/stream/cache2.c +++ b/stream/cache2.c @@ -16,6 +16,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef __OS2__ +// Define to enable extensions of OS/2 kLIBC such as _beginthread() and +// _endthread(). +#define _EMX_SOURCE +#endif + #include "config.h" // Initial draft of my new cache system... -- 2.42.0

3 5