head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.4 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.2 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q2:1.5.0.12 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.10 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.8 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.6 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.4 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.2 pkgsrc-2011Q1-base:1.5 pkgsrc-2009Q4:1.3.0.26 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.24 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.22 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.20 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.18 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.16 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.14 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.12 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.10 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.2.0.14 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.12 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.10 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.8 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.6 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.4 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.2 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.1.1.1.0.4 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.2 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2012.08.04.13.47.09; author drochner; state dead; branches; next 1.5; 1.5 date 2011.01.24.15.12.59; author wiz; state Exp; branches; next 1.4; 1.4 date 2011.01.14.11.42.57; author wiz; state Exp; branches; next 1.3; 1.3 date 2006.04.09.07.26.52; author xtraeme; state dead; branches; next 1.2; 1.2 date 2004.07.06.21.12.58; author drochner; state Exp; branches; next 1.1; 1.1 date 2004.01.26.13.04.47; author jmmv; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.01.26.13.04.47; author jmmv; state Exp; branches; next ; desc @@ 1.6 log @update to 0.99.7 changes: better M3U playlist handling, various UI fixes (including a deadlock fix and a crash fix), use of XScreenSaver, and two overflow bug fixes @ text @$NetBSD: patch-ac,v 1.5 2011/01/24 15:12:59 wiz Exp $ Fix build with png-1.5. https://bugs.xine-project.org/show_bug.cgi?id=404 --- src/xitk/Imlib-light/load.c.orig 2010-03-01 17:02:05.000000000 +0000 +++ src/xitk/Imlib-light/load.c @@@@ -61,7 +61,7 @@@@ unsigned char *_LoadPNG(ImlibData * id, png_destroy_read_struct(&png_ptr, NULL, NULL); return NULL; } - if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) + if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) { png_destroy_read_struct(&png_ptr, &info_ptr, NULL); return NULL; @ 1.5 log @Add upstream bug report URL. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2011/01/14 11:42:57 wiz Exp $ @ 1.4 log @Fix build with png-1.5. @ text @d1 1 a1 1 $NetBSD$ d4 1 @ 1.3 log @Update to 0.99.4: xine-ui (0.99.4) unstable; urgency=low * Fixed deadlock, segfaults and mem-leaks, several other fixes and enhancements, can't remember details (thanks also to Marcelo Jimenez and Jakub Labath) * Menu to reset video controls * fixed menu shortcut strings allocation/freeing [bug #1223022] * audio post plugin support * use UTF-8 for Japanese locale if nl_langinfo doesn't work [bug #1096974] * expand tabs in post-plugin help * merge some osd menus from oxine * aspect ratio fixed for multihead setups (especially TwinView) [bugs #1089328, #1001702 and #989157] * fixed parsing post plugin parameters of type double for some locales * autoload subtitles with .txt extension too * be more POSIX-compliant (head, tail) (build fix) [bug #1172729] * Russian translations (thanks to Pavel Maryanov) * forced not loading old playlist with -P option xine-ui (0.99.3) unstable; urgency=low * enlarge stream info window (required for Russian translation), * possibility to specify more than one playlist in command line, * unlock mutex before destroying (thanks to Matthias Drochner), * netBSD mutex locking fix, * cursor support implementation into xiTK, * use post plugins for deinterlacing, * fix segfault on enqueuing, * fix segfault on playlist deletion, * add non-official subtitle support into ASX playlists, * add get_speed in session control optarg, * restore original sound volume on exit, * fix memory corruption with huge playlists, * remove obsolete "black stream hack", * reset screensaver after playback resume, * various WM layering bugs, * handle new UTF8 meta infos, * Japanese translations (thanks to Tadashi Jokagi), * visualization switching while playback is running fix, * handle .pls playlist inside URL, * new 'b' shortcut (border visibility toggle), * support alpha channel in splash screen image, @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2004/07/06 21:12:58 drochner Exp $ d3 13 a15 42 --- src/xitk/xine-toolkit/tips.c.orig 2004-07-02 15:23:31.000000000 +0200 +++ src/xitk/xine-toolkit/tips.c @@@@ -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__) +#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); @ 1.2 log @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... @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1.1.1 2003/04/11 11:59:56 rh Exp $ d3 1 a3 1 --- src/xitk/xine-toolkit/tips.c.orig Tue Mar 4 00:43:48 2003 d5 25 a29 3 @@@@ -240,12 +240,12 @@@@ static void *_tips_thread(void *data) { /* Create a thread which will destroy the tips window */ { d35 3 a44 18 @@@@ -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); @ 1.1.1.1 log @Move xine-ui to the multimedia category (coming from graphics). This is version 0.9.22nb1. @ text @@