Attachment 146339 Details for Bug 193041 – multimedia_xine.diff

[patch] multimedia_xine.diff

multimedia_xine.diff (text/plain), 5.55 KB, created by tkato432 on 2014-08-26 18:39:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-08-26 18:39:35 UTC

Size: 5.55 KB

patch

obsolete

>diff -urN /usr/ports/multimedia/xine/Makefile multimedia/xine/Makefile
>--- /usr/ports/multimedia/xine/Makefile	2014-08-12 02:06:04.000000000 +0900
>+++ multimedia/xine/Makefile	2014-08-27 00:00:00.000000000 +0900
>@@ -1,8 +1,7 @@
> # $FreeBSD: head/multimedia/xine/Makefile 364613 2014-08-11 13:59:47Z tijl $
> 
> PORTNAME=	xine
>-PORTVERSION=	0.99.8
>-PORTREVISION=	2
>+PORTVERSION=	0.99.9
> CATEGORIES=	multimedia
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION}
> DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
>@@ -16,7 +15,7 @@
> 		libpng15.so:${PORTSDIR}/graphics/png \
> 		libxine.so:${PORTSDIR}/multimedia/libxine
> 
>-USES=		desktop-file-utils gmake iconv pkgconfig readline \
>+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
>@@ -30,7 +29,6 @@
> 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
>@@ -56,14 +54,13 @@
> XFT_USE=		XORG=xft
> XFT_CONFIGURE_ENABLE=	xft
> 
>-.include <bsd.port.options.mk>
>-
>-.if ${OSVERSION} < 1000052
>-LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
>-.endif
>+XINE_PLUGINSDIR=	lib/xine/plugins/2.3
> 
> 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>
>diff -urN /usr/ports/multimedia/xine/distinfo multimedia/xine/distinfo
>--- /usr/ports/multimedia/xine/distinfo	2014-06-21 17:43:10.000000000 +0900
>+++ multimedia/xine/distinfo	2014-08-27 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (xine-ui-0.99.8.tar.xz) = 1ac5a9fc8dbf81f12a8677108bf2b623e70d7adbb83b83912b9cdf00bc78b2a7
>-SIZE (xine-ui-0.99.8.tar.xz) = 1758372
>+SHA256 (xine-ui-0.99.9.tar.xz) = 8dd180219f546a7be0a5651370996b95b3a38ec97bf01b57d2bd1cb966e591a2
>+SIZE (xine-ui-0.99.9.tar.xz) = 1759568
>diff -urN /usr/ports/multimedia/xine/files/patch-src_xitk_Imlib-light_load.c multimedia/xine/files/patch-src_xitk_Imlib-light_load.c
>--- /usr/ports/multimedia/xine/files/patch-src_xitk_Imlib-light_load.c	2014-06-21 17:43:10.000000000 +0900
>+++ multimedia/xine/files/patch-src_xitk_Imlib-light_load.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,10 +0,0 @@
>---- src/xitk/Imlib-light/load.c.orig	2010-03-01 18:02:05.000000000 +0100
>-+++ src/xitk/Imlib-light/load.c	2012-05-06 06:38:35.000000000 +0200
>-@@ -5,6 +5,7 @@
>- #include "Imlib.h"
>- #include "Imlib_private.h"
>- #include <setjmp.h>
>-+#include <pngpriv.h>
>- 
>- #ifndef INT_MAX
>- #define INT_MAX ((int)((unsigned int)(1 << (8 * sizeof(int) - 1)) - 1))
>diff -urN /usr/ports/multimedia/xine/files/patch-src_xitk_main.c multimedia/xine/files/patch-src_xitk_main.c
>--- /usr/ports/multimedia/xine/files/patch-src_xitk_main.c	2014-06-21 17:43:10.000000000 +0900
>+++ multimedia/xine/files/patch-src_xitk_main.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- src/xitk/main.c.orig	2012-01-19 11:04:00.000000000 +0000
>-+++ src/xitk/main.c
>-@@ -21,7 +21,7 @@
>-  *
>-  */
>- /* required for getsubopt(); the __sun test gives us strncasecmp() on solaris */
>--#if !defined(__sun) && ! defined(__FreeBSD__)
>-+#if !defined(__sun) && ! defined(__FreeBSD__) && ! defined(__DragonFly__)
>- #define _XOPEN_SOURCE 500
>- #endif
>- /* required for strncasecmp() */
>diff -urN /usr/ports/multimedia/xine/files/patch-src_xitk_network.c multimedia/xine/files/patch-src_xitk_network.c
>--- /usr/ports/multimedia/xine/files/patch-src_xitk_network.c	2014-06-21 17:43:10.000000000 +0900
>+++ multimedia/xine/files/patch-src_xitk_network.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,31 +0,0 @@
>---- 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);
>-   
>diff -urN /usr/ports/multimedia/xine/files/patch-src_xitk_session.c multimedia/xine/files/patch-src_xitk_session.c
>--- /usr/ports/multimedia/xine/files/patch-src_xitk_session.c	2014-06-21 17:43:10.000000000 +0900
>+++ multimedia/xine/files/patch-src_xitk_session.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- src/xitk/session.c.orig	2010-03-11 09:40:12.000000000 +0000
>-+++ src/xitk/session.c
>-@@ -21,7 +21,7 @@
>- /* Largely inspired of xmms control socket stuff */
>- 
>- /* required for getsubopt(); the __sun test gives us strncasecmp() on solaris */
>--#if ! defined (__sun) && ! defined (__OpenBSD__) && ! defined (__FreeBSD__)
>-+#if ! defined (__sun) && ! defined (__OpenBSD__) && ! defined (__FreeBSD__) && !defined(__DragonFly__)
>- #define _XOPEN_SOURCE 500
>- #endif
>-

Actions: View | Diff

Attachments on bug 193041: 146339