diff options
author | Arun Raghavan <ford_prefect@gentoo.org> | 2012-07-05 14:18:14 +0000 |
---|---|---|
committer | Arun Raghavan <ford_prefect@gentoo.org> | 2012-07-05 14:18:14 +0000 |
commit | a6fd1480f2cae73aa1ea484c56abbe80913cad5a (patch) | |
tree | e6d6b4dfe8003dda98af26ea15b2e78c77fa2cca /media-sound/pulseaudio/files | |
parent | Revert that, SLOTs are not allowed. (diff) | |
download | historical-a6fd1480f2cae73aa1ea484c56abbe80913cad5a.tar.gz historical-a6fd1480f2cae73aa1ea484c56abbe80913cad5a.tar.bz2 historical-a6fd1480f2cae73aa1ea484c56abbe80913cad5a.zip |
Drop old redundant versions.
Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64
Diffstat (limited to 'media-sound/pulseaudio/files')
-rw-r--r-- | media-sound/pulseaudio/files/pulseaudio-1.0-version-fix.patch | 47 | ||||
-rw-r--r-- | media-sound/pulseaudio/files/pulseaudio.init.d-4 | 87 |
2 files changed, 0 insertions, 134 deletions
diff --git a/media-sound/pulseaudio/files/pulseaudio-1.0-version-fix.patch b/media-sound/pulseaudio/files/pulseaudio-1.0-version-fix.patch deleted file mode 100644 index 13378db01851..000000000000 --- a/media-sound/pulseaudio/files/pulseaudio-1.0-version-fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 7563e0bbb54fbac54e77f3a62d9761a70f3a559c Mon Sep 17 00:00:00 2001 -From: Colin Guthrie <colin@mageia.org> -Date: Sat, 1 Oct 2011 12:03:44 +0100 -Subject: [PATCH] libpulse: Always return a three part version number in API - calls. - -For both the headers and the library we should provide clean, three part -strings as this has been what we've previously done in the past -and some external systems apparently rely on this format. While it's not -something we've officially commented on before, there is no real advantage -to us to change it so let's not try to tidy things up too much -considering some third party apps (e.g. Skype) seem to dislike a two -part version string. ---- - src/pulse/context.c | 2 +- - src/pulse/version.h.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/pulse/context.c b/src/pulse/context.c -index 25d04a1..af144aa 100644 ---- a/src/pulse/context.c -+++ b/src/pulse/context.c -@@ -1281,7 +1281,7 @@ pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_su - } - - const char* pa_get_library_version(void) { -- return PACKAGE_VERSION; -+ return pa_get_headers_version(); - } - - const char* pa_context_get_server(pa_context *c) { -diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in -index 7e00c5e..1be4c75 100644 ---- a/src/pulse/version.h.in -+++ b/src/pulse/version.h.in -@@ -35,7 +35,7 @@ PA_C_DECL_BEGIN - /** Return the version of the header files. Keep in mind that this is - a macro and not a function, so it is impossible to get the pointer of - it. */ --#define pa_get_headers_version() ("@PACKAGE_VERSION@") -+#define pa_get_headers_version() ("@PA_MAJOR@.@PA_MINOR@.0") - - /** Return the version of the library the current application is - * linked to. */ --- -1.7.6.1 - diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-4 b/media-sound/pulseaudio/files/pulseaudio.init.d-4 deleted file mode 100644 index 30bc2abcb906..000000000000 --- a/media-sound/pulseaudio/files/pulseaudio.init.d-4 +++ /dev/null @@ -1,87 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/files/pulseaudio.init.d-4,v 1.6 2009/09/13 10:46:12 flameeyes Exp $ - -depend() { - need localmount - use net - - local script="/etc/pulse/system.pa" - - for opt in ${PA_OPTS}; do - case "$opt" in - --file=*) script="${opt#*=}" ;; - -F*) script="${opt#-F}" ;; - esac - done - - config "$script" - - local needs="$(get_options need)" - if [ -n "${needs}" ]; then - need ${needs} - return - fi - - if egrep -q '^[[:space:]]*load-module[[:space:]]+module-console-kit' "$script"; then - needs="${needs} consolekit" - fi - -#ifdef UDEV - if egrep -q '^[[:space:]]*load-module[[:space:]]+module-udev-detect' "$script"; then - needs="${needs} udev" - fi -#endif - -#ifdef HAL - if egrep -q '^[[:space:]]*load-module[[:space:]]+module-hal-detect' "$script"; then - needs="${needs} hald" - fi -#endif - -#ifdef AVAHI - if egrep -q '^[[:space:]]*load-module[[:space:]]+module-zeroconf-publish' "$script"; then - needs="${needs} avahi-daemon" - fi -#endif - -#ifdef BLUETOOTH - if egrep -q '^[[:space:]]*load-module[[:space:]]+module-bt-proximity' "$script"; then - needs="${needs} bluetooth" - fi -#endif - -#ifdef ALSA - if egrep -q '^[[:space:]]*load-module[[:space:]]+module-alsa-(sink|source)' "$script" || - egrep -q '^[[:space:]]*load-module[[:space:]]+module-((hal|udev)-)?detect' "$script" || - egrep -q '^[[:space:]]*add-autoload-source[[:space:]]+(input|output)[[:space:]]+module-alsa-(sink|source)' "$script"; then - needs="${needs} alsasound" - fi -#endif - - need "${needs}" - save_options need "${needs}" -} - -start() { - if [ -z "${PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE}" ]; then - eerror "Please don't use system wide PulseAudio unless you read the" - eerror "documentation available at http://www.pulseaudio.org/wiki/WhatIsWrongWithSystemMode" - eerror "" - eerror "When you're done, please set the variable PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE in" - eerror "/etc/conf.d/pulseaudio . Please remember that upstream does not support this mode" - eerror "when used for standard desktop configurations." - return 1 - fi - ebegin "Starting pulseaudio" - PA_ALL_OPTS="${PA_OPTS} --fail=1 --daemonize=1 --system" - start-stop-daemon --start --exec /usr/bin/pulseaudio -- ${PA_ALL_OPTS} - eend $? -} - -stop() { - ebegin "Stopping pulseaudio" - start-stop-daemon --stop --quiet --exec /usr/bin/pulseaudio --pidfile /var/run/pulse/pid - eend $? -} |