Here is an update to Xine-ui 0.99.7. Tested on amd64.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/multimedia/xine-ui/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- Makefile 9 May 2012 06:30:38 -0000 1.25 +++ Makefile 11 Jun 2012 02:08:26 -0000 @@ -2,13 +2,12 @@ COMMENT= multimedia player -DISTNAME= xine-ui-0.99.6 -REVISION= 5 +DISTNAME= xine-ui-0.99.7 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} -EXTRACT_SUFX= .tar.bz2 +EXTRACT_SUFX= .tar.xz -HOMEPAGE= http://xinehq.de/ +HOMEPAGE= http://www.xine-project.org/ # GPLv2+ PERMIT_PACKAGE_CDROM= Yes @@ -16,21 +15,25 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += X11 Xext Xft Xinerama Xtst Xv Xxf86vm c curl m ncurses -WANTLIB += png pthread readline xine z +WANTLIB= X11 Xext Xft Xinerama Xss Xtst Xv Xxf86vm c curl jpeg m ncurses \ + png pthread readline xine z MODULES= devel/gettext RUN_DEPENDS= devel/desktop-file-utils \ misc/shared-mime-info -LIB_DEPENDS= multimedia/xine-lib \ - net/curl \ - graphics/png +LIB_DEPENDS= graphics/jpeg \ + graphics/png \ + multimedia/xine-lib \ + net/curl +MAKE_FLAGS= V=1 + +USE_GMAKE= Yes USE_LIBTOOL= Yes USE_GROFF= Yes -CONFIGURE_STYLE= autoconf -AUTOCONF_VERSION= 2.65 +CONFIGURE_STYLE= gnu CONFIGURE_ARGS+=--disable-lirc \ + --disable-nvtvsimple \ --disable-vdr-keys \ --without-aalib \ --without-caca Index: distinfo =================================================================== RCS file: /home/cvs/ports/multimedia/xine-ui/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 18 Apr 2010 20:59:39 -0000 1.4 +++ distinfo 11 Jun 2012 01:32:10 -0000 @@ -1,5 +1,5 @@ -MD5 (xine-ui-0.99.6.tar.bz2) = GAV9r9L4Qi0JCmvvYkVlLg== -RMD160 (xine-ui-0.99.6.tar.bz2) = bN9jm1//9Uus+gp772WvHn68rO4= -SHA1 (xine-ui-0.99.6.tar.bz2) = qNarmp5MvrCl1nfWlI4j0RAZ/Fs= -SHA256 (xine-ui-0.99.6.tar.bz2) = bH0wR5UEFU3sECoUMaBjK+QIPH7H3+YjByCiZ2qofzo= -SIZE (xine-ui-0.99.6.tar.bz2) = 2180633 +MD5 (xine-ui-0.99.7.tar.xz) = Kvb8wq1q9rouRxSXxdFA3A== +RMD160 (xine-ui-0.99.7.tar.xz) = 4vIxH2Klxce5kStMiswFnEJAanw= +SHA1 (xine-ui-0.99.7.tar.xz) = yoLgnPgkXQOIE7xNvYOEunnL8Zc= +SHA256 (xine-ui-0.99.7.tar.xz) = nYzf0cXIQlHWl4dlsFmt9XCZ/2xEfz5LWQZshWP2a8Q= +SIZE (xine-ui-0.99.7.tar.xz) = 1752328 Index: patches/patch-configure_ac =================================================================== RCS file: patches/patch-configure_ac diff -N patches/patch-configure_ac --- patches/patch-configure_ac 18 Apr 2010 20:59:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,31 +0,0 @@ -$OpenBSD: patch-configure_ac,v 1.1 2010/04/18 20:59:39 sthen Exp $ ---- configure.ac.orig Fri Mar 5 20:31:43 2010 -+++ configure.ac Fri Apr 9 18:26:10 2010 -@@ -88,13 +88,17 @@ dnl linked to thread lib, so the following AC - dnl in src/xitk/xine-toolkit/Makefile.am - dnl - case "$host" in -- *-*-freebsd*|*-*-openbsd*) -+ *-*-freebsd*) - THREAD_LIBS="-L/usr/local/lib -pthread" - THREAD_CFLAGS="-I/usr/local/include -D_THREAD_SAFE" - CFLAGS="-L/usr/local/lib $THREAD_CFLAGS $CFLAGS" - CPPFLAGS="-I/usr/local/include -L/usr/local/lib $CPPFLAGS" - ;; - -+ *-*-openbsd*) -+ THREAD_LIBS="-pthread" -+ ;; -+ - *-*-hpux11*) - THREAD_LIBS=" -pthread" - THREAD_CFLAGS="-D_REENTRANT" -@@ -471,7 +475,7 @@ dnl - dnl - BUILD_CC="`$CC -v 2>&1 | tail -n 1`" - BUILD_OS="`uname -s -r -m`" --BUILD_DATE="`date \"+%a %d %b %Y %T\"`" -+BUILD_DATE="`date "+%a %d %b %Y %T"`" - AC_SUBST(BUILD_CC) - AC_SUBST(BUILD_OS) - AC_SUBST(BUILD_DATE) Index: patches/patch-misc_desktops_Makefile_in =================================================================== RCS file: patches/patch-misc_desktops_Makefile_in diff -N patches/patch-misc_desktops_Makefile_in --- patches/patch-misc_desktops_Makefile_in 18 Apr 2010 20:59:39 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-misc_desktops_Makefile_in,v 1.2 2010/04/18 20:59:39 sthen Exp $ ---- misc/desktops/Makefile.in.orig Fri Mar 5 20:34:49 2010 -+++ misc/desktops/Makefile.in Sat Apr 3 12:57:12 2010 -@@ -269,7 +269,7 @@ icon22_DATA = icons/22/xine.png - icon32_DATA = icons/32/xine.png - icon48_DATA = icons/48/xine.png - pixmap_DATA = xine.xpm --desktopdir = $(datadir)/xine/desktop -+desktopdir = $(datadir)/applications - desktop_DATA = xine.desktop - all: all-am - Index: patches/patch-src_xitk_Imlib-light_load_c =================================================================== RCS file: patches/patch-src_xitk_Imlib-light_load_c diff -N patches/patch-src_xitk_Imlib-light_load_c --- patches/patch-src_xitk_Imlib-light_load_c 8 Jul 2011 20:38:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_xitk_Imlib-light_load_c,v 1.1 2011/07/08 20:38:01 naddy Exp $ - -Fix build with png-1.5. - ---- src/xitk/Imlib-light/load.c.orig Wed Jul 6 10:58:51 2011 -+++ src/xitk/Imlib-light/load.c Wed Jul 6 11:00:28 2011 -@@ -61,7 +61,7 @@ unsigned char *_LoadPNG(ImlibData * id, FILE * f, int - 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; Index: patches/patch-src_xitk_common_h =================================================================== RCS file: patches/patch-src_xitk_common_h diff -N patches/patch-src_xitk_common_h --- patches/patch-src_xitk_common_h 18 Apr 2010 20:59:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_xitk_common_h,v 1.1 2010/04/18 20:59:39 sthen Exp $ ---- src/xitk/common.h.orig Fri Apr 9 19:01:24 2010 -+++ src/xitk/common.h Fri Apr 9 19:09:16 2010 -@@ -375,8 +375,8 @@ typedef struct { - - void (*nongui_error_msg)(char *text); - -- FILE *stdout; /* Channel to original stdout at startup */ -- /* before an evtl. later redirection */ -+ FILE *orig_stdout; /* original stdout at startup */ -+ /* before an evtl. later redirection */ - } gGui_t; - - extern gGui_t *gGui; Index: patches/patch-src_xitk_download_c =================================================================== RCS file: patches/patch-src_xitk_download_c diff -N patches/patch-src_xitk_download_c --- patches/patch-src_xitk_download_c 7 Jul 2011 08:00:03 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_xitk_download_c,v 1.1 2011/07/07 08:00:03 jasper Exp $ ---- src/xitk/download.c.orig Thu Jul 7 09:59:09 2011 -+++ src/xitk/download.c Thu Jul 7 09:59:13 2011 -@@ -28,7 +28,6 @@ - - #ifdef HAVE_CURL - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - #endif - Index: patches/patch-src_xitk_main_c =================================================================== RCS file: patches/patch-src_xitk_main_c diff -N patches/patch-src_xitk_main_c --- patches/patch-src_xitk_main_c 18 Apr 2010 20:59:39 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,34 +0,0 @@ -$OpenBSD: patch-src_xitk_main_c,v 1.3 2010/04/18 20:59:39 sthen Exp $ ---- src/xitk/main.c.orig Fri Apr 9 19:09:27 2010 -+++ src/xitk/main.c Fri Apr 9 19:23:31 2010 -@@ -1425,7 +1425,7 @@ int main(int argc, char *argv[]) { - gGui->no_mouse = 0; - gGui->wid = 0; - gGui->nongui_error_msg = NULL; -- gGui->stdout = stdout; -+ gGui->orig_stdout = stdout; - - window_attribute.x = window_attribute.y = -8192; - window_attribute.width = window_attribute.height = -1; -@@ -1921,8 +1921,8 @@ int main(int argc, char *argv[]) { - else if(dup2(stdout_fd, STDOUT_FILENO) < 0) - fprintf(stderr, "cannot dup2 stdout_fd: %s.\n", strerror(errno)); - else { -- gGui->stdout = guiout_fp; -- setlinebuf(gGui->stdout); -+ gGui->orig_stdout = guiout_fp; -+ setlinebuf(gGui->orig_stdout); - close(stdout_fd); /* stdout_fd was intermediate, not needed any longer */ - } - } -@@ -2242,8 +2242,8 @@ int main(int argc, char *argv[]) { - - if(gGui->report != stdout) - fclose(gGui->report); -- if(gGui->stdout != stdout) -- fclose(gGui->stdout); -+ if(gGui->orig_stdout != stdout) -+ fclose(gGui->orig_stdout); - - free_command_line_args(&_argv, _argc); - Index: patches/patch-src_xitk_mediamark_c =================================================================== RCS file: patches/patch-src_xitk_mediamark_c diff -N patches/patch-src_xitk_mediamark_c --- patches/patch-src_xitk_mediamark_c 1 Apr 2011 12:32:34 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: patch-src_xitk_mediamark_c,v 1.1 2011/04/01 12:32:34 sthen Exp $ - -Avoid a possible overflow when handling media marks. - ---- src/xitk/mediamark.c.orig Fri Dec 18 19:34:22 2009 -+++ src/xitk/mediamark.c Thu Mar 31 19:24:33 2011 -@@ -796,7 +796,7 @@ static mediamark_t **guess_toxine_playlist(playlist_t - playlist->data = tox_content; - - if(playlist_split_data(playlist)) { -- char buffer[23768], path[_PATH_MAX + _NAME_MAX + 2]; -+ char buffer[32768], path[_PATH_MAX + _NAME_MAX + 2]; - char *p, *pp, *origin; - int start = 0; - int linen = 0; -@@ -976,8 +976,9 @@ static mediamark_t **guess_toxine_playlist(playlist_t - } - - if(*pp != '\0') { -- *p = *pp; -- p++; -+ /* buffer full? don't copy */ -+ if (p - buffer < sizeof (buffer) - 1) -+ *p++ = *pp; - pp++; - } - } Index: patches/patch-src_xitk_panel_c =================================================================== RCS file: patches/patch-src_xitk_panel_c diff -N patches/patch-src_xitk_panel_c --- patches/patch-src_xitk_panel_c 9 May 2012 06:30:38 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_xitk_panel_c,v 1.3 2012/05/09 06:30:38 ajacoutot Exp $ ---- src/xitk/panel.c.orig Tue May 8 23:36:00 2012 -+++ src/xitk/panel.c Tue May 8 23:36:47 2012 -@@ -1555,14 +1555,14 @@ void panel_init (void) { - - { - pthread_attr_t pth_attrs; --#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING -+#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0) - struct sched_param pth_params; - #endif - - pthread_attr_init(&pth_attrs); - - /* this won't work on linux, freebsd 5.0 */ --#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING -+#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0) - pthread_attr_getschedparam(&pth_attrs, &pth_params); - pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER); - pthread_attr_setschedparam(&pth_attrs, &pth_params); Index: patches/patch-src_xitk_stdctl_c =================================================================== RCS file: patches/patch-src_xitk_stdctl_c diff -N patches/patch-src_xitk_stdctl_c --- patches/patch-src_xitk_stdctl_c 18 Apr 2010 20:59:39 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_xitk_stdctl_c,v 1.1 2010/04/18 20:59:39 sthen Exp $ ---- src/xitk/stdctl.c.orig Fri Apr 9 19:23:40 2010 -+++ src/xitk/stdctl.c Fri Apr 9 19:23:53 2010 -@@ -170,7 +170,7 @@ void stdctl_start(void) { - int err; - - stdctl.fd = STDIN_FILENO; -- stdctl.fbk = gGui->stdout; -+ stdctl.fbk = gGui->orig_stdout; - - 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)); Index: patches/patch-src_xitk_xine-toolkit_image_c =================================================================== RCS file: patches/patch-src_xitk_xine-toolkit_image_c diff -N patches/patch-src_xitk_xine-toolkit_image_c --- patches/patch-src_xitk_xine-toolkit_image_c 1 Apr 2011 12:32:34 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-src_xitk_xine-toolkit_image_c,v 1.1 2011/04/01 12:32:34 sthen Exp $ - -Avoid a possible overflow when handling M3U files. - ---- src/xitk/xine-toolkit/image.c.orig Fri Dec 18 19:34:22 2009 -+++ src/xitk/xine-toolkit/image.c Thu Mar 31 19:24:12 2011 -@@ -497,6 +497,7 @@ xitk_image_t *xitk_image_create_image_with_colors_from - lines[numlines++] = bp; - bp += linel; - linel = 1; -+ bp[linel] = 0; - } - else { - char *nextword = (bp + lastws); -@@ -514,6 +515,7 @@ xitk_image_t *xitk_image_create_image_with_colors_from - memmove(bp, nextword, wordlen + 1); - - linel = wordlen; -+ lastws = 0; - } - - if(wlinew > maxw) Index: patches/patch-src_xitk_xine-toolkit_label_c =================================================================== RCS file: patches/patch-src_xitk_xine-toolkit_label_c diff -N patches/patch-src_xitk_xine-toolkit_label_c --- patches/patch-src_xitk_xine-toolkit_label_c 9 May 2012 06:30:38 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_xitk_xine-toolkit_label_c,v 1.5 2012/05/09 06:30:38 ajacoutot Exp $ ---- src/xitk/xine-toolkit/label.c.orig Fri Dec 18 19:34:22 2009 -+++ src/xitk/xine-toolkit/label.c Tue May 8 23:41:57 2012 -@@ -319,7 +319,7 @@ static void label_setup_label(xitk_widget_t *w, const - - if(label_len > private_data->length) { - pthread_attr_t pth_attrs; --#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING -+#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0) - struct sched_param pth_params; - #endif - -@@ -327,7 +327,7 @@ static void label_setup_label(xitk_widget_t *w, const - - pthread_attr_init(&pth_attrs); - --#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING -+#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0) - pthread_attr_getschedparam(&pth_attrs, &pth_params); - pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER); - pthread_attr_setschedparam(&pth_attrs, &pth_params); Index: patches/patch-src_xitk_xine-toolkit_tips_c =================================================================== RCS file: patches/patch-src_xitk_xine-toolkit_tips_c diff -N patches/patch-src_xitk_xine-toolkit_tips_c --- patches/patch-src_xitk_xine-toolkit_tips_c 9 May 2012 06:30:38 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_xitk_xine-toolkit_tips_c,v 1.5 2012/05/09 06:30:38 ajacoutot Exp $ ---- src/xitk/xine-toolkit/tips.c.orig Fri Dec 18 19:34:22 2009 -+++ src/xitk/xine-toolkit/tips.c Tue May 8 23:43:50 2012 -@@ -222,7 +222,7 @@ void xitk_tips_init(Display *disp) { - - if(!tips.running) { - pthread_attr_t pth_attrs; --#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING -+#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0) - struct sched_param pth_params; - #endif - -@@ -240,7 +240,7 @@ void xitk_tips_init(Display *disp) { - - pthread_attr_init(&pth_attrs); - --#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING -+#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0) - pthread_attr_getschedparam(&pth_attrs, &pth_params); - pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER); - pthread_attr_setschedparam(&pth_attrs, &pth_params); Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/multimedia/xine-ui/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 28 Apr 2012 14:08:54 -0000 1.7 +++ pkg/PLIST 11 Jun 2012 02:14:01 -0000 @@ -4,33 +4,33 @@ bin/xine-bugreport bin/xine-check @bin bin/xine-remote -@comment man/de/ -@comment man/de/man1/ -@comment @man man/de/man1/aaxine.1 -@comment @man man/de/man1/xine-bugreport.1 -@comment @man man/de/man1/xine-check.1 -@comment @man man/de/man1/xine-remote.1 -@comment @man man/de/man1/xine.1 -@comment man/es/ -@comment man/es/man1/ -@comment @man man/es/man1/aaxine.1 -@comment @man man/es/man1/xine-bugreport.1 -@comment @man man/es/man1/xine-check.1 -@comment @man man/es/man1/xine-remote.1 -@comment @man man/es/man1/xine.1 -@comment man/fr/ -@comment man/fr/man1/ -@comment @man man/fr/man1/xine.1 -@comment @man man/man1/aaxine.1 +man/de/ +man/de/man1/ +@man man/de/man1/aaxine.1 +@man man/de/man1/xine-bugreport.1 +@man man/de/man1/xine-check.1 +@man man/de/man1/xine-remote.1 +@man man/de/man1/xine.1 +man/es/ +man/es/man1/ +@man man/es/man1/aaxine.1 +@man man/es/man1/xine-bugreport.1 +@man man/es/man1/xine-check.1 +@man man/es/man1/xine-remote.1 +@man man/es/man1/xine.1 +man/fr/ +man/fr/man1/ +@man man/fr/man1/xine.1 +@man man/man1/aaxine.1 @man man/man1/xine-bugreport.1 @man man/man1/xine-check.1 @man man/man1/xine-remote.1 @man man/man1/xine.1 -@comment man/pl/ -@comment man/pl/man1/ -@comment @man man/pl/man1/aaxine.1 -@comment @man man/pl/man1/xine-remote.1 -@comment @man man/pl/man1/xine.1 +man/pl/ +man/pl/man1/ +@man man/pl/man1/aaxine.1 +@man man/pl/man1/xine-remote.1 +@man man/pl/man1/xine.1 share/applications/xine.desktop share/doc/xine-ui/ share/doc/xine-ui/README.config_en @@ -107,7 +107,7 @@ share/xine/oxine/ share/xine/oxine/mainmenu share/xine/oxine/mediamarks share/xine/skins/ -share/xine/skins/xine-ui_logo.mpv +share/xine/skins/xine-ui_logo.png share/xine/skins/xine_splash.png share/xine/skins/xinetic/ share/xine/skins/xinetic/BigArrowDown.png @@ -173,7 +173,7 @@ share/xine/skins/xinetic/SmallArrowDown. share/xine/skins/xinetic/SmallArrowUp.png share/xine/skins/xinetic/skinconfig share/xine/visuals/ -share/xine/visuals/default.avi +share/xine/visuals/default.mpv @exec %D/bin/update-mime-database %D/share/mime @unexec-delete %D/bin/update-mime-database %D/share/mime @exec %D/bin/update-desktop-database -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.