Attachment 164450 Details for Bug 205486 – Split up python support it its own slave port

[patch] Split up python support it its own slave port

speech-dispatcher-python-split.diff (text/plain), 6.62 KB, created by Koop Mast on 2015-12-21 11:00:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koop Mast

Created: 2015-12-21 11:00:17 UTC

Size: 6.62 KB

patch

obsolete

>Index: accessibility/py3-speech-dispatcher/Makefile
>===================================================================
>--- accessibility/py3-speech-dispatcher/Makefile	(nonexistent)
>+++ accessibility/py3-speech-dispatcher/Makefile	(working copy)
>@@ -0,0 +1,16 @@
>+# $FreeBSD$
>+
>+PKGNAMEPREFIX=  ${PYTHON_PKGNAMEPREFIX}
>+
>+COMMENT=	Common interface to speech synthesis python bindings
>+
>+SPEECH_SLAVE=	yes
>+
>+MASTERDIR=	${.CURDIR}/../../accessibility/speech-dispatcher
>+
>+BUILD_WRKSRC=	${WRKSRC}/src/api/python
>+INSTALL_WRKSRC=	${WRKSRC}/src/api/python
>+
>+PLIST=	${.CURDIR}/pkg-plist
>+
>+.include "${MASTERDIR}/Makefile"
>
>Property changes on: accessibility/py3-speech-dispatcher/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: accessibility/py3-speech-dispatcher/pkg-plist
>===================================================================
>--- accessibility/py3-speech-dispatcher/pkg-plist	(nonexistent)
>+++ accessibility/py3-speech-dispatcher/pkg-plist	(working copy)
>@@ -0,0 +1,24 @@
>+bin/spd-conf
>+%%PYTHON_SITELIBDIR%%/speechd/__init__.py
>+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYVER%%.pyc
>+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYVER%%.pyo
>+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYVER%%.pyc
>+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYVER%%.pyo
>+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYVER%%.pyc
>+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYVER%%.pyo
>+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYVER%%.pyc
>+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYVER%%.pyo
>+%%PYTHON_SITELIBDIR%%/speechd/_test.py
>+%%PYTHON_SITELIBDIR%%/speechd/client.py
>+%%PYTHON_SITELIBDIR%%/speechd/paths.py
>+%%PYTHON_SITELIBDIR%%/speechd_config/__init__.py
>+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYVER%%.pyc
>+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYVER%%.pyo
>+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYVER%%.pyc
>+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYVER%%.pyo
>+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYVER%%.pyc
>+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYVER%%.pyo
>+%%PYTHON_SITELIBDIR%%/speechd_config/config.py
>+%%PYTHON_SITELIBDIR%%/speechd_config/paths.py
>+share/sounds/speech-dispatcher/test.wav
>+%%DATADIR%%/conf/desktop/speechd.desktop
>
>Property changes on: accessibility/py3-speech-dispatcher/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: accessibility/speech-dispatcher/Makefile
>===================================================================
>--- accessibility/speech-dispatcher/Makefile	(revision 404086)
>+++ accessibility/speech-dispatcher/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	speech-dispatcher
> PORTVERSION=	0.8.3
>+PORTREVISION=	1
> CATEGORIES=	accessibility audio
> MASTER_SITES=	http://devel.freebsoft.org/pub/projects/speechd/
> 
>@@ -23,6 +24,10 @@
> USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
> 
>+.if !defined(SPEECH_SLAVE)
>+
>+CONFIGURE_ARGS+=--disable-python
>+
> ETCFILES=	clients/emacs.conf modules/pico-generic.conf \
> 		modules/cicero.conf modules/dtk-generic.conf \
> 		modules/epos-generic.conf modules/espeak-generic.conf \
>@@ -35,8 +40,7 @@
> 
> INFO=		spd-say speech-dispatcher speech-dispatcher-cs ssip
> 
>-OPTIONS_DEFINE=	ALSA AO DOCS ESPEAK FESTIVAL FLITE NAS \
>-		PULSEAUDIO PYTHON
>+OPTIONS_DEFINE=	ALSA AO DOCS ESPEAK FESTIVAL FLITE NAS PULSEAUDIO
> OPTIONS_DEFAULT=ESPEAK
> OPTIONS_SUB=	yes
> 
>@@ -64,11 +68,6 @@
> PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
> PULSEAUDIO_CONFIGURE_WITH=pulse
> 
>-PYTHON_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py3-xdg
>-PYTHON_USES=		python:3
>-PYTHON_USE=		PYTHON=py3kplist
>-PYTHON_CONFIGURE_ENABLE=python
>-
> post-patch:
> 	@${REINPLACE_CMD} -e '/SUBDIRS/ s/tests//' \
> 		${WRKSRC}/src/Makefile.in
>@@ -82,4 +81,16 @@
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
> 
>+
>+.else
>+
>+USES+=		python:3
>+LIB_DEPENDS+=	libspeechd.so:${PORTSDIR}/accessibility/speech-dispatcher
>+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py3-xdg
>+
>+USE_PYTHON=	py3kplist
>+PLIST_SUB=	PYVER=${PYTHON_VER:S|.||}
>+
>+.endif
>+
> .include <bsd.port.mk>
>Index: accessibility/speech-dispatcher/pkg-plist
>===================================================================
>--- accessibility/speech-dispatcher/pkg-plist	(revision 404086)
>+++ accessibility/speech-dispatcher/pkg-plist	(working copy)
>@@ -1,4 +1,3 @@
>-%%PYTHON%%bin/spd-conf
> bin/spd-say
> bin/spdsend
> bin/speech-dispatcher
>@@ -26,27 +25,6 @@
> lib/libspeechd.so
> lib/libspeechd.so.2
> lib/libspeechd.so.2.6.0
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/__init__.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/__init__.pyc
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/__init__.pyo
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/_test.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/_test.pyc
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/_test.pyo
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/client.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/client.pyc
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/client.pyo
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/paths.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/paths.pyc
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/paths.pyo
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/__init__.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/__init__.pyc
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/__init__.pyo
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/config.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/config.pyc
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/config.pyo
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/paths.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/paths.pyc
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/paths.pyo
> lib/speech-dispatcher-modules/sd_cicero
> lib/speech-dispatcher-modules/sd_dummy
> %%ESPEAK%%lib/speech-dispatcher-modules/sd_espeak
>@@ -67,4 +45,3 @@
> share/locale/cs/LC_MESSAGES/speech-dispatcher.mo
> share/locale/hu/LC_MESSAGES/speech-dispatcher.mo
> share/sounds/speech-dispatcher/dummy-message.wav
>-%%PYTHON%%share/sounds/speech-dispatcher/test.wav

Actions: View | Diff

Attachments on bug 205486: 164450