Accepting request 688625 from home:olh:branches:multimedia:libs

- Use alsa API properly. Consumers are expected to use
  <alsa/asoundlib.h> instead of <asoundlib.h>.
  This is in preparation of an change to pkgconfig(alsa) to
  not pollute CFLAGS with -I/usr/include/alsa anymore (bsc#1130333)
  apulse-alsa.patch

OBS-URL: https://build.opensuse.org/request/show/688625
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/apulse?expand=0&rev=23

apulse-alsa.patch

@@ -0,0 +1,22 @@
+--- a/src/apulse.h
++++ b/src/apulse.h
+@@ -26,7 +26,7 @@
+ 
+ #define _GNU_SOURCE
+ #include "ringbuffer.h"
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+ #include <glib.h>
+ #include <poll.h>
+ #include <pthread.h>
+--- a/src/util.h
++++ b/src/util.h
+@@ -24,7 +24,7 @@
+ 
+ #pragma once
+ 
+-#include <asoundlib.h>
++#include <alsa/asoundlib.h>
+ #include <pulse/pulseaudio.h>
+ 
+ int

apulse.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Mar 26 07:03:44 UTC 2019 - olaf@aepfle.de
+
+- Use alsa API properly. Consumers are expected to use
+  <alsa/asoundlib.h> instead of <asoundlib.h>.
+  This is in preparation of an change to pkgconfig(alsa) to
+  not pollute CFLAGS with -I/usr/include/alsa anymore (bsc#1130333)
+  apulse-alsa.patch
+
 -------------------------------------------------------------------
 Sat Jun 16 15:48:41 UTC 2018 - sor.alexei@meowr.ru
 

apulse.spec

@@ -30,6 +30,7 @@ Source2:        %{name}.py
 Source3:        %{name}.conf
 # PATCH-FIX-OPENSUSE apulse-fix-pulse-12.patch sor.alexei@meowr.ru -- Fix PulseAudio 12+ compatibility.
 Patch0:         apulse-fix-pulse-12.patch
+Patch1:         apulse-alsa.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
@@ -44,8 +45,7 @@ Recommends:     %{name}-32bit = %{version}
 PulseAudio emulation intended to be used with Firefox and Skype.
 
 %prep
-%setup -q
+%autosetup -p1
-%patch0 -p1
 
 %build
 %cmake \