On Wednesday 26 October 2011 13:30:08 Alberto Villa wrote: > SVN commit 7772 by avilla: > > - Add optional dependency on gstreamer-plugins-all in > phonon-gstreamer, off by default and bump PORTREVISION. > - Add note to kde4-workspace's pkg-message to alert people they *need* > at least gstreamer-plugins-ogg to avoid a deadlock at logout. > > Reported by: ale via e-mail > > > M +5 -0 KDE/x11/kde4-workspace/pkg-message > M +15 -0 PORTS/multimedia/phonon-gstreamer/Makefile > A PORTS/multimedia/phonon-gstreamer/pkg-message
Even with this commit, we are shipping by default a non-working KDE desktop at the moment (`pkg_add -r kde4` will install phonon- gstreamer with no plugins, it will only print those two pkg-messages as an alert). Maybe we should add a USE_GSTREAMER+=ogg when WITH_PHONON_GSTREAMER is set in kde4-workspace? By the way, I attached the patch I committed in this revision for you all to check what's the situation. -- Alberto Villa, FreeBSD committer <avi...@freebsd.org> http://people.FreeBSD.org/~avilla MAIDEN AUNT: A girl who never had the sense to say "uncle."
Index: KDE/x11/kde4-workspace/pkg-message
===================================================================
--- KDE/x11/kde4-workspace/pkg-message (revision 7770)
+++ KDE/x11/kde4-workspace/pkg-message (working copy)
@@ -4,4 +4,9 @@
/etc/rc.conf. To get full functionality you also need procfs(5)
mounted.
+Warning: if you're going to use Phonon-GStreamer as your default
+Phonon backend, you'll need to install *at least*
+audio/gstreamer-plugins-ogg to avoid finding yourself stuck when
+logging out of KDE Plasma Desktop.
+
======================================================================
Index: PORTS/multimedia/phonon-gstreamer/pkg-message
===================================================================
--- PORTS/multimedia/phonon-gstreamer/pkg-message (revision 0)
+++ PORTS/multimedia/phonon-gstreamer/pkg-message (revision 0)
@@ -0,0 +1,2 @@
+You'll need to install some GStreamer plugins to make Phonon able to
+play something: check multimedia/gstreamer-plugins-all.
Index: PORTS/multimedia/phonon-gstreamer/Makefile
===================================================================
--- PORTS/multimedia/phonon-gstreamer/Makefile (revision 7770)
+++ PORTS/multimedia/phonon-gstreamer/Makefile (working copy)
@@ -6,6 +6,7 @@
PORTNAME= phonon
PORTVERSION= 4.5.1
+PORTREVISION= 1
CATEGORIES= multimedia kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
@@ -16,6 +17,9 @@
MAINTAINER= k...@freebsd.org
COMMENT= GStreamer backend for Phonon
+# Required in order to avoid conflicts with multimedia/phonon's OPTIONS.
+LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
+
CONFLICTS= qt4-phonon-gst-4*
PHONON_BRANCH= stable
@@ -43,11 +47,22 @@
IGNORE= conflicts with Qt 4 Phonon. Please, deinstall qt4-phonon-gst and unset WITH_QT_PHONON to continue
.endif
+OPTIONS= PLUGINS "Install GStreamer plugins" off
+
+.include <bsd.port.options.mk>
+
+.ifdef(WITH_PLUGINS)
+RUN_DEPENDS+= gstreamer-plugins-all>=0:${PORTSDIR}/multimedia/gstreamer-plugins-all
+.endif
+
pre-su-install:
${MKDIR} ${QT_PLUGINDIR}/phonon_backend
post-install:
${LN} -sf ${PREFIX}/lib/kde4/plugins/phonon_backend/phonon_gstreamer.so \
${QT_PLUGINDIR}/phonon_backend/libphonon_gstreamer.so
+.ifdef(WITH_PLUGINS)
+ ${CAT} ${PKGMESSAGE}
+.endif
.include <bsd.port.mk>
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
