From cd57d42f0093e926842b23da74925667e679321b Mon Sep 17 00:00:00 2001 From: kwm Date: Fri, 5 Oct 2012 10:21:19 +0000 Subject: Woops fix bsd.gstreamer.mk. I accidently edited some things in the USE_GSTREAMER section while it was ment for USE_GSTREAMER1 git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17095 df743ca5-7f9a-e211-a948-0013205c9059 --- Mk/bsd.gstreamer.mk | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'Mk') diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk index 270132486..8c474c200 100644 --- a/Mk/bsd.gstreamer.mk +++ b/Mk/bsd.gstreamer.mk @@ -6,7 +6,7 @@ # Created by: Michael Johnson # # $FreeBSD$ -# $MCom$ +# $MCom: ports/Mk/bsd.gstreamer.mk,v 1.48 2012/10/04 08:12:44 kwm Exp $ .if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include) @@ -94,7 +94,6 @@ core_DEPENDS= multimedia/gstreamer-plugins-core yes_DEPENDS= multimedia/gstreamer-plugins yes_NAME= gstreamer-plugins -yes_GST1_NAME= gstreamer1-plugins yes_GST_PREFIX= # empty yes_GST1_PREFIX= #empty @@ -318,8 +317,8 @@ ${ext}_GST_PREFIX?= gstreamer-plugins- ${ext}_GST_VERSION?= ${GST_VERSION}${GST_MINOR_VERSION} ${ext}_NAME?= ${ext} . if ${_USE_GSTREAMER_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_DEPENDS}) -BUILD_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_DEPENDS:S/gstreamer/gstreamer1/} -RUN_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_DEPENDS:S/gstreamer/gstreamer1/} +BUILD_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} +RUN_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_DEPENDS} . else IGNORE= cannot install: unknown gstreamer 0.10 plugin -- ${ext} . endif @@ -328,13 +327,12 @@ IGNORE= cannot install: unknown gstreamer 0.10 plugin -- ${ext} .for ext in ${USE_GSTREAMER1} ${ext}_GST1_PREFIX?= gstreamer1-plugins- ${ext}_GST1_VERSION?= ${GST1_VERSION}${GST1_MINOR_VERSION} -${ext}_GST1_NAME?= ${ext} -. if ${_USE_GSTREAMER_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_DEPENDS}) +${ext}_GST1_NAME?= ${ext:S/gstreamer/gstreamer1/} +${ext}_GST1_DEPENDS?= ${${ext}_DEPENDS:S/gstreamer/gstreamer1/} +. if ${_USE_GSTREAMER_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_GST1_DEPENDS}) # XXX version check hmmm hier moet nog uit gedacht worden. -BUILD_DEPENDS+= ${${ext}_GST1_PREFIX}${${ext}_NAME}>=${${ext}_GST1_VERSION}}: - ${PORTSDIR}/${${ext}_DEPENDS} -RUN_DEPENDS+= ${${ext}_GST1_PREFIX}${${ext}_NAME}>=${${ext}_GST1_VERSION}}: - ${PORTSDIR}/${${ext}_DEPENDS} +BUILD_DEPENDS+= ${${ext}_GST1_PREFIX}${${ext}_GST1_NAME}>=${${ext}_GST1_VERSION}:${PORTSDIR}/${${ext}_GST1_DEPENDS} +RUN_DEPENDS+= ${${ext}_GST1_PREFIX}${${ext}_GST1_NAME}>=${${ext}_GST1_VERSION}:${PORTSDIR}/${${ext}_GST1_DEPENDS} . else IGNORE= cannot install: unknown gstreamer 1.0 plugin -- ${ext} . endif -- cgit v1.2.3