diff --git a/common/shlibs b/common/shlibs index 90854a9128f..57e2785888b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -687,6 +687,8 @@ libpulsecommon-5.0.so libpulseaudio-5.0_1 libpulsecommon-6.0.so libpulseaudio-6.0_1 libpulsecommon-7.0.so libpulseaudio-7.0_1 libpulsecommon-7.1.so libpulseaudio-7.1_1 +libpulsecommon-8.0.so libpulseaudio-8.0_1 +libpulsecore-8.0.so libpulseaudio-8.0_1 liborc-0.4.so.0 orc-0.4.11_1 liborc-test-0.4.so.0 orc-0.4.11_1 libgmime-2.6.so.0 gmime-2.6.4_1 diff --git a/srcpkgs/pulseaudio/patches/musl.patch b/srcpkgs/pulseaudio/patches/musl.patch deleted file mode 100644 index 43682e3afb3..00000000000 --- a/srcpkgs/pulseaudio/patches/musl.patch +++ /dev/null @@ -1,48 +0,0 @@ -Portability fixes for musl: - -- _WORDIZE is declared in via . -- does not exist, check for it correctly. - - --xtraeme - ---- configure.ac.orig 2015-09-24 11:36:06.107661526 +0200 -+++ configure.ac 2015-09-24 11:36:40.420036775 +0200 -@@ -407,7 +407,7 @@ AC_HEADER_STDC - # POSIX - AC_CHECK_HEADERS_ONCE([arpa/inet.h glob.h grp.h netdb.h netinet/in.h \ - netinet/in_systm.h netinet/tcp.h poll.h pwd.h sched.h \ -- sys/mman.h sys/select.h sys/socket.h sys/wait.h \ -+ sys/mman.h sys/select.h sys/socket.h sys/wait.h sys/user.h xlocale.h \ - sys/uio.h syslog.h sys/dl.h dlfcn.h linux/sockios.h]) - AC_CHECK_HEADERS([netinet/ip.h], [], [], - [#include ---- src/pulsecore/sample-util.h.orig 2015-09-24 11:37:57.773677238 +0200 -+++ src/pulsecore/sample-util.h 2015-09-24 11:38:46.668208677 +0200 -@@ -24,6 +24,14 @@ - #include - #include - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ -+#ifdef HAVE_SYS_USER_H -+#include /* required by _WORDIZE with musl */ -+#endif -+ - #include - #include - #include ---- src/pulsecore/core-util.c.orig 2015-09-24 11:45:57.919919956 +0200 -+++ src/pulsecore/core-util.c 2015-09-24 11:46:23.343196284 +0200 -@@ -54,7 +54,9 @@ - - #ifdef HAVE_STRTOD_L - #include --#include -+# ifdef HAVE_XLOCALE_H -+# include -+# endif - #endif - - #ifdef HAVE_SCHED_H diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index f1dc8a29b37..e38aaba1066 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,7 +1,7 @@ # Template file for 'pulseaudio' pkgname=pulseaudio -version=7.1 -revision=3 +version=8.0 +revision=1 build_style=gnu-configure configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc @@ -31,7 +31,7 @@ system_accounts="pulse" pulse_groups="audio" pulse_homedir="/var/run/pulse" distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz" -checksum=e667514a28328f92aceea754a224a0150dddfe7e9a71b4c6d31489220153b9d9 +checksum=690eefe28633466cfd1ab9d85ebfa9376f6b622deec6bfee5091ac9737cd1989 pre_configure() { NOCONFIGURE=1 ./bootstrap.sh @@ -42,7 +42,7 @@ post_install() { } libpulseaudio_package() { - shlib_provides="libpulsecommon-7.1.so" + shlib_provides="libpulsecore-${version}.so libpulsecommon-${version}.so" short_desc+=" - shared libraries" pkg_install() { vmove "usr/lib/libpulse.so.*"