Accepting request 243338 from home:tiwai:branches:multimedia:libs

- Remove obsoleted README.SuSE (bnc#889023)
- Correct SUSE branding names in some texts (bnc#889023,FATE#316521)
- Properly include time.h for CLOCK_MONOTONIC_RAW:
  0015-pcm-pcm_local.h-include-time.h-to-enable-CLOCK_MONOT.patch

OBS-URL: https://build.opensuse.org/request/show/243338
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=164

0015-pcm-pcm_local.h-include-time.h-to-enable-CLOCK_MONOT.patch

@@ -0,0 +1,29 @@
+From f6b879e7cc87d83343f5004369146881d1d1e335 Mon Sep 17 00:00:00 2001
+From: Shengjiu Wang <shengjiu.wang@freescale.com>
+Date: Wed, 23 Jul 2014 15:09:58 +0800
+Subject: [PATCH] pcm: pcm_local.h: include <time.h> to enable CLOCK_MONOTONIC
+
+CLOCK_MONITONIC is defined in <bits/time.h>, add <time.h> before
+<sys/time.h>.
+
+Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ src/pcm/pcm_local.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h
+index 2206afe2c4a9..80bbe5973bdb 100644
+--- a/src/pcm/pcm_local.h
++++ b/src/pcm/pcm_local.h
+@@ -24,6 +24,7 @@
+ #include <stdlib.h>
+ #include <limits.h>
+ #include <sys/uio.h>
++#include <time.h>
+ #include <sys/time.h>
+ 
+ #define _snd_mask sndrv_mask
+-- 
+2.0.1
+

README.SuSE

@@ -1,21 +0,0 @@
-Sound Driver Loading
---------------------
-Since openSUSE-11.0, all sound driver modules are loaded via udev.
-The setups in /etc/sysconfig/hardware/* that have been used for 10.0
-and later systems are no longer used and simply ignored.
-
-
-Module Configuration on Linux 2.6 Kernels
------------------------------------------
-The configuration of ALSA modules is written to /etc/modprobe.d/sound
-file via YaST.  Don't modify /etc/modprobe.conf directly, since this
-file may be overwritten when the package is updated.
-
-
-ALSACONF
---------
-The alsaconf script included in alsa-utils package is only for older
-distros in general.  It still might work in some cases, but avoid it
-unless you are really sure why you use it.
-
-

all_notes_off

@@ -4,6 +4,7 @@
 # MIDI-Devices configured in the System
 # 
 # Written by Matthias Nagorni, (c) 2001 SuSE GmbH Nuremberg
+#                              (c) 2014 SUSE Linux Products GmbH
 #
 for d in /dev/snd/midiC?D?; do
     echo Sending "all notes off" to MIDI device $d

alsa.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jul 31 17:41:50 CEST 2014 - tiwai@suse.de
+
+- Remove obsoleted README.SuSE (bnc#889023)
+- Correct SUSE branding names in some texts (bnc#889023,FATE#316521)
+- Properly include time.h for CLOCK_MONOTONIC_RAW:
+  0015-pcm-pcm_local.h-include-time.h-to-enable-CLOCK_MONOT.patch
+
 -------------------------------------------------------------------
 Tue Jul 22 17:46:51 CEST 2014 - tiwai@suse.de
 

alsa.spec

@@ -40,7 +40,6 @@ Source13:       joystick
 Source14:       sysconfig.joystick
 Source16:       set_default_volume
 Source17:       test.wav
-Source20:       README.SuSE
 Source21:       README.testwav
 Source30:       all_notes_off
 Source31:       all_notes_off.bin
@@ -65,6 +64,7 @@ Patch11:        0011-pcm-route-Use-get-put-labels-for-all-3-byte-formats.patch
 Patch12:        0012-pcm-Fill-sw_params-proto-field.patch
 Patch13:        0013-pcm-route-Use-get32-for-multi-source-route-calculati.patch
 Patch14:        0014-pcm-Drop-snd_pcm_linear_-get-put-32_index.patch
+Patch15:        0015-pcm-pcm_local.h-include-time.h-to-enable-CLOCK_MONOT.patch
 # rest suse patches
 Patch99:        alsa-lib-doxygen-avoid-crash-for-11.3.diff
 BuildRequires:  doxygen
@@ -147,6 +147,7 @@ Architecture.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 %if 0%{?suse_version} == 1130
 %patch99 -p1
 %endif

joystick

@@ -1,5 +1,6 @@
 #! /bin/bash
 # Copyright (c) 2002 SuSE Linux AG Nuernberg, Germany.
+#           (c) 2014 SUSE Linux Products GmbH
 # 
 # Author: Takashi Iwai <tiwai@suse.de>, 2001
 #