Date: Tue, 5 Dec 2006 10:36:08 -0500 From: "Michael Johnson" <ahze@ahze.net> To: "Andrew Pantyukhin" <infofarmer@freebsd.org> Cc: multimedia@freebsd.org Subject: Re: fix py*-gstreamer depends Message-ID: <b2203fed0612050736r297bedfdo4c7700cdbf412f45@mail.gmail.com> In-Reply-To: <cb5206420612050100m63f8d702xf0a21a97f10b2160@mail.gmail.com> References: <cb5206420612032118g65df7537ga401287a2feb1759@mail.gmail.com> <b2203fed0612040330s74ad5e61le83955b55e3ab74b@mail.gmail.com> <op.tj1rw7xa9aq2h7@mezz.mezzweb.com> <b2203fed0612041833k472941adu7f323979fdb913a7@mail.gmail.com> <cb5206420612050100m63f8d702xf0a21a97f10b2160@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On 12/5/06, Andrew Pantyukhin <infofarmer@freebsd.org> wrote:
> On 12/5/06, Michael Johnson <ahze@ahze.net> wrote:
> > On 12/4/06, Jeremy Messenger <mezz7@cox.net> wrote:
> > > On Mon, 04 Dec 2006 05:30:41 -0600, Michael Johnson <ahze@ahze.net> wrote:
> > >
> > > > On 12/4/06, Andrew Pantyukhin <infofarmer@freebsd.org> wrote:
> > > >> Any objections?
> > >
> > > In future, please explain what kind of problem that you are seeing. That
> > > will get less email to reply or agrue.
> > >
> > > > I don't have a problem with it, but why is it needed?
> > >
> > > Without test it, but I can see there has a problem. There is no
> > > USE_PYTHON=yes in bsd.gstreamer.mk to make PYTHON_PKGNAMEPREFIX define.
> >
> > I'm not really sure which way to swing on this one, using this patch
> > defeats the purpose of USE_PYTHON and PYTHON_PKG....
> > but not using it forces the porter to define USE_PYTHON with
> > USE_GSTREAMER=python.
> >
> > I've been rather busy lately with family stuff, but I'll try to figure
> > out a way for bsd.gstreamer.mk to define USE_PYTHON *with out*
> > using .if ${X:Mpython}!="" and not having to use py*-
>
> Can we have a temporary fix? This issue makes some
> things very broken, I wouldn't start this discussion
> if I hadn't shot myself in the foot already.
>
> > this is also a problem in bsd.gnome.mk
>
> Good to know we're not alone.
>
here is a patch, I made it in 3min and only have tested it on one port,
I'll have better time later this afternoon to test, but here is at least
a prototype.
Michael
[-- Attachment #2 --]
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.544
diff -u -r1.544 bsd.port.mk
--- bsd.port.mk 30 Sep 2006 19:25:45 -0000 1.544
+++ bsd.port.mk 5 Dec 2006 15:32:29 -0000
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.544 2006/09/30 19:25:45 linimon Exp $
+# $FreeBSD$
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -1485,6 +1485,10 @@
.include "${PORTSDIR}/Mk/bsd.php.mk"
.endif
+.if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER80)
+.include "${PORTSDIR}/Mk/bsd.gstreamer.mk"
+.endif
+
.if defined(USE_PYTHON) || defined(USE_PYTHON_BUILD) || defined(USE_PYTHON_RUN)
.include "${PORTSDIR}/Mk/bsd.python.mk"
.endif
@@ -1521,10 +1525,6 @@
.include "${PORTSDIR}/Mk/bsd.wx.mk"
.endif
-.if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER80)
-.include "${PORTSDIR}/Mk/bsd.gstreamer.mk"
-.endif
-
.if defined(USE_QMAIL) || defined(USE_QMAIL_RUN) || defined(USE_QMAIL_BUILD) || defined(WANT_QMAIL)
.include "${PORTSDIR}/Mk/bsd.mail.mk"
.endif
Index: bsd.gstreamer.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.gstreamer.mk,v
retrieving revision 1.23
diff -u -r1.23 bsd.gstreamer.mk
--- bsd.gstreamer.mk 14 Oct 2006 08:35:00 -0000 1.23
+++ bsd.gstreamer.mk 5 Dec 2006 15:32:06 -0000
@@ -223,6 +223,7 @@
python_DEPENDS= multimedia/py-gstreamer
python_NAME= gstreamer
+python_USE= USE_PYTHON="yes"
python_GST80_SUFX= 80
python_GST80_PREFIX= ${PYTHON_PKGNAMEPREFIX}
python_GST_PREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -245,6 +246,13 @@
# X11-Toolkits Plugins Section
pango_DEPENDS= x11-toolkits/gstreamer-plugins-pango
+
+.for ext in ${USE_GSTREAMER80} ${USE_GSTREAMER}
+. for use in ${${ext}_USE}
+${use}
+. endfor
+.endfor
+
.if defined(_POSTMKINCLUDED) && !defined(Gstreamer_Post_Include)
Gstreamer_Post_Include= bsd.gstreamer.mk
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b2203fed0612050736r297bedfdo4c7700cdbf412f45>