Date: Sun, 15 Apr 2012 22:25:08 +0200 (CEST) From: Tijl Coosemans <tijl@coosemans.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/166980: [patch] multimedia/xfce4-parole: various fixes Message-ID: <201204152025.q3FKP8Ad070360@kalimero.tijl.coosemans.org> Resent-Message-ID: <201204152030.q3FKUBVt059182@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 166980
>Category: ports
>Synopsis: [patch] multimedia/xfce4-parole: various fixes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 15 20:30:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Tijl Coosemans
>Release: FreeBSD 10.0-CURRENT i386
>Organization:
>Environment:
>Description:
The attached patch contains various fixes for multimedia/xfce4-parole:
- Change PORTNAME to parole so DISTNAME and DATADIR no longer have to be set.
- Use shorthand to set MASTER_SITES.
- Shorten COMMENT to fit in pkg_info output.
- Add LICENSE.
- Remove GNU_CONFIGURE (redundant with USE_AUTOTOOLS).
- Replace some gstreamer plugins with "core" which also includes pango
plugin needed for subtitles.
- Remove x264 gstreamer plugin because it's an encoder. H.264 decoding is
provided by ffmpeg plugin which is part of core.
- Remove --disable-gtk-doc-html from CONFIGURE_ARGS.
- Remove ac_cv_prog_AWK="${AWK}" from CONFIGURE_ENV.
- Make soup gstreamer plugin optional because it pulls in Gnome components.
- Replace cdio gstreamer plugin with cdparanoia plugin which seems to use
fewer cd disc reads. Also, cdio is part the "ugly" plugin package and
cdparanoia of the "base" plugin package.
- Remove cdaudio gstreamer plugin. It doesn't seem to work and is redundant
with cdparanoia.
- Fix NLS option by patching configure script. Currently locale data is
always installed.
- Add share/applications to pkg-plist.
- Any portlint issues have been fixed as well.
>How-To-Repeat:
>Fix:
--- xfce4-parole.update begins here ---
diff -ur /usr/ports/multimedia/xfce4-parole/Makefile xfce4-parole/Makefile
--- /usr/ports/multimedia/xfce4-parole/Makefile 2012-04-15 21:58:01.000000000 +0200
+++ xfce4-parole/Makefile 2012-04-15 21:44:51.000000000 +0200
@@ -5,37 +5,31 @@
# $FreeBSD: ports/multimedia/xfce4-parole/Makefile,v 1.15 2011/10/23 13:45:59 rene Exp $
#
-PORTNAME= xfce4-parole
+PORTNAME= parole
PORTVERSION= 0.2.0.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia xfce
-MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=/src/apps/parole/0.2
+MASTER_SITES= XFCE/src/apps/parole/0.2/
DIST_SUBDIR= xfce4
-DISTNAME= parole-${PORTVERSION}
MAINTAINER= xfce@FreeBSD.org
-COMMENT= Lightweight media player for Xfce4 based on the gstreamer engine
+COMMENT= Lightweight media player for Xfce4 based on gstreamer
-DATADIR= ${PREFIX}/share/${PORTNAME:S/xfce4-//}
+LICENSE= GPLv2
LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib \
notify.4:${PORTSDIR}/devel/libnotify \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
USE_AUTOTOOLS= libtool
-GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_GSTREAMER= ffmpeg good theora xvid mp3 faad ogg dvd x264 \
- flac wavpack soup
+USE_GSTREAMER= core faad flac wavpack
USE_GMAKE= yes
CONFIGURE_ARGS= --disable-power-manager-plugin \
--enable-libnotify \
--enable-taglib \
- --disable-gtk-doc-html \
--without-html-dir
-CONFIGURE_ENV= ac_cv_prog_AWK="${AWK}"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_GNOME= gnomehack gtk20 glib20 intltool intlhack pkgconfig \
@@ -44,10 +38,19 @@
USE_XORG= x11 sm
USE_LDCONFIG= yes
-OPTIONS= NLS "Enable Native Language Support" on \
- CDDA "Enable CD audio support" on
+OPTIONS= CDDA "CD audio support (cdparanoia)" on \
+ HTTP "HTTP streaming support (libsoup)" on \
+ NLS "Native Language Support" on
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
+
+.if !defined(WITHOUT_CDDA)
+USE_GSTREAMER+= cdparanoia
+.endif
+
+.if !defined(WITHOUT_HTTP)
+USE_GSTREAMER+= soup
+.endif
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
@@ -58,12 +61,7 @@
PLIST_SUB+= NLS="@comment "
.endif
-.if !defined(WITHOUT_CDDA)
-LIB_DEPENDS+= cdio++.0:${PORTSDIR}/sysutils/gstreamer-plugins-cdio
-USE_GSTREAMER+= cdaudio
-.endif
-
post-install:
@-update-desktop-database
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ur /usr/ports/multimedia/xfce4-parole/files/patch-configure xfce4-parole/files/patch-configure
--- /usr/ports/multimedia/xfce4-parole/files/patch-configure 2012-04-13 12:00:17.000000000 +0200
+++ xfce4-parole/files/patch-configure 2012-04-15 21:44:51.000000000 +0200
@@ -1,6 +1,14 @@
--- configure.orig 2010-01-25 12:47:28.000000000 +0100
+++ configure 2011-03-11 17:11:27.000000000 +0100
-@@ -20717,17 +20717,17 @@
+@@ -18550,7 +18550,6 @@
+
+ fi
+ fi
+- USE_NLS=yes
+
+
+ gt_cv_have_gettext=no
+@@ -21388,17 +21387,17 @@
if test "x${prefix}" = "xNONE"; then
cat >>confdefs.h <<_ACEOF
diff -ur /usr/ports/multimedia/xfce4-parole/pkg-plist xfce4-parole/pkg-plist
--- /usr/ports/multimedia/xfce4-parole/pkg-plist 2012-04-13 12:00:17.000000000 +0200
+++ xfce4-parole/pkg-plist 2012-04-15 21:44:51.000000000 +0200
@@ -59,6 +59,7 @@
%%NLS%%@dirrmtry share/locale/ug
%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ast
+@dirrmtry share/applications
@dirrm lib/parole-0
@dirrm include/parole
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
--- xfce4-parole.update ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204152025.q3FKP8Ad070360>