diff --git a/srcpkgs/pulseaudio/patches/udev-183.patch b/srcpkgs/pulseaudio/patches/udev-183.patch new file mode 100644 index 0000000000..4d0c712de8 --- /dev/null +++ b/srcpkgs/pulseaudio/patches/udev-183.patch @@ -0,0 +1,49 @@ +--- src/modules/module-udev-detect.c.orig 2012-05-26 16:17:59.213118773 +0200 ++++ src/modules/module-udev-detect.c 2012-05-26 16:18:37.259226386 +0200 +@@ -123,7 +123,7 @@ static char *card_get_sysattr(const char + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("%s/class/sound/card%s", "/sys", card_idx); + card = udev_device_new_from_syspath(udev, t); + pa_xfree(t); + +@@ -282,7 +282,7 @@ static void verify_access(struct userdat + 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("%s/snd/controlC%s", "/dev", 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)); + +@@ -632,7 +632,7 @@ static int setup_inotify(struct userdata + return -1; + } + +- dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev)); ++ dev_snd = pa_sprintf_malloc("%s/snd", "/dev"); + r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); + pa_xfree(dev_snd); + +--- src/modules/udev-util.c.orig 2012-05-26 16:20:06.106142401 +0200 ++++ src/modules/udev-util.c 2012-05-26 16:20:29.688589253 +0200 +@@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_pr + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("%s/class/sound/card%i", "/sys", 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, + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("%s/class/sound/card%i", "/sys", card_idx); + card = udev_device_new_from_syspath(udev, t); + pa_xfree(t); + diff --git a/srcpkgs/pulseaudio/pulseaudio-devel.template b/srcpkgs/pulseaudio/pulseaudio-devel.template index f489c39dca..1484b765cc 100644 --- a/srcpkgs/pulseaudio/pulseaudio-devel.template +++ b/srcpkgs/pulseaudio/pulseaudio-devel.template @@ -1,6 +1,7 @@ # Template file for 'pulseaudio-devel'. # -depends="libasyncns-devel dbus-devel libXtst-devel libpulseaudio>=2.0" +noarch=yes +depends="libasyncns-devel dbus-devel libXtst-devel libpulseaudio>=$version" short_desc="${short_desc} - development files" long_desc=" PulseAudio, previously known as Polypaudio, is a sound server for POSIX and @@ -9,7 +10,6 @@ long_desc=" This package contains files for development, headers, static libs, etc." - do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib diff --git a/srcpkgs/pulseaudio/pulseaudio.rshlibs b/srcpkgs/pulseaudio/pulseaudio.rshlibs index 224ac9288e..1e0f609cba 100644 --- a/srcpkgs/pulseaudio/pulseaudio.rshlibs +++ b/srcpkgs/pulseaudio/pulseaudio.rshlibs @@ -23,7 +23,6 @@ librt.so.1 libm.so.6 ld-linux.so.2 libasound.so.2 -libudev.so.0 libavahi-common.so.3 libavahi-client.so.3 libjack.so.0 @@ -37,3 +36,4 @@ libsystemd-daemon.so.0 libstdc++.so.6 libgcc_s.so.1 libwebrtc_audio_processing.so.0 +libudev.so.1 diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index 66d018bcdb..d2df96d3da 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,15 +1,16 @@ # Template file for 'pulseaudio' pkgname=pulseaudio version=2.0 -revision=3 +revision=4 distfiles="$FREEDESKTOP_SITE/$pkgname/releases/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --enable-jack --disable-lirc --disable-hal --disable-hal-compat --disable-gconf --with-database=tdb --enable-orc" depends="libpulseaudio>=${version}" -makedepends="pkg-config intltool zlib-devel gtk+-devel libltdl-devel speex-devel libXi-devel libXtst-devel xcb-util-devel libxcb-devel libsndfile-devel libasyncns-devel dbus-devel tdb-devel libcap-devel libbluetooth-devel avahi-libs-devel alsa-lib-devel libudev-devel openssl-devel libsamplerate-devel json-c-devel orc-devel glib-devel jack-devel fftw-devel systemd-devel webrtc-audio-processing-devel" +makedepends="pkg-config intltool zlib-devel gtk+-devel libltdl-devel speex-devel libXi-devel libXtst-devel xcb-util-devel libxcb-devel libsndfile-devel libasyncns-devel dbus-devel tdb-devel libcap-devel libbluetooth-devel avahi-libs-devel alsa-lib-devel libudev-devel>=183 openssl-devel libsamplerate-devel json-c-devel orc-devel glib-devel jack-devel fftw-devel systemd-devel webrtc-audio-processing-devel" fulldepends="rtkit" +subpackages="libpulseaudio $pkgname-devel" short_desc="A featureful, general-purpose sound server" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/PulseAudio" @@ -40,8 +41,6 @@ long_desc=" * Extensible plug-in architecture with plug-ins for jackd, multicast-rtp lirc and avahi, just to name a few." -subpackages="libpulseaudio $pkgname-devel" - conf_files=" /etc/pulse/system.pa /etc/pulse/daemon.conf