update to 0.99.2

official changelist:
* update screensaver key faking code to avoid false triggering of the
  "sticky keys" feature on newer distros
* fix crashes caused by tooltips
* fix reporting of dropped frames
* experimental feature: output video to a different display than control panel.
  set gui.video_display to the second display name, usually ":0.1" or ":1",
* removed -funroll-all-loops from SPARC and PPC targets.
* fix xitk trying set a window property when its atom may be undefined
* add --disable-shm-default configure option which sets feature.shm to zero
  but keeps the shm code compiled in

unfortunately new bugs in timer handling and mutex locking were
introduced...

5 files changed, 59 insertions, 38 deletions

diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 100b5a65fb9..9a7ffe85ecd 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/05/12 16:42:49 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/06 21:12:58 drochner Exp $
 #
 
-DISTNAME=		xine-ui-0.99.1
+DISTNAME=		xine-ui-0.99.2
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 
diff --git a/multimedia/xine-ui/distinfo b/multimedia/xine-ui/distinfo
index ead61b38d11..d7402fb269a 100644
--- a/multimedia/xine-ui/distinfo
+++ b/multimedia/xine-ui/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.3 2004/05/12 16:42:49 drochner Exp $
+$NetBSD: distinfo,v 1.4 2004/07/06 21:12:58 drochner Exp $
 
-SHA1 (xine-ui-0.99.1.tar.gz) = c803b1d389f742a8e3f02caa8d37149623199245
-Size (xine-ui-0.99.1.tar.gz) = 2339506 bytes
-SHA1 (patch-aa) = e36d7b1d52cf490906f36f2a87fba6192f54b765
+SHA1 (xine-ui-0.99.2.tar.gz) = 0815f3b660e50a3a69bac1d54bdf8036e9ff57e2
+Size (xine-ui-0.99.2.tar.gz) = 2374176 bytes
+SHA1 (patch-aa) = 2e32fd05f1c47fd5edd1be6997840cfc04e0b448
 SHA1 (patch-ab) = 7f3a44781d0a0418f277c082486e606058fa5357
-SHA1 (patch-ac) = 44925827dd883dabb5864ad739ed47a99fd10bda
+SHA1 (patch-ac) = 6b25785ab06d40d49acf0fd4c748e7b8e081c91f
 SHA1 (patch-ad) = 44e69b2a8f087082a4db186eecb8dc562d0fa58f
 SHA1 (patch-ae) = 813c897b89edbc1e37b731008b87fe6b04cf53f2
 SHA1 (patch-ag) = 4dd810e87922da673dc463367dc231105cfdeb6a
 SHA1 (patch-ah) = 9d61282de803459e4b9c49814796dcc97658849d
 SHA1 (patch-ai) = 78228fa174cb0d455a9debec18125d9ee13d34dd
 SHA1 (patch-aj) = 13648ce45993399bb44ac5f275bd0431b1ce0e02
+SHA1 (patch-ak) = 21d6d048502b71a703365e3fab136b096c4575d3
diff --git a/multimedia/xine-ui/patches/patch-aa b/multimedia/xine-ui/patches/patch-aa
index 4e9bb107ee7..82d30900440 100644
--- a/multimedia/xine-ui/patches/patch-aa
+++ b/multimedia/xine-ui/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2004/05/12 16:42:49 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2004/07/06 21:12:58 drochner Exp $
 
---- doc/man/Makefile.in.orig	2004-05-11 23:32:27.000000000 +0200
-+++ doc/man/Makefile.in	2004-05-11 23:32:50.000000000 +0200
-@@ -174,7 +174,7 @@
- am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
+--- doc/man/Makefile.in.orig	2004-07-04 18:26:01.000000000 +0200
++++ doc/man/Makefile.in
+@@ -251,7 +251,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
 -SUBDIRS = fr es en pl de
 +SUBDIRS = en
  subdir = doc/man
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/multimedia/xine-ui/patches/patch-ac b/multimedia/xine-ui/patches/patch-ac
index 01ff0ce723e..970d4444f97 100644
--- a/multimedia/xine-ui/patches/patch-ac
+++ b/multimedia/xine-ui/patches/patch-ac
@@ -1,15 +1,40 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:04:47 jmmv Exp $
+$NetBSD: patch-ac,v 1.2 2004/07/06 21:12:58 drochner Exp $
 
---- src/xitk/xine-toolkit/tips.c.orig	Tue Mar  4 00:43:48 2003
+--- src/xitk/xine-toolkit/tips.c.orig	2004-07-02 15:23:31.000000000 +0200
 +++ src/xitk/xine-toolkit/tips.c
-@@ -240,12 +240,12 @@ static void *_tips_thread(void *data) {
-   /* Create a thread which will destroy the tips window */  
-   {
+@@ -87,6 +87,10 @@ static void *_tips_loop_thread(void *dat
+     gettimeofday(&tv, NULL);
+     ts.tv_sec  = tv.tv_sec;
+     ts.tv_nsec = (tv.tv_usec + 300000) * 1000;      
++    while (ts.tv_nsec >= 1000000000) {
++	    ts.tv_nsec -= 1000000000;
++	    ts.tv_sec ++;
++    }
+     
+     result = pthread_cond_timedwait(&tips.prewait_cond, &tips.prewait_mutex, &ts);
+     tips.prewait = 0;
+@@ -208,6 +212,10 @@ static void *_tips_loop_thread(void *dat
+       gettimeofday(&tv, NULL);
+       ts.tv_sec  = tv.tv_sec;
+       ts.tv_nsec = (tv.tv_usec + (tips.widget->tips_timeout * 10000)) * 1000;      
++      while (ts.tv_nsec >= 1000000000) {
++	      ts.tv_nsec -= 1000000000;
++	      ts.tv_sec ++;
++      }
+ 
+       pthread_mutex_lock(&tips.timer_mutex);
+       pthread_cond_timedwait(&tips.timer_cond, &tips.timer_mutex, &ts);
+@@ -239,7 +247,7 @@ void xitk_tips_init(Display *disp) {
+   
+   if(!tips.running) {
      pthread_attr_t       pth_attrs;
 -#if ! defined (__OpenBSD__)
 +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
      struct sched_param   pth_params;
  #endif
+ 
+@@ -258,7 +266,7 @@ void xitk_tips_init(Display *disp) {
+     pthread_cond_init(&tips.prewait_cond, NULL);
      
      pthread_attr_init(&pth_attrs);
 -#if ! defined (__OpenBSD__)
@@ -17,21 +42,3 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/01/26 13:04:47 jmmv Exp $
      pthread_attr_getschedparam(&pth_attrs, &pth_params);
      pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
      pthread_attr_setschedparam(&pth_attrs, &pth_params);
-@@ -266,7 +266,7 @@ static void *_tips_thread(void *data) {
-  */
- void xitk_tips_create(xitk_widget_t *w) {
-   pthread_attr_t       pth_attrs;
--#if ! defined (__OpenBSD__)
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-   struct sched_param   pth_params;
- #endif
-   tips_private_t      *tp;
-@@ -283,7 +283,7 @@ void xitk_tips_create(xitk_widget_t *w) 
-     tp->w  = w;
-     pthread_attr_init(&pth_attrs);
-     
--#if ! defined (__OpenBSD__)
-+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-     pthread_attr_getschedparam(&pth_attrs, &pth_params);
-     pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
-     pthread_attr_setschedparam(&pth_attrs, &pth_params);
diff --git a/multimedia/xine-ui/patches/patch-ak b/multimedia/xine-ui/patches/patch-ak
new file mode 100644
index 00000000000..69255cb6504
--- /dev/null
+++ b/multimedia/xine-ui/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2004/07/06 21:12:58 drochner Exp $
+
+--- src/xitk/xine-toolkit/label.c.orig	2004-07-06 21:28:32.000000000 +0200
++++ src/xitk/xine-toolkit/label.c
+@@ -133,6 +133,8 @@ static void notify_destroy(xitk_widget_t
+     XITK_FREE(private_data->fontname);
+     XITK_FREE(private_data->skin_element_name);
+ 
++    pthread_mutex_unlock(&private_data->paint_mutex);
++    pthread_mutex_unlock(&private_data->change_mutex);
+     pthread_mutex_destroy(&private_data->paint_mutex);
+     pthread_mutex_destroy(&private_data->change_mutex);
+