summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-08-18 02:57:41 +0000
committerMike Frysinger <vapier@gentoo.org>2012-08-18 02:57:41 +0000
commitb2bcb7a7d8f4b264b04b205ebdde3ef22508ec5e (patch)
tree17456cc7b3807167c7d487c1740a6742b1b01f00 /media-plugins
parentCleanup old; revision bump and move patches to git backports instead. (diff)
downloadgentoo-2-b2bcb7a7d8f4b264b04b205ebdde3ef22508ec5e.tar.gz
gentoo-2-b2bcb7a7d8f4b264b04b205ebdde3ef22508ec5e.tar.bz2
gentoo-2-b2bcb7a7d8f4b264b04b205ebdde3ef22508ec5e.zip
Add fix from upstream for building with glibc-2.16 #426254 by devsk.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/alsa-plugins/ChangeLog7
-rw-r--r--media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild3
-rw-r--r--media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-glibc-2.16.patch31
3 files changed, 38 insertions, 3 deletions
diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index a9a76b03c019..e541c8b3241a 100644
--- a/media-plugins/alsa-plugins/ChangeLog
+++ b/media-plugins/alsa-plugins/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-plugins/alsa-plugins
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.151 2012/05/05 08:27:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.152 2012/08/18 02:57:41 vapier Exp $
+
+ 18 Aug 2012; Mike Frysinger <vapier@gentoo.org>
+ +files/alsa-plugins-1.0.25-glibc-2.16.patch, alsa-plugins-1.0.25-r1.ebuild:
+ Add fix from upstream for building with glibc-2.16 #426254 by devsk.
05 May 2012; Jeff Horelick <jdhore@gentoo.org> alsa-plugins-1.0.24.ebuild,
alsa-plugins-1.0.25.ebuild, alsa-plugins-1.0.25-r1.ebuild:
@@ -655,4 +659,3 @@
New package alsa-plugins, built from upstream's alsa-plugins tarball.
Features jack, resampling, a52 and other plugins. Supersedes
media-plugins/alsa-jack.
-
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild
index 613d2912e726..8b34cd00b981 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild,v 1.10 2012/05/05 08:27:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild,v 1.11 2012/08/18 02:57:41 vapier Exp $
EAPI=3
@@ -35,6 +35,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.0.19-missing-avutil.patch"
"${FILESDIR}/${PN}-1.0.23-automagic.patch"
"${FILESDIR}/${PN}-1.0.25-avcodec54.patch"
+ "${FILESDIR}/${P}-glibc-2.16.patch" #426254
)
S="${WORKDIR}/${MY_P}"
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-glibc-2.16.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-glibc-2.16.patch
new file mode 100644
index 000000000000..2942c47fde45
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-glibc-2.16.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/426254
+
+From 81ae188c8d1b42d187b97846e3b31479a00d4720 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Tue, 31 Jul 2012 11:18:54 +0200
+Subject: [PATCH] usb_stream: Fix build with glibc 2.16
+
+_GNU_SOURCE needs to be defined at first.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ usb_stream/pcm_usb_stream.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usb_stream/pcm_usb_stream.c b/usb_stream/pcm_usb_stream.c
+index b1fd68f..8220849 100644
+--- a/usb_stream/pcm_usb_stream.c
++++ b/usb_stream/pcm_usb_stream.c
+@@ -18,8 +18,8 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <byteswap.h>
+ #define _GNU_SOURCE
++#include <byteswap.h>
+ #include <sys/mman.h>
+ #include <sys/shm.h>
+ #include <sys/ioctl.h>
+--
+1.7.9.7
+