diff options
author | xtraeme <xtraeme> | 2006-04-09 07:26:52 +0000 |
---|---|---|
committer | xtraeme <xtraeme> | 2006-04-09 07:26:52 +0000 |
commit | 77a71312868f393566dc0a59680e9506a97f7b6d (patch) | |
tree | b6ef0dead1cc2b68d83c60811b5fbf0841763cca | |
parent | 1598f3376bf2dad28c4aca9ba58005b68ed8eeb0 (diff) | |
download | pkgsrc-77a71312868f393566dc0a59680e9506a97f7b6d.tar.gz |
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,
-rw-r--r-- | multimedia/xine-ui/Makefile | 7 | ||||
-rw-r--r-- | multimedia/xine-ui/PLIST | 14 | ||||
-rw-r--r-- | multimedia/xine-ui/distinfo | 20 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-aa | 14 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-ab | 22 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-ac | 44 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-ad | 21 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-ae | 16 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-aj | 25 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-ak | 13 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-am | 10 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-ap | 23 |
12 files changed, 67 insertions, 162 deletions
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile index 3ddf149191a..795fd761b2e 100644 --- a/multimedia/xine-ui/Makefile +++ b/multimedia/xine-ui/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2006/04/06 06:22:30 reed Exp $ +# $NetBSD: Makefile,v 1.22 2006/04/09 07:26:52 xtraeme Exp $ # -DISTNAME= xine-ui-0.99.2 -PKGREVISION= 4 +DISTNAME= xine-ui-0.99.4 +#PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} @@ -23,6 +23,7 @@ USE_GNU_READLINE= yes .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" +.include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../multimedia/xine-lib/buildlink3.mk" .include "../../www/curl/buildlink3.mk" diff --git a/multimedia/xine-ui/PLIST b/multimedia/xine-ui/PLIST index 7f4b914c0dc..f504a9b85fe 100644 --- a/multimedia/xine-ui/PLIST +++ b/multimedia/xine-ui/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2004/05/12 16:42:49 drochner Exp $ +@comment $NetBSD: PLIST,v 1.4 2006/04/09 07:26:52 xtraeme Exp $ bin/aaxine bin/fbxine bin/xine @@ -21,6 +21,7 @@ share/doc/xine-ui/README.en.15.MRLs share/doc/xine-ui/README.en.20.DVD share/doc/xine-ui/README.en.25.VideoCD share/doc/xine-ui/README.en.30.Advanced +share/doc/xine-ui/README.en.32.Window_managers share/doc/xine-ui/README.en.35.Legal_issues share/doc/xine-ui/README.en.5.xine-ui share/doc/xine-ui/README_cs @@ -39,14 +40,20 @@ ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xine-ui.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xitk.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xine-ui.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xitk.mo +${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xine-ui.mo +${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xitk.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xine-ui.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xitk.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xine-ui.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xitk.mo +${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xine-ui.mo +${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xitk.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xine-ui.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xitk.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xine-ui.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xitk.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xine-ui.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xitk.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xine-ui.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xitk.mo ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xine-ui.mo @@ -57,7 +64,8 @@ share/pixmaps/xine_22x22.png share/pixmaps/xine_32x32.png share/pixmaps/xine_48x48.png share/xine/desktop/xine.desktop -share/xine/skins/black.mpv +share/xine/oxine/mainmenu +share/xine/oxine/mediamarks share/xine/skins/xine-ui_logo.mpv share/xine/skins/xine_splash.png share/xine/skins/xinetic/BigArrowDown.png @@ -126,6 +134,8 @@ share/xine/visuals/default.avi @dirrm share/xine/visuals @dirrm share/xine/skins/xinetic @dirrm share/xine/skins +@dirrm share/xine/oxine @dirrm share/xine/desktop +@comment in xdg-dirs: @dirrm share/pixmaps @dirrm share/doc/xitk @dirrm share/doc/xine-ui diff --git a/multimedia/xine-ui/distinfo b/multimedia/xine-ui/distinfo index c89dc57673b..4631113062d 100644 --- a/multimedia/xine-ui/distinfo +++ b/multimedia/xine-ui/distinfo @@ -1,18 +1,14 @@ -$NetBSD: distinfo,v 1.8 2005/10/10 22:52:44 joerg Exp $ +$NetBSD: distinfo,v 1.9 2006/04/09 07:26:52 xtraeme Exp $ -SHA1 (xine-ui-0.99.2.tar.gz) = 0815f3b660e50a3a69bac1d54bdf8036e9ff57e2 -RMD160 (xine-ui-0.99.2.tar.gz) = ccfd667417a9aa51561a132ab86e3fb1d3349694 -Size (xine-ui-0.99.2.tar.gz) = 2374176 bytes -SHA1 (patch-aa) = 2e32fd05f1c47fd5edd1be6997840cfc04e0b448 -SHA1 (patch-ab) = 7f3a44781d0a0418f277c082486e606058fa5357 -SHA1 (patch-ac) = 6b25785ab06d40d49acf0fd4c748e7b8e081c91f -SHA1 (patch-ad) = d5bfdfe1714d1c00a15a5da6b6b392329a277c86 -SHA1 (patch-ae) = baf9bf2a9f2c375208fce090b9030e938b5ba428 +SHA1 (xine-ui-0.99.4.tar.gz) = b982e5697f183559c216f9243b9410d61b9c58aa +RMD160 (xine-ui-0.99.4.tar.gz) = eeead5c6e566ade5505c8fcb924272c74eb4f49a +Size (xine-ui-0.99.4.tar.gz) = 2544984 bytes +SHA1 (patch-aa) = 4221e235da0b2047d218a9123f82a40cce92e15b +SHA1 (patch-ae) = 1d5887168efd340f047dfdb9e135ce12c18e2d5f SHA1 (patch-ag) = dddbea5257a5b21e3a7ba21207661f4a47a9fa7e SHA1 (patch-ah) = 9d61282de803459e4b9c49814796dcc97658849d SHA1 (patch-ai) = 78228fa174cb0d455a9debec18125d9ee13d34dd -SHA1 (patch-aj) = 48deb40db11492858245b8affca709f11a6c240f -SHA1 (patch-ak) = 21d6d048502b71a703365e3fab136b096c4575d3 SHA1 (patch-al) = d00f3ad348450e209d55ba69c1c053fce7d359b3 -SHA1 (patch-am) = 55f13b6288a2ef06ed3d82bec6e28be3d65620ee +SHA1 (patch-am) = 57567b2c1f86ef575ff4abcbfaa5f06e3178a056 SHA1 (patch-ao) = 09e83615b88dffbdfeb0b0bad07dcdc60024ba67 +SHA1 (patch-ap) = ff3cb41059fe441d9aeea0cd70b516ad3f1f3041 diff --git a/multimedia/xine-ui/patches/patch-aa b/multimedia/xine-ui/patches/patch-aa index 82d30900440..7be485f7ea9 100644 --- a/multimedia/xine-ui/patches/patch-aa +++ b/multimedia/xine-ui/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.4 2004/07/06 21:12:58 drochner Exp $ +$NetBSD: patch-aa,v 1.5 2006/04/09 07:26:52 xtraeme Exp $ ---- 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@ +--- doc/man/Makefile.in.orig 2006-04-08 21:22:54.000000000 +0200 ++++ doc/man/Makefile.in 2006-04-08 21:23:16.000000000 +0200 +@@ -280,7 +280,7 @@ 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 + all: all-recursive + + .SUFFIXES: diff --git a/multimedia/xine-ui/patches/patch-ab b/multimedia/xine-ui/patches/patch-ab deleted file mode 100644 index 4d49e899153..00000000000 --- a/multimedia/xine-ui/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 13:04:47 jmmv Exp $ - ---- src/xitk/xine-toolkit/label.c.orig Tue Mar 4 00:43:46 2003 -+++ src/xitk/xine-toolkit/label.c -@@ -294,7 +294,7 @@ static void label_setup_label(xitk_widge - - if(label_len > private_data->length) { - pthread_attr_t pth_attrs; --#if ! defined (__OpenBSD__) -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - struct sched_param pth_params; - #endif - -@@ -303,7 +303,7 @@ static void label_setup_label(xitk_widge - pthread_attr_init(&pth_attrs); - - /* this won't work on linux, freebsd 5.0 */ --#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-ac b/multimedia/xine-ui/patches/patch-ac deleted file mode 100644 index 970d4444f97..00000000000 --- a/multimedia/xine-ui/patches/patch-ac +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2004/07/06 21:12:58 drochner Exp $ - ---- 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); diff --git a/multimedia/xine-ui/patches/patch-ad b/multimedia/xine-ui/patches/patch-ad deleted file mode 100644 index 191b6b0f502..00000000000 --- a/multimedia/xine-ui/patches/patch-ad +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2005/02/22 00:44:20 wiz Exp $ - ---- src/xitk/panel.c.orig 2004-07-04 18:25:14.000000000 +0200 -+++ src/xitk/panel.c -@@ -1525,14 +1525,14 @@ void panel_init (void) { - - { - pthread_attr_t pth_attrs; --#if !defined (__OpenBSD__) -+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING - struct sched_param pth_params; - #endif - - pthread_attr_init(&pth_attrs); - - /* this won't work on linux, freebsd 5.0 */ --#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-ae b/multimedia/xine-ui/patches/patch-ae index e84d85a9e69..d6f420b3e73 100644 --- a/multimedia/xine-ui/patches/patch-ae +++ b/multimedia/xine-ui/patches/patch-ae @@ -1,14 +1,14 @@ -$NetBSD: patch-ae,v 1.2 2005/02/22 00:44:20 wiz Exp $ +$NetBSD: patch-ae,v 1.3 2006/04/09 07:26:52 xtraeme Exp $ ---- src/xitk/event.c.orig 2004-07-02 23:41:02.000000000 +0200 -+++ src/xitk/event.c -@@ -1230,7 +1230,9 @@ void gui_init (int nfiles, char *filenam - if (!XInitThreads ()) { +--- src/xitk/event.c.orig 2006-04-08 21:32:08.000000000 +0200 ++++ src/xitk/event.c 2006-04-08 21:32:59.000000000 +0200 +@@ -1301,7 +1301,9 @@ + if(!XInitThreads()) { printf (_("\nXInitThreads failed - looks like you don't have a " "thread-safe xlib.\n")); -+#ifndef _PTH_PTHREAD_H_ - exit (1); -+#endif ++ #ifndef _PTH_PTHREAD_H_ + exit(1); ++ #endif } if((gGui->display = XOpenDisplay((getenv("DISPLAY")))) == NULL) { diff --git a/multimedia/xine-ui/patches/patch-aj b/multimedia/xine-ui/patches/patch-aj deleted file mode 100644 index cb9119e8cb5..00000000000 --- a/multimedia/xine-ui/patches/patch-aj +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2005/02/22 00:44:20 wiz Exp $ - ---- src/xitk/actions.c.orig 2004-07-02 23:40:53.000000000 +0200 -+++ src/xitk/actions.c -@@ -1069,6 +1069,11 @@ static void *_gui_set_current_position(v - - pthread_detach(pthread_self()); - -+ if (pthread_mutex_trylock(&gGui->xe_mutex)) { -+ pthread_exit(NULL); -+ return NULL; -+ } -+ - if(gGui->logo_mode && (mediamark_get_current_mrl())) { - if(!xine_open(gGui->stream, (mediamark_get_current_mrl()))) { - gui_handle_xine_error(gGui->stream, (char *)(mediamark_get_current_mrl())); -@@ -1200,8 +1205,6 @@ void gui_set_current_position (int pos) - - if(gGui->new_pos == -1) { - -- pthread_mutex_lock(&gGui->xe_mutex); -- - pthread_mutex_lock(&new_pos_mutex); - gGui->new_pos = pos; - pthread_mutex_unlock(&new_pos_mutex); diff --git a/multimedia/xine-ui/patches/patch-ak b/multimedia/xine-ui/patches/patch-ak deleted file mode 100644 index 69255cb6504..00000000000 --- a/multimedia/xine-ui/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$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); - diff --git a/multimedia/xine-ui/patches/patch-am b/multimedia/xine-ui/patches/patch-am index 842780b0010..2a4c178dae1 100644 --- a/multimedia/xine-ui/patches/patch-am +++ b/multimedia/xine-ui/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.1 2005/09/20 12:15:34 dmcmahill Exp $ +$NetBSD: patch-am,v 1.2 2006/04/09 07:26:52 xtraeme Exp $ ---- src/xitk/Makefile.in.orig 2004-07-04 12:26:05.000000000 -0400 -+++ src/xitk/Makefile.in -@@ -319,7 +319,7 @@ xine_remote_SOURCES = xine-remote.c +--- src/xitk/Makefile.in.orig 2006-04-08 21:02:11.000000000 +0200 ++++ src/xitk/Makefile.in 2006-04-08 21:02:20.000000000 +0200 +@@ -397,7 +397,7 @@ xine_remote_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la \ xine-remote.c @@ -10,4 +10,4 @@ $NetBSD: patch-am,v 1.1 2005/09/20 12:15:34 dmcmahill Exp $ +xine_remote_LDADD = @XINE_LIBS@ $(INTLLIBS) $(NET_LIBS) $(THREAD_LIBS) $(READLINE_LIBS) $(NCURSES_LIB) \ $(top_builddir)/src/common/libcommon.la $(DBG_LIBS) - + session_ctrl_LDADD = @XINE_LIBS@ $(top_builddir)/src/common/libcommon.la $(DBG_LIBS) diff --git a/multimedia/xine-ui/patches/patch-ap b/multimedia/xine-ui/patches/patch-ap new file mode 100644 index 00000000000..eabf9d0f851 --- /dev/null +++ b/multimedia/xine-ui/patches/patch-ap @@ -0,0 +1,23 @@ +$NetBSD: patch-ap,v 1.1 2006/04/09 07:26:52 xtraeme Exp $ + +--- src/xitk/oxine/mediamarks.c.orig 2006-04-08 21:16:59.000000000 +0200 ++++ src/xitk/oxine/mediamarks.c 2006-04-08 21:19:27.000000000 +0200 +@@ -451,15 +451,15 @@ + + *line = NULL; + *n = 0; +- a = getline(line, n, file); ++ a = fgets(line, n, file); + if(a<=0) return; + +- while((a = getline(line, n, file))>0) { ++ while((a = fgets(line, n, file))>0) { + char *str; + playitem_t *item; + + if(*line[0] == '#') continue; +- str = strndup(*line, a-1); ++ str = strdup(*line); + /* printf("%s\n", str); */ + item = playitem_new (TYPE_REG, basename(str), str, list_new()); + ho_free(str); |