diff options
author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2005-09-20 16:46:18 +0000 |
---|---|---|
committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2005-09-20 16:46:18 +0000 |
commit | 68728f68dc79e935519b27dba50d27972dc3551a (patch) | |
tree | 2019d38b03dc3dc76c27671bef10f082093d5ece /multimedia/xine | |
parent | Update to 1.1.0. (diff) |
Update to 0.99.4.
Add WITHOUT_LIBCACA knob. [*]
PR: ports/84744 [*]
Submitted by: Carlos A M dos Santos <casantos@urisan.tche.br> [*]
Diffstat (limited to 'multimedia/xine')
-rw-r--r-- | multimedia/xine/Makefile | 7 | ||||
-rw-r--r-- | multimedia/xine/distinfo | 4 | ||||
-rw-r--r-- | multimedia/xine/files/patch-src:xitk:oxine:mediamarks.c | 42 | ||||
-rw-r--r-- | multimedia/xine/pkg-plist | 8 |
4 files changed, 55 insertions, 6 deletions
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile index 15c76c789288..c40d7127d924 100644 --- a/multimedia/xine/Makefile +++ b/multimedia/xine/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xine -PORTVERSION= 0.99.3 -PORTREVISION= 1 +PORTVERSION= 0.99.4 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +15,7 @@ DISTNAME= ${PORTNAME}-ui-${PORTVERSION} MAINTAINER= nobutaka@FreeBSD.org COMMENT= An X11 multimedia player -LIB_DEPENDS= xine.13:${PORTSDIR}/multimedia/libxine \ +LIB_DEPENDS= xine.14:${PORTSDIR}/multimedia/libxine \ aa.1:${PORTSDIR}/graphics/aalib \ png.5:${PORTSDIR}/graphics/png @@ -72,7 +71,7 @@ LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft CONFIGURE_ARGS+= --disable-xft .endif -.if exists(${LOCALBASE}/lib/libcaca.a) || defined(WITH_LIBCACA) +.if !defined(WITHOUT_LIBCACA) && (exists(${LOCALBASE}/lib/libcaca.a) || defined(WITH_LIBCACA)) PLIST_SUB+= WITH_LIBCACA="" .else PLIST_SUB+= WITH_LIBCACA="@comment " diff --git a/multimedia/xine/distinfo b/multimedia/xine/distinfo index 1b38523eb16b..2e3c6dd2a35d 100644 --- a/multimedia/xine/distinfo +++ b/multimedia/xine/distinfo @@ -1,2 +1,2 @@ -MD5 (xine-ui-0.99.3.tar.gz) = aa7805a93e511e3d67dc1bf09a71fcdd -SIZE (xine-ui-0.99.3.tar.gz) = 2610080 +MD5 (xine-ui-0.99.4.tar.gz) = 90ea1f76747e9788a30a73e7f4a76cf6 +SIZE (xine-ui-0.99.4.tar.gz) = 2544984 diff --git a/multimedia/xine/files/patch-src:xitk:oxine:mediamarks.c b/multimedia/xine/files/patch-src:xitk:oxine:mediamarks.c new file mode 100644 index 000000000000..6d9a8b1cbf9a --- /dev/null +++ b/multimedia/xine/files/patch-src:xitk:oxine:mediamarks.c @@ -0,0 +1,42 @@ +--- src/xitk/oxine/mediamarks.c.orig Tue Sep 20 23:58:50 2005 ++++ src/xitk/oxine/mediamarks.c Wed Sep 21 00:13:23 2005 +@@ -439,34 +439,19 @@ + + static void parse_m3u(const char *mrl, list_t *items) { + FILE *file; +- char **line; +- int *n; +- int a; ++ char line[1024]; + + file = fopen(mrl, "r"); +- if(!file) return ; ++ if(!file) return; + +- n = ho_new(size_t); +- line = ho_new(char *); +- +- *line = NULL; +- *n = 0; +- a = getline(line, n, file); +- if(a<=0) return; +- +- while((a = getline(line, n, file))>0) { +- char *str; ++ while(fgets(line, sizeof(line) - 1, file) != NULL) { + playitem_t *item; + +- if(*line[0] == '#') continue; +- str = strndup(*line, a-1); ++ if(line[0] == '#') continue; + /* printf("%s\n", str); */ +- item = playitem_new (TYPE_REG, basename(str), str, list_new()); +- ho_free(str); ++ item = playitem_new (TYPE_REG, basename(line), line, list_new()); + playitem_append(item, items); + } +- ho_free(line); +- ho_free(n); + fclose(file); + } + diff --git a/multimedia/xine/pkg-plist b/multimedia/xine/pkg-plist index 67f51bb3a93b..9468ad453617 100644 --- a/multimedia/xine/pkg-plist +++ b/multimedia/xine/pkg-plist @@ -16,6 +16,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 @@ -34,6 +35,8 @@ share/locale/de/LC_MESSAGES/xine-ui.mo share/locale/de/LC_MESSAGES/xitk.mo share/locale/es/LC_MESSAGES/xine-ui.mo share/locale/es/LC_MESSAGES/xitk.mo +share/locale/eu/LC_MESSAGES/xine-ui.mo +share/locale/eu/LC_MESSAGES/xitk.mo share/locale/fr/LC_MESSAGES/xine-ui.mo share/locale/fr/LC_MESSAGES/xitk.mo share/locale/it/LC_MESSAGES/xine-ui.mo @@ -44,6 +47,8 @@ share/locale/pl/LC_MESSAGES/xine-ui.mo share/locale/pl/LC_MESSAGES/xitk.mo share/locale/pt_BR/LC_MESSAGES/xine-ui.mo share/locale/pt_BR/LC_MESSAGES/xitk.mo +share/locale/ru/LC_MESSAGES/xine-ui.mo +share/locale/ru/LC_MESSAGES/xitk.mo share/locale/sk/LC_MESSAGES/xine-ui.mo share/locale/sk/LC_MESSAGES/xitk.mo share/locale/uk/LC_MESSAGES/xine-ui.mo @@ -54,6 +59,8 @@ share/pixmaps/xine_22x22.png share/pixmaps/xine_32x32.png share/pixmaps/xine_48x48.png share/xine/desktop/xine.desktop +share/xine/oxine/mainmenu +share/xine/oxine/mediamarks share/xine/skins/xine_splash.png share/xine/skins/xine-ui_logo.mpv share/xine/skins/xinetic/BigArrowDown.png @@ -146,6 +153,7 @@ share/xine/visuals/default.avi @unexec rmdir %D/share/locale 2>/dev/null || true @dirrm share/xine/visuals @dirrm share/xine/skins/xinetic +@dirrm share/xine/oxine @dirrm share/xine/desktop @dirrm share/xine/skins @unexec rmdir %D/share/xine 2>/dev/null || true |