Commit c5ba09ce authored by Carlo Landmeter's avatar Carlo Landmeter
Browse files

Merge commit 'ncopa/master'

parents a0e1257e f71e31f6
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=binutils
pkgver=2.19.50.0.1
pkgver=2.19.51.0.3
pkgdesc="Tools necessary to build programs"
url=http://sources.redhat.com/binutils
source=ftp://ftp.kernel.org/pub/linux/devel/binutils/$pkgname-$pkgver.tar.bz2
......@@ -10,20 +11,16 @@ subpackages="$pkgname-doc"
build() {
cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr \
--mandir /usr/share/man \
--build ${CHOST:-i486-alpine-linux-uclibc}
--build ${CHOST:-i486-alpine-linux-uclibc} \
--infodir /usr/share/info \
--enable-shared \
--enable-64-bit-bfd \
--disable-werror \
--disable-nls
# check build env
make configure-host || return 1
make || return 1
make install DESTDIR="$pkgdir"
}
md5sums="c71bf140587a5662bd1fa9d5a19556ed binutils-2.19.50.0.1.tar.bz2"
md5sums="c55a2b1eadf818d38e963060412fadca binutils-2.19.51.0.3.tar.bz2"
Fix mute script: save volume and then set it to 0 instead of saving it directly
to 0. Bug #122087.
Index: aumix-2.8/src/mute
===================================================================
--- aumix-2.8.orig/src/mute
+++ aumix-2.8/src/mute
@@ -8,7 +8,8 @@
volumes=$(aumix -vq |tr -d ,)
if [ $(echo $volumes | awk '{print $2}') -ne 0 -o \
$(echo $volumes | awk '{print $3}') -ne 0 ]; then
- aumix -S -v 0
+ aumix -S
+ aumix -v 0
else
aumix -L > /dev/null
fi
diff -Naur aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
--- aumix-2.8.orig/src/common.c 2002-10-29 13:27:51.000000000 -0800
+++ aumix-2.8/src/common.c 2004-07-22 01:28:07.684999900 -0700
@@ -591,7 +591,7 @@
char filename[PATH_MAX];
if (save_filename == NULL) {
home = getenv("HOME");
- if ((strlen(home) + strlen(AUMIXRC) + 2) < PATH_MAX) {
+ if (home && (strlen(home) + strlen(AUMIXRC) + 2) < PATH_MAX) {
sprintf(filename, "%s/.%s", home, AUMIXRC);
setfile = CheckAndOpen(filename, mode);
}
--- a/src/common.c 2002-11-28 14:22:00.000000000 +0100
+++ b/src/common.c 2002-11-28 14:23:11.000000000 +0100
@@ -116,6 +116,7 @@
int main(int argc, char *argv[])
{
int optn, ii;
+ int save = 0, load = 0;
#ifdef HAVE_CURSES
int setcolors = FALSE;
#endif /* HAVE_CURSES */
@@ -171,14 +172,10 @@
break;
#endif /* HAVE_CURSES */
case 'S': /* Save to file. */
- if (mixer_fd == -1)
- ErrorExitWarn(InitializeMixer(device_filename), 'e');
- ErrorExitWarn(SaveSettings(), 'e');
+ save = 1;
break;
case 'L': /* Load from file. */
- if (mixer_fd == -1)
- ErrorExitWarn(InitializeMixer(device_filename), 'e');
- ErrorExitWarn(LoadSettings(), 'e');
+ load = 1;
break;
#if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
case 'I': /* User asked for interactive mode. */
@@ -194,6 +191,17 @@
}
}
}
+ if (save | load) {
+ if (mixer_fd == -1)
+ ErrorExitWarn(InitializeMixer(device_filename), 'e');
+ if (save)
+ ErrorExitWarn(SaveSettings(), 'e');
+ else
+ ErrorExitWarn(LoadSettings(), 'e');
+ close(mixer_fd);
+ exit(EXIT_SUCCESS);
+ }
+
#if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
/* Be interactive if no options were given. */
if (!interactive && argc <= 1)
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/files/aumix.rc6,v 1.12 2007/03/25 13:05:51 drac Exp $
depend() {
use modules hotplug coldplug alsasound
}
checkconfig() {
if ! grep -q -E 'sound|OSS|sparcaudio' /proc/devices && [ ! -d /proc/asound ] ; then
eerror "Sound support has not been compiled into the kernel,"
eerror "or is disabled. Please check that the correct modules"
eerror "is loaded."
return 1
fi
# /dev/mixer can be a symlink
if [ ! -e /dev/mixer ] ; then
eerror "/dev/mixer does not exist, please create it, or load the"
eerror "correct modules to enable your card's mixer"
return 1
fi
}
start() {
checkconfig || return 1
if [ -f /etc/aumixrc ] ; then
ebegin "Loading Mixer settings"
/usr/bin/aumix -f /etc/aumixrc -L >/dev/null 2>&1
else
ebegin "Setting Mixer settings"
/usr/bin/aumix -v75 -c75 -w75 >/dev/null 2>&1
fi
eend $?
}
stop() {
checkconfig || return 1
ebegin "Saving Mixer settings"
/usr/bin/aumix -f /etc/aumixrc -S >/dev/null 2>&1
eend $?
}
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cgit
pkgver=0.8.2
_gitver=1.6.1.1
pkgver=0.8.2.1
_gitver=1.6.2.1
pkgdesc="a fast webinterface for git"
url="http://hjemli.net/git/cgit"
license=GPL-2
......@@ -23,5 +24,5 @@ build() {
ln -s cgit.cgi "$pkgdir"/usr/share/webapps/cgit/cgit
}
md5sums="6887c96f51c7f3bb2b9c8f6c6b0378f5 cgit-0.8.2.tar.gz
d2b6925cb03e1e33911fdf9392946747 git-1.6.1.1.tar.bz2"
md5sums="12f5468a948be40c275445253e73d309 cgit-0.8.2.1.tar.gz
e96481361887f63227fdaa5ccdbb03b7 git-1.6.2.1.tar.bz2"
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ksymoops
pkgver=2.4.11
pkgrel=0
pkgdesc="A Linux kernel Oops file troubleshooting tool"
url="ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4"
license="GPL-2"
depends="uclibc"
makedepends="!gettext !libiconv"
source="ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/v2.4/$pkgname-$pkgver.tar.bz2
$pkgname-2.4.11-build.patch
"
subpackages="$pkgname-doc"
build ()
{
cd "$srcdir/$pkgname-$pkgver"
patch -p1 < ../$pkgname-2.4.11-build.patch || return 1
make || return 1
make install \
INSTALL_PREFIX="$pkgdir"/usr \
INSTALL_MANDIR="$pkgdir"/usr/share/man
}
md5sums="4a8249e182a5dbc75e566d162e9f3314 ksymoops-2.4.11.tar.bz2
bad82d31c7d15431fc022be237791d59 ksymoops-2.4.11-build.patch"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment