From owner-svn-ports-all@FreeBSD.ORG Thu Jun 11 17:38:43 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3714C58B; Thu, 11 Jun 2015 17:38:43 +0000 (UTC) (envelope-from bogorodskiy@gmail.com) Received: from mail-la0-x22c.google.com (mail-la0-x22c.google.com [IPv6:2a00:1450:4010:c03::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BDBD51F85; Thu, 11 Jun 2015 17:38:42 +0000 (UTC) (envelope-from bogorodskiy@gmail.com) Received: by laew7 with SMTP id w7so8111824lae.1; Thu, 11 Jun 2015 10:38:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=Qu084fn1+c3HRWY4H/GUdICV0hWuSdsr1RwX0wqWJTs=; b=NzA3xaDL9XICEz1S9Pdb4sDyggcQ5Ttgi2eZuZn20a6WObzpJa7cQpEHYRT1lUk7I6 m2YDelVDZ8gv8B0qIDm52XbWnF1/fcGtKqa2M0S+h9WzLYzXPNoTj7hYqc+uxWJfN4Y5 pFqoqEU+alkM9dYy816AuHvR0pmf2DX6MpoMwjk4zYMjbM8Fm7/ffRqxqnVOxavlef3i mHndrnnpm1JXEjUUk9D/tC1awVh7Hv9mSpIfpclz9Lk+Mb1p0xqUqwpQ9k0Tf2Mckqpr Bs/k6QsrB0/4OjkCM/ON/un5Blxq931ZcFRiq6KMJ2OvmAwOcOCp6GGYnhwj5QzNCzfM Ro3g== X-Received: by 10.112.166.132 with SMTP id zg4mr11172281lbb.3.1434044320563; Thu, 11 Jun 2015 10:38:40 -0700 (PDT) Received: from kloomba ([77.94.198.13]) by mx.google.com with ESMTPSA id gn6sm315620lbc.28.2015.06.11.10.38.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jun 2015 10:38:39 -0700 (PDT) Date: Thu, 11 Jun 2015 20:37:03 +0300 From: Roman Bogorodskiy To: Johannes Jost Meixner Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r389223 - in head/net-im/skype4: . files Message-ID: <20150611173659.GA88250@kloomba> References: <201506111458.t5BEw4qn012538@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="YZ5djTAD1cGYuMQK" Content-Disposition: inline In-Reply-To: <201506111458.t5BEw4qn012538@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2015 17:38:43 -0000 --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Johannes Jost Meixner wrote: > Author: xmj > Date: Thu Jun 11 14:58:03 2015 > New Revision: 389223 > URL: https://svnweb.freebsd.org/changeset/ports/389223 >=20 > Log: > net-im/skype4: unbreak on 11.0-CURRENT > =20 > Changes: > =20 > The "skype" binary works fine after recent update in linux compat lay= er when > linux-c6-pulseaudio (libpulse.so.0) is not installed (but linprocfs(5= ) must be > mounted into ${LINUXBASE}/proc). So: > =20 > - Unbreak net-im/skype4 for __FreeBSD_version >=3D 1100075. > - (temporarily) Disable PA dependency. > =20 > Also: > - Drop (indirect) PA dependencies. > - Add tcp_wrappers-libs into linux-c6-pulseaudio-libs dependencies (u= sed by > libpulse.so.0) > - Fix some portlint(1) warnings. > =20 > 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). > =20 > PR: 200608 > Submitted by: Andriy Voskoboinyk >=20 > Modified: > head/net-im/skype4/Makefile > head/net-im/skype4/files/skype.sh.in >=20 > Modified: head/net-im/skype4/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/net-im/skype4/Makefile Thu Jun 11 14:55:40 2015 (r389222) > +++ head/net-im/skype4/Makefile Thu Jun 11 14:58:03 2015 (r389223) > @@ -11,6 +11,8 @@ PKGNAMESUFFIX=3D 4 > MAINTAINER=3D xmj@chaot.net > COMMENT=3D P2P VoIP software > =20 > +RUN_DEPENDS=3D ${LINUXBASE}/lib/skype_oss_wrapper/libpulse.so.0:${PORTSD= IR}/audio/linux-skype_oss_wrapper > + > CONFLICTS=3D skype-devel-[0-9]* > =20 > OPTIONS_DEFINE=3D VIDEO > @@ -20,7 +22,7 @@ NO_BUILD=3D yes > =20 > USES=3D cpe desktop-file-utils tar:bzip2 > USE_LINUX=3D yes > -USE_LINUX_APPS+=3D fontconfig xorglibs qt47 qt47-x11 qt47-webkit libsndf= ile openssl-compat pulseaudio-libs tcp_wrappers-libs flac libasyncns > +USE_LINUX_APPS+=3D fontconfig xorglibs qt47 qt47-x11 qt47-webkit openssl= -compat > =20 > RESTRICTED=3D Redistribution prohibited. > =20 > @@ -30,13 +32,15 @@ PLIST_SUB+=3D SKYPEDIR=3D${SKYPEDIR} > SUB_FILES=3D skype.sh > SUB_LIST+=3D SKYPEDIR=3D${SKYPEDIR} > =20 > -BROKEN=3D Skype 4.3 is missing several Linux syscalls. > -DEPRECATED=3D Broken for more than 6 months > -EXPIRATION_DATE=3D 2015-05-26 > - > -#NVIDIA_GL_RUN_DEPENDS=3D ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x1= 1/nvidia-driver > -#NVIDIA_GL_USE=3D LINUX_APPS=3Dxorglibs > -#NVIDIA_GL_USE_OFF=3D LINUX_APPS=3Ddri > +.include > + > +.if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} < 1100075 > +BROKEN=3D Skype 4.3 requires Linux 2.6.32 emulation. ^^^ Nit: I guess the period is not needed here because the resulting message will look something like this: =3D=3D=3D> skype4-4.3.0.37,1 is marked as broken: Skype 4.3 requires Linux 2.6.32 emulation.. > +.endif > + > +NVIDIA_GL_RUN_DEPENDS=3D ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11= /nvidia-driver > +NVIDIA_GL_USE=3D LINUX_APPS=3Dxorglibs > +NVIDIA_GL_USE_OFF=3D LINUX_APPS=3Ddri > =20 > .include > .if ${PORT_OPTIONS:MVIDEO} > @@ -49,9 +53,13 @@ SUB_LIST+=3D VIDEO=3D"" > =20 > do-install: > @${INSTALL} -d ${STAGEDIR}${PREFIX}/share/applications > - @${INSTALL_DATA} ${WRKSRC}/skype.desktop ${STAGEDIR}${PREFIX}/share/app= lications/ > - @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${STAGEDIR}${PREFI= X}/share/pixmaps/skype.png > - @cd ${WRKSRC}/ && ${MKDIR} ${STAGEDIR}${PREFIX}/${SKYPEDIR} && ${COPYTR= EE_SHARE} "avatars icons sounds lang" ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ > + @${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}/ > =20 > # The binary main program > @${INSTALL_PROGRAM} ${WRKSRC}/skype ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ > @@ -63,4 +71,4 @@ do-install: > @${INSTALL} -d ${STAGEDIR}${DOCSDIR} > @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} > =20 > -.include > +.include >=20 > Modified: head/net-im/skype4/files/skype.sh.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/net-im/skype4/files/skype.sh.in Thu Jun 11 14:55:40 2015 (r38922= 2) > +++ head/net-im/skype4/files/skype.sh.in Thu Jun 11 14:58:03 2015 (r38922= 3) > @@ -1,3 +1,4 @@ > -#!/compat/linux/bin/sh > -%%VIDEO%% %%PREFIX%%/%%SKYPEDIR%%/skype --resources=3D%%PREFIX%%/%%SKYPE= DIR%% --disable-api $@ > +#!/bin/sh > +export %%VIDEO%%LD_LIBRARY_PATH=3D/lib/skype_oss_wrapper:${LD_LIBRARY_PA= TH} > +exec %%PREFIX%%/%%SKYPEDIR%%/skype --resources=3D%%PREFIX%%/%%SKYPEDIR%%= --disable-api "$@" > =20 >=20 Roman Bogorodskiy --YZ5djTAD1cGYuMQK Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJVecc7AAoJEMltX/4IwiJqKvQIAJSbM+k0/fYhoqiCczRJGoJf my41DoAgdNw+xGAWVokISA68L+6oyAo7zqa/Gkj3I99Rn2yfAhpfObzg/rDn01TG 86Z908QJ/l82suQkPikzDj0guiT4tDn4oACShi/ZI5Utaoko3UVTFKVyO8OFFtRA QyCVaHG5+vuOhNQmE+26ds18NsLw8wZOuBNVfFHO/TOqFQCXMwXl0Ix+lJ/8bXwq dRsja07A+onRVNXeHIR+t7iX233KYihyGdHF9/xvqKC9MINv72m5B8QHz2H8yVix VPvZsoseZiaZQYf8eAssUfScraFCXZsaaxRQHIgEYXWck3GBD9eCI5CR7MY2ABk= =C1Ts -----END PGP SIGNATURE----- --YZ5djTAD1cGYuMQK--