Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Nov 2006 10:34:51 GMT
From:      Max Brazhnikov<makc@issp.ac.ru>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/105201: maintainer update: multimedia/gxine
Message-ID:  <200611061034.kA6AYp3Y043316@www.freebsd.org>
Resent-Message-ID: <200611061040.kA6Aeed5011021@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         105201
>Category:       ports
>Synopsis:       maintainer update: multimedia/gxine
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 06 10:40:39 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
FreeBSD luna.zuzino.mipt.ru 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Sat Oct 28 18:43:15 MSD 2006     root@luna.zuzino.mipt.ru:/usr/obj/usr/src/sys/LUNA  i386
>Description:
Update gxine to 0.5.8.
See changes at  http://sourceforge.net/project/shownotes.php?release_id=453656&group_id=9655
Add LIRC option (default off).

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/multimedia/gxine/Makefile /home/makc/porting/ports/multimedia/gxine/Makefile
--- /usr/ports/multimedia/gxine/Makefile	Sat Oct 14 12:54:20 2006
+++ /home/makc/porting/ports/multimedia/gxine/Makefile	Mon Nov  6 12:48:20 2006
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gxine
-PORTVERSION=	0.5.7
-PORTREVISION=	1
+PORTVERSION=	0.5.8
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xine
@@ -15,7 +14,8 @@
 MAINTAINER=	makc@issp.ac.ru
 COMMENT=	An alternative GUI for the Xine media player
 
-LIB_DEPENDS=	xine.15:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS=	xine.15:${PORTSDIR}/multimedia/libxine \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
@@ -23,7 +23,7 @@
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -I${X11BASE}/lib"
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
+CONFIGURE_ARGS+=--mandir=${PREFIX}/man --with-dbus
 CFLAGS=		-O2 -fno-strict-aliasing -pipe
 INSTALLS_ICONS=	yes
 
@@ -31,7 +31,8 @@
 MAN1=		gxine.1 gxine_client.1
 MANCOMPRESSED=	no
 
-OPTIONS=	MOZILLA_PLUGIN "Install Mozilla plugin" on
+OPTIONS=	MOZILLA_PLUGIN "Install Mozilla plugin" on \
+		LIRC "Enable lirc support" off
 
 .include <bsd.port.pre.mk>
 .if defined(WITHOUT_NLS)
@@ -42,16 +43,29 @@
 PLIST_SUB+=	NLS=""
 .endif
 
+.if defined(WITH_LIRC)
+LIB_DEPENDS+=	lirc_client.0:${PORTSDIR}/comms/lirc
+CONFIGURE_ARGS+=	--enable-lirc
+.else
+CONFIGURE_ARGS+=	--disable-lirc
+.endif
+
 .if defined(WITHOUT_MOZILLA_PLUGIN)
 LIB_DEPENDS+=	js.1:${PORTSDIR}/lang/spidermonkey
 CONFIGURE_ARGS+=--without-browser-plugin
 PLIST_SUB+=	MOZILLA_PLUGIN="@comment "
 .else
-USE_GECKO=	firefox mozilla seamonkey xulrunner firefox-devel
+USE_GECKO=	firefox mozilla xulrunner firefox15
 .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
+LIB_DEPENDS+=	nspr4.1:${PORTSDIR}/devel/nspr
 CONFIGURE_ARGS+=--disable-libjs
+CFLAGS+=	-I${LOCALBASE}/include/nspr
 PLIST_SUB+=	MOZILLA_PLUGIN=""
 .endif
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|firefox/nspr/||g" \
+			${WRKSRC}/configure
 
 post-install:
 .if !defined(WITHOUT_MOZILLA_PLUGIN)
diff -ruN --exclude=CVS /usr/ports/multimedia/gxine/distinfo /home/makc/porting/ports/multimedia/gxine/distinfo
--- /usr/ports/multimedia/gxine/distinfo	Tue Aug 29 02:51:24 2006
+++ /home/makc/porting/ports/multimedia/gxine/distinfo	Sun Oct 22 11:37:39 2006
@@ -1,3 +1,3 @@
-MD5 (gxine-0.5.7.tar.bz2) = 61585b08f699a33528749be101fe8a87
-SHA256 (gxine-0.5.7.tar.bz2) = 08f9da823bf87ce9a7beae6938ab2e5405004bb85f97ba49e3a2a1738ec0520c
-SIZE (gxine-0.5.7.tar.bz2) = 964963
+MD5 (gxine-0.5.8.tar.bz2) = e6bc2be9c6b3a13a101d462b2034b035
+SHA256 (gxine-0.5.8.tar.bz2) = ee62e0934bf63a2ed22dc2059ae73aadb192b14307ecf69cb9b49d329c4fe271
+SIZE (gxine-0.5.8.tar.bz2) = 1014295
diff -ruN --exclude=CVS /usr/ports/multimedia/gxine/files/patch-src::desktop_integration.c /home/makc/porting/ports/multimedia/gxine/files/patch-src::desktop_integration.c
--- /usr/ports/multimedia/gxine/files/patch-src::desktop_integration.c	Tue Aug 29 02:51:24 2006
+++ /home/makc/porting/ports/multimedia/gxine/files/patch-src::desktop_integration.c	Thu Jan  1 03:00:00 1970
@@ -1,10 +0,0 @@
---- src/desktop_integration.c.orig	Thu Jun  8 18:15:59 2006
-+++ src/desktop_integration.c	Tue Jul 11 00:35:11 2006
-@@ -31,7 +31,6 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <dlfcn.h>
--#include <alloca.h>
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
diff -ruN --exclude=CVS /usr/ports/multimedia/gxine/files/patch-src::engine.c /home/makc/porting/ports/multimedia/gxine/files/patch-src::engine.c
--- /usr/ports/multimedia/gxine/files/patch-src::engine.c	Tue Aug 29 02:51:24 2006
+++ /home/makc/porting/ports/multimedia/gxine/files/patch-src::engine.c	Thu Jan  1 03:00:00 1970
@@ -1,11 +0,0 @@
---- src/engine.c.orig	Fri Jun 30 18:56:00 2006
-+++ src/engine.c	Tue Jul 11 01:36:59 2006
-@@ -36,7 +36,7 @@
- 
- se_t *gse; /* global script engine */
- xine_t *xine; /* global xine instance */
--pthread_mutex_t engine_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+pthread_mutex_t engine_lock = PTHREAD_MUTEX_INITIALIZER;
- 
- gboolean initialised = FALSE;
- 
diff -ruN --exclude=CVS /usr/ports/multimedia/gxine/files/patch-src::http.c /home/makc/porting/ports/multimedia/gxine/files/patch-src::http.c
--- /usr/ports/multimedia/gxine/files/patch-src::http.c	Tue Aug 29 02:51:24 2006
+++ /home/makc/porting/ports/multimedia/gxine/files/patch-src::http.c	Thu Jan  1 03:00:00 1970
@@ -1,12 +0,0 @@
---- src/http.c.orig	Thu Jun 29 04:35:39 2006
-+++ src/http.c	Tue Jul 11 00:54:35 2006
-@@ -35,6 +35,9 @@
- #include <ctype.h>
- #include <errno.h>
- 
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#define IPPROTO_TCP 6
- #include "http.h"
- #include "utils.h"
- 
diff -ruN --exclude=CVS /usr/ports/multimedia/gxine/files/patch-src::script_engine.c /home/makc/porting/ports/multimedia/gxine/files/patch-src::script_engine.c
--- /usr/ports/multimedia/gxine/files/patch-src::script_engine.c	Tue Aug 29 02:51:24 2006
+++ /home/makc/porting/ports/multimedia/gxine/files/patch-src::script_engine.c	Thu Jan  1 03:00:00 1970
@@ -1,11 +0,0 @@
---- src/script_engine.c.orig	Thu Jun 15 17:13:25 2006
-+++ src/script_engine.c	Tue Jul 11 00:38:49 2006
-@@ -1554,7 +1554,7 @@
- 
-   pthread_mutexattr_t attr;
-   pthread_mutexattr_init (&attr);
--  pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP);
-+  pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
-   pthread_mutex_init (&se->lock, &attr);
-   pthread_mutexattr_destroy (&attr);
- 
diff -ruN --exclude=CVS /usr/ports/multimedia/gxine/files/patch-src_desktop__integration.c /home/makc/porting/ports/multimedia/gxine/files/patch-src_desktop__integration.c
--- /usr/ports/multimedia/gxine/files/patch-src_desktop__integration.c	Thu Jan  1 03:00:00 1970
+++ /home/makc/porting/ports/multimedia/gxine/files/patch-src_desktop__integration.c	Sun Nov  5 03:34:11 2006
@@ -0,0 +1,10 @@
+--- src/desktop_integration.c.orig
++++ src/desktop_integration.c
+@@ -31,7 +31,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <dlfcn.h>
+-#include <alloca.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff -ruN --exclude=CVS /usr/ports/multimedia/gxine/files/patch-src_engine.c /home/makc/porting/ports/multimedia/gxine/files/patch-src_engine.c
--- /usr/ports/multimedia/gxine/files/patch-src_engine.c	Thu Jan  1 03:00:00 1970
+++ /home/makc/porting/ports/multimedia/gxine/files/patch-src_engine.c	Sun Nov  5 03:34:18 2006
@@ -0,0 +1,10 @@
+--- src/engine.c.orig
++++ src/engine.c
+@@ -33,6 +33,7 @@
+ #include "engine.h"
+ #include "ui.h"
+ #include "utils.h"
++#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_MUTEX_INITIALIZER
+ 
+ se_t *gse; /* global script engine */
+ xine_t *xine; /* global xine instance */
diff -ruN --exclude=CVS /usr/ports/multimedia/gxine/files/patch-src_http.c /home/makc/porting/ports/multimedia/gxine/files/patch-src_http.c
--- /usr/ports/multimedia/gxine/files/patch-src_http.c	Thu Jan  1 03:00:00 1970
+++ /home/makc/porting/ports/multimedia/gxine/files/patch-src_http.c	Sun Nov  5 03:34:28 2006
@@ -0,0 +1,13 @@
+--- src/http.c.orig
++++ src/http.c
+@@ -38,6 +38,10 @@
+ #include "http.h"
+ #include "utils.h"
+ 
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#define IPPROTO_TCP 6
++
+ /*
+ #define LOG
+ */
diff -ruN --exclude=CVS /usr/ports/multimedia/gxine/files/patch-src_script__engine.c /home/makc/porting/ports/multimedia/gxine/files/patch-src_script__engine.c
--- /usr/ports/multimedia/gxine/files/patch-src_script__engine.c	Thu Jan  1 03:00:00 1970
+++ /home/makc/porting/ports/multimedia/gxine/files/patch-src_script__engine.c	Sun Nov  5 03:34:34 2006
@@ -0,0 +1,10 @@
+--- src/script_engine.c.orig
++++ src/script_engine.c
+@@ -54,6 +54,7 @@
+ #include "snapshot.h"
+ #include "engine.h"
+ #include "history.h"
++#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+ /*
+ #define LOG
+ */
diff -ruN --exclude=CVS /usr/ports/multimedia/gxine/pkg-plist /home/makc/porting/ports/multimedia/gxine/pkg-plist
--- /usr/ports/multimedia/gxine/pkg-plist	Tue Aug 29 02:51:24 2006
+++ /home/makc/porting/ports/multimedia/gxine/pkg-plist	Sun Nov  5 22:06:46 2006
@@ -20,7 +20,7 @@
 %%DATADIR%%/pixmaps/set-volume.svg
 %%DATADIR%%/pixmaps/speaker.png
 %%DATADIR%%/pixmaps/splash.png
-share/icons/hicolor/48x48/apps/gxine.png
+share/icons/hicolor/64x64/apps/gxine.png
 %%NLS%%share/locale/cs/LC_MESSAGES/gxine.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gxine.theme.mo
 %%NLS%%share/locale/de/LC_MESSAGES/gxine.mo
@@ -29,6 +29,8 @@
 %%NLS%%share/locale/fr/LC_MESSAGES/gxine.theme.mo
 %%NLS%%share/locale/it/LC_MESSAGES/gxine.mo
 %%NLS%%share/locale/it/LC_MESSAGES/gxine.theme.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gxine.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gxine.theme.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/gxine.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/gxine.theme.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/gxine.mo
@@ -40,6 +42,21 @@
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gxine.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gxine.theme.mo
 share/pixmaps/gxine.png
+@dirrmtry share/pixmaps
+%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN
+%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/uk
+%%NLS%%@dirrmtry share/locale/sq/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sq
+%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pl
+%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cs
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
===> Done

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611061034.kA6AYp3Y043316>