From 5c02490e22fb639272ee45021c3695a4b21268d0 Mon Sep 17 00:00:00 2001 From: makc Date: Sat, 9 Jun 2012 00:41:21 +0000 Subject: Merge changes from area51 repository (SVN commit 8197 by avilla): - Remove SIPFILES option, some ports (e.g., pykde4) require the files to be installed. - Remove DEBUG and TRACING options, and merge them under WITH_DEBUG. --- multimedia/py-qt4-multimedia/Makefile | 33 ++++++++++------------------ multimedia/py-qt4-multimedia/pkg-plist | 22 +++++++++---------- multimedia/py-qt4-phonon/Makefile | 33 ++++++++++------------------ multimedia/py-qt4-phonon/pkg-plist | 40 +++++++++++++++++----------------- 4 files changed, 53 insertions(+), 75 deletions(-) (limited to 'multimedia') diff --git a/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile index 13a2a6d67526..e15c29a556ec 100644 --- a/multimedia/py-qt4-multimedia/Makefile +++ b/multimedia/py-qt4-multimedia/Makefile @@ -24,29 +24,28 @@ HAS_CONFIGURE= yes USE_PYTHON= 2.5+ USE_QT4= multimedia qmake_build -OPTIONS= API "Install Phonon API for QScintilla2" on \ - DEBUG "Enable debugging in generated code" off \ - SIPFILES "Install the Phonon SIP files" on \ - TRACING "Enable tracing in generated code" off +OPTIONS= API "Install Phonon API for QScintilla2" on PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" -ARGS= -b ${PREFIX}/bin\ - -d ${PYTHONPREFIX_SITELIBDIR}\ - -p ${PREFIX}/${QT_PLUGINDIR_REL}\ - -q ${QMAKE}\ - --confirm-license\ +ARGS= -b ${PREFIX}/bin \ + -d ${PYTHONPREFIX_SITELIBDIR} \ + -p ${PREFIX}/${QT_PLUGINDIR_REL} \ + -q ${QMAKE} \ + --confirm-license \ + --sipdir ${SIPDIR} \ --enable QtMultimedia +.if defined(WITH_DEBUG) +ARGS+= --debug --trace +.endif + .include "../../devel/py-sip/files/bsd.pyqt.mk" .include -.if defined(WITH_DEBUG) -ARGS+= --debug -.endif .if defined(WITHOUT_API) ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " @@ -55,16 +54,6 @@ LIB_DEPENDS+= qscintilla2.8:${PORTSDIR}/devel/qscintilla2 ARGS+= --qsci-api --qsci-api-destdir=${QSCIDIR} PLIST_SUB+= API="" .endif -.if defined(WITHOUT_SIPFILES) -ARGS+= --no-sip-files -PLIST_SUB+= SIP="@comment " -.else -ARGS+= --sipdir ${SIPDIR} -PLIST_SUB+= SIP="" -.endif -.if defined(WITH_TRACING) -ARGS+= --trace -.endif do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ diff --git a/multimedia/py-qt4-multimedia/pkg-plist b/multimedia/py-qt4-multimedia/pkg-plist index 7f5b5e6761f5..65da82378a00 100644 --- a/multimedia/py-qt4-multimedia/pkg-plist +++ b/multimedia/py-qt4-multimedia/pkg-plist @@ -1,14 +1,14 @@ %%PYTHON_SITELIBDIR%%/PyQt4/QtMultimedia.so -%%SIP%%share/py-sip/QtMultimedia/QtMultimediamod.sip -%%SIP%%share/py-sip/QtMultimedia/qabstractvideobuffer.sip -%%SIP%%share/py-sip/QtMultimedia/qabstractvideosurface.sip -%%SIP%%share/py-sip/QtMultimedia/qaudio.sip -%%SIP%%share/py-sip/QtMultimedia/qaudiodeviceinfo.sip -%%SIP%%share/py-sip/QtMultimedia/qaudioformat.sip -%%SIP%%share/py-sip/QtMultimedia/qaudioinput.sip -%%SIP%%share/py-sip/QtMultimedia/qaudiooutput.sip -%%SIP%%share/py-sip/QtMultimedia/qvideoframe.sip -%%SIP%%share/py-sip/QtMultimedia/qvideosurfaceformat.sip +share/py-sip/QtMultimedia/QtMultimediamod.sip +share/py-sip/QtMultimedia/qabstractvideobuffer.sip +share/py-sip/QtMultimedia/qabstractvideosurface.sip +share/py-sip/QtMultimedia/qaudio.sip +share/py-sip/QtMultimedia/qaudiodeviceinfo.sip +share/py-sip/QtMultimedia/qaudioformat.sip +share/py-sip/QtMultimedia/qaudioinput.sip +share/py-sip/QtMultimedia/qaudiooutput.sip +share/py-sip/QtMultimedia/qvideoframe.sip +share/py-sip/QtMultimedia/qvideosurfaceformat.sip %%API%%share/qt4/qsci/api/python/QtMultimedia.api -%%SIP%%@dirrm share/py-sip/QtMultimedia +@dirrm share/py-sip/QtMultimedia @dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4 diff --git a/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile index 6da186352778..21c794444d86 100644 --- a/multimedia/py-qt4-phonon/Makefile +++ b/multimedia/py-qt4-phonon/Makefile @@ -24,29 +24,28 @@ HAS_CONFIGURE= yes USE_PYTHON= 2.5+ USE_QT4= phonon qmake_build -OPTIONS= API "Install Phonon API for QScintilla2" on \ - DEBUG "Enable debugging in generated code" off \ - SIPFILES "Install the Phonon SIP files" on \ - TRACING "Enable tracing in generated code" off +OPTIONS= API "Install Phonon API for QScintilla2" on PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" -ARGS= -b ${PREFIX}/bin\ - -d ${PYTHONPREFIX_SITELIBDIR}\ - -p ${PREFIX}/${QT_PLUGINDIR_REL}\ - -q ${QMAKE}\ - --confirm-license\ +ARGS= -b ${PREFIX}/bin \ + -d ${PYTHONPREFIX_SITELIBDIR} \ + -p ${PREFIX}/${QT_PLUGINDIR_REL} \ + -q ${QMAKE} \ + --confirm-license \ + --sipdir ${SIPDIR} \ --enable phonon +.if defined(WITH_DEBUG) +ARGS+= --debug --trace +.endif + .include "../../devel/py-sip/files/bsd.pyqt.mk" .include -.if defined(WITH_DEBUG) -ARGS+= --debug -.endif .if defined(WITHOUT_API) ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " @@ -55,16 +54,6 @@ LIB_DEPENDS+= qscintilla2.8:${PORTSDIR}/devel/qscintilla2 ARGS+= --qsci-api --qsci-api-destdir=${QSCIDIR} PLIST_SUB+= API="" .endif -.if defined(WITHOUT_SIPFILES) -ARGS+= --no-sip-files -PLIST_SUB+= SIP="@comment " -.else -ARGS+= --sipdir ${SIPDIR} -PLIST_SUB+= SIP="" -.endif -.if defined(WITH_TRACING) -ARGS+= --trace -.endif do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ diff --git a/multimedia/py-qt4-phonon/pkg-plist b/multimedia/py-qt4-phonon/pkg-plist index 5eada5b1cb04..9d068934e240 100644 --- a/multimedia/py-qt4-phonon/pkg-plist +++ b/multimedia/py-qt4-phonon/pkg-plist @@ -1,23 +1,23 @@ %%PYTHON_SITELIBDIR%%/PyQt4/phonon.so -%%SIP%%share/py-sip/phonon/abstractaudiooutput.sip -%%SIP%%share/py-sip/phonon/abstractvideooutput.sip -%%SIP%%share/py-sip/phonon/audiooutput.sip -%%SIP%%share/py-sip/phonon/backendcapabilities.sip -%%SIP%%share/py-sip/phonon/effect.sip -%%SIP%%share/py-sip/phonon/effectparameter.sip -%%SIP%%share/py-sip/phonon/effectwidget.sip -%%SIP%%share/py-sip/phonon/mediacontroller.sip -%%SIP%%share/py-sip/phonon/medianode.sip -%%SIP%%share/py-sip/phonon/mediaobject.sip -%%SIP%%share/py-sip/phonon/mediasource.sip -%%SIP%%share/py-sip/phonon/objectdescription.sip -%%SIP%%share/py-sip/phonon/path.sip -%%SIP%%share/py-sip/phonon/phononmod.sip -%%SIP%%share/py-sip/phonon/phononnamespace.sip -%%SIP%%share/py-sip/phonon/seekslider.sip -%%SIP%%share/py-sip/phonon/videoplayer.sip -%%SIP%%share/py-sip/phonon/videowidget.sip -%%SIP%%share/py-sip/phonon/volumeslider.sip +share/py-sip/phonon/abstractaudiooutput.sip +share/py-sip/phonon/abstractvideooutput.sip +share/py-sip/phonon/audiooutput.sip +share/py-sip/phonon/backendcapabilities.sip +share/py-sip/phonon/effect.sip +share/py-sip/phonon/effectparameter.sip +share/py-sip/phonon/effectwidget.sip +share/py-sip/phonon/mediacontroller.sip +share/py-sip/phonon/medianode.sip +share/py-sip/phonon/mediaobject.sip +share/py-sip/phonon/mediasource.sip +share/py-sip/phonon/objectdescription.sip +share/py-sip/phonon/path.sip +share/py-sip/phonon/phononmod.sip +share/py-sip/phonon/phononnamespace.sip +share/py-sip/phonon/seekslider.sip +share/py-sip/phonon/videoplayer.sip +share/py-sip/phonon/videowidget.sip +share/py-sip/phonon/volumeslider.sip %%API%%share/qt4/qsci/api/python/phonon.api -%%SIP%%@dirrm share/py-sip/phonon +@dirrm share/py-sip/phonon @dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4 -- cgit