March 2022 - MPlayer-dev-eng - lists.mplayerhq.hu

[PATCH] Remove OpenBSD bits from Sun audio backend
by Brad Smith 27 Mar '22

27 Mar '22

Remove some OpenBSD bits from the Sun audio backend. We have been using sndio for 12+ years. Index: libao2/ao_sun.c =================================================================== --- libao2/ao_sun.c (revision 38359) +++ libao2/ao_sun.c (working copy) @@ -455,7 +455,7 @@ else info.play.balance = (vol->right - vol->left + volume) * AUDIO_RIGHT_BALANCE / (2*volume); } -#if !defined (__OpenBSD__) && !defined (__NetBSD__) +#ifndef __NetBSD__ info.output_muted = (volume == 0); #endif ioctl( fd,AUDIO_SETINFO,&info ); @@ -646,7 +646,7 @@ #endif ioctl(audio_fd, AUDIO_GETINFO, &info); -#if !defined (__OpenBSD__) && !defined(__NetBSD__) +#ifndef __NetBSD__ if (queued_bursts - info.play.eof > 2) return 0; return ao_data.outburst; @@ -682,7 +682,7 @@ static float get_delay(void){ audio_info_t info; ioctl(audio_fd, AUDIO_GETINFO, &info); -#if defined (__OpenBSD__) || defined(__NetBSD__) +#ifdef __NetBSD__ return (float) info.play.seek/ (float)byte_per_sec ; #else if (info.play.samples && enable_sample_timing == RTSC_ENABLED)

3 4

[PATCH] Have sndio check use the pkg-config file
by Brad Smith 27 Mar '22

27 Mar '22

Have the sndio check use the pkg-config file. BTW, looking at other examples to take inspiration for this I noticed the Pulse and JACK bits use libs_mplayer vs extra_ldflags and echores is higher up. Little inconsistencies are kind of annoying when looking at code to get an idea of how to do things. Index: configure =================================================================== --- configure (revision 38348) +++ configure (working copy) @@ -6358,12 +6358,16 @@ echocheck "sndio audio" if test "$_sndio" = auto ; then _sndio=no - statement_check sndio.h 'sio_open(SIO_DEVANY, SIO_PLAY, 0)' -lsndio && _sndio=yes + if $_pkg_config --exists 'sndio' ; then + header_check sndio.h $($_pkg_config --libs --cflags sndio) && + _sndio=yes + fi fi if test "$_sndio" = yes ; then def_sndio='#define CONFIG_SNDIO_AUDIO 1' aomodules="sndio $aomodules" - extra_ldflags="$extra_ldflags -lsndio" + extra_ldflags="$extra_ldflags $($_pkg_config --libs sndio)" + extra_cflags="$extra_cflags $($_pkg_config --cflags sndio)" else def_sndio='#undef CONFIG_SNDIO_AUDIO' noaomodules="sndio $noaomodules"

2 5

[PATCH] Remove Win32 codecs support for OpenBSD
by Brad Smith 02 Mar '22

02 Mar '22

OpenBSD has not used the Win32 codecs for 12 years and the LDT support was removed 6 years ago. Index: configure =================================================================== --- configure (revision 38359) +++ configure (working copy) @@ -7258,7 +7262,7 @@ echocheck "Win32 codecs" if test "$_win32dll" = auto ; then _win32dll=no - if x86_32 && ! qnx; then + if x86_32 && ! qnx && ! openbsd; then _win32dll=yes fi fi @@ -7304,7 +7308,7 @@ _real=no res_comment="dynamic loader support needed" if test "$_dl" = yes || test "$_win32dll" = yes && - (linux || freebsd || netbsd || openbsd || dragonfly || darwin || win32 || os2) ; then + (linux || freebsd || netbsd || dragonfly || darwin || win32 || os2) ; then _real=yes fi fi Index: libmpcodecs/ad_realaud.c =================================================================== --- libmpcodecs/ad_realaud.c (revision 38359) +++ libmpcodecs/ad_realaud.c (working copy) @@ -78,7 +78,7 @@ // exit(1); } -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) void ___brk_addr(void); void ___brk_addr(void) {exit(0);} char **__environ={NULL}; Index: loader/ldt_keeper.c =================================================================== --- loader/ldt_keeper.c (revision 38359) +++ loader/ldt_keeper.c (working copy) @@ -52,7 +52,7 @@ int modify_ldt(int func, void *ptr, unsigned long bytecount); #endif #else -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) #include <machine/segments.h> #include <machine/sysarch.h> #elif defined(__APPLE__) @@ -162,7 +162,7 @@ #endif #endif -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__APPLE__) static void LDT_EntryToBytes( unsigned long *buffer, const struct modify_ldt_ldt_s *content ) { *buffer++ = ((content->base_addr & 0x0000ffff) << 16) | @@ -220,7 +220,7 @@ perror("install_fs"); printf("Couldn't install fs segment, expect segfault\n"); } -#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) +#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__APPLE__) { unsigned long d[2]; @@ -237,9 +237,6 @@ perror("install_fs"); printf("Couldn't install fs segment, expect segfault\n"); printf("Did you reconfigure the kernel with \"options USER_LDT\"?\n"); -#ifdef __OpenBSD__ - printf("On newer OpenBSD systems did you set machdep.userldt to 1?\n"); -#endif } } #elif defined(__svr4__)

1 0