Update to 0.99.5.

Use OPTIONS.
Add lirc support (default off).
Make curl support optional (default on).
Add WITHOUT_NLS knob

PR:		ports/114015
Submitted by:	Max Brazhnikov <makc@issp.ac.ru>
This commit is contained in:
MANTANI Nobutaka 2007-07-15 15:28:34 +00:00
parent 14905f1b01
commit d7e60fec56
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=195663
19 changed files with 314 additions and 376 deletions

View file

@ -6,8 +6,7 @@
# #
PORTNAME= xine PORTNAME= xine
PORTVERSION= 0.99.4 PORTVERSION= 0.99.5
PORTREVISION= 10
CATEGORIES= multimedia CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} MASTER_SITE_SUBDIR= ${PORTNAME}
@ -17,22 +16,30 @@ MAINTAINER= nobutaka@FreeBSD.org
COMMENT= An X11 multimedia player COMMENT= An X11 multimedia player
LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine \ LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine \
png.5:${PORTSDIR}/graphics/png \ png.5:${PORTSDIR}/graphics/png
curl.4:${PORTSDIR}/ftp/curl
USE_GETTEXT= yes USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes USE_GMAKE= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \ LDFLAGS="-L${LOCALBASE}/lib" \
THREAD_CFLAGS="${PTHREAD_CFLAGS}" \ THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
THREAD_LIBS="${PTHREAD_LIBS}" THREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --program-transform-name=""
MANLANG= "" de es fr pl MANLANG= "" de es fr pl
MAN1= aaxine.1 xine-bugreport.1 xine-check.1 xine-remote.1 xine.1 MAN1= aaxine.1 xine-bugreport.1 xine-check.1 xine-remote.1 xine.1
OPTIONS= CACA "Enable libcaca output" off \
AALIB "Enable aalib output" off \
LIRC "Enable lirc support" off \
CURL "Enable culr support" on \
WIN32_CODECS "Enable win32 codecs (for i386 only)" on \
NLS "Enable Native Language Support" on \
XFT "Enable Xft support" on
DOCSDIR= ${TARGETDIR}/share/doc/xine-ui
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${ARCH} == "i386" .if ${ARCH} == "i386"
@ -65,22 +72,44 @@ LIB_DEPENDS+= readline.5:${PORTSDIR}/devel/readline
CONFIGURE_ARGS+= --with-readline=${LOCALBASE} CONFIGURE_ARGS+= --with-readline=${LOCALBASE}
.endif .endif
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.endif
.if !defined(WITHOUT_XFT) .if !defined(WITHOUT_XFT)
LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft
.else .else
CONFIGURE_ARGS+= --disable-xft CONFIGURE_ARGS+= --disable-xft
.endif .endif
.if !defined(WITHOUT_CACA) && (exists(${LOCALBASE}/lib/libcaca.a) || defined(WITH_CACA)) .if !defined(WITHOUT_CURL)
LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl
.else
CONFIGURE_ARGS+= --without-curl
.endif
.if defined(WITH_LIRC)
LIB_DEPENDS+= lirc_client.1:${PORTSDIR}/comms/lirc
CONFIGURE_ARGS+= --enable-lirc
.else
CONFIGURE_ARGS+= --disable-lirc
.endif
.if defined(WITH_CACA)
PLIST_SUB+= WITH_CACA="" PLIST_SUB+= WITH_CACA=""
.else .else
PLIST_SUB+= WITH_CACA="@comment " PLIST_SUB+= WITH_CACA="@comment "
CONFIGURE_ARGS+= --without-libcaca --disable-cacatest CONFIGURE_ARGS+= --without-caca --disable-cacatest
.endif .endif
.if !defined(WITHOUT_AALIB) && (exists(${LOCALBASE}/lib/libaa.so.1) || defined (WITH_AALIB)) .if defined(WITH_AALIB)
LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
PLIST_SUB+= WITH_AALIB="" PLIST_SUB+= WITH_AALIB=""
CONFIGURE_ARGS+= --with-aalib
.else .else
PLIST_SUB+= WITH_AALIB="@comment " PLIST_SUB+= WITH_AALIB="@comment "
CONFIGURE_ARGS+= --without-aalib --disable-aalibtest CONFIGURE_ARGS+= --without-aalib --disable-aalibtest
@ -89,16 +118,8 @@ CONFIGURE_ARGS+= --without-aalib --disable-aalibtest
post-patch: post-patch:
@${REINPLACE_CMD} -e \ @${REINPLACE_CMD} -e \
's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \ 's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \ s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g' \
s|-L/usr/local/lib||g ; \ ${WRKSRC}/configure
s|-I/usr/local/include||g' ${WRKSRC}/configure
.if ${OSVERSION} >= 500035
@${REINPLACE_CMD} -e \
's|-malign-loops|-falign-loops|g ; \
s|-malign-jumps|-falign-jumps|g ; \
s|-malign-functions|-falign-functions|g' ${WRKSRC}/configure
.endif
@${RM} ${WRKSRC}/src/xitk/xine-remote.c
post-install: post-install:
.for l in es fr .for l in es fr

View file

@ -1,3 +1,3 @@
MD5 (xine-ui-0.99.4.tar.gz) = 90ea1f76747e9788a30a73e7f4a76cf6 MD5 (xine-ui-0.99.5.tar.gz) = e643cd1fcad4d98a5ae4eb877ce5087b
SHA256 (xine-ui-0.99.4.tar.gz) = 5841e72b8167248420bc42cf4f7e019ba0cae4ff4d54676d060cc2344ae53e07 SHA256 (xine-ui-0.99.5.tar.gz) = 1368aa9cfd70433d14efde5bf0e70911f80f9463a026192c1f133a339be25e1e
SIZE (xine-ui-0.99.4.tar.gz) = 2544984 SIZE (xine-ui-0.99.5.tar.gz) = 2606481

View file

@ -1,32 +0,0 @@
--- ltmain.sh.orig Sat Apr 17 07:11:07 2004
+++ ltmain.sh Mon May 10 00:27:21 2004
@@ -1238,6 +1238,7 @@
;;
-avoid-version)
+ build_old_libs=no
avoid_version=yes
continue
;;
@@ -1341,7 +1342,7 @@
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -5493,10 +5494,12 @@
fi
# Install the pseudo-library for information purposes.
+ if /usr/bin/false; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $?
+ fi
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

View file

@ -1,10 +0,0 @@
--- src/common/utils.c.orig Wed Jan 7 01:04:22 2004
+++ src/common/utils.c Wed Jan 7 01:04:47 2004
@@ -34,7 +34,6 @@
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/utsname.h>
-#include <alloca.h>
#ifdef HAVE_X11
#include <X11/Xlib.h>

View file

@ -1,11 +0,0 @@
--- src/xitk/Makefile.in.orig Wed Jan 7 22:11:20 2004
+++ src/xitk/Makefile.in Wed Jan 7 22:16:30 2004
@@ -469,7 +469,7 @@
$(LINK) $(xine_LDFLAGS) $(xine_OBJECTS) $(xine_LDADD) $(LIBS)
xine-remote$(EXEEXT): $(xine_remote_OBJECTS) $(xine_remote_DEPENDENCIES)
@rm -f xine-remote$(EXEEXT)
- $(LINK) $(xine_remote_LDFLAGS) $(xine_remote_OBJECTS) $(xine_remote_LDADD) $(LIBS)
+ $(LINK) $(xine_remote_LDFLAGS) $(xine_remote_OBJECTS) $(xine_remote_LDADD) $(LIBS) $(INTLLIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core

View file

@ -1,13 +1,13 @@
--- src/xitk/kbindings.c.orig Fri Dec 17 01:14:08 2004 --- src/xitk/kbindings.c.orig Tue Apr 10 07:39:35 2007
+++ src/xitk/kbindings.c Thu Dec 30 04:29:27 2004 +++ src/xitk/kbindings.c Sun Jul 15 19:19:16 2007
@@ -81,8 +81,8 @@ @@ -81,8 +81,8 @@
} _kbedit_t; } _kbedit_t;
static _kbedit_t *kbedit = NULL; static _kbedit_t *kbedit = NULL;
-static char *fontname = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*"; -static char *fontname = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
-static char *br_fontname = "-misc-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*"; -static char *br_fontname = "-misc-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*";
+static char *fontname = "-*-*-bold-r-normal-*-12-*-*-*-*-*-*-*"; +static char *fontname = "-*-*-bold-r-*-*-12-*-*-*-*-*-*-*";
+static char *br_fontname = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*"; +static char *br_fontname = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*";
#define FONT_HEIGHT_MODEL "azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN&é(-è_çà)=¹~#{[|`\\^@]}%"
#define WINDOW_WIDTH 520 #define WINDOW_WIDTH 530
#define WINDOW_HEIGHT 456

View file

@ -1,13 +0,0 @@
--- src/xitk/kbindings_man.c.orig Fri Dec 17 01:14:08 2004
+++ src/xitk/kbindings_man.c Thu Dec 30 04:30:07 2004
@@ -81,8 +81,8 @@
} _kbedit_t;
static _kbedit_t *kbedit = NULL;
-static char *fontname = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
-static char *br_fontname = "-misc-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*";
+static char *fontname = "-*-*-bold-r-normal-*-12-*-*-*-*-*-*-*";
+static char *br_fontname = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*";
#define FONT_HEIGHT_MODEL "azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN&é(-è_çà)=¹~#{[|`\\^@]}%"
#define WINDOW_WIDTH 520

View file

@ -1,10 +0,0 @@
--- src/xitk/network.c.orig Mon Mar 3 23:43:41 2003
+++ src/xitk/network.c Tue Mar 25 00:10:12 2003
@@ -48,6 +48,7 @@
#include <time.h>
#include <sys/ioctl.h>
#include <sys/types.h>
+#include <sys/select.h>
#include <sys/stat.h>
#include <sys/signal.h>
#include <sys/time.h>

View file

@ -1,42 +0,0 @@
--- 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);
}

View file

@ -1,10 +0,0 @@
--- src/xitk/session.c.orig Mon Mar 3 23:43:45 2003
+++ src/xitk/session.c Tue Mar 25 00:11:39 2003
@@ -41,6 +41,7 @@
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/un.h>
+#include <sys/select.h>
#include <errno.h>
#include "common.h"

View file

@ -1,14 +1,13 @@
--- src/xitk/skins.c.orig Mon Nov 22 17:45:26 2004 --- src/xitk/skins.c.orig Fri Mar 30 08:51:34 2007
+++ src/xitk/skins.c Thu Dec 30 04:32:43 2004 +++ src/xitk/skins.c Sun Jul 15 19:22:31 2007
@@ -1083,8 +1083,9 @@ @@ -1050,8 +1050,8 @@
layer_above_video(xitk_window_get_window(xwin)); layer_above_video(xitk_window_get_window(xwin));
if((slxs = skins_get_slx_entries(url)) != NULL) { if((slxs = skins_get_slx_entries(url)) != NULL) {
- char *fontname = "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*"; - char *br_fontname = "-misc-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*";
- char *btnfontname = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*"; - char *btnfontname = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
+ char *fontname = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*"; + char *br_fontname = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*";
+ char *btnfontname = "-*-*-bold-r-normal-*-12-*-*-*-*-*-*-*"; + char *btnfontname = "-*-*-bold-r-*-*-12-*-*-*-*-*-*-*";
+
int i; int i;
xitk_browser_widget_t br; xitk_browser_widget_t br;
xitk_labelbutton_widget_t lb; xitk_labelbutton_widget_t lb;

View file

@ -1,128 +1,128 @@
--- src/xitk/skins/xinetic/skinconfig.orig Thu Dec 30 03:33:25 2004 --- src/xitk/skins/xinetic/skinconfig.orig Mon Jan 1 06:58:51 2007
+++ src/xitk/skins/xinetic/skinconfig Thu Dec 30 04:35:46 2004 +++ src/xitk/skins/xinetic/skinconfig Sun Jul 15 19:25:17 2007
@@ -243,7 +243,7 @@ @@ -244,7 +244,7 @@
color = #9fa4ad color = #9fa4ad
color_focus = #081e2f color_focus = #081e2f
color_click = #081e2f color_click = #081e2f
- font = *-helvetica-*-i-*-*-12-*-*-*-*-*-*-* - font = *-helvetica-bold-o-*-*-12-*-*-*-*-*-*-*
+ font = -*-*-bold-r-normal-*-12-*-*-*-*-*-*-* + font = *-*-bold-o-*-*-12-*-*-*-*-*-*-*
} }
max_buttons = 7 max_buttons = 7
} }
@@ -303,7 +303,7 @@ @@ -304,7 +304,7 @@
color = #9fa4ad color = #9fa4ad
color_focus = #081e2f color_focus = #081e2f
color_click = #081e2f color_click = #081e2f
- font = *-helvetica-*-i-*-*-12-*-*-*-*-*-*-* - font = *-helvetica-bold-o-*-*-12-*-*-*-*-*-*-*
+ font = -*-*-bold-r-normal-*-12-*-*-*-*-*-*-* + font = *-*-bold-o-*-*-12-*-*-*-*-*-*-*
} }
} }
@@ -317,7 +317,7 @@ @@ -318,7 +318,7 @@
color = #9fa4ad color = #9fa4ad
color_focus = #081e2f color_focus = #081e2f
color_click = #081e2f color_click = #081e2f
- font = *-helvetica-*-i-*-*-12-*-*-*-*-*-*-* - font = *-helvetica-bold-o-*-*-12-*-*-*-*-*-*-*
+ font = -*-*-bold-r-normal-*-12-*-*-*-*-*-*-* + font = *-*-bold-o-*-*-12-*-*-*-*-*-*-*
} }
} }
@@ -331,7 +331,7 @@ @@ -332,7 +332,7 @@
color = #9fa4ad color = #9fa4ad
color_focus = #081e2f color_focus = #081e2f
color_click = #081e2f color_click = #081e2f
- font = *-helvetica-*-i-*-*-12-*-*-*-*-*-*-* - font = *-helvetica-bold-o-*-*-12-*-*-*-*-*-*-*
+ font = -*-*-bold-r-normal-*-12-*-*-*-*-*-*-* + font = *-*-bold-o-*-*-12-*-*-*-*-*-*-*
} }
} }
@@ -349,7 +349,7 @@ @@ -350,7 +350,7 @@
color = #a4abb0 color = #a4abb0
color_focus = #a4abb0 color_focus = #a4abb0
color_click = #081e2f color_click = #081e2f
- font = *-helvetica-*-i-*-*-12-*-*-*-*-*-*-* - font = *-helvetica-*-o-*-*-12-*-*-*-*-*-*-*
+ font = -*-*-bold-r-normal-*-12-*-*-*-*-*-*-* + font = *-*-*-o-*-*-12-*-*-*-*-*-*-*
} }
} }
@@ -403,7 +403,7 @@ @@ -404,7 +404,7 @@
color = #9fa4ad color = #9fa4ad
color_focus = #081e2f color_focus = #081e2f
color_click = #081e2f color_click = #081e2f
- font = *-helvetica-*-i-*-*-12-*-*-*-*-*-*-* - font = *-helvetica-bold-o-*-*-12-*-*-*-*-*-*-*
+ font = -*-*-bold-r-normal-*-12-*-*-*-*-*-*-* + font = *-*-bold-o-*-*-12-*-*-*-*-*-*-*
} }
} }
@@ -487,7 +487,7 @@ @@ -488,7 +488,7 @@
color = #9fa4ad color = #9fa4ad
color_focus = #081e2f color_focus = #081e2f
color_click = #081e2f color_click = #081e2f
- font = *-helvetica-*-i-*-*-12-*-*-*-*-*-*-* - font = *-helvetica-bold-o-*-*-12-*-*-*-*-*-*-*
+ font = -*-*-bold-r-normal-*-12-*-*-*-*-*-*-* + font = *-*-bold-o-*-*-12-*-*-*-*-*-*-*
} }
max_buttons = 6 max_buttons = 6
} }
@@ -502,7 +502,7 @@ @@ -503,7 +503,7 @@
color = #9fa4ad color = #9fa4ad
color_focus = #9fa4ad color_focus = #9fa4ad
color_click = #081e2f color_click = #081e2f
- font = *-helvetica-*-i-*-*-12-*-*-*-*-*-*-* - font = *-helvetica-*-o-*-*-12-*-*-*-*-*-*-*
+ font = -*-*-bold-r-normal-*-12-*-*-*-*-*-*-* + font = *-*-*-o-*-*-12-*-*-*-*-*-*-*
} }
} }
@@ -693,7 +693,7 @@ @@ -694,7 +694,7 @@
color = #a4aab4 color = #a4aab4
color_focus = #a4aab4 color_focus = #a4aab4
color_click = #081e2f color_click = #081e2f
- font = *-helvetica-*-i-*-*-12-*-*-*-*-*-*-* - font = *-helvetica-*-o-*-*-12-*-*-*-*-*-*-*
+ font = -*-*-bold-r-normal-*-12-*-*-*-*-*-*-* + font = *-*-*-o-*-*-12-*-*-*-*-*-*-*
} }
} }
@@ -707,7 +707,7 @@ @@ -708,7 +708,7 @@
color = #9fa4ad color = #9fa4ad
color_focus = #081e2f color_focus = #081e2f
color_click = #081e2f color_click = #081e2f
- font = *-helvetica-*-i-*-*-12-*-*-*-*-*-*-* - font = *-helvetica-bold-o-*-*-12-*-*-*-*-*-*-*
+ font = -*-*-bold-r-normal-*-12-*-*-*-*-*-*-* + font = *-*-bold-o-*-*-12-*-*-*-*-*-*-*
} }
} }
@@ -734,7 +734,7 @@ @@ -735,7 +735,7 @@
color = #a4aab4 color = #a4aab4
color_focus = #a4aab4 color_focus = #a4aab4
color_click = #081e2f color_click = #081e2f
- font = *-helvetica-*-i-*-*-12-*-*-*-*-*-*-* - font = *-helvetica-*-o-*-*-12-*-*-*-*-*-*-*
+ font = -*-*-bold-r-normal-*-12-*-*-*-*-*-*-* + font = *-*-*-o-*-*-12-*-*-*-*-*-*-*
} }
} }
@@ -748,7 +748,7 @@ @@ -749,7 +749,7 @@
color = #9fa4ad color = #9fa4ad
color_focus = #081e2f color_focus = #081e2f
color_click = #081e2f color_click = #081e2f
- font = *-helvetica-*-i-*-*-12-*-*-*-*-*-*-* - font = *-helvetica-bold-o-*-*-12-*-*-*-*-*-*-*
+ font = -*-*-bold-r-normal-*-12-*-*-*-*-*-*-* + font = *-*-bold-o-*-*-12-*-*-*-*-*-*-*
} }
} }
@@ -770,7 +770,7 @@ @@ -771,7 +771,7 @@
color = #9fa4ad color = #9fa4ad
color_focus = #081e2f color_focus = #081e2f
color_click = #081e2f color_click = #081e2f
- font = *-helvetica-*-i-*-*-12-*-*-*-*-*-*-* - font = *-helvetica-bold-o-*-*-12-*-*-*-*-*-*-*
+ font = -*-*-bold-r-normal-*-12-*-*-*-*-*-*-* + font = *-*-bold-o-*-*-12-*-*-*-*-*-*-*
} }
} }
@@ -854,7 +854,7 @@ @@ -855,7 +855,7 @@
color = #9fa4ad color = #9fa4ad
color_focus = #081e2f color_focus = #081e2f
color_click = #081e2f color_click = #081e2f
- font = *-helvetica-*-i-*-*-12-*-*-*-*-*-*-* - font = *-helvetica-bold-o-*-*-12-*-*-*-*-*-*-*
+ font = -*-*-bold-r-normal-*-12-*-*-*-*-*-*-* + font = *-*-bold-o-*-*-12-*-*-*-*-*-*-*
} }
max_buttons = 8 max_buttons = 8
} }

View file

@ -1,15 +1,15 @@
--- src/xitk/tvset.c.orig Thu Dec 16 06:10:46 2004 --- src/xitk/tvset.c.orig Fri Mar 30 08:51:34 2007
+++ src/xitk/tvset.c Thu Dec 30 04:36:57 2004 +++ src/xitk/tvset.c Sun Jul 15 19:26:24 2007
@@ -45,9 +45,9 @@ @@ -45,9 +45,9 @@
extern gGui_t *gGui; extern gGui_t *gGui;
-static char *tvsetfontname = "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*"; -static char *tvsetfontname = "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*";
-static char *lfontname = "-*-helvetica-bold-r-*-*-11-*-*-*-*-*-*-*"; -static char *lfontname = "-*-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*";
-static char *btnfontname = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*"; -static char *btnfontname = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
+static char *tvsetfontname = "-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*"; +static char *tvsetfontname = "-*-*-medium-r-*-*-10-*-*-*-*-*-*-*";
+static char *lfontname = "-*-*-bold-r-normal-*-11-*-*-*-*-*-*-*"; +static char *lfontname = "-*-*-bold-r-*-*-10-*-*-*-*-*-*-*";
+static char *btnfontname = "-*-*-bold-r-normal-*-12-*-*-*-*-*-*-*"; +static char *btnfontname = "-*-*-bold-r-*-*-12-*-*-*-*-*-*-*";
typedef struct { typedef struct {
xitk_window_t *xwin; xitk_window_t *xwin;

View file

@ -0,0 +1,18 @@
--- src/aaui/Makefile.in.orig Sun Jul 15 18:51:53 2007
+++ src/aaui/Makefile.in Sun Jul 15 18:54:51 2007
@@ -266,13 +266,13 @@
aaxine_SOURCES = $(GETOPT_C) main.c
aaxine_CFLAGS = $(AALIB_CFLAGS) -DAA $(AM_CFLAGS)
aaxine_LDADD = @XINE_LIBS@ $(AALIB_LIBS) $(DYNAMIC_LD_LIBS) -lm \
- $(top_builddir)/src/common/libcommon.a
+ $(top_builddir)/src/common/libcommon.a $(THREAD_LIBS)
aaxine_DEPENDENCIES = $(top_builddir)/src/common/libcommon.a
cacaxine_SOURCES = $(GETOPT_C) main.c
cacaxine_CFLAGS = $(CACA_CFLAGS) -DCACA $(AM_CFLAGS)
cacaxine_LDADD = @XINE_LIBS@ $(CACA_LIBS) $(DYNAMIC_LD_LIBS) -lm \
- $(top_builddir)/src/common/libcommon.a
+ $(top_builddir)/src/common/libcommon.a $(THREAD_LIBS)
cacaxine_DEPENDENCIES = $(top_builddir)/src/common/libcommon.a
all: all-am

View file

@ -0,0 +1,11 @@
--- src/fb/Makefile.in.orig Sun Jul 15 18:56:10 2007
+++ src/fb/Makefile.in Sun Jul 15 18:56:42 2007
@@ -264,7 +264,7 @@
target_alias = @target_alias@
AM_CFLAGS = @XINE_CFLAGS@ $(X_CFLAGS) -DFONTDIR=\"$(XINE_SKINDIR)/../fonts/\"
fbxine_DEPENDENCIES = $(top_builddir)/src/common/libcommon.a
-fbxine_LDADD = @XINE_LIBS@ $(LIRC_LIBS) $(DYNAMIC_LD_LIBS) -lm $(top_builddir)/src/common/libcommon.a
+fbxine_LDADD = @XINE_LIBS@ $(LIRC_LIBS) $(DYNAMIC_LD_LIBS) -lm $(top_builddir)/src/common/libcommon.a $(THREAD_LIBS)
fbxine_SOURCES = main.c lirc.c actions.c keys.c options.c callback.c stdctl.c post.c osd.c config_wrapper.c
noinst_HEADERS = main.h lirc.h actions.h keys.h options.h callback.h stdctl.h post.h osd.h config_wrapper.h
all: all-am

View file

@ -0,0 +1,20 @@
--- src/xitk/Makefile.in.orig Tue May 1 07:51:15 2007
+++ src/xitk/Makefile.in Sun Jul 15 18:48:07 2007
@@ -351,7 +351,7 @@
$(top_builddir)/src/common/libcommonx.a \
$(X_PRE_LIBS) $(LIRC_LIBS) $(DYNAMIC_LD_LIBS) $(XFT_LIBS) \
$(X_LIBS) $(XTEST_LIBS) $(CURL_LIBS) $(NVTVSIMPLE_LIBS) \
- -lX11 -lm $(DBG_LIBS) $(XV_LIB) $(LIBPNG_LIBS) $(INTLLIBS)
+ -lX11 -lm $(DBG_LIBS) $(XV_LIB) $(LIBPNG_LIBS) $(INTLLIBS) $(THREAD_LIBS)
xine_remote_CFLAGS = $(AM_CFLAGS) -DNETWORK_CLIENT
xine_remote_SOURCES = network.c
@@ -465,7 +465,7 @@
$(LINK) $(xine_LDFLAGS) $(xine_OBJECTS) $(xine_LDADD) $(LIBS)
xine-remote$(EXEEXT): $(xine_remote_OBJECTS) $(xine_remote_DEPENDENCIES)
@rm -f xine-remote$(EXEEXT)
- $(LINK) $(xine_remote_LDFLAGS) $(xine_remote_OBJECTS) $(xine_remote_LDADD) $(LIBS)
+ $(LINK) $(xine_remote_LDFLAGS) $(xine_remote_OBJECTS) $(xine_remote_LDADD) $(LIBS) $(INTLLIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)

View file

@ -1,29 +0,0 @@
--- src/xitk/main.c.orig Sun Jul 24 11:40:37 2005
+++ src/xitk/main.c Thu Apr 20 01:03:46 2006
@@ -456,7 +456,7 @@
int len;
char *blanks = " ";
- printf(title);
+ printf("%s", title);
sprintf(buffer, "%s", blanks);
plugin = *plugins++;
@@ -469,7 +469,7 @@
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 @@
}
if(strlen(buffer))
- printf(buffer);
+ printf("%s", buffer);
printf(".\n\n");
}

View file

@ -0,0 +1,15 @@
--- src/xitk/stream_infos.c.orig Sun Jul 15 19:28:59 2007
+++ src/xitk/stream_infos.c Sun Jul 15 19:29:13 2007
@@ -45,9 +45,9 @@
extern gGui_t *gGui;
-static char *sinfosfontname = "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*";
-static char *lfontname = "-*-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*";
-static char *btnfontname = "-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*";
+static char *sinfosfontname = "-*-*-medium-r-*-*-10-*-*-*-*-*-*-*";
+static char *lfontname = "-*-*-bold-r-*-*-10-*-*-*-*-*-*-*";
+static char *btnfontname = "-*-*-bold-r-*-*-12-*-*-*-*-*-*-*";
typedef struct {
xitk_window_t *xwin;

View file

@ -5,142 +5,153 @@ bin/xine
bin/xine-bugreport bin/xine-bugreport
bin/xine-check bin/xine-check
bin/xine-remote bin/xine-remote
share/doc/xine-ui/README.config_en %%DOCSDIR%%/README.config_en
share/doc/xine-ui/README.cs.0.Introduction %%DOCSDIR%%/README.cs.0.Introduction
share/doc/xine-ui/README.cs.10.Remote_control %%DOCSDIR%%/README.cs.10.Remote_control
share/doc/xine-ui/README.cs.15.MRLs %%DOCSDIR%%/README.cs.15.MRLs
share/doc/xine-ui/README.cs.5.xine-ui %%DOCSDIR%%/README.cs.5.xine-ui
share/doc/xine-ui/README.en.0.Introduction %%DOCSDIR%%/README.en.0.Introduction
share/doc/xine-ui/README.en.10.Remote_control %%DOCSDIR%%/README.en.10.Remote_control
share/doc/xine-ui/README.en.15.MRLs %%DOCSDIR%%/README.en.15.MRLs
share/doc/xine-ui/README.en.20.DVD %%DOCSDIR%%/README.en.20.DVD
share/doc/xine-ui/README.en.25.VideoCD %%DOCSDIR%%/README.en.25.VideoCD
share/doc/xine-ui/README.en.30.Advanced %%DOCSDIR%%/README.en.30.Advanced
share/doc/xine-ui/README.en.32.Window_managers %%DOCSDIR%%/README.en.32.Window_managers
share/doc/xine-ui/README.en.35.Legal_issues %%DOCSDIR%%/README.en.35.Legal_issues
share/doc/xine-ui/README.en.5.xine-ui %%DOCSDIR%%/README.en.5.xine-ui
share/doc/xine-ui/README_cs %%DOCSDIR%%/README_cs
share/doc/xine-ui/README_de %%DOCSDIR%%/README_de
share/doc/xine-ui/README_en %%DOCSDIR%%/README_en
share/doc/xine-ui/README_es %%DOCSDIR%%/README_es
share/doc/xine-ui/README_fi %%DOCSDIR%%/README_fi
share/doc/xine-ui/README_fr %%DOCSDIR%%/README_fr
share/doc/xine-ui/README_it %%DOCSDIR%%/README_it
share/doc/xine-ui/README_pl %%DOCSDIR%%/README_pl
share/doc/xine-ui/README_uk %%DOCSDIR%%/README_uk
share/doc/xitk/README share/doc/xitk/README
share/locale/cs/LC_MESSAGES/xine-ui.mo share/icons/hicolor/16x16/apps/xine.png
share/locale/cs/LC_MESSAGES/xitk.mo share/icons/hicolor/22x22/apps/xine.png
share/locale/de/LC_MESSAGES/xine-ui.mo share/icons/hicolor/32x32/apps/xine.png
share/locale/de/LC_MESSAGES/xitk.mo share/icons/hicolor/48x48/apps/xine.png
share/locale/es/LC_MESSAGES/xine-ui.mo %%NLS%%share/locale/cs/LC_MESSAGES/xine-ui.mo
share/locale/es/LC_MESSAGES/xitk.mo %%NLS%%share/locale/cs/LC_MESSAGES/xitk.mo
share/locale/eu/LC_MESSAGES/xine-ui.mo %%NLS%%share/locale/de/LC_MESSAGES/xine-ui.mo
share/locale/eu/LC_MESSAGES/xitk.mo %%NLS%%share/locale/de/LC_MESSAGES/xitk.mo
share/locale/fr/LC_MESSAGES/xine-ui.mo %%NLS%%share/locale/eo/LC_MESSAGES/xine-ui.mo
share/locale/fr/LC_MESSAGES/xitk.mo %%NLS%%share/locale/es/LC_MESSAGES/xine-ui.mo
share/locale/it/LC_MESSAGES/xine-ui.mo %%NLS%%share/locale/es/LC_MESSAGES/xitk.mo
share/locale/it/LC_MESSAGES/xitk.mo %%NLS%%share/locale/eu/LC_MESSAGES/xine-ui.mo
share/locale/ja/LC_MESSAGES/xine-ui.mo %%NLS%%share/locale/eu/LC_MESSAGES/xitk.mo
share/locale/ja/LC_MESSAGES/xitk.mo %%NLS%%share/locale/fr/LC_MESSAGES/xine-ui.mo
share/locale/pl/LC_MESSAGES/xine-ui.mo %%NLS%%share/locale/fr/LC_MESSAGES/xitk.mo
share/locale/pl/LC_MESSAGES/xitk.mo %%NLS%%share/locale/it/LC_MESSAGES/xine-ui.mo
share/locale/pt_BR/LC_MESSAGES/xine-ui.mo %%NLS%%share/locale/it/LC_MESSAGES/xitk.mo
share/locale/pt_BR/LC_MESSAGES/xitk.mo %%NLS%%share/locale/ja/LC_MESSAGES/xine-ui.mo
share/locale/ru/LC_MESSAGES/xine-ui.mo %%NLS%%share/locale/ja/LC_MESSAGES/xitk.mo
share/locale/ru/LC_MESSAGES/xitk.mo %%NLS%%share/locale/nb/LC_MESSAGES/xine-ui.mo
share/locale/sk/LC_MESSAGES/xine-ui.mo %%NLS%%share/locale/nb/LC_MESSAGES/xitk.mo
share/locale/sk/LC_MESSAGES/xitk.mo %%NLS%%share/locale/pl/LC_MESSAGES/xine-ui.mo
share/locale/uk/LC_MESSAGES/xine-ui.mo %%NLS%%share/locale/pl/LC_MESSAGES/xitk.mo
share/locale/uk/LC_MESSAGES/xitk.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/xine-ui.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/xitk.mo
%%NLS%%share/locale/ru/LC_MESSAGES/xine-ui.mo
%%NLS%%share/locale/ru/LC_MESSAGES/xitk.mo
%%NLS%%share/locale/sk/LC_MESSAGES/xine-ui.mo
%%NLS%%share/locale/sk/LC_MESSAGES/xitk.mo
%%NLS%%share/locale/uk/LC_MESSAGES/xine-ui.mo
%%NLS%%share/locale/uk/LC_MESSAGES/xitk.mo
share/pixmaps/xine.xpm share/pixmaps/xine.xpm
share/pixmaps/xine_16x16.png %%DATADIR%%/desktop/xine.desktop
share/pixmaps/xine_22x22.png %%DATADIR%%/oxine/mainmenu
share/pixmaps/xine_32x32.png %%DATADIR%%/oxine/mediamarks
share/pixmaps/xine_48x48.png %%DATADIR%%/skins/xine-ui_logo.mpv
share/xine/desktop/xine.desktop %%DATADIR%%/skins/xine_splash.png
share/xine/oxine/mainmenu %%DATADIR%%/skins/xinetic/BigArrowDown.png
share/xine/oxine/mediamarks %%DATADIR%%/skins/xinetic/BigArrowLeft.png
share/xine/skins/xine_splash.png %%DATADIR%%/skins/xinetic/BigArrowRight.png
share/xine/skins/xine-ui_logo.mpv %%DATADIR%%/skins/xinetic/BigArrowUp.png
share/xine/skins/xinetic/BigArrowDown.png %%DATADIR%%/skins/xinetic/CtlBg.png
share/xine/skins/xinetic/BigArrowLeft.png %%DATADIR%%/skins/xinetic/CtlBtn.png
share/xine/skins/xinetic/BigArrowRight.png %%DATADIR%%/skins/xinetic/CtlDismiss.png
share/xine/skins/xinetic/BigArrowUp.png %%DATADIR%%/skins/xinetic/CtlDummy.png
share/xine/skins/xinetic/CtlBg.png %%DATADIR%%/skins/xinetic/CtlReset.png
share/xine/skins/xinetic/CtlBtn.png %%DATADIR%%/skins/xinetic/CtlSave.png
share/xine/skins/xinetic/CtlDismiss.png %%DATADIR%%/skins/xinetic/Letters.png
share/xine/skins/xinetic/CtlDummy.png %%DATADIR%%/skins/xinetic/Letters2.png
share/xine/skins/xinetic/CtlReset.png %%DATADIR%%/skins/xinetic/MainAutoButton.png
share/xine/skins/xinetic/CtlSave.png %%DATADIR%%/skins/xinetic/MainBg.png
share/xine/skins/xinetic/Letters.png %%DATADIR%%/skins/xinetic/MainCam.png
share/xine/skins/xinetic/Letters2.png %%DATADIR%%/skins/xinetic/MainClose.png
share/xine/skins/xinetic/MainAutoButton.png %%DATADIR%%/skins/xinetic/MainDown.png
share/xine/skins/xinetic/MainBg.png %%DATADIR%%/skins/xinetic/MainEject.png
share/xine/skins/xinetic/MainCam.png %%DATADIR%%/skins/xinetic/MainFastB.png
share/xine/skins/xinetic/MainClose.png %%DATADIR%%/skins/xinetic/MainFastF.png
share/xine/skins/xinetic/MainDown.png %%DATADIR%%/skins/xinetic/MainFullScreen.png
share/xine/skins/xinetic/MainEject.png %%DATADIR%%/skins/xinetic/MainMute.png
share/xine/skins/xinetic/MainFastB.png %%DATADIR%%/skins/xinetic/MainNav.png
share/xine/skins/xinetic/MainFastF.png %%DATADIR%%/skins/xinetic/MainNext.png
share/xine/skins/xinetic/MainFullScreen.png %%DATADIR%%/skins/xinetic/MainPause.png
share/xine/skins/xinetic/MainMute.png %%DATADIR%%/skins/xinetic/MainPlay.png
share/xine/skins/xinetic/MainNav.png %%DATADIR%%/skins/xinetic/MainPower.png
share/xine/skins/xinetic/MainNext.png %%DATADIR%%/skins/xinetic/MainPrev.png
share/xine/skins/xinetic/MainPause.png %%DATADIR%%/skins/xinetic/MainSetup.png
share/xine/skins/xinetic/MainPlay.png %%DATADIR%%/skins/xinetic/MainStop.png
share/xine/skins/xinetic/MainPower.png %%DATADIR%%/skins/xinetic/MainUp.png
share/xine/skins/xinetic/MainPrev.png %%DATADIR%%/skins/xinetic/MainVolumeBg.png
share/xine/skins/xinetic/MainSetup.png %%DATADIR%%/skins/xinetic/MainVolumePad.png
share/xine/skins/xinetic/MainStop.png %%DATADIR%%/skins/xinetic/MrlBg.png
share/xine/skins/xinetic/MainUp.png %%DATADIR%%/skins/xinetic/MrlBtn.png
share/xine/skins/xinetic/MainVolumeBg.png %%DATADIR%%/skins/xinetic/MrlDismiss.png
share/xine/skins/xinetic/MainVolumePad.png %%DATADIR%%/skins/xinetic/MrlFlit.png
share/xine/skins/xinetic/MrlBg.png %%DATADIR%%/skins/xinetic/MrlSelect.png
share/xine/skins/xinetic/MrlBtn.png %%DATADIR%%/skins/xinetic/Onglet.png
share/xine/skins/xinetic/MrlDismiss.png %%DATADIR%%/skins/xinetic/PlBg.png
share/xine/skins/xinetic/MrlFlit.png %%DATADIR%%/skins/xinetic/PlBtn.png
share/xine/skins/xinetic/MrlSelect.png %%DATADIR%%/skins/xinetic/PlDelete.png
share/xine/skins/xinetic/Onglet.png %%DATADIR%%/skins/xinetic/PlDeleteAll.png
share/xine/skins/xinetic/PlBg.png %%DATADIR%%/skins/xinetic/PlDismiss.png
share/xine/skins/xinetic/PlBtn.png %%DATADIR%%/skins/xinetic/PlInputTxt.png
share/xine/skins/xinetic/PlDelete.png %%DATADIR%%/skins/xinetic/PlItemBtn.png
share/xine/skins/xinetic/PlDeleteAll.png %%DATADIR%%/skins/xinetic/PlMoveDn.png
share/xine/skins/xinetic/PlDismiss.png %%DATADIR%%/skins/xinetic/PlMoveUp.png
share/xine/skins/xinetic/PlInputTxt.png %%DATADIR%%/skins/xinetic/PlPlay.png
share/xine/skins/xinetic/PlItemBtn.png %%DATADIR%%/skins/xinetic/PlSlidHBg.png
share/xine/skins/xinetic/PlMoveDn.png %%DATADIR%%/skins/xinetic/SkItemBtn.png
share/xine/skins/xinetic/PlMoveUp.png %%DATADIR%%/skins/xinetic/SkSlidBG.png
share/xine/skins/xinetic/PlPlay.png %%DATADIR%%/skins/xinetic/SkSlidHBg.png
share/xine/skins/xinetic/PlSlidHBg.png %%DATADIR%%/skins/xinetic/SkSlidHPad.png
share/xine/skins/xinetic/SkItemBtn.png %%DATADIR%%/skins/xinetic/SlidHPad.png
share/xine/skins/xinetic/SkSlidBG.png %%DATADIR%%/skins/xinetic/SliderHBg.png
share/xine/skins/xinetic/SkSlidHBg.png %%DATADIR%%/skins/xinetic/SliderHPad.png
share/xine/skins/xinetic/SkSlidHPad.png %%DATADIR%%/skins/xinetic/SliderVBg.png
share/xine/skins/xinetic/SlidHPad.png %%DATADIR%%/skins/xinetic/SliderVPad.png
share/xine/skins/xinetic/SliderHBg.png %%DATADIR%%/skins/xinetic/SmallArrowDown.png
share/xine/skins/xinetic/SliderHPad.png %%DATADIR%%/skins/xinetic/SmallArrowUp.png
share/xine/skins/xinetic/SliderVBg.png %%DATADIR%%/skins/xinetic/skinconfig
share/xine/skins/xinetic/SliderVPad.png %%DATADIR%%/visuals/default.avi
share/xine/skins/xinetic/SmallArrowDown.png @dirrm %%DATADIR%%/visuals
share/xine/skins/xinetic/SmallArrowUp.png @dirrm %%DATADIR%%/skins/xinetic
share/xine/skins/xinetic/skinconfig @dirrm %%DATADIR%%/skins
share/xine/visuals/default.avi @dirrm %%DATADIR%%/oxine
@dirrmtry man/de/man1 @dirrm %%DATADIR%%/desktop
@dirrmtry man/de @dirrmtry %%DATADIR%%
@dirrmtry man/es/man1 @dirrmtry share/icons/hicolor/48x48/apps
@dirrmtry man/es @dirrmtry share/icons/hicolor/48x48
@dirrmtry man/fr/man1 @dirrmtry share/icons/hicolor/32x32/apps
@dirrmtry man/fr @dirrmtry share/icons/hicolor/32x32
@dirrmtry share/icons/hicolor/22x22/apps
@dirrmtry share/icons/hicolor/22x22
@dirrmtry share/icons/hicolor/16x16/apps
@dirrmtry share/icons/hicolor/16x16
@dirrmtry share/icons/hicolor
@dirrmtry share/icons
@dirrm share/doc/xitk
@dirrm %%DOCSDIR%%
@dirrmtry man/pl/man1 @dirrmtry man/pl/man1
@dirrmtry man/pl @dirrmtry man/pl
@dirrmtry share/locale/pl_PL/LC_MESSAGES @dirrmtry man/fr/man1
@dirrmtry share/locale/pl_PL @dirrmtry man/fr
@dirrm share/xine/visuals @dirrmtry man/es/man1
@dirrm share/xine/skins/xinetic @dirrmtry man/es
@dirrm share/xine/oxine @dirrmtry man/de/man1
@dirrm share/xine/desktop @dirrmtry man/de
@dirrm share/xine/skins
@dirrmtry share/xine
@dirrm share/doc/xine-ui
@dirrm share/doc/xitk