6977966888
- Backport upstream fix patches, including the deadlock fix for aplay/arecord (boo#1031525): 0001-ucm-Add-ATTRIBUTE_UNUSED-for-unused-parameters-of-ex.patch 0002-ucm-parser-needs-limits.h.patch 0003-pcm-direct-allow-users-to-configure-different-period.patch 0004-pcm-dshare-enable-silence.patch 0005-pcm-rate-fix-the-hw_ptr-update-until-the-boundary-av.patch 0006-plugin-dynamically-update-avail_min-on-slave.patch 0007-rate-dynamic-update-avail_min-on-slave.patch 0008-topology-fix-unused-const-variable-warning.patch 0009-seq-improve-documentation-about-new-get-pid-card-fun.patch 0010-pcm-direct-returning-semop-error-code-for-semaphore-.patch 0011-pcm-direct-Fix-for-sync-issue-on-xrun-recover.patch 0012-pcm-direct-check-state-before-enter-poll-on-timer.patch 0013-pcm-direct-don-t-return-bogus-buffer-levels-in-xrun-.patch 0014-conf-ucm-broxton-add-broxton-rt298-conf-files.patch 0015-pcm-direct-Fix-deadlock-in-poll_descriptors.patch 0016-ucm-Assure-the-user-input-card-name-not-to-exceed-ma.patch 0017-ucm-Load-device-specific-configuration-file-based-on.patch 0018-ucm-Add-command-get-_file-to-get-the-config-file-nam.patch 0019-topology-Fix-incorrect-license-in-source-comments.patch 0020-conf-cards-add-support-for-pistachio-card.patch 0021-pcm-multi-Drop-the-fixed-slave_map-in-snd_pcm_multi_.patch 0022-conf-Add-card-config-for-Intel-HDMI-DP-LPE-audio.patch 0023-pcm-Avoid-lock-for-snd_pcm_nonblock.patch 0024-pcm-Disable-locking-in-async-mode.patch 0025-pcm-dmix-Allow-disabling-x86-optimizations.patch 0026-pcm-dmix_rewind-corrupts-application-pointer-fix.patch 0027-pcm-direct-fix-race-on-clearing-timer-events.patch 0028-pcm-file-Enable-file-writing-for-capture-path.patch OBS-URL: https://build.opensuse.org/request/show/483406 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=210
61 lines
2.3 KiB
Diff
61 lines
2.3 KiB
Diff
From 3bad0a21b4d13d8d10691f382c836897fa7a7cb9 Mon Sep 17 00:00:00 2001
|
|
From: Breno Leitao <leitao@debian.org>
|
|
Date: Wed, 22 Feb 2017 16:45:00 -0300
|
|
Subject: [PATCH 32/43] Drop ppc64-specific workaround for versioned symbols
|
|
|
|
Currently aserver fails to build when using parameter
|
|
--without-versioned, due to an workaround for ppc64
|
|
(06221f86d207cb33ddd4867ca5301eeb247c4400). This workaround is
|
|
not required anymore on the ppc64 ABI v2, and, in fact is breaking the
|
|
compilation. Reverting this commit
|
|
|
|
Signed-off-by: Breno Leitao <leitao@debian.org>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
include/alsa-symbols.h | 17 -----------------
|
|
1 file changed, 17 deletions(-)
|
|
|
|
--- a/include/alsa-symbols.h
|
|
+++ b/include/alsa-symbols.h
|
|
@@ -29,19 +29,10 @@
|
|
#define INTERNAL_CONCAT2_2(Pre, Post) Pre##Post
|
|
#define INTERNAL(Name) INTERNAL_CONCAT2_2(__, Name)
|
|
|
|
-#ifdef __powerpc64__
|
|
-# define symbol_version(real, name, version) \
|
|
- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version); \
|
|
- __asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@" #version)
|
|
-# define default_symbol_version(real, name, version) \
|
|
- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version); \
|
|
- __asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@@" #version)
|
|
-#else
|
|
# define symbol_version(real, name, version) \
|
|
__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version)
|
|
# define default_symbol_version(real, name, version) \
|
|
__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version)
|
|
-#endif
|
|
|
|
#ifdef USE_VERSIONED_SYMBOLS
|
|
#define use_symbol_version(real, name, version) \
|
|
@@ -50,13 +41,6 @@
|
|
default_symbol_version(real, name, version)
|
|
#else
|
|
#define use_symbol_version(real, name, version) /* nothing */
|
|
-#ifdef __powerpc64__
|
|
-#define use_default_symbol_version(real, name, version) \
|
|
- __asm__ (".weak " ASM_NAME(#name)); \
|
|
- __asm__ (".weak ." ASM_NAME(#name)); \
|
|
- __asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real)); \
|
|
- __asm__ (".set ." ASM_NAME(#name) ",." ASM_NAME(#real))
|
|
-#else
|
|
#if defined(__alpha__) || defined(__mips__)
|
|
#define use_default_symbol_version(real, name, version) \
|
|
__asm__ (".weak " ASM_NAME(#name)); \
|
|
@@ -67,6 +51,5 @@
|
|
__asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real))
|
|
#endif
|
|
#endif
|
|
-#endif
|
|
|
|
#endif /* __ALSA_SYMBOLS_H */
|