sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net-im/skype4: unbreak on 11.0-CURRENT

Browse source 
Changes:

  The "skype" binary works fine after recent update in linux compat layer when
  linux-c6-pulseaudio (libpulse.so.0) is not installed (but linprocfs(5) must be
  mounted into ${LINUXBASE}/proc). So:

  - Unbreak net-im/skype4 for __FreeBSD_version >= 1100075.
  - (temporarily) Disable PA dependency.

  Also:
  - Drop (indirect) PA dependencies.
  - Add tcp_wrappers-libs into linux-c6-pulseaudio-libs dependencies (used by
    libpulse.so.0)
  - Fix some portlint(1) warnings.

  Workaround: libpulse.so.0 can be replaced with PA wrapper from
  https://github.com/waterlaz/skype_oss_wrapper - then sound will work too (with
  mounted devfs(5) in ${LINUXBASE}/dev).

PR:		200608
Submitted by:	Andriy Voskoboinyk <s3erios@gmail.com>
This commit is contained in:
Johannes Jost Meixner 2015-06-11 14:58:03 +00:00
parent 55e63d7557
commit 3b7562930f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=389223
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
net-im/skype4/Makefile
View file

@ -11,6 +11,8 @@ PKGNAMESUFFIX= 4
MAINTAINER= xmj@chaot.net MAINTAINER= xmj@chaot.net
COMMENT= P2P VoIP software COMMENT= P2P VoIP software
RUN_DEPENDS= ${LINUXBASE}/lib/skype_oss_wrapper/libpulse.so.0:${PORTSDIR}/audio/linux-skype_oss_wrapper
CONFLICTS= skype-devel-[0-9]* CONFLICTS= skype-devel-[0-9]*
OPTIONS_DEFINE= VIDEO OPTIONS_DEFINE= VIDEO
@ -20,7 +22,7 @@ NO_BUILD= yes
USES= cpe desktop-file-utils tar:bzip2 USES= cpe desktop-file-utils tar:bzip2
USE_LINUX= yes 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. RESTRICTED= Redistribution prohibited.
@ -30,13 +32,15 @@ PLIST_SUB+= SKYPEDIR=${SKYPEDIR}
SUB_FILES= skype.sh SUB_FILES= skype.sh
SUB_LIST+= SKYPEDIR=${SKYPEDIR} SUB_LIST+= SKYPEDIR=${SKYPEDIR}
BROKEN= Skype 4.3 is missing several Linux syscalls. .include <bsd.port.pre.mk>
DEPRECATED= Broken for more than 6 months
EXPIRATION_DATE= 2015-05-26
#NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100075
#NVIDIA_GL_USE= LINUX_APPS=xorglibs BROKEN= Skype 4.3 requires Linux 2.6.32 emulation.
#NVIDIA_GL_USE_OFF= LINUX_APPS=dri .endif
NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
NVIDIA_GL_USE= LINUX_APPS=xorglibs
NVIDIA_GL_USE_OFF= LINUX_APPS=dri
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MVIDEO} .if ${PORT_OPTIONS:MVIDEO}
@ -49,9 +53,13 @@ SUB_LIST+= VIDEO=""
do-install: do-install:
@${INSTALL} -d ${STAGEDIR}${PREFIX}/share/applications @${INSTALL} -d ${STAGEDIR}${PREFIX}/share/applications
@${INSTALL_DATA} ${WRKSRC}/skype.desktop ${STAGEDIR}${PREFIX}/share/applications/ @${INSTALL_DATA} ${WRKSRC}/skype.desktop \
@${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${STAGEDIR}${PREFIX}/share/pixmaps/skype.png ${STAGEDIR}${PREFIX}/share/applications/
@cd ${WRKSRC}/ && ${MKDIR} ${STAGEDIR}${PREFIX}/${SKYPEDIR} && ${COPYTREE_SHARE} "avatars icons sounds lang" ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ @${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 # The binary main program
@${INSTALL_PROGRAM} ${WRKSRC}/skype ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ @${INSTALL_PROGRAM} ${WRKSRC}/skype ${STAGEDIR}${PREFIX}/${SKYPEDIR}/
@ -63,4 +71,4 @@ do-install:
@${INSTALL} -d ${STAGEDIR}${DOCSDIR} @${INSTALL} -d ${STAGEDIR}${DOCSDIR}
@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk> .include <bsd.port.post.mk>

5
net-im/skype4/files/skype.sh.in
View file

@ -1,3 +1,4 @@
#!/compat/linux/bin/sh #!/bin/sh
%%VIDEO%% %%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% --disable-api $@ export %%VIDEO%%LD_LIBRARY_PATH=/lib/skype_oss_wrapper:${LD_LIBRARY_PATH}
exec %%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% --disable-api "$@"