From 3baf50f8d244f98e2b046d2ec466cfdee60155ab Mon Sep 17 00:00:00 2001 From: orchidman Date: Thu, 6 Oct 2011 14:23:05 +0200 Subject: pulseaudio 1.0-2 ajout patch et deps --- extra/pulseaudio/.md5sum.x86_64 | 1 + extra/pulseaudio/Pkgfile | 12 ++++++---- extra/pulseaudio/pulseaudio-version.patch | 40 +++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 extra/pulseaudio/pulseaudio-version.patch (limited to 'extra/pulseaudio') diff --git a/extra/pulseaudio/.md5sum.x86_64 b/extra/pulseaudio/.md5sum.x86_64 index 89f2b3e50..2e3081335 100644 --- a/extra/pulseaudio/.md5sum.x86_64 +++ b/extra/pulseaudio/.md5sum.x86_64 @@ -1,6 +1,7 @@ d3fd33576454cbdcbf26f546292af937 NuTyX_config.patch e29ab6a42d1e088d9c824f87695094cd configuration_resample_tweak.patch 538e0b55ab9ba2987a88047ae332f5f4 pulseaudio-1.0.tar.xz +2c15058a61d6952353c1555ff90bb279 pulseaudio-version.patch 31af1f34453aa59eecb6f942dcab4aca pulseaudio.svg 440f9593a52eb7a42a55182df01ed153 pulseaudio.xinit db768937c2fe51bedf3fc9c91270bc82 sound.conf diff --git a/extra/pulseaudio/Pkgfile b/extra/pulseaudio/Pkgfile index 046536bdb..7837136e3 100644 --- a/extra/pulseaudio/Pkgfile +++ b/extra/pulseaudio/Pkgfile @@ -2,23 +2,25 @@ # URL: http://www.pulseaudio.org # Maintainer: NuTyX core team # Packager: piernov -# Depends on: consolekit, alsa-lib, gconf, libcap, liboil, policykit, libsamplerate, libsndfile, speex, libvorbis, json-c, xorg-libxtst, xorg-libsm, xorg-xcb-util, imagemagick, bluez, jack-audio-connection-kit, avahi -# Run on: consolekit,alsa-lib,gconf,libcap,liboil,policykit,libsamplerate,libsndfile,speex,libvorbis,json-c,bluez,jack-audio-connection-kit,avahi +# Depends on: consolekit, alsa-lib, gconf, libcap, liboil, policykit, libsamplerate, libsndfile, speex, libvorbis, json-c, xorg-libxtst, xorg-libsm, xorg-xcb-util, imagemagick, bluez, jack-audio-connection-kit, avahi, lcms2,librsvg +# Run on: consolekit,alsa-lib,gconf,libcap,liboil,policykit,libsamplerate,libsndfile,speex,libvorbis,json-c,bluez,jack-audio-connection-kit,avahi, lcms2,librsvg name=pulseaudio version=1.0 -release=1 +release=2 source=(http://freedesktop.org/software/$name/releases/$name-$version.tar.xz pulseaudio.xinit pulseaudio.svg sound.conf configuration_resample_tweak.patch start_pulseaudio_earlier_with_Gnome.patch - NuTyX_config.patch) + NuTyX_config.patch + pulseaudio-version.patch) build() { cd $name-$version - + + patch -p1 < ../pulseaudio-version.patch patch -p1 < ../configuration_resample_tweak.patch patch -p1 < ../start_pulseaudio_earlier_with_Gnome.patch patch -p1 < ../NuTyX_config.patch diff --git a/extra/pulseaudio/pulseaudio-version.patch b/extra/pulseaudio/pulseaudio-version.patch new file mode 100644 index 000000000..78889073c --- /dev/null +++ b/extra/pulseaudio/pulseaudio-version.patch @@ -0,0 +1,40 @@ +commit 7563e0bbb54fbac54e77f3a62d9761a70f3a559c +Author: Colin Guthrie +Date: Sat Oct 1 12:03:44 2011 +0100 + + 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. + +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. */ -- cgit v1.2.3-70-g09d2