kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

www/linux-*-flashplugin11: convert ALSA to option, but off by default

Browse source 
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
This commit is contained in:
John Marino 2014-11-26 19:48:24 +00:00
parent 210951350a
commit b17ef56062
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=373458
6 changed files with 64 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
www/linux-c6-flashplugin11/Makefile
View file

@ -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)

2
www/linux-c6-flashplugin11/distinfo
View file

@ -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

5
www/linux-c6-flashplugin11/pkg-plist
View file

@ -6,3 +6,8 @@ share/icons/hicolor/22x22/apps/flash-player-properties.png
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%%

37
www/linux-f10-flashplugin11/Makefile
View file

@ -3,25 +3,24 @@
PORTNAME= flashplugin
PORTVERSION= 11.2r202.418
PORTREVISION= 3
PORTREVISION= 4
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.21_5:${PORTSDIR}/audio/linux-f10-alsa-lib
ONLY_FOR_ARCHS= amd64 i386
USE_LINUX= f10
USE_LINUX_APPS= alsalib alsa-plugins-oss curl cyrus-sasl2 \
gtk2 libssh2 nspr nss openldap openssl
USE_LINUX_APPS= curl cyrus-sasl2 gtk2 libssh2 nspr nss openldap openssl
WANT_GNOME= yes
RESTRICTED= Redistribution not allowed
RESTRICTED_FILES= ${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
NO_BUILD= yes
NO_WRKSUBDIR= yes
@ -29,19 +28,27 @@ 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.21_5:${PORTSDIR}/audio/linux-f10-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
.endif
.if ${PORT_OPTIONS:MGNOME}
USES+= desktop-file-utils
INSTALLS_ICONS= yes
.endif
@ -49,8 +56,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)

2
www/linux-f10-flashplugin11/distinfo
View file

@ -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

5
www/linux-f10-flashplugin11/pkg-plist
View file

@ -6,3 +6,8 @@ share/icons/hicolor/22x22/apps/flash-player-properties.png
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%%