From 49bc257b7dfeadcb00e6865751df4d0e68c4bf74 Mon Sep 17 00:00:00 2001 From: piernov Date: Sat, 14 Jul 2012 18:57:01 +0000 Subject: pulseaudio 2.0-2 ajout patch systemd --- pulseaudio/.footprint.i686 | 3 +- pulseaudio/.footprint.x86_64 | 3 +- pulseaudio/.md5sum.i686 | 1 + pulseaudio/.md5sum.x86_64 | 1 + pulseaudio/Pkgfile | 6 +- ...emove-usage-of-deprecated-udev_get_-_path.patch | 79 ++++++++++++++++++++++ 6 files changed, 87 insertions(+), 6 deletions(-) create mode 100644 pulseaudio/remove-usage-of-deprecated-udev_get_-_path.patch (limited to 'pulseaudio') diff --git a/pulseaudio/.footprint.i686 b/pulseaudio/.footprint.i686 index 9102b94dc..0baefecbe 100644 --- a/pulseaudio/.footprint.i686 +++ b/pulseaudio/.footprint.i686 @@ -30,7 +30,6 @@ lrwxrwxrwx root/root usr/bin/parecord -> pacat -rwxr-xr-x root/root usr/bin/pasuspender -rwxr-xr-x root/root usr/bin/pax11publish -rwxr-xr-x root/root usr/bin/pulseaudio --rwxr-xr-x root/root usr/bin/qpaeq -rwxr-xr-x root/root usr/bin/start-pulseaudio-kde -rwxr-xr-x root/root usr/bin/start-pulseaudio-x11 drwxr-xr-x root/root usr/include/ @@ -130,7 +129,6 @@ drwxr-xr-x root/root usr/lib/pulse-2.0/modules/ -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-device-manager.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-device-restore.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-echo-cancel.so --rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-equalizer-sink.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-esound-compat-spawnfd.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-esound-compat-spawnpid.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-esound-protocol-tcp.so @@ -175,6 +173,7 @@ drwxr-xr-x root/root usr/lib/pulse-2.0/modules/ -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-suspend-on-idle.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-switch-on-connect.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-switch-on-port-available.so +-rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-systemd-login.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-tunnel-sink.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-tunnel-source.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-udev-detect.so diff --git a/pulseaudio/.footprint.x86_64 b/pulseaudio/.footprint.x86_64 index 9102b94dc..0baefecbe 100644 --- a/pulseaudio/.footprint.x86_64 +++ b/pulseaudio/.footprint.x86_64 @@ -30,7 +30,6 @@ lrwxrwxrwx root/root usr/bin/parecord -> pacat -rwxr-xr-x root/root usr/bin/pasuspender -rwxr-xr-x root/root usr/bin/pax11publish -rwxr-xr-x root/root usr/bin/pulseaudio --rwxr-xr-x root/root usr/bin/qpaeq -rwxr-xr-x root/root usr/bin/start-pulseaudio-kde -rwxr-xr-x root/root usr/bin/start-pulseaudio-x11 drwxr-xr-x root/root usr/include/ @@ -130,7 +129,6 @@ drwxr-xr-x root/root usr/lib/pulse-2.0/modules/ -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-device-manager.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-device-restore.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-echo-cancel.so --rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-equalizer-sink.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-esound-compat-spawnfd.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-esound-compat-spawnpid.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-esound-protocol-tcp.so @@ -175,6 +173,7 @@ drwxr-xr-x root/root usr/lib/pulse-2.0/modules/ -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-suspend-on-idle.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-switch-on-connect.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-switch-on-port-available.so +-rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-systemd-login.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-tunnel-sink.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-tunnel-source.so -rwxr-xr-x root/root usr/lib/pulse-2.0/modules/module-udev-detect.so diff --git a/pulseaudio/.md5sum.i686 b/pulseaudio/.md5sum.i686 index aeb216982..5a0652208 100644 --- a/pulseaudio/.md5sum.i686 +++ b/pulseaudio/.md5sum.i686 @@ -3,5 +3,6 @@ e29ab6a42d1e088d9c824f87695094cd configuration_resample_tweak.patch 9bbde657c353fe675c3b693054175a8e pulseaudio-2.0.tar.xz 31af1f34453aa59eecb6f942dcab4aca pulseaudio.svg 440f9593a52eb7a42a55182df01ed153 pulseaudio.xinit +0f677f2b847983b05f68e66ffdd514c9 remove-usage-of-deprecated-udev_get_-_path.patch db768937c2fe51bedf3fc9c91270bc82 sound.conf c459ed54f3155c44fc74ac2997ff625b start_pulseaudio_earlier_with_Gnome.patch diff --git a/pulseaudio/.md5sum.x86_64 b/pulseaudio/.md5sum.x86_64 index aeb216982..5a0652208 100644 --- a/pulseaudio/.md5sum.x86_64 +++ b/pulseaudio/.md5sum.x86_64 @@ -3,5 +3,6 @@ e29ab6a42d1e088d9c824f87695094cd configuration_resample_tweak.patch 9bbde657c353fe675c3b693054175a8e pulseaudio-2.0.tar.xz 31af1f34453aa59eecb6f942dcab4aca pulseaudio.svg 440f9593a52eb7a42a55182df01ed153 pulseaudio.xinit +0f677f2b847983b05f68e66ffdd514c9 remove-usage-of-deprecated-udev_get_-_path.patch db768937c2fe51bedf3fc9c91270bc82 sound.conf c459ed54f3155c44fc74ac2997ff625b start_pulseaudio_earlier_with_Gnome.patch diff --git a/pulseaudio/Pkgfile b/pulseaudio/Pkgfile index b6d581a02..0acbd6df3 100644 --- a/pulseaudio/Pkgfile +++ b/pulseaudio/Pkgfile @@ -7,14 +7,15 @@ name=pulseaudio version=2.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 + remove-usage-of-deprecated-udev_get_-_path.patch) build() { cd $name-$version @@ -24,6 +25,7 @@ build() { patch -p1 < ../configuration_resample_tweak.patch patch -p1 < ../start_pulseaudio_earlier_with_Gnome.patch patch -p1 < ../NuTyX_config.patch + patch -p1 < ../remove-usage-of-deprecated-udev_get_-_path.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/pulseaudio/remove-usage-of-deprecated-udev_get_-_path.patch b/pulseaudio/remove-usage-of-deprecated-udev_get_-_path.patch new file mode 100644 index 000000000..ac1c20c3f --- /dev/null +++ b/pulseaudio/remove-usage-of-deprecated-udev_get_-_path.patch @@ -0,0 +1,79 @@ +From 45607b113a052e4bec93a8707dc4db113c5dd100 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sat, 26 May 2012 02:58:11 +0200 +Subject: [PATCH] Remove usage of deprecated udev_get_*_path + +These symbols were removed in libudev.so.1.0.0. Replace them with +hardcoded strings. + +Signed-off-by: Jan Alexander Steffens (heftig) +--- + src/modules/module-udev-detect.c | 9 +++------ + src/modules/udev-util.c | 4 ++-- + 2 files changed, 5 insertions(+), 8 deletions(-) + +diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c +index 1192194..31416bd 100644 +--- a/src/modules/module-udev-detect.c ++++ b/src/modules/module-udev-detect.c +@@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) { + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("/sys/class/sound/card%s", card_idx); + card = udev_device_new_from_syspath(udev, t); + pa_xfree(t); + +@@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) { + pa_assert(u); + pa_assert(d); + +- cd = pa_sprintf_malloc("%s/snd/controlC%s", udev_get_dev_path(u->udev), path_get_card_id(d->path)); ++ cd = pa_sprintf_malloc("/dev/snd/controlC%s", path_get_card_id(d->path)); + accessible = access(cd, R_OK|W_OK) >= 0; + pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible)); + +@@ -621,7 +621,6 @@ fail: + } + + static int setup_inotify(struct userdata *u) { +- char *dev_snd; + int r; + + if (u->inotify_fd >= 0) +@@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) { + return -1; + } + +- dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev)); +- r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); +- pa_xfree(dev_snd); ++ r = inotify_add_watch(u->inotify_fd, "/dev/snd", IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); + + if (r < 0) { + int saved_errno = errno; +diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c +index 2f18bc4..b0bb17d 100644 +--- a/src/modules/udev-util.c ++++ b/src/modules/udev-util.c +@@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) { + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); + card = udev_device_new_from_syspath(udev, t); + pa_xfree(t); + +@@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) { + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); + card = udev_device_new_from_syspath(udev, t); + pa_xfree(t); + +-- +1.7.10.2 -- cgit v1.2.3-54-g00ecf