Date: Wed, 26 Nov 2014 21:14:59 +0100 From: Tijl Coosemans <tijl@FreeBSD.org> To: John Marino <marino@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r373458 - in head/www: linux-c6-flashplugin11 linux-f10-flashplugin11 Message-ID: <20141126211459.241dfadb@kalimero.tijl.coosemans.org> In-Reply-To: <201411261948.sAQJmO9U029389@svn.freebsd.org> References: <201411261948.sAQJmO9U029389@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 26 Nov 2014 19:48:24 +0000 (UTC) John Marino <marino@FreeBSD.org> wrote: > Author: marino > Date: Wed Nov 26 19:48:24 2014 > New Revision: 373458 > URL: https://svnweb.freebsd.org/changeset/ports/373458 > QAT: https://qat.redports.org/buildarchive/r373458/ > > Log: > www/linux-*-flashplugin11: convert ALSA to option, but off by default > > ALSA output in Flash is fragile and doesn't work without the major > linulator update currently baking in dchagin's lemul branch. While > waiting for that change, current ALSA to a disabled-by-default option. > > PR: 195416 > Submitted by: Jan Beich > Approved by: Continuation of recent work > > Modified: > head/www/linux-c6-flashplugin11/Makefile > head/www/linux-c6-flashplugin11/distinfo > head/www/linux-c6-flashplugin11/pkg-plist > head/www/linux-f10-flashplugin11/Makefile > head/www/linux-f10-flashplugin11/distinfo > head/www/linux-f10-flashplugin11/pkg-plist > > Modified: head/www/linux-c6-flashplugin11/Makefile > ============================================================================== > --- head/www/linux-c6-flashplugin11/Makefile Wed Nov 26 19:13:29 2014 (r373457) > +++ head/www/linux-c6-flashplugin11/Makefile Wed Nov 26 19:48:24 2014 (r373458) > @@ -3,25 +3,24 @@ > > PORTNAME= flashplugin > PORTVERSION= 11.2r202.418 > -PORTREVISION= 2 > +PORTREVISION= 3 > CATEGORIES= www multimedia linux > -MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/ > +MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \ > + LOCAL/nox:suplib > PKGNAMEPREFIX= linux-${USE_LINUX}- > -DISTFILES= install_flash_player_11_linux.i386.tar.gz > +DISTFILES= install_flash_player_11_linux.i386.tar.gz:plugin > DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} > > MAINTAINER= emulation@FreeBSD.org > COMMENT= Adobe Flash Player NPAPI Plugin > > -RUN_DEPENDS+= linux-${USE_LINUX}-alsa-lib>=1.0.22_2:${PORTSDIR}/audio/linux-c6-alsa-lib > - > ONLY_FOR_ARCHS= amd64 i386 > USE_LINUX= c6 > -USE_LINUX_APPS= alsalib alsa-plugins-oss curl cyrus-sasl2 \ > - gtk2 nspr nss # libssh2 openldap > +USE_LINUX_APPS= curl cyrus-sasl2 gtk2 nspr nss # libssh2 openldap > WANT_GNOME= yes > > RESTRICTED= Redistribution not allowed > +RESTRICTED_FILES= ${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//} > > NO_BUILD= yes > NO_WRKSUBDIR= yes > @@ -29,19 +28,29 @@ NO_WRKSUBDIR= yes > USES= webplugin:linux desktop-file-utils cpe > WEBPLUGIN_FILES= libflashplayer.so > > -OPTIONS_DEFINE= GNOME > +OPTIONS_DEFINE= ALSA GNOME > +OPTIONS_SUB= yes > + > +ALSA_DESC= ALSA audio output (broken, needs lemul) > +ALSA_RUN_DEPENDS=linux-${USE_LINUX}-alsa-lib>=1.0.22_2:${PORTSDIR}/audio/linux-c6-alsa-lib > +ALSA_DISTFILES_OFF=linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib > +ALSA_PLIST_SUB_OFF=LINUXBASE="${LINUXBASE}" COMPATDIR="${LINUXBASE:H}" > + > GNOME_DESC= include gnome support for .desktop file > +GNOME_USES= desktop-file-utils > > CPE_VENDOR= adobe > CPE_PRODUCT= flash_player > > -OPTIONS_SUB= yes > -PLIST_SUB= LINUXBASE="${LINUXBASE}" > - > .include <bsd.port.options.mk> > > +.if ${PORT_OPTIONS:MALSA} > +USE_LINUX_APPS+=alsalib alsa-plugins-oss > +.else > +USE_LINUX_APPS+=openssl-compat > +.endif > + > .if ${PORT_OPTIONS:MGNOME} > -USES+= desktop-file-utils > INSTALLS_ICONS= yes > .endif > > @@ -49,8 +58,12 @@ post-patch: > @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e '/^NotShowIn=KDE/d' ${WRKDIR}/usr/share/applications/flash-player-properties.desktop > > do-install: > - ${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} ${STAGEDIR}${LINUXBASE}/usr/lib > + ${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} > ${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR} > +.if ! ${PORT_OPTIONS:MALSA} > + ${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib > + ${INSTALL_LIB} ${WRKDIR}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib > +.endif > ${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/flash-player-properties ${STAGEDIR}${PREFIX}/bin > ${INSTALL_DATA} ${WRKDIR}/usr/share/applications/flash-player-properties.desktop ${STAGEDIR}${DESKTOPDIR} > (cd ${WRKDIR}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${STAGEDIR}${PREFIX}/share/icons) > > Modified: head/www/linux-c6-flashplugin11/distinfo > ============================================================================== > --- head/www/linux-c6-flashplugin11/distinfo Wed Nov 26 19:13:29 2014 (r373457) > +++ head/www/linux-c6-flashplugin11/distinfo Wed Nov 26 19:48:24 2014 (r373458) > @@ -1,2 +1,4 @@ > SHA256 (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = e374f4fec5f2881407728c261754bd596e4af0e1237dbe7de5fcacbde796b79e > SIZE (flashplugin/11.2r202.418/install_flash_player_11_linux.i386.tar.gz) = 6925123 > +SHA256 (flashplugin/11.2r202.418/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf > +SIZE (flashplugin/11.2r202.418/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 > > Modified: head/www/linux-c6-flashplugin11/pkg-plist > ============================================================================== > --- head/www/linux-c6-flashplugin11/pkg-plist Wed Nov 26 19:13:29 2014 (r373457) > +++ head/www/linux-c6-flashplugin11/pkg-plist Wed Nov 26 19:48:24 2014 (r373458) > @@ -6,3 +6,8 @@ share/icons/hicolor/22x22/apps/flash-pla > share/icons/hicolor/24x24/apps/flash-player-properties.png > share/icons/hicolor/32x32/apps/flash-player-properties.png > share/icons/hicolor/48x48/apps/flash-player-properties.png > +%%NO_ALSA%%%%LINUXBASE%%/usr/lib/libflashsupport.so > +%%NO_ALSA%%@dir %%LINUXBASE%%/usr/lib > +%%NO_ALSA%%@dir %%LINUXBASE%%/usr > +%%NO_ALSA%%@dir %%LINUXBASE%% > +%%NO_ALSA%%@dir %%COMPATDIR%% Traditionally /compat is a symlink to /usr/compat, so I'm not sure it's safe to delete it like this. But even if it is this port depends on emulators/linux_base so none of these @dir are necessary.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20141126211459.241dfadb>