cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.99.5

Browse Source 
ok brad
This commit is contained in:
steven 2007-05-22 08:11:08 +00:00
parent e280a37700
commit 50e6aa7e93
14 changed files with 45 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
multimedia/xine-ui/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2007/05/14 22:24:27 naddy Exp $
# $OpenBSD: Makefile,v 1.7 2007/05/22 08:11:08 steven Exp $
COMMENT= "multimedia player"
DISTNAME= xine-ui-0.99.4
PKGNAME= ${DISTNAME}p2
DISTNAME= xine-ui-0.99.5
CATEGORIES= multimedia
HOMEPAGE= http://xinehq.de/
@ -22,8 +21,8 @@ LIB_DEPENDS= xine.>=14::multimedia/xine-lib \
curl.>=2::net/curl \
png.>=4::graphics/png
WANTLIB= ICE SM X11 Xau Xdmcp Xext Xinerama Xtst Xv Xxf86vm \
c crypto freetype idn m ncurses pthread readline ssl z
WANTLIB= X11 Xau Xdmcp Xext Xinerama Xtst Xv Xxf86vm \
c crypto m ncurses pthread readline ssl z
USE_X11= Yes
USE_LIBTOOL= Yes
@ -36,7 +35,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--without-aalib \
--without-libcaca
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
.include <bsd.port.mk>

10
multimedia/xine-ui/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xine-ui-0.99.4.tar.gz) = kOofdnR+l4ijCnPn9Kds9g==
RMD160 (xine-ui-0.99.4.tar.gz) = 7urVxuVmreVQXI/LkkJyx0609Jo=
SHA1 (xine-ui-0.99.4.tar.gz) = uYLlaX8YNVnCFvkkO5QQ1hucWKo=
SHA256 (xine-ui-0.99.4.tar.gz) = WEHnK4FnJIQgvELPT34Bm6DK5P9NVGdtBgzCNErlPgc=
SIZE (xine-ui-0.99.4.tar.gz) = 2544984
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

22
multimedia/xine-ui/patches/patch-configure
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2006/03/24 22:46:37 jakemsr Exp $
--- configure.orig Tue Jan 10 02:28:32 2006
+++ configure Tue Jan 10 02:35:06 2006
@@ -29914,8 +29914,8 @@ BUILD_OS="`uname -s -r -m`"
BUILD_DATE="`date \"+%a %d %b %Y %T\"`"
+if false ; then
-
if test "$GCC" = yes; then
echo "$as_me:$LINENO: checking if $CC supports \"-mpreferred-stack-boundary=2\" flags" >&5
echo $ECHO_N "checking if $CC supports \"-mpreferred-stack-boundary=2\" flags... $ECHO_C" >&6
@@ -31110,7 +31110,7 @@ _ACEOF
;;
esac
-
+fi
if test x$no_BSDiconv != "xyes"; then
HAVE_GICONV_TRUE=

13
multimedia/xine-ui/patches/patch-src_common_utils_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_common_utils_c,v 1.1.1.1 2006/03/24 22:46:37 jakemsr Exp $
--- src/common/utils.c.orig Mon Feb 21 04:17:42 2005
+++ src/common/utils.c Mon Feb 21 04:18:02 2005
@@ -34,7 +34,9 @@
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/utsname.h>
+#ifdef HAVE_ALLOCA_H
#include <alloca.h>
+#endif
#ifdef HAVE_X11
#include <X11/Xlib.h>

8
multimedia/xine-ui/patches/patch-src_xitk_Imlib-light_utils_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_xitk_Imlib-light_utils_c,v 1.1.1.1 2006/03/24 22:46:37 jakemsr Exp $
--- src/xitk/Imlib-light/utils.c.orig Sun Jan 8 22:56:23 2006
+++ src/xitk/Imlib-light/utils.c Sun Jan 8 22:57:57 2006
@@ -154,7 +154,7 @@ Imlib_clone_image(ImlibData * id, ImlibI
$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)
{

30
multimedia/xine-ui/patches/patch-src_xitk_main_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-src_xitk_main_c,v 1.1 2006/04/22 18:37:28 bernd Exp $
--- src/xitk/main.c.orig Sun Jul 24 04:40:37 2005
+++ src/xitk/main.c Sat Apr 22 11:49:42 2006
@@ -456,7 +456,7 @@ static void print_formatted(char *title,
int len;
char *blanks = " ";
- printf(title);
+ printf("%s", title);
sprintf(buffer, "%s", blanks);
plugin = *plugins++;
@@ -469,7 +469,7 @@ static void print_formatted(char *title,
sprintf(buffer, "%s%s%s", buffer, (strlen(buffer) == strlen(blanks)) ? "" : ", ", plugin);
}
else {
- printf(buffer);
+ printf("%s", buffer);
printf(",\n");
snprintf(buffer, sizeof(buffer), "%s%s", blanks, plugin);
}
@@ -478,7 +478,7 @@ static void print_formatted(char *title,
}
if(strlen(buffer))
- printf(buffer);
+ printf("%s", buffer);
printf(".\n\n");
}

182
multimedia/xine-ui/patches/patch-src_xitk_oxine_mediamarks_c
View File

@ -1,182 +0,0 @@
$OpenBSD: patch-src_xitk_oxine_mediamarks_c,v 1.1.1.1 2006/03/24 22:46:37 jakemsr Exp $
--- src/xitk/oxine/mediamarks.c.orig Tue Feb 15 12:09:28 2005
+++ src/xitk/oxine/mediamarks.c Sun Jan 8 23:06:58 2006
@@ -33,6 +33,9 @@
#include <fcntl.h>
#include <string.h>
#include <libgen.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <errno.h>
#include "common.h"
@@ -88,7 +91,159 @@ struct mm_session_s {
/* private functions */
static int file_is_m3u(const char *mrl);
+/* prototypes */
+ssize_t getdelim (char **, size_t *, int, FILE *);
+ssize_t getline (char **, size_t *, FILE *);
+size_t strnlen (const char *, size_t);
+char * strndup (const char *, size_t);
+
+/* getline() */
+
+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t) -1)
+#endif
+#ifndef SSIZE_MAX
+# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
+#endif
+
+/* Read up to (and including) a DELIMITER from FP into *LINEPTR (and
+ NUL-terminate it). *LINEPTR is a pointer returned from malloc (or
+ NULL), pointing to *N characters of space. It is realloc'ed as
+ necessary. Returns the number of characters read (not including
+ the null terminator), or -1 on error or EOF. */
+
+ssize_t
+getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
+{
+ ssize_t result = 0;
+ size_t cur_len = 0;
+
+ if (lineptr == NULL || n == NULL || fp == NULL)
+ {
+ errno = EINVAL;
+ return -1;
+ }
+
+ flockfile (fp);
+
+ if (*lineptr == NULL || *n == 0)
+ {
+ *n = 120;
+ *lineptr = (char *) malloc (*n);
+ if (*lineptr == NULL)
+ {
+ result = -1;
+ goto unlock_return;
+ }
+ }
+
+ for (;;)
+ {
+ int i;
+
+ i = getc (fp);
+ if (i == EOF)
+ {
+ result = -1;
+ break;
+ }
+
+ /* Make enough space for len+1 (for final NUL) bytes. */
+ if (cur_len + 1 >= *n)
+ {
+ size_t needed_max =
+ SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
+ size_t needed = 2 * *n + 1; /* Be generous. */
+ char *new_lineptr;
+
+ if (needed_max < needed)
+ needed = needed_max;
+ if (cur_len + 1 >= needed)
+ {
+ result = -1;
+ goto unlock_return;
+ }
+
+ new_lineptr = (char *) realloc (*lineptr, needed);
+ if (new_lineptr == NULL)
+ {
+ result = -1;
+ goto unlock_return;
+ }
+
+ *lineptr = new_lineptr;
+ *n = needed;
+ }
+
+ (*lineptr)[cur_len] = i;
+ cur_len++;
+
+ if (i == delimiter)
+ break;
+ }
+ (*lineptr)[cur_len] = '\0';
+ result = cur_len ? cur_len : result;
+
+ unlock_return:
+ funlockfile (fp);
+ return result;
+}
+
+
+ssize_t
+getline (char **lineptr, size_t *n, FILE *stream)
+{
+ return getdelim (lineptr, n, '\n', stream);
+}
+
+
+#ifndef weak_alias
+# define __strnlen strnlen
+#endif
+
+/* Find the length of STRING, but scan at most MAXLEN characters.
+ If no '\0' terminator is found in that many characters, return MAXLEN. */
+
+size_t
+__strnlen (const char *string, size_t maxlen)
+{
+ const char *end = memchr (string, '\0', maxlen);
+ return end ? (size_t) (end - string) : maxlen;
+}
+#ifdef weak_alias
+weak_alias (__strnlen, strnlen)
+#endif
+
+
+#undef __strndup
+#undef strndup
+
+#ifndef weak_alias
+# define __strndup strndup
+#endif
+
+char *
+__strndup (const char *s, size_t n)
+{
+ size_t len = strnlen (s, n);
+ char *new = malloc (len + 1);
+
+ if (new == NULL)
+ return NULL;
+
+ new[len] = '\0';
+ return memcpy (new, s, len);
+}
+#ifdef weak_alias
+weak_alias (__strndup, strndup)
+#endif
+
+
+
+
+
+
/* body of mediamarks functions */
static void bpush (list_t *list, list_t *item) {
@@ -718,7 +873,7 @@ void mediamarks_cb (void *data) {
snprintf(mmpath,sizeof(mmpath),"%s/.xine/oxine/mediamarks", xine_get_homedir());
if (!read_mediamarks(items, mmpath)) {
lprintf("trying to load system wide mediamarks\n");
- snprintf(mmpath,1024,"%s/mediamarks", XINE_OXINEDIR);
+ snprintf(mmpath,sizeof(mmpath),"%s/mediamarks", XINE_OXINEDIR);
if (read_mediamarks(items, mmpath)) {
bpush(session->backpath, items);
oxine->reentry_data = session;

12
multimedia/xine-ui/patches/patch-src_xitk_oxine_oxine_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_xitk_oxine_oxine_c,v 1.1.1.1 2006/03/24 22:46:37 jakemsr Exp $
--- src/xitk/oxine/oxine.c.orig Sun Jan 8 23:07:11 2006
+++ src/xitk/oxine/oxine.c Sun Jan 8 23:08:41 2006
@@ -534,7 +534,7 @@ static void main_menu_init(oxine_t *oxin
snprintf(mmpath,sizeof(mmpath),"%s/.xine/oxine/mainmenu", xine_get_homedir());
if (!read_main_menu(oxine, oxine->main_menu_items, mmpath)) {
lprintf("trying to load system wide mainmenu\n");
- snprintf(mmpath,1024,"%s/mainmenu", XINE_OXINEDIR);
+ snprintf(mmpath,sizeof(mmpath),"%s/mainmenu", XINE_OXINEDIR);
if (read_main_menu(oxine, oxine->main_menu_items, mmpath)) {
/**/
} else {

11
multimedia/xine-ui/patches/patch-src_xitk_xine-remote_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_xitk_xine-remote_c,v 1.1.1.1 2006/03/24 22:46:37 jakemsr Exp $
--- src/xitk/xine-remote.c.orig Sun Jan 8 23:09:07 2006
+++ src/xitk/xine-remote.c Sun Jan 8 23:09:34 2006
@@ -41,6 +41,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <signal.h>
#if defined(__hpux)
#include <strings.h>

10
multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_font_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_xitk_xine-toolkit_font_c,v 1.1.1.1 2006/03/24 22:46:37 jakemsr Exp $
--- src/xitk/xine-toolkit/font.c.orig Thu Jan 6 09:46:56 2005
+++ src/xitk/xine-toolkit/font.c Sat Dec 24 23:18:18 2005
$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
@ -9,7 +9,7 @@ $OpenBSD: patch-src_xitk_xine-toolkit_font_c,v 1.1.1.1 2006/03/24 22:46:37 jakem
#endif
#ifdef HAVE_LANGINFO_CODESET
@@ -406,7 +407,7 @@ static int xitk_font_load_one(Display *d
@@ -419,7 +420,7 @@ static int xitk_font_load_one(Display *display, char *
#endif
{
XLOCK(display);
@ -18,7 +18,7 @@ $OpenBSD: patch-src_xitk_xine-toolkit_font_c,v 1.1.1.1 2006/03/24 22:46:37 jakem
xtfs->font = XftFontOpenName( display, DefaultScreen(display), xitk_font_core_string_to_xft(font));
#else
xtfs->font = XLoadQueryFont(display, font);
@@ -1262,7 +1263,7 @@ char *xitk_get_system_encoding(void) {
@@ -1285,7 +1286,7 @@ char *xitk_get_system_encoding(void) {
char *lang, *codeset = NULL;
#ifdef HAVE_LANGINFO_CODESET

8
multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_label_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_xitk_xine-toolkit_label_c,v 1.1.1.1 2006/03/24 22:46:37 jakemsr Exp $
--- src/xitk/xine-toolkit/label.c.orig Mon Feb 21 04:22:48 2005
+++ src/xitk/xine-toolkit/label.c Mon Feb 21 04:23:14 2005
@@ -335,7 +335,9 @@ static void label_setup_label(xitk_widge
$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 *
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
pthread_attr_getschedparam(&pth_attrs, &pth_params);

8
multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_tips_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_xitk_xine-toolkit_tips_c,v 1.1.1.1 2006/03/24 22:46:37 jakemsr Exp $
--- src/xitk/xine-toolkit/tips.c.orig Fri May 20 16:56:44 2005
+++ src/xitk/xine-toolkit/tips.c Sat Dec 24 21:41:58 2005
@@ -273,7 +273,9 @@ void xitk_tips_init(Display *disp) {
$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) {
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
pthread_attr_getschedparam(&pth_attrs, &pth_params);

12
multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_xitk_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_xitk_xine-toolkit_xitk_c,v 1.1 2006/04/22 18:37:28 bernd Exp $
--- src/xitk/xine-toolkit/xitk.c.orig Sat May 21 00:02:05 2005
+++ src/xitk/xine-toolkit/xitk.c Sat Apr 22 11:49:42 2006
@@ -1877,7 +1877,7 @@ void xitk_init(Display *display, XColor
sprintf(buffer, "%s%s", buffer, " ]-");
if(verbosity)
- printf(buffer);
+ printf("%s", buffer);
gXitk->wm_type = xitk_check_wm(display);

23
multimedia/xine-ui/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/03/24 22:46:37 jakemsr Exp $
@comment $OpenBSD: PLIST,v 1.2 2007/05/22 08:11:08 steven Exp $
@comment bin/fbxine
bin/xine
bin/xine-bugreport
@ -53,10 +53,25 @@ share/doc/xine-ui/README_pl
share/doc/xine-ui/README_uk
share/doc/xitk/
share/doc/xitk/README
share/icons/
share/icons/hicolor/
share/icons/hicolor/16x16/
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/xine.png
share/icons/hicolor/22x22/
share/icons/hicolor/22x22/apps/
share/icons/hicolor/22x22/apps/xine.png
share/icons/hicolor/32x32/
share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/xine.png
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/xine.png
share/locale/cs/LC_MESSAGES/xine-ui.mo
share/locale/cs/LC_MESSAGES/xitk.mo
share/locale/de/LC_MESSAGES/xine-ui.mo
share/locale/de/LC_MESSAGES/xitk.mo
share/locale/eo/LC_MESSAGES/xine-ui.mo
share/locale/es/LC_MESSAGES/xine-ui.mo
share/locale/es/LC_MESSAGES/xitk.mo
share/locale/eu/
@ -69,6 +84,8 @@ share/locale/it/LC_MESSAGES/xine-ui.mo
share/locale/it/LC_MESSAGES/xitk.mo
share/locale/ja/LC_MESSAGES/xine-ui.mo
share/locale/ja/LC_MESSAGES/xitk.mo
share/locale/nb/LC_MESSAGES/xine-ui.mo
share/locale/nb/LC_MESSAGES/xitk.mo
share/locale/pl/LC_MESSAGES/xine-ui.mo
share/locale/pl/LC_MESSAGES/xitk.mo
share/locale/pt_BR/LC_MESSAGES/xine-ui.mo
@ -81,10 +98,6 @@ share/locale/uk/LC_MESSAGES/xine-ui.mo
share/locale/uk/LC_MESSAGES/xitk.mo
share/pixmaps/
share/pixmaps/xine.xpm
share/pixmaps/xine_16x16.png
share/pixmaps/xine_22x22.png
share/pixmaps/xine_32x32.png
share/pixmaps/xine_48x48.png
share/xine/
share/xine/desktop/
share/xine/desktop/xine.desktop