Attachment #146339 for bug #193041

View | Details | Raw Unified | Return to bug 193041
Collapse All | Expand All




# $FreeBSD: head/multimedia/xine/Makefile 364613 2014-08-11 13:59:47Z tijl $

PORTNAME=	xine
PORTVERSION=	0.99.9
PORTREVISION=	2
CATEGORIES=	multimedia
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION}
DISTNAME=	${PORTNAME}-ui-${PORTVERSION}

		libpng15.so:${PORTSDIR}/graphics/png \
		libxine.so:${PORTSDIR}/multimedia/libxine

USES=		desktop-file-utils execinfo gmake iconv pkgconfig readline \
		shared-mime-info tar:xz
USE_XORG=	x11 xext xinerama xscrnsaver xtst xv xxf86vm
GNU_CONFIGURE=	yes

LDFLAGS+=	-L${LOCALBASE}/lib

DOCSDIR=	${PREFIX}/share/doc/xine-ui
XINE_PLUGINSDIR=	lib/xine/plugins/2.3

OPTIONS_DEFINE=		AALIB CACA CURL DOCS LIRC NLS XFT
OPTIONS_DEFAULT=	CURL XFT

XFT_USE=		XORG=xft
XFT_CONFIGURE_ENABLE=	xft

XINE_PLUGINSDIR=	lib/xine/plugins/2.3

.if ${OSVERSION} < 1000052
LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		's|<string.h>|<strings.h>|' ${WRKSRC}/src/aaui/main.c
	@${REINPLACE_CMD} -e \
		's|<\(readline.h\)>|<readline/\1>| ; \
		 s|<\(history.h\)>|<readline/\1>|' ${WRKSRC}/src/xitk/network.c

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)multimedia/xine/distinfo (-2 / +2 lines)
1	SHA256 (xine-ui-0.99.8.tar.xz) = 1ac5a9fc8dbf81f12a8677108bf2b623e70d7adbb83b83912b9cdf00bc78b2a7	1	SHA256 (xine-ui-0.99.9.tar.xz) = 8dd180219f546a7be0a5651370996b95b3a38ec97bf01b57d2bd1cb966e591a2
2	SIZE (xine-ui-0.99.8.tar.xz) = 1758372	2	SIZE (xine-ui-0.99.9.tar.xz) = 1759568

Lines 1-10 Link Here

(-)multimedia/xine/files/patch-src_xitk_Imlib-light_load.c (-10 lines)
1	--- src/xitk/Imlib-light/load.c.orig 2010-03-01 18:02:05.000000000 +0100
2	+++ src/xitk/Imlib-light/load.c 2012-05-06 06:38:35.000000000 +0200
3	@@ -5,6 +5,7 @@
4	#include "Imlib.h"
5	#include "Imlib_private.h"
6	#include <setjmp.h>
7	+#include <pngpriv.h>
8
9	#ifndef INT_MAX
10	#define INT_MAX ((int)((unsigned int)(1 << (8 * sizeof(int) - 1)) - 1))

Lines 1-11 Link Here

(-)multimedia/xine/files/patch-src_xitk_main.c (-11 lines)
1	--- src/xitk/main.c.orig 2012-01-19 11:04:00.000000000 +0000
2	+++ src/xitk/main.c
3	@@ -21,7 +21,7 @@
4	*
5	*/
6	/* required for getsubopt(); the __sun test gives us strncasecmp() on solaris */
7	-#if !defined(__sun) && ! defined(__FreeBSD__)
8	+#if !defined(__sun) && ! defined(__FreeBSD__) && ! defined(__DragonFly__)
9	#define _XOPEN_SOURCE 500
10	#endif
11	/* required for strncasecmp() */




--- src/xitk/network.c.orig
+++ src/xitk/network.c
@@ -24,7 +24,7 @@
 /* required for getsubopt(); the __sun test avoids compilation problems on 
     solaris. On FreeBSD defining this disable BSD functions to be visible
     and remove INADDR_NONE */
-#if ! defined (__sun__) && ! defined (__OpenBSD__)  && ! defined(__FreeBSD__) && ! defined(__APPLE__)
+#if ! defined (__sun__) && ! defined (__OpenBSD__)  && ! defined(__FreeBSD__) && ! defined(__APPLE__) && ! defined (__DragonFly__)
 #define _XOPEN_SOURCE 500
 #endif
 /* required for strncasecmp() */
@@ -64,8 +64,8 @@
 #include <netdb.h>
 #include <pthread.h>
 
-#include <readline.h>
-#include <history.h>
+#include <readline/readline.h>
+#include <readline/history.h>
 
 #include "common.h"
 
@@ -1255,7 +1255,7 @@ int main(int argc, char **argv) {
   rl_readline_name = PROGNAME;
   rl_set_prompt(session.prompt);
   rl_initialize();
-  rl_attempted_completion_function = (CPPFunction *)completion_function;
+  rl_attempted_completion_function = (rl_completion_func_t *)completion_function;
   
   signal(SIGPIPE, SIG_IGN);
   

Lines 1-11 Link Here

(-)multimedia/xine/files/patch-src_xitk_session.c (-11 lines)
1	--- src/xitk/session.c.orig 2010-03-11 09:40:12.000000000 +0000
2	+++ src/xitk/session.c
3	@@ -21,7 +21,7 @@
4	/* Largely inspired of xmms control socket stuff */
5
6	/* required for getsubopt(); the __sun test gives us strncasecmp() on solaris */
7	-#if ! defined (__sun) && ! defined (__OpenBSD__) && ! defined (__FreeBSD__)
8	+#if ! defined (__sun) && ! defined (__OpenBSD__) && ! defined (__FreeBSD__) && !defined(__DragonFly__)
9	#define _XOPEN_SOURCE 500
10	#endif
11

Return to bug 193041

Lines 1-8 Link Here

(-)multimedia/xine/Makefile (-9 / +6 lines)
1	# $FreeBSD: head/multimedia/xine/Makefile 364613 2014-08-11 13:59:47Z tijl $	1	# $FreeBSD: head/multimedia/xine/Makefile 364613 2014-08-11 13:59:47Z tijl $
2		2
3	PORTNAME= xine	3	PORTNAME= xine
4	PORTVERSION= 0.99.8	4	PORTVERSION= 0.99.9
5	PORTREVISION= 2
6	CATEGORIES= multimedia	5	CATEGORIES= multimedia
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION}	6	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION}
8	DISTNAME= ${PORTNAME}-ui-${PORTVERSION}	7	DISTNAME= ${PORTNAME}-ui-${PORTVERSION}
Lines 16-22 Link Here
16	libpng15.so:${PORTSDIR}/graphics/png \	15	libpng15.so:${PORTSDIR}/graphics/png \
17	libxine.so:${PORTSDIR}/multimedia/libxine	16	libxine.so:${PORTSDIR}/multimedia/libxine
18		17
19	USES= desktop-file-utils gmake iconv pkgconfig readline \	18	USES= desktop-file-utils execinfo gmake iconv pkgconfig readline \
20	shared-mime-info tar:xz	19	shared-mime-info tar:xz
21	USE_XORG= x11 xext xinerama xscrnsaver xtst xv xxf86vm	20	USE_XORG= x11 xext xinerama xscrnsaver xtst xv xxf86vm
22	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
Lines 30-36 Link Here
30	LDFLAGS+= -L${LOCALBASE}/lib	29	LDFLAGS+= -L${LOCALBASE}/lib
31		30
32	DOCSDIR= ${PREFIX}/share/doc/xine-ui	31	DOCSDIR= ${PREFIX}/share/doc/xine-ui
33	XINE_PLUGINSDIR= lib/xine/plugins/2.3
34		32
35	OPTIONS_DEFINE= AALIB CACA CURL DOCS LIRC NLS XFT	33	OPTIONS_DEFINE= AALIB CACA CURL DOCS LIRC NLS XFT
36	OPTIONS_DEFAULT= CURL XFT	34	OPTIONS_DEFAULT= CURL XFT
Lines 56-69 Link Here
56	XFT_USE= XORG=xft	54	XFT_USE= XORG=xft
57	XFT_CONFIGURE_ENABLE= xft	55	XFT_CONFIGURE_ENABLE= xft
58		56
59	.include <bsd.port.options.mk>	57	XINE_PLUGINSDIR= lib/xine/plugins/2.3
60
61	.if ${OSVERSION} < 1000052
62	LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
63	.endif
64		58
65	post-patch:	59	post-patch:
66	@${REINPLACE_CMD} -e \	60	@${REINPLACE_CMD} -e \
67	's\|<string.h>\|<strings.h>\|' ${WRKSRC}/src/aaui/main.c	61	's\|<string.h>\|<strings.h>\|' ${WRKSRC}/src/aaui/main.c
		62	@${REINPLACE_CMD} -e \
		63	's\|<\(readline.h\)>\|<readline/\1>\| ; \
		64	s\|<\(history.h\)>\|<readline/\1>\|' ${WRKSRC}/src/xitk/network.c
68		65
69	.include <bsd.port.mk>	66	.include <bsd.port.mk>

Lines 1-31 Link Here

(-)multimedia/xine/files/patch-src_xitk_network.c (-31 lines)
1	--- src/xitk/network.c.orig
2	+++ src/xitk/network.c
3	@@ -24,7 +24,7 @@
4	/* required for getsubopt(); the __sun test avoids compilation problems on
5	solaris. On FreeBSD defining this disable BSD functions to be visible
6	and remove INADDR_NONE */
7	-#if ! defined (__sun__) && ! defined (__OpenBSD__) && ! defined(__FreeBSD__) && ! defined(__APPLE__)
8	+#if ! defined (__sun__) && ! defined (__OpenBSD__) && ! defined(__FreeBSD__) && ! defined(__APPLE__) && ! defined (__DragonFly__)
9	#define _XOPEN_SOURCE 500
10	#endif
11	/* required for strncasecmp() */
12	@@ -64,8 +64,8 @@
13	#include <netdb.h>
14	#include <pthread.h>
15
16	-#include <readline.h>
17	-#include <history.h>
18	+#include <readline/readline.h>
19	+#include <readline/history.h>
20
21	#include "common.h"
22
23	@@ -1255,7 +1255,7 @@ int main(int argc, char **argv) {
24	rl_readline_name = PROGNAME;
25	rl_set_prompt(session.prompt);
26	rl_initialize();
27	- rl_attempted_completion_function = (CPPFunction *)completion_function;
28	+ rl_attempted_completion_function = (rl_completion_func_t *)completion_function;
29
30	signal(SIGPIPE, SIG_IGN);
31