This commit is contained in:
parent
e216aee4f2
commit
ed35a1131e
49
alsa-info.sh
49
alsa-info.sh
@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
SCRIPT_VERSION=0.4.43
|
||||
CHANGELOG="http://hg.alsa-project.org/alsa/log/tip/alsa-info.sh"
|
||||
SCRIPT_VERSION=0.4.48
|
||||
CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
|
||||
|
||||
#################################################################################
|
||||
#Copyright (C) 2007 Free Software Foundation.
|
||||
@ -32,8 +32,12 @@ BGTITLE="ALSA-Info v $SCRIPT_VERSION"
|
||||
PASTEBINKEY="C9cRIO8m/9y8Cs0nVs0FraRx7U0pHsuc"
|
||||
#Define some simple functions
|
||||
|
||||
pbcheck(){
|
||||
[[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" NOUPLOAD="yes" PBERROR="yes"
|
||||
}
|
||||
|
||||
update() {
|
||||
wget -O /tmp/alsa-info.sh http://hg.alsa-project.org/alsa/raw-file/tip/alsa-info.sh >/dev/null 2>&1
|
||||
wget -O /tmp/alsa-info.sh "http://www.alsa-project.org/alsa-info.sh" >/dev/null 2>&1
|
||||
REMOTE_VERSION=`grep SCRIPT_VERSION /tmp/alsa-info.sh |head -n1 |sed 's/.*=//'`
|
||||
if [ "$REMOTE_VERSION" != "$SCRIPT_VERSION" ]; then
|
||||
if [[ -n $DIALOG ]]
|
||||
@ -190,7 +194,6 @@ SNDOPTIONS=$(modprobe -c|sed -n 's/^options \(snd[-_][^ ]*\)/\1:/p')
|
||||
|
||||
QUESTION="yes"
|
||||
PROCEED="yes"
|
||||
NOUPLOAD=""
|
||||
REPEAT=""
|
||||
while [ -z "$REPEAT" ]; do
|
||||
REPEAT="no"
|
||||
@ -215,7 +218,7 @@ done
|
||||
if [ "$QUESTION" = "yes" ]; then
|
||||
if [[ -n "$DIALOG" ]]
|
||||
then
|
||||
if [ -z "NOUPLOAD" ]; then
|
||||
if [ -z "$NOUPLOAD" ]; then
|
||||
dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nBy default, this script will AUTOMATICALLY UPLOAD your information to a pastebin site.\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
|
||||
else
|
||||
dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
|
||||
@ -411,9 +414,7 @@ then
|
||||
withamixer
|
||||
withalsactl
|
||||
withlsmod
|
||||
#Workaround, while we sort out pastebin location, since pastebin.ca blocked us.
|
||||
#NOUPLOAD="yes"
|
||||
|
||||
pbcheck
|
||||
fi
|
||||
|
||||
fi # proceed
|
||||
@ -457,17 +458,6 @@ then
|
||||
withalsactl
|
||||
withlsmod
|
||||
;;
|
||||
#### FIX ME
|
||||
--secure)
|
||||
withdevices
|
||||
withconfigs
|
||||
withaplay
|
||||
withamixer
|
||||
withalsactl
|
||||
withlsmod
|
||||
withsecure
|
||||
;;
|
||||
###########
|
||||
--with-aplay)
|
||||
withaplay
|
||||
;;
|
||||
@ -598,7 +588,11 @@ fi
|
||||
if [[ -n $DIALOG ]]
|
||||
then
|
||||
if [[ -n $NOUPLOAD ]]; then
|
||||
dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "You requested that your information was NOT automatically uploaded to the pastebin\n\nYour ALSA information can be seen by looking in $FILE" 10 100
|
||||
if [[ -n $PBERROR ]]; then
|
||||
dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occured while contacting the pastebin. Your information was NOT automatically uploaded.\n\nYour ALSA information can be seen by looking in $FILE" 10 100
|
||||
else
|
||||
dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "You requested that your information was NOT automatically uploaded to the pastebin\n\nYour ALSA information can be seen by looking in $FILE" 10 100
|
||||
fi
|
||||
else
|
||||
dialog --backtitle "$BGTITLE" --title "Information uploaded" --yesno "Would you like to see the uploaded information?" 5 100
|
||||
DIALOG_EXIT_CODE=$?
|
||||
@ -610,10 +604,17 @@ then
|
||||
fi
|
||||
clear
|
||||
if [[ -n $NOUPLOAD ]]; then
|
||||
echo "You requested that your information was NOT automatically uploaded to the pastebin"
|
||||
echo ""
|
||||
echo "Your ALSA information can be seen by looking in $FILE"
|
||||
echo ""
|
||||
if [[ -n $PBERROR ]]; then
|
||||
echo "An error occured while contacting the pastebin. Your information was NOT automatically uploaded."
|
||||
echo ""
|
||||
echo "Your ALSA information can be seen by looking in $FILE"
|
||||
echo ""
|
||||
else
|
||||
echo "You requested that your information was NOT automatically uploaded to the pastebin"
|
||||
echo ""
|
||||
echo "Your ALSA information can be seen by looking in $FILE"
|
||||
echo ""
|
||||
fi
|
||||
fi
|
||||
if [[ -z $NOUPLOAD ]]; then
|
||||
echo "Your ALSA information is located at $FINAL_URL"
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ae19b33f109e9185c4df709fcab7f6cbbacce82565c5025ba4ebc0e2beca26cd
|
||||
size 782235
|
3
alsa-lib-1.0.17rc2.tar.bz2
Normal file
3
alsa-lib-1.0.17rc2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:31099f06bcc788385c2308f7f9dc09a104ffab71d9ea6e86989171cfc22e9746
|
||||
size 788288
|
22
alsa-lib-git-fixes.diff
Normal file
22
alsa-lib-git-fixes.diff
Normal file
@ -0,0 +1,22 @@
|
||||
diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
|
||||
index 3f4c033..ee2300e 100644
|
||||
--- a/src/pcm/pcm.c
|
||||
+++ b/src/pcm/pcm.c
|
||||
@@ -2385,16 +2385,13 @@ int snd_pcm_wait_nocheck(snd_pcm_t *pcm, int timeout)
|
||||
#endif
|
||||
|
||||
/**
|
||||
- * \brief Return number of frames ready to be read/written
|
||||
+ * \brief Return number of frames ready to be read (capture) / written (playback)
|
||||
* \param pcm PCM handle
|
||||
* \return a positive number of frames ready otherwise a negative
|
||||
* error code
|
||||
*
|
||||
* On capture does all the actions needed to transport to application
|
||||
* level all the ready frames across underlying layers.
|
||||
- *
|
||||
- * Using of this function is useless for the standard read/write
|
||||
- * operations. Use it only for mmap access. See to #snd_pcm_delay.
|
||||
*/
|
||||
snd_pcm_sframes_t snd_pcm_avail_update(snd_pcm_t *pcm)
|
||||
{
|
File diff suppressed because it is too large
Load Diff
20
alsa.changes
20
alsa.changes
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 18 14:41:57 CEST 2008 - tiwai@suse.de
|
||||
|
||||
- updated to version 1.0.17-rc2:
|
||||
* including previous fixes
|
||||
- updated alsa-info.sh:
|
||||
* fixed URL of alsa-info.sh
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jun 7 10:58:48 CEST 2008 - tiwai@suse.de
|
||||
|
||||
- fix segfault with dmix when 3-bytes formats are used
|
||||
(bnc#398265)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 6 17:48:01 CEST 2008 - tiwai@suse.de
|
||||
|
||||
- fix mmap conversion in plug plugin (bnc#397523)
|
||||
- fix alsa-info.sh to check whether pastebin is down
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 4 13:54:50 CEST 2008 - rodrigo@suse.de
|
||||
|
||||
|
21
alsa.spec
21
alsa.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package alsa (Version 1.0.16)
|
||||
# spec file for package alsa (Version 1.0.16.92)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
Name: alsa
|
||||
BuildRequires: doxygen
|
||||
%define package_version 1.0.16
|
||||
%define package_version 1.0.17rc2
|
||||
License: GPL v2 or later
|
||||
Group: System/Libraries
|
||||
Requires: alsa-utils
|
||||
@ -21,8 +21,8 @@ Recommends: alsa-plugins alsa-oss
|
||||
PreReq: %insserv_prereq %fillup_prereq
|
||||
AutoReqProv: on
|
||||
Summary: Advanced Linux Sound Architecture
|
||||
Version: 1.0.16
|
||||
Release: 38
|
||||
Version: 1.0.16.92
|
||||
Release: 1
|
||||
Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
|
||||
Source8: 40-alsa.rules
|
||||
Source11: alsasound
|
||||
@ -38,7 +38,7 @@ Source31: all_notes_off.bin
|
||||
Source32: all_notes_off.mid
|
||||
Source33: alsa-info.sh
|
||||
Source34: alsa-init.sh
|
||||
Patch: alsa-lib-hg-fixes.diff
|
||||
Patch: alsa-lib-git-fixes.diff
|
||||
Url: http://www.alsa-project.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -252,6 +252,17 @@ exit 0
|
||||
%{_datadir}/alsa
|
||||
|
||||
%changelog
|
||||
* Wed Jun 18 2008 tiwai@suse.de
|
||||
- updated to version 1.0.17-rc2:
|
||||
* including previous fixes
|
||||
- updated alsa-info.sh:
|
||||
* fixed URL of alsa-info.sh
|
||||
* Sat Jun 07 2008 tiwai@suse.de
|
||||
- fix segfault with dmix when 3-bytes formats are used
|
||||
(bnc#398265)
|
||||
* Fri Jun 06 2008 tiwai@suse.de
|
||||
- fix mmap conversion in plug plugin (bnc#397523)
|
||||
- fix alsa-info.sh to check whether pastebin is down
|
||||
* Wed Jun 04 2008 rodrigo@suse.de
|
||||
- Removed patch to alsa.conf, to not force PulseAudio on all
|
||||
apps (ie, non-GNOME installs) (bnc#394177)
|
||||
|
Loading…
Reference in New Issue
Block a user