Attachment 145600 Details for Bug 192541 – use alsa (f10 and c6)

[patch] use alsa (f10 and c6)

use_alsa.diff (text/plain), 4.36 KB, created by Jan Beich on 2014-08-10 01:17:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-08-10 01:17:30 UTC

Size: 4.36 KB

patch

obsolete

>Index: www/linux-f10-flashplugin11/Makefile
>===================================================================
>--- www/linux-f10-flashplugin11/Makefile	(revision 364487)
>+++ www/linux-f10-flashplugin11/Makefile	(working copy)
>@@ -4,11 +4,9 @@
> PORTNAME=	flashplugin
> PORTVERSION=	11.2r202.394
> CATEGORIES=	www multimedia linux
>-MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:C/r/\./}/:plugin \
>-		LOCAL/nox:suplib
>+MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:C/r/\./}/
> PKGNAMEPREFIX=	linux-f10-
>-DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin \
>-		linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
>+DISTFILES=	install_flash_player_11_linux.i386.tar.gz
> DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
> 
> MAINTAINER=	eadler@FreeBSD.org
>@@ -16,11 +14,11 @@ COMMENT=	Adobe Flash Player NPAPI Plugin
> 
> ONLY_FOR_ARCHS=	amd64 i386
> USE_LINUX=	yes
>-USE_LINUX_APPS=	openssl curl cyrus-sasl2 libssh2 nspr nss openldap gtk2
>+USE_LINUX_APPS= alsalib alsa-plugins-oss openssl curl cyrus-sasl2 \
>+		libssh2 nspr nss openldap gtk2
> WANT_GNOME=	yes
> 
> RESTRICTED=	Redistribution not allowed
>-RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
> 
> NO_BUILD=	yes
> NO_WRKSUBDIR=	yes
>@@ -47,7 +45,6 @@ post-patch:
> do-install:
> 	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} ${STAGEDIR}${LINUXBASE}/usr/lib
> 	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
>-	${INSTALL_LIB} ${WRKDIR}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib
> 	${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)
>Index: www/linux-f10-flashplugin11/pkg-plist
>===================================================================
>--- www/linux-f10-flashplugin11/pkg-plist	(revision 364487)
>+++ www/linux-f10-flashplugin11/pkg-plist	(working copy)
>@@ -20,5 +20,4 @@ share/icons/hicolor/48x48/apps/flash-player-proper
> @dirrmtry share/icons
> @dirrmtry %%WEBPLUGIN_DIR%%
> @cwd /compat/linux
>-usr/lib/libflashsupport.so
> @cwd %%RESETPREFIX%%
>diff --git www/linux-c6-flashplugin11/Makefile www/linux-c6-flashplugin11/Makefile
>index 1fd6508..1184690 100644
>--- www/linux-c6-flashplugin11/Makefile
>+++ www/linux-c6-flashplugin11/Makefile
>@@ -4,11 +4,9 @@
> PORTNAME=	flashplugin
> PORTVERSION=	11.2r202.346
> CATEGORIES=	www multimedia linux
>-MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:C/r/\./}/:plugin \
>-		LOCAL/nox:suplib
>+MASTER_SITES=	http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:C/r/\./}/
> PKGNAMEPREFIX=	linux-${USE_LINUX}-
>-DISTFILES=	install_flash_player_11_linux.i386.tar.gz:plugin \
>-		linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
>+DISTFILES=	install_flash_player_11_linux.i386.tar.gz
> DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
> 
> MAINTAINER=	eadler@FreeBSD.org
>@@ -16,11 +14,11 @@ COMMENT=	Adobe Flash Player NPAPI Plugin
> 
> ONLY_FOR_ARCHS=	amd64 i386
> USE_LINUX=	yes
>-USE_LINUX_APPS=	openssl curl cyrus-sasl2 nspr nss gtk2 #-alsalib libssh2 openldap
>+USE_LINUX_APPS=	alsalib alsa-plugins-oss openssl curl cyrus-sasl2 \
>+		nspr nss gtk2 # libssh2 openldap
> WANT_GNOME=	yes
> 
> RESTRICTED=	Redistribution not allowed
>-RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
> 
> NO_BUILD=	yes
> NO_WRKSUBDIR=	yes
>@@ -47,7 +45,6 @@ post-patch:
> do-install:
> 	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} ${STAGEDIR}${LINUXBASE}/usr/lib
> 	${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR}
>-	${INSTALL_LIB} ${WRKDIR}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib
> 	${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)
>diff --git www/linux-c6-flashplugin11/pkg-plist www/linux-c6-flashplugin11/pkg-plist
>index 1d74fbb..b376a76 100644
>--- www/linux-c6-flashplugin11/pkg-plist
>+++ www/linux-c6-flashplugin11/pkg-plist
>@@ -20,7 +20,6 @@ share/icons/hicolor/48x48/apps/flash-player-properties.png
> @dirrmtry share/icons
> @dirrmtry %%WEBPLUGIN_DIR%%
> @cwd /compat/linux
>-usr/lib/libflashsupport.so
> @dirrmtry usr/lib
> @dirrmtry usr
> @cwd %%RESETPREFIX%%

Actions: View | Diff

Attachments on bug 192541: 145600 | 147594 | 148156 | 149454 | 149814