Attachment 147587 Details for Bug 193861 – fix

[patch] fix

fix.diff (text/plain), 3.19 KB, created by Jan Beich on 2014-09-23 07:25:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-09-23 07:25:50 UTC

Size: 3.19 KB

patch

obsolete

>diff --git audio/linux-f10-pulseaudio-libs/Makefile audio/linux-f10-pulseaudio-libs/Makefile
>index 774fc54..6cd55eb 100644
>--- audio/linux-f10-pulseaudio-libs/Makefile
>+++ audio/linux-f10-pulseaudio-libs/Makefile
>@@ -8,26 +8,21 @@ MASTER_SITES=	LOCAL
> MASTER_SITE_SUBDIR=	netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
> 
> MAINTAINER=	emulation@FreeBSD.org
>-COMMENT=	Libraries for PulseAudio clients
>+COMMENT=	Libraries for PulseAudio clients (Linux Fedora ${LINUX_DIST_VER})
> 
> ONLY_FOR_ARCHS=	i386 amd64
> USE_LINUX=	f10
> USE_LINUX_RPM=	yes
>+USE_LINUX_APPS=	libasyncns xorglibs
> 
> RPMVERSION=	4.fc10
> SRC_DISTFILES=	${PORTNAME:S/-libs//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
> USE_LDCONFIG=	yes
> 
>-CONF_FILE=	etc/pulse/client.conf
>-
> pre-patch:
>-	@${MV} ${WRKSRC}/${CONF_FILE} ${WRKSRC}/${CONF_FILE}-dist
>+	@cd ${WRKSRC}/etc/pulse && ${MV} client.conf client.conf.sample
>+
> post-patch:
> 	@${FIND} ${WRKSRC} -name "*.orig" -delete
> 
>-post-install:
>-	@if [ ! -f ${PREFIX}/${CONF_FILE} ]; then \
>-		${CP} -p ${STAGEDIR}${PREFIX}/${CONF_FILE}-dist ${STAGEDIR}${PREFIX}/${CONF_FILE} ; \
>-	fi
>-
> .include <bsd.port.mk>
>diff --git audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf-dist audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf-dist
>deleted file mode 100644
>index 1ac209b..0000000
>--- audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf-dist
>+++ /dev/null
>@@ -1,16 +0,0 @@
>---- etc/pulse/client.conf-dist.orig	2011-04-01 15:42:58.548733177 +0300
>-+++ etc/pulse/client.conf-dist	2011-04-01 15:53:03.306719164 +0300
>-@@ -23,11 +23,11 @@
>- ; default-source =
>- ; default-server =
>- 
>--; autospawn = yes
>-+autospawn = no
>- ; daemon-binary = /usr/bin/pulseaudio
>- ; extra-arguments = --log-target=syslog
>- 
>- ; cookie-file =
>- 
>--; disable-shm = no
>-+disable-shm = yes
>- ; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
>diff --git audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf.sample audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf.sample
>new file mode 100644
>index 0000000..6271d20
>--- /dev/null
>+++ audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf.sample
>@@ -0,0 +1,16 @@
>+--- etc/pulse/client.conf.sample.orig	2011-04-01 15:42:58.548733177 +0300
>++++ etc/pulse/client.conf.sample	2011-04-01 15:53:03.306719164 +0300
>+@@ -23,11 +23,11 @@
>+ ; default-source =
>+ ; default-server =
>+ 
>+-; autospawn = yes
>++autospawn = no
>+ ; daemon-binary = /usr/bin/pulseaudio
>+ ; extra-arguments = --log-target=syslog
>+ 
>+ ; cookie-file =
>+ 
>+-; disable-shm = no
>++disable-shm = yes
>+ ; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
>diff --git audio/linux-f10-pulseaudio-libs/pkg-plist audio/linux-f10-pulseaudio-libs/pkg-plist
>index 1c2943b..def82c3 100644
>--- audio/linux-f10-pulseaudio-libs/pkg-plist
>+++ audio/linux-f10-pulseaudio-libs/pkg-plist
>@@ -1,6 +1,4 @@
>-@unexec if cmp -s %D/etc/pulse/client.conf-dist %D/etc/pulse/client.conf; then rm -f %D/etc/pulse/client.conf; fi
>-etc/pulse/client.conf-dist
>-@exec if [ ! -f %D/etc/pulse/client.conf ] ; then cp -p %D/%F %B/client.conf; fi
>+@sample etc/pulse/client.conf.sample
> usr/lib/libpulse-simple.so.0
> usr/lib/libpulse-simple.so.0.0.2
> usr/lib/libpulse.so.0

Actions: View | Diff

Attachments on bug 193861: 147587 | 149812 | 149813