diff options
author | drochner <drochner> | 2010-05-07 17:46:24 +0000 |
---|---|---|
committer | drochner <drochner> | 2010-05-07 17:46:24 +0000 |
commit | 8ef5eb52cdde7264514f6b6ad9de13a40838ba3f (patch) | |
tree | ecac45de972541630d5aec9315a133860f01288a | |
parent | b04e8cd81cc2daece39937d5bcaff098037babe2 (diff) | |
download | pkgsrc-8ef5eb52cdde7264514f6b6ad9de13a40838ba3f.tar.gz |
update to 0.99.6
changes: many bugfixes
-rw-r--r-- | multimedia/xine-ui/Makefile | 8 | ||||
-rw-r--r-- | multimedia/xine-ui/PLIST | 3 | ||||
-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 | 36 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-ag | 17 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-ah | 43 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-ai | 13 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-aj | 13 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-at | 14 | ||||
-rw-r--r-- | multimedia/xine-ui/patches/patch-zy | 116 |
11 files changed, 133 insertions, 164 deletions
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile index 1d9b271a022..a39f767c7eb 100644 --- a/multimedia/xine-ui/Makefile +++ b/multimedia/xine-ui/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.43 2010/02/17 10:36:00 zafer Exp $ +# $NetBSD: Makefile,v 1.44 2010/05/07 17:46:24 drochner Exp $ # -DISTNAME= xine-ui-0.99.5 -PKGREVISION= 4 +DISTNAME= xine-ui-0.99.6 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.xine-project.org/home @@ -17,12 +17,14 @@ USE_TOOLS+= msgfmt pkg-config USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_GNU_READLINE= yes +CONFIGURE_ARGS+= --disable-lirc BUILDLINK_DEPMETHOD.libXt?= build PTHREAD_AUTO_VARS= yes .include "../../converters/libiconv/buildlink3.mk" +.include "../../databases/shared-mime-info/mimedb.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" diff --git a/multimedia/xine-ui/PLIST b/multimedia/xine-ui/PLIST index a407e718fea..d88f1d4b411 100644 --- a/multimedia/xine-ui/PLIST +++ b/multimedia/xine-ui/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:08:12 joerg Exp $ +@comment $NetBSD: PLIST,v 1.11 2010/05/07 17:46:24 drochner Exp $ bin/fbxine bin/xine bin/xine-bugreport @@ -63,6 +63,7 @@ share/locale/sk/LC_MESSAGES/xine-ui.mo share/locale/sk/LC_MESSAGES/xitk.mo share/locale/uk/LC_MESSAGES/xine-ui.mo share/locale/uk/LC_MESSAGES/xitk.mo +share/mime/packages/xine-ui.xml share/pixmaps/xine.xpm share/xine/desktop/xine.desktop share/xine/oxine/mainmenu diff --git a/multimedia/xine-ui/distinfo b/multimedia/xine-ui/distinfo index de3f224c3c2..7ae78c1c300 100644 --- a/multimedia/xine-ui/distinfo +++ b/multimedia/xine-ui/distinfo @@ -1,12 +1,14 @@ -$NetBSD: distinfo,v 1.17 2007/07/20 16:54:21 joerg Exp $ +$NetBSD: distinfo,v 1.18 2010/05/07 17:46:24 drochner Exp $ -SHA1 (xine-ui-0.99.5.tar.gz) = 4f452516319f31cda01d08ea2779f195933af0bb -RMD160 (xine-ui-0.99.5.tar.gz) = 64cb69549d88d904d986ea7dd7b36a51d5b91756 -Size (xine-ui-0.99.5.tar.gz) = 2606481 bytes -SHA1 (patch-aa) = 9a4bc545b2574477aaba82604e9e794617ee4cdc -SHA1 (patch-ab) = 4c6bf8802d2558db43bddea4cc31c826ddb56a46 +SHA1 (xine-ui-0.99.6.tar.bz2) = a8d6ab9a9e4cbeb0a5d677d6948e23d11019fc5b +RMD160 (xine-ui-0.99.6.tar.bz2) = 6cdf639b5ffff54bacfa0a7bef65af1e7ebcacee +Size (xine-ui-0.99.6.tar.bz2) = 2180633 bytes +SHA1 (patch-aa) = f812ef6651d364030bad754f386f4d64c5cd8022 +SHA1 (patch-ab) = 5d9754d3824f66a80bc3a7bd2418870b1fae3b9f SHA1 (patch-ae) = 1d5887168efd340f047dfdb9e135ce12c18e2d5f -SHA1 (patch-ag) = dddbea5257a5b21e3a7ba21207661f4a47a9fa7e -SHA1 (patch-at) = 433c648bbeea1a73189ab4e42c3c9ce4c4610290 -SHA1 (patch-zy) = 47bc376d68594604c65d017e61574218e4c5b71a +SHA1 (patch-ag) = 0f1686bba57805e2dccf939e5733faf997bc14f7 +SHA1 (patch-ah) = 9beaee5509306e6afa1b06aef4eab24635c2a79e +SHA1 (patch-ai) = bd73bc709708f8ce9a94d87f4c6142948445affd +SHA1 (patch-aj) = 768594b88a1014d2f2f2b56a851b9d13362fa31b +SHA1 (patch-at) = eab32a39c19b108bd8ea11adeb19ff50020e2b5f SHA1 (patch-zz) = f3b33d65805a9e58daaf812a3b9eb572c86ee7b9 diff --git a/multimedia/xine-ui/patches/patch-aa b/multimedia/xine-ui/patches/patch-aa index 8d0d22acd34..c6d674aab20 100644 --- a/multimedia/xine-ui/patches/patch-aa +++ b/multimedia/xine-ui/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.6 2007/07/15 19:41:28 xtraeme Exp $ +$NetBSD: patch-aa,v 1.7 2010/05/07 17:46:24 drochner Exp $ ---- doc/man/Makefile.in.orig 2007-07-15 21:13:56.000000000 +0200 -+++ doc/man/Makefile.in 2007-07-15 21:14:08.000000000 +0200 -@@ -246,7 +246,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- doc/man/Makefile.in.orig 2010-03-06 01:34:49.000000000 +0000 ++++ doc/man/Makefile.in +@@ -266,7 +266,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ -SUBDIRS = fr es en pl de +SUBDIRS = en all: all-recursive diff --git a/multimedia/xine-ui/patches/patch-ab b/multimedia/xine-ui/patches/patch-ab index ed51835ca47..ebbc7f3a616 100644 --- a/multimedia/xine-ui/patches/patch-ab +++ b/multimedia/xine-ui/patches/patch-ab @@ -1,30 +1,30 @@ -$NetBSD: patch-ab,v 1.3 2007/07/20 16:54:22 joerg Exp $ +$NetBSD: patch-ab,v 1.4 2010/05/07 17:46:24 drochner Exp $ ---- configure.orig 2007-07-20 16:04:38.000000000 +0000 +--- configure.orig 2010-03-06 01:34:51.000000000 +0000 +++ configure -@@ -7521,13 +7521,13 @@ case "$host" in +@@ -7759,13 +7759,13 @@ case "$host" in ;; *) -- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 --echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 -+ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 -+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6 - if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 +-$as_echo_n "checking for pthread_create in -lpthread... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 ++$as_echo_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; } + if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" +LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -7586,7 +7586,7 @@ fi - echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 - echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 - if test $ac_cv_lib_pthread_pthread_create = yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -7796,7 +7796,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 + $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } + if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : - THREAD_LIBS="-lpthread" + THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" else - { { echo "$as_me:$LINENO: error: pthread needed" >&5 - echo "$as_me: error: pthread needed" >&2;} + as_fn_error "pthread needed" "$LINENO" 5 + fi diff --git a/multimedia/xine-ui/patches/patch-ag b/multimedia/xine-ui/patches/patch-ag index 9e9d03fb4d0..143422d8b13 100644 --- a/multimedia/xine-ui/patches/patch-ag +++ b/multimedia/xine-ui/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.2 2005/02/22 00:44:20 wiz Exp $ +$NetBSD: patch-ag,v 1.3 2010/05/07 17:46:24 drochner Exp $ ---- src/xitk/common.h.orig 2004-07-02 23:41:02.000000000 +0200 +--- src/xitk/common.h.orig 2009-12-19 00:34:22.000000000 +0000 +++ src/xitk/common.h -@@ -80,6 +80,14 @@ +@@ -82,6 +82,14 @@ #include <lirc/lirc_client.h> #endif @@ -17,3 +17,14 @@ $NetBSD: patch-ag,v 1.2 2005/02/22 00:44:20 wiz Exp $ /* * config related constants */ +@@ -375,8 +383,10 @@ typedef struct { + + void (*nongui_error_msg)(char *text); + ++#if 0 + FILE *stdout; /* Channel to original stdout at startup */ + /* before an evtl. later redirection */ ++#endif + } gGui_t; + + extern gGui_t *gGui; diff --git a/multimedia/xine-ui/patches/patch-ah b/multimedia/xine-ui/patches/patch-ah new file mode 100644 index 00000000000..146a4bddfc2 --- /dev/null +++ b/multimedia/xine-ui/patches/patch-ah @@ -0,0 +1,43 @@ +$NetBSD: patch-ah,v 1.3 2010/05/07 17:46:25 drochner Exp $ + +--- src/xitk/main.c.orig 2010-03-11 09:33:24.000000000 +0000 ++++ src/xitk/main.c +@@ -1425,7 +1425,9 @@ int main(int argc, char *argv[]) { + gGui->no_mouse = 0; + gGui->wid = 0; + gGui->nongui_error_msg = NULL; ++#if 0 + gGui->stdout = stdout; ++#endif + + window_attribute.x = window_attribute.y = -8192; + window_attribute.width = window_attribute.height = -1; +@@ -1912,6 +1914,7 @@ int main(int argc, char *argv[]) { + int guiout_fd, stdout_fd; + FILE *guiout_fp; + ++#if 0 + if((guiout_fd = dup(STDOUT_FILENO)) < 0) + fprintf(stderr, "cannot dup STDOUT_FILENO: %s.\n", strerror(errno)); + else if((guiout_fp = fdopen(guiout_fd, "w")) == NULL) +@@ -1925,6 +1928,7 @@ int main(int argc, char *argv[]) { + setlinebuf(gGui->stdout); + close(stdout_fd); /* stdout_fd was intermediate, not needed any longer */ + } ++#endif + } + #endif + +@@ -2240,10 +2244,12 @@ int main(int argc, char *argv[]) { + pthread_mutex_destroy(&gGui->download_mutex); + pthread_mutex_destroy(&gGui->logo_mutex); + ++#if 0 + if(gGui->report != stdout) + fclose(gGui->report); + if(gGui->stdout != stdout) + fclose(gGui->stdout); ++#endif + + free_command_line_args(&_argv, _argc); + diff --git a/multimedia/xine-ui/patches/patch-ai b/multimedia/xine-ui/patches/patch-ai new file mode 100644 index 00000000000..d1801c453a2 --- /dev/null +++ b/multimedia/xine-ui/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.4 2010/05/07 17:46:25 drochner Exp $ + +--- src/xitk/stdctl.c.orig 2010-03-11 09:36:27.000000000 +0000 ++++ src/xitk/stdctl.c +@@ -170,7 +170,7 @@ void stdctl_start(void) { + int err; + + stdctl.fd = STDIN_FILENO; +- stdctl.fbk = gGui->stdout; ++ stdctl.fbk = STDOUT_FILENO; + + if((err = pthread_create(&(stdctl.thread), NULL, xine_stdctl_loop, NULL)) != 0) { + fprintf(stderr, _("%s(): can't create new thread (%s)\n"), __XINE_FUNCTION__, strerror(err)); diff --git a/multimedia/xine-ui/patches/patch-aj b/multimedia/xine-ui/patches/patch-aj new file mode 100644 index 00000000000..9361048dd63 --- /dev/null +++ b/multimedia/xine-ui/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.4 2010/05/07 17:46:25 drochner Exp $ + +--- src/xitk/session.c.orig 2010-03-11 09:40:12.000000000 +0000 ++++ src/xitk/session.c +@@ -21,7 +21,7 @@ + /* Largely inspired of xmms control socket stuff */ + + /* required for getsubopt(); the __sun test gives us strncasecmp() on solaris */ +-#if ! defined (__sun) && ! defined (__OpenBSD__) && ! defined (__FreeBSD__) ++#if ! defined (__sun) && ! defined (__OpenBSD__) && ! defined (__FreeBSD__) && !defined(__NetBSD__) + #define _XOPEN_SOURCE 500 + #endif + diff --git a/multimedia/xine-ui/patches/patch-at b/multimedia/xine-ui/patches/patch-at index 31568757f32..1a86174645c 100644 --- a/multimedia/xine-ui/patches/patch-at +++ b/multimedia/xine-ui/patches/patch-at @@ -1,11 +1,11 @@ -$NetBSD: patch-at,v 1.2 2007/07/15 19:41:30 xtraeme Exp $ +$NetBSD: patch-at,v 1.3 2010/05/07 17:46:25 drochner Exp $ ---- doc/man/en/Makefile.in.orig 2007-07-15 21:13:06.000000000 +0200 -+++ doc/man/en/Makefile.in 2007-07-15 21:13:17.000000000 +0200 -@@ -243,7 +243,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- doc/man/en/Makefile.in.orig 2010-03-06 01:34:49.000000000 +0000 ++++ doc/man/en/Makefile.in +@@ -253,7 +253,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ -manfiles = xine.1 aaxine.1 xine-check.1 xine-remote.1 +manfiles = xine.1 xine-check.1 xine-remote.1 man_MANS = $(manfiles) xine-bugreport.1 diff --git a/multimedia/xine-ui/patches/patch-zy b/multimedia/xine-ui/patches/patch-zy deleted file mode 100644 index bc1b934a512..00000000000 --- a/multimedia/xine-ui/patches/patch-zy +++ /dev/null @@ -1,116 +0,0 @@ -$NetBSD: patch-zy,v 1.1 2007/07/16 10:12:46 xtraeme Exp $ - ---- src/xitk/actions.c.orig 2007-04-07 00:52:54.000000000 +0000 -+++ src/xitk/actions.c 2007-06-07 00:15:04.000000000 +0000 -@@ -638,58 +638,77 @@ - - if(video_window_is_visible()) - video_window_set_visibility(0); -+ -+ config_update_num("gui.amp_level", gGui->mixer.amp_level); -+ config_save(); - -+ /* we are going to dispose this stream, so make sure slider_loop -+ * won't use it anymore (otherwise -> segfault on exit). -+ */ -+ gGui->running = 0; -+ -+ if(gGui->visual_anim.event_queue) { -+ xine_event_dispose_queue(gGui->visual_anim.event_queue); -+ gGui->visual_anim.event_queue = 0; -+ } -+ if(gGui->visual_anim.stream) { -+ xine_dispose(gGui->visual_anim.stream); -+ gGui->visual_anim.stream = 0; -+ } -+ - tvout_deinit(gGui->tvout); -- video_window_exit(); - --#ifdef HAVE_XF86VIDMODE -- /* just in case a different modeline than the original one is running, -- * toggle back to window mode which automatically causes a switch back to -- * the original modeline -- */ -- if(gGui->XF86VidMode_fullscreen) -- video_window_set_fullscreen_mode(WINDOWED_MODE); -- // gui_set_fullscreen_mode(NULL,NULL); --#endif -- -+ if(gGui->event_queue) { -+ xine_event_dispose_queue(gGui->event_queue); -+ gGui->event_queue = 0; -+ } -+ - osd_deinit(); - -- config_update_num("gui.amp_level", gGui->mixer.amp_level); -- config_save(); -- -+ if(gGui->ao_none) { -+ xine_close_audio_driver(gGui->xine, gGui->ao_none); -+ gGui->ao_none = 0; -+ } -+ if(gGui->vo_none) { -+ xine_close_video_driver(gGui->xine, gGui->vo_none); -+ gGui->vo_none = 0; -+ } -+ - /* Restore old audio volume */ - if(gGui->ao_port && (gGui->mixer.method == SOUND_CARD_MIXER)) - xine_set_param(gGui->stream, XINE_PARAM_AUDIO_VOLUME, gGui->mixer.original_level); -- -- xine_close(gGui->stream); -- xine_close(gGui->visual_anim.stream); - -- xine_event_dispose_queue(gGui->event_queue); -- xine_event_dispose_queue(gGui->visual_anim.event_queue); -- -- /* we are going to dispose this stream, so make sure slider_loop -- * won't use it anymore (otherwise -> segfault on exit). -- */ -- gGui->running = 0; -+ if(gGui->stream) { -+ xine_dispose(gGui->stream); -+ gGui->stream = 0; -+ } - - if(gGui->visual_anim.post_output_element.post) - xine_post_dispose(gGui->xine, gGui->visual_anim.post_output_element.post); - -- xine_dispose(gGui->stream); -- /* xine_dispose(gGui->visual_anim.stream); */ -- -- if(gGui->vo_port) -+ if(gGui->vo_port) { - xine_close_video_driver(gGui->xine, gGui->vo_port); -- if(gGui->vo_none) -- xine_close_video_driver(gGui->xine, gGui->vo_none); -- -- if(gGui->ao_port) -+ gGui->vo_port = 0; -+ } -+ if(gGui->ao_port) { - xine_close_audio_driver(gGui->xine, gGui->ao_port); -- if(gGui->ao_none) -- xine_close_audio_driver(gGui->xine, gGui->ao_none); -+ gGui->ao_port = 0; -+ } - - xine_exit(gGui->xine); -+ -+ video_window_exit(); - -+#ifdef HAVE_XF86VIDMODE -+ /* just in case a different modeline than the original one is running, -+ * toggle back to window mode which automatically causes a switch back to -+ * the original modeline -+ */ -+ if(gGui->XF86VidMode_fullscreen) -+ video_window_set_fullscreen_mode(WINDOWED_MODE); -+ // gui_set_fullscreen_mode(NULL,NULL); -+#endif -+ - #ifdef HAVE_LIRC - if(gGui->lirc_enable) - lirc_stop(); |