Merge remote-tracking branch 'x/master'

* x/master:
  alsa-utils: update to 1.0.25.
  alsa-plugins: update to 1.0.25.
  alsa-lib: update to 1.0.25.
  rxvt-unicode: update to 9.15.
  p11-kit: update to 0.10.
  gdb: update to 7.4.
This commit is contained in:
davehome 2012-01-25 14:16:27 -07:00
commit a587bf0373
7 changed files with 19 additions and 59 deletions

View file

@ -1,12 +1,11 @@
# Template build file for 'alsa-lib'.
pkgname=alsa-lib
version=1.0.24.1
version=1.0.25
distfiles="ftp://ftp.alsa-project.org/pub/lib/$pkgname-$version.tar.bz2"
build_style=gnu-configure
revision=1
short_desc="The Advanced Linux Sound Architecture (ALSA) library"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=a32f7c21015b6c71f9a80ff70a2b6a50e4ff4d5c77c744ff0793dea7ba7a2517
checksum=5a1a805cf04106316d549ec650116ce6711a162e107ba8b3c551866680e286e6
long_desc="
The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
functionality to the Linux operating system.

View file

@ -1,32 +0,0 @@
--- jack/pcm_jack.c.old 2011-11-05 00:39:14.238794519 -0600
+++ jack/pcm_jack.c 2011-11-05 00:43:07.936817855 -0600
@@ -307,6 +307,19 @@
return 0;
}
+static int make_nonblock(int fd)
+{
+ int fl;
+
+ if ((fl = fcntl(fd, F_GETFL)) < 0)
+ return fl;
+
+ if (fl & O_NONBLOCK)
+ return 0;
+
+ return fcntl(fd, F_SETFL, fl | O_NONBLOCK);
+}
+
static int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name,
snd_config_t *playback_conf,
snd_config_t *capture_conf,
@@ -363,6 +376,9 @@
socketpair(AF_LOCAL, SOCK_STREAM, 0, fd);
+ make_nonblock(fd[0]);
+ make_nonblock(fd[1]);
+
jack->fd = fd[0];
jack->io.version = SND_PCM_IOPLUG_VERSION;

View file

@ -1,13 +1,12 @@
# Template build file for 'alsa-plugins'.
pkgname=alsa-plugins
version=1.0.24 # NOTE: Remove fix-jack-blocking-pipe.patch on next release!
revision=6
version=1.0.25
distfiles="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$version.tar.bz2"
build_style=gnu-configure
configure_args="--disable-maemo-plugin --with-speex=lib"
short_desc="Advanced Linux Sound Architecture (ALSA) extra plugins"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=fa8e12eb2dfeac083f117c03b3708a017531426ba542a8a729e4801d37861263
checksum=a0e374fd6d5ee9683473a5b6e73dadde61d54851065ed670d6627d344b565aab
long_desc="
The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
functionality to the Linux operating system.
@ -15,7 +14,6 @@ long_desc="
This package includes some ALSA extra plugins for PulseAudio, Speex,
FFmpeg's libavcodec library and libsamplerate."
Add_dependency build pkg-config
Add_dependency build alsa-lib-devel
Add_dependency build speex-devel

View file

@ -1,7 +1,6 @@
# Template build file for 'alsa-utils'.
pkgname=alsa-utils
version=1.0.24.2
revision=6
version=1.0.25
distfiles="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$version.tar.bz2"
build_style=gnu-configure
configure_args="--with-systemdsystemunitdir=/lib/systemd/system"
@ -9,7 +8,7 @@ short_desc="The Advanced Linux Sound Architecture (ALSA) utils"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.alsa-project.org"
license="GPL-2"
checksum=95127f740291086486c06c28118cabca0814bde48fd14dac041a9812a5ac1be2
checksum=2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb615705b302c
long_desc="
The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
functionality to the Linux operating system.

View file

@ -1,6 +1,6 @@
# Template file for 'gdb'
pkgname=gdb
version=7.3.1
version=7.4
distfiles="http://ftp.gnu.org/gnu/gdb/gdb-$version.tar.bz2"
build_style=gnu-configure
configure_args="--disable-nls --with-system-readline
@ -9,7 +9,7 @@ short_desc="The GNU Debugger"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/gdb/"
license="GPL-3"
checksum=6d7bff716fde98d03866a1b747c0929ee7dba49bca13e01d975e0b0fa9b33a28
checksum=de7e2db7f0475eca7f9ffa9251abaddd3d37e0eed0b3759f71abfd810a3fd20f
long_desc="
The purpose of a debugger such as GDB is to allow you to see what
is going on inside another program while it executes--or what
@ -34,8 +34,7 @@ Add_dependency build zlib-devel
Add_dependency build readline-devel
Add_dependency build python-devel
post_install()
{
post_install() {
# resolve conflicts with binutils
rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib
[ -d ${DESTDIR}/usr/lib64 ] && rm -rf ${DESTDIR}/usr/lib64

View file

@ -1,13 +1,13 @@
# Template file for 'p11-kit'
pkgname=p11-kit
version=0.9
version=0.10
homepage="http://p11-glue.freedesktop.org"
distfiles="$homepage/releases/$pkgname-$version.tar.gz"
build_style=gnu-configure
short_desc="Provides a way to load and enumerate PKCS#11 modules"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
checksum=96486f971111f976743be05f2f88b75ced7f14954fad42861b54480c889c66d0
checksum=9646149022bd39c3d3f72f361a917a36f6a5dd09175824d13c36daf4697e8e36
long_desc="
Provides a standard configuration setup for installing PKCS#11 modules in
such a way that they're discoverable.

View file

@ -1,6 +1,6 @@
# Template build file for 'rxvt-unicode'.
pkgname=rxvt-unicode
version=9.14
version=9.15
distfiles="http://dist.schmorp.de/${pkgname}/${pkgname}-${version}.tar.bz2"
build_style=gnu-configure
configure_args="--with-terminfo=/usr/share/terminfo --enable-256-color
@ -12,7 +12,7 @@ short_desc="rxvt clone supporting Xft fonts and Unicode"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://software.schmorp.de/pkg/rxvt-unicode.html"
license="GPL-2"
checksum=29928a33be6b3fb0edd126df2c3d35e1900f8268b546ce54430780c550fa1d52
checksum=ec1aa2932da844979ed8140bd92223defb12042aa5e877e05ac31139ca81f2b1
long_desc="
rxvt-unicode is a clone of the well known terminal emulator rxvt,
modified to store text in Unicode (either UCS-2 or UCS-4) and to use
@ -23,19 +23,16 @@ Add_dependency full perl ">=0"
Add_dependency build pkg-config
Add_dependency build renderproto
Add_dependency build fontconfig-devel
Add_dependency build freetype-devel
Add_dependency build fontconfig-devel
Add_dependency build libX11-devel
Add_dependency build libXft-devel
Add_dependency build libXrender-devel
Add_dependency build gdk-pixbuf-devel
Add_dependency build libXft-devel
Add_dependency build glib-devel
Add_dependency build gdk-pixbuf-devel
Add_dependency build startup-notification-devel
post_install()
{
install -D -m644 ${FILESDIR}/${pkgname}.desktop \
${DESTDIR}/usr/share/applications/${pkgname}.desktop
install -D -m644 ${FILESDIR}/${pkgname}.png \
${DESTDIR}/usr/share/pixmaps/${pkgname}.png
post_install() {
vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
vinstall ${FILESDIR}/${pkgname}.png 644 usr/share/pixmaps
}