NetBSD patches (was: [MPlayer-dev-eng] [PATCH] FreeBSD DVD Fix)

[Dominik 'Rathann' Mierzejewski]

On Sunday, 08 August 2004 at 19:50, Bernd Ernesti wrote:
> On Sun, Aug 08, 2004 at 07:25:16PM +0200, Diego Biurrun wrote:
[...]
> > What happened to the NetBSD patch set?
> 
> Good question, a long time ago i switched to the mplayer cvs version and
> someone else took over the maintainer job.
> 
> Maybe patch-ab could be added, don't know how patch-ad could be handled.
> 
> I attach both patches here.
> 
> > From the patch-ab cvs log:
> 
> revision 1.3
> date: 2004/07/24 01:19:35;  author: wiz;  state: Exp;  lines: +13 -15
> Unlocking a mutex before destroying it makes libpthread much happier.
> 
> And for patch-ad:
> 
> revision 1.5
> date: 2003/04/09 17:19:14;  author: drochner;  state: Exp;  lines:
> +17 -73
> comment out some dispensable code which triggers a fatal bug in
> not-absolutely-current NetBSD libintl
> 
> There is also one more patch in the NetBSD package tree (patch-aa), but
> I think the changes in it won't be acepted, so i leave them out here.
> 
> Bernd
> 

> $NetBSD: patch-ab,v 1.3 2004/07/24 01:19:35 wiz Exp $
> 
> --- loader/win32.c.orig 2004-07-01 00:00:53.000000000 +0200
> +++ loader/win32.c
> @@ -444,8 +444,10 @@ static int my_release(void* memory)
> 
>      if (last_alloc)
> 	pthread_mutex_unlock(&memmut);
> -    else
> +    else {
> +	pthread_mutex_unlock(&memmut);
> 	pthread_mutex_destroy(&memmut);
> +    }
> 
>      //if (alccnt < 40000) printf("MY_RELEASE: %p\t%ld    (%d)\n",
>      header, header->size, alccnt);
>  #else

Looks clean, but is it strictly NetBSD-specific? If so, it should be surrounded
by something like #ifdef _netbsd_ #endif.

> $NetBSD: patch-ad,v 1.3 2004/07/17 19:06:36 wiz Exp $
> 
> --- mp_msg.c.orig	2003-09-12 17:46:16.000000000 +0200
> +++ mp_msg.c
> @@ -34,6 +34,7 @@ void mp_msg_init(){
>  #ifdef MP_DEBUG
>      fprintf(stdout, "Using GNU internationalization\n");
>      fprintf(stdout, "Original domain: %s\n", textdomain(NULL));
> +#if 0
>      fprintf(stdout, "Original dirname: %s\n",
>      bindtextdomain(textdomain(NULL),NULL));
>  #endif
>      setlocale(LC_ALL, ""); /* set from the environment variables */
> @@ -41,9 +42,12 @@ void mp_msg_init(){
>      textdomain("mplayer");
>  #ifdef MP_DEBUG
>      fprintf(stdout, "Current domain: %s\n", textdomain(NULL));
> +#if 0
>      fprintf(stdout, "Current dirname: %s\n\n",
>      bindtextdomain(textdomain(NULL),NULL));
>  #endif
>  #endif
> +#endif
> +#endif
>      mp_msg_set_level(MSGL_STATUS);
>  }
> 

NetBSD's gettext doesn't support bindtextdomain? This could either be #ifdef'd
with some _netbsd_ #define or we could provide bindtextdomain replacement in
osdep/ .

R.

-- 
MPlayer RPMs maintainer: http://greysector.rangers.eu.org/mplayer/
"I am Grey. I stand between the candle and the star. We are Grey.
 We stand between the darkness ... and the light."
        -- Delenn in Grey Council in Babylon 5:"Babylon Squared"