Here is an update to Xine-ui 0.99.6.
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/xine-ui/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 22 Dec 2009 15:46:59 -0000 1.13
+++ Makefile 9 Apr 2010 23:34:59 -0000
@@ -1,43 +1,41 @@
# $OpenBSD: Makefile,v 1.13 2009/12/22 15:46:59 ajacoutot Exp $
-COMMENT= multimedia player
+COMMENT= multimedia player
-DISTNAME= xine-ui-0.99.5
-PKGNAME= ${DISTNAME}p3
-CATEGORIES= multimedia
+DISTNAME= xine-ui-0.99.6
+CATEGORIES= multimedia
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
+EXTRACT_SUFX= .tar.bz2
-HOMEPAGE= http://xinehq.de/
+HOMEPAGE= http://xinehq.de/
-# GPL
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
+WANTLIB= X11 Xau Xdmcp Xext Xft Xinerama Xrender Xtst Xv Xxf86vm c \
+ expat fontconfig freetype m ncurses pthread pthread-stubs \
+ readline xcb z
+
+MODULES= devel/gettext
+RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
+LIB_DEPENDS= xine.>=14::multimedia/xine-lib \
+ curl.>=2::net/curl \
+ png.>=4::graphics/png
+
+USE_X11= Yes
+USE_LIBTOOL= Yes
+CONFIGURE_STYLE= autoconf
+# Should be 2.65
+AUTOCONF_VERSION= 2.64
+CONFIGURE_ARGS+=--disable-lirc \
+ --disable-mbs \
+ --disable-vdr-keys \
+ --without-aalib \
+ --without-caca
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
-
-MODULES= devel/gettext
-
-RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS= xine.>=14::multimedia/xine-lib \
- curl.>=2::net/curl \
- png.>=4::graphics/png
-
-WANTLIB= X11 Xau Xdmcp Xext Xinerama Xtst Xv Xxf86vm \
- c m ncurses pthread pthread-stubs readline xcb z
-
-USE_X11= Yes
-USE_LIBTOOL= Yes
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
- --disable-lirc \
- --disable-vdr-keys \
- --disable-mbs \
- --disable-xft \
- --without-aalib \
- --without-libcaca
-
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng" \
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/xine-ui/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 22 May 2007 08:11:08 -0000 1.3
+++ distinfo 3 Apr 2010 16:40:19 -0000
@@ -1,5 +1,5 @@
-MD5 (xine-ui-0.99.5.tar.gz) = 5kPNH8rU2Ypa5OuHfOUIew==
-RMD160 (xine-ui-0.99.5.tar.gz) = ZMtpVJ2I2QTZhup917NqUdW5F1Y=
-SHA1 (xine-ui-0.99.5.tar.gz) = T0UlFjGfMc2gHQjqJ3nxlZM68Ls=
-SHA256 (xine-ui-0.99.5.tar.gz) = E2iqnP1wQz0U795b8OcJEfgPlGOgJhksHxM6M5viXh4=
-SIZE (xine-ui-0.99.5.tar.gz) = 2606481
+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
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac 9 Apr 2010 22:26:20 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+--- 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:
/cvs/ports/multimedia/xine-ui/patches/patch-misc_desktops_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-misc_desktops_Makefile_in
--- patches/patch-misc_desktops_Makefile_in 29 Jan 2009 17:37:57 -0000
1.1
+++ patches/patch-misc_desktops_Makefile_in 3 Apr 2010 16:57:31 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-misc_desktops_Makefile_in,v 1.1 2009/01/29 17:37:57 ajacoutot
Exp $
---- misc/desktops/Makefile.in.orig Thu Jan 29 17:54:11 2009
-+++ misc/desktops/Makefile.in Thu Jan 29 17:54:27 2009
-@@ -271,7 +271,7 @@ icon22_DATA = icons/22/xine.png
+--- 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
Index: patches/patch-src_xitk_Imlib-light_utils_c
===================================================================
RCS file: patches/patch-src_xitk_Imlib-light_utils_c
diff -N patches/patch-src_xitk_Imlib-light_utils_c
--- patches/patch-src_xitk_Imlib-light_utils_c 22 May 2007 08:11:08 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_xitk_Imlib-light_utils_c,v 1.2 2007/05/22 08:11:08 steven
Exp $
---- src/xitk/Imlib-light/utils.c.orig Thu Apr 20 21:02:13 2006
-+++ src/xitk/Imlib-light/utils.c Wed May 16 17:38:59 2007
-@@ -154,7 +154,7 @@ Imlib_clone_image(ImlibData * id, ImlibImage * im)
- s = malloc(strlen(im->filename) + 320);
- if (s)
- {
-- snprintf(s, sizeof(s), "%s_%x_%x", im->filename, (int)time(NULL),
(int)rand());
-+ snprintf(s, strlen(im->filename) + 320, "%s_%x_%x", im->filename,
(int)time(NULL), (int)rand());
- im2->filename = malloc(strlen(s) + 1);
- if (im2->filename)
- strcpy(im2->filename, s);
Index: patches/patch-src_xitk_common_h
===================================================================
RCS file: patches/patch-src_xitk_common_h
diff -N patches/patch-src_xitk_common_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_xitk_common_h 9 Apr 2010 23:24:04 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- 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_event_c
===================================================================
RCS file: patches/patch-src_xitk_event_c
diff -N patches/patch-src_xitk_event_c
--- patches/patch-src_xitk_event_c 24 Mar 2006 22:46:37 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_xitk_event_c,v 1.1.1.1 2006/03/24 22:46:37 jakemsr Exp $
---- src/xitk/event.c.orig Sat Jul 23 19:40:37 2005
-+++ src/xitk/event.c Sat Dec 24 21:41:58 2005
-@@ -47,6 +47,10 @@
-
- #define STEP_SIZE 256
-
-+#ifndef PRIi64
-+#define PRIi64 "ld"
-+#endif
-+
- /*
- * global variables
- */
Index: patches/patch-src_xitk_main_c
===================================================================
RCS file: patches/patch-src_xitk_main_c
diff -N patches/patch-src_xitk_main_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_xitk_main_c 9 Apr 2010 23:24:01 -0000
@@ -0,0 +1,34 @@
+$OpenBSD$
+--- 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_stdctl_c
===================================================================
RCS file: patches/patch-src_xitk_stdctl_c
diff -N patches/patch-src_xitk_stdctl_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_xitk_stdctl_c 9 Apr 2010 23:24:01 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- 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_font_c
===================================================================
RCS file: patches/patch-src_xitk_xine-toolkit_font_c
diff -N patches/patch-src_xitk_xine-toolkit_font_c
--- patches/patch-src_xitk_xine-toolkit_font_c 22 May 2007 08:11:08 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-src_xitk_xine-toolkit_font_c,v 1.2 2007/05/22 08:11:08 steven
Exp $
---- src/xitk/xine-toolkit/font.c.orig Mon Mar 26 00:53:06 2007
-+++ src/xitk/xine-toolkit/font.c Wed May 16 17:38:59 2007
-@@ -38,6 +38,7 @@
-
- #ifdef HAVE_ICONV
- #include <iconv.h>
-+#include <localcharset.h>
- #endif
-
- #ifdef HAVE_LANGINFO_CODESET
-@@ -419,7 +420,7 @@ static int xitk_font_load_one(Display *display, char *
- #endif
- {
- XLOCK(display);
--#ifdef WITH_XFT
-+#ifdef WITH_XMB
- xtfs->font = XftFontOpenName( display, DefaultScreen(display),
xitk_font_core_string_to_xft(font));
- #else
- xtfs->font = XLoadQueryFont(display, font);
-@@ -1285,7 +1286,7 @@ char *xitk_get_system_encoding(void) {
- char *lang, *codeset = NULL;
-
- #ifdef HAVE_LANGINFO_CODESET
-- codeset = nl_langinfo(CODESET);
-+ codeset = locale_charset();
- #endif
- /*
- * guess locale codeset according to shell variables
Index: patches/patch-src_xitk_xine-toolkit_label_c
===================================================================
RCS file:
/cvs/ports/multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_label_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_xitk_xine-toolkit_label_c
--- patches/patch-src_xitk_xine-toolkit_label_c 22 May 2007 08:11:08 -0000
1.2
+++ patches/patch-src_xitk_xine-toolkit_label_c 3 Apr 2010 16:57:27 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_xitk_xine-toolkit_label_c,v 1.2 2007/05/22 08:11:08 steven
Exp $
---- src/xitk/xine-toolkit/label.c.orig Mon May 22 19:53:26 2006
-+++ src/xitk/xine-toolkit/label.c Wed May 16 17:38:59 2007
-@@ -335,7 +335,9 @@ static void label_setup_label(xitk_widget_t *w, char *
+--- src/xitk/xine-toolkit/label.c.orig Fri Dec 18 19:34:22 2009
++++ src/xitk/xine-toolkit/label.c Sat Apr 3 12:57:12 2010
+@@ -329,7 +329,9 @@ static void label_setup_label(xitk_widget_t *w, const
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
pthread_attr_getschedparam(&pth_attrs, &pth_params);
Index: patches/patch-src_xitk_xine-toolkit_tips_c
===================================================================
RCS file:
/cvs/ports/multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_tips_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_xitk_xine-toolkit_tips_c
--- patches/patch-src_xitk_xine-toolkit_tips_c 22 May 2007 08:11:08 -0000
1.2
+++ patches/patch-src_xitk_xine-toolkit_tips_c 3 Apr 2010 16:57:27 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_xitk_xine-toolkit_tips_c,v 1.2 2007/05/22 08:11:08 steven
Exp $
---- src/xitk/xine-toolkit/tips.c.orig Sun Dec 31 22:58:10 2006
-+++ src/xitk/xine-toolkit/tips.c Wed May 16 17:38:59 2007
-@@ -248,7 +248,9 @@ void xitk_tips_init(Display *disp) {
+--- src/xitk/xine-toolkit/tips.c.orig Fri Dec 18 19:34:22 2009
++++ src/xitk/xine-toolkit/tips.c Sat Apr 3 12:57:12 2010
+@@ -242,7 +242,9 @@ void xitk_tips_init(Display *disp) {
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
pthread_attr_getschedparam(&pth_attrs, &pth_params);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/xine-ui/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 22 Dec 2009 15:46:59 -0000 1.4
+++ pkg/PLIST 9 Apr 2010 23:28:59 -0000
@@ -13,6 +13,10 @@ bin/xine-check
@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/
@@ -95,6 +99,9 @@ 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/
+share/mime/packages/
+share/mime/packages/xine-ui.xml
share/pixmaps/
share/pixmaps/xine.xpm
share/xine/
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
