Attachment 157437 Details for Bug 200608 – Add dependency for skype_oss_wrapper (skype4)

[patch] Add dependency for skype_oss_wrapper (skype4)

patch-skype4.diff (text/plain), 3.05 KB, created by Andriy Voskoboinyk on 2015-06-05 18:06:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-06-05 18:06:56 UTC

Size: 3.05 KB

patch

obsolete

>Index: net-im/skype4/Makefile
>===================================================================
>--- net-im/skype4/Makefile	(revision 388600)
>+++ net-im/skype4/Makefile	(working copy)
>@@ -11,6 +11,8 @@
> MAINTAINER=	xmj@chaot.net
> COMMENT=	P2P VoIP software
> 
>+RUN_DEPENDS=	${LINUXBASE}/lib/skype_oss_wrapper/libpulse.so.0:${PORTSDIR}/audio/skype_oss_wrapper
>+
> CONFLICTS=	skype-devel-[0-9]*
> 
> OPTIONS_DEFINE=	VIDEO
>@@ -20,7 +22,8 @@
> 
> USES=		cpe desktop-file-utils tar:bzip2
> USE_LINUX=	yes
>-USE_LINUX_APPS+= fontconfig xorglibs qt47 qt47-x11 qt47-webkit libsndfile openssl-compat pulseaudio-libs tcp_wrappers-libs flac libasyncns
>+USE_LINUX_APPS+=	fontconfig xorglibs qt47 qt47-x11 qt47-webkit \
>+			openssl-compat
> 
> RESTRICTED=	Redistribution prohibited.
> 
>@@ -30,9 +33,11 @@
> SUB_FILES=	skype.sh
> SUB_LIST+=	SKYPEDIR=${SKYPEDIR}
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100075
> BROKEN=		Skype 4.3 is missing several Linux syscalls.
>-DEPRECATED=	Broken for more than 6 months
>-EXPIRATION_DATE=	2015-05-26
>+.endif
> 
> #NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
> #NVIDIA_GL_USE=		LINUX_APPS=xorglibs
>@@ -48,19 +53,23 @@
> .endif
> 
> do-install:
>-	@${INSTALL} -d ${STAGEDIR}${PREFIX}/share/applications
>-	@${INSTALL_DATA} ${WRKSRC}/skype.desktop ${STAGEDIR}${PREFIX}/share/applications/
>-	@${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${STAGEDIR}${PREFIX}/share/pixmaps/skype.png
>-	@cd ${WRKSRC}/ && ${MKDIR} ${STAGEDIR}${PREFIX}/${SKYPEDIR} && ${COPYTREE_SHARE} "avatars icons sounds lang" ${STAGEDIR}${PREFIX}/${SKYPEDIR}/
>+	${INSTALL} -d ${STAGEDIR}${PREFIX}/share/applications
>+	${INSTALL_DATA} ${WRKSRC}/skype.desktop \
>+	    ${STAGEDIR}${PREFIX}/share/applications/
>+	${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png \
>+	    ${STAGEDIR}${PREFIX}/share/pixmaps/skype.png
>+	@cd ${WRKSRC}/ && ${MKDIR} ${STAGEDIR}${PREFIX}/${SKYPEDIR} && \
>+	    ${COPYTREE_SHARE} "avatars icons sounds lang" \
>+	        ${STAGEDIR}${PREFIX}/${SKYPEDIR}/
> 
> # The binary main program
>-	@${INSTALL_PROGRAM} ${WRKSRC}/skype ${STAGEDIR}${PREFIX}/${SKYPEDIR}/
>+	${INSTALL_PROGRAM} ${WRKSRC}/skype ${STAGEDIR}${PREFIX}/${SKYPEDIR}/
> 
> # The wrapper for main program
>-	@${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${STAGEDIR}${PREFIX}/bin/skype
>+	${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${STAGEDIR}${PREFIX}/bin/skype
> 
> # Documentation
>-	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
>+	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
> 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: net-im/skype4/files/skype.sh.in
>===================================================================
>--- net-im/skype4/files/skype.sh.in	(revision 388600)
>+++ net-im/skype4/files/skype.sh.in	(working copy)
>@@ -1,3 +1,4 @@
>-#!/compat/linux/bin/sh
>-%%VIDEO%% %%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% --disable-api $@
>+#!/bin/sh
>+export %%VIDEO%%LD_LIBRARY_PATH=/lib/skype_oss_wrapper:${LD_LIBRARY_PATH}
>+exec %%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% --disable-api "$@"
>

Actions: View | Diff

Attachments on bug 200608: 157385 | 157386 | 157436 | 157437