diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-07-01 17:57:12 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-07-01 17:57:12 +0000 |
| commit | 80a7dcb93bf2baf3d2a84c877dda3ac2d139536f (patch) | |
| tree | 4cea0b64b82fdcd2b9a0540987610ae7d96fc7e5 /dev-libs/libusb-compat | |
| parent | Drop alpha keywords (diff) | |
| download | gentoo-2-80a7dcb93bf2baf3d2a84c877dda3ac2d139536f.tar.gz gentoo-2-80a7dcb93bf2baf3d2a84c877dda3ac2d139536f.tar.bz2 gentoo-2-80a7dcb93bf2baf3d2a84c877dda3ac2d139536f.zip | |
Don't redefine usbi_log_level because libusbx is now defining it wrt #423135 by Jeroen Dekien
(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libusb-compat')
| -rw-r--r-- | dev-libs/libusb-compat/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch | 17 | ||||
| -rw-r--r-- | dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild | 5 |
3 files changed, 27 insertions, 2 deletions
diff --git a/dev-libs/libusb-compat/ChangeLog b/dev-libs/libusb-compat/ChangeLog index ba25e51157ba..9ecfb770c89c 100644 --- a/dev-libs/libusb-compat/ChangeLog +++ b/dev-libs/libusb-compat/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/libusb-compat # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/ChangeLog,v 1.16 2012/06/17 18:23:10 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/ChangeLog,v 1.17 2012/07/01 17:57:12 ssuominen Exp $ + + 01 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> + libusb-compat-0.1.4.ebuild, +files/libusb-0.1-libusbx.patch: + Don't redefine usbi_log_level because libusbx is now defining it wrt #423135 + by Jeroen Dekien 17 Jun 2012; Raúl Porcel <armin76@gentoo.org> libusb-compat-0.1.4.ebuild: alpha/ia64/m68k/s390/sh/sparc stable wrt #417135 diff --git a/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch b/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch new file mode 100644 index 000000000000..61563651b25a --- /dev/null +++ b/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch @@ -0,0 +1,17 @@ +http://bugs.gentoo.org/423135 + +--- libusb/core.c ++++ libusb/core.c +@@ -32,12 +32,6 @@ + static libusb_context *ctx = NULL; + static int usb_debug = 0; + +-enum usbi_log_level { +- LOG_LEVEL_DEBUG, +- LOG_LEVEL_INFO, +- LOG_LEVEL_WARNING, +- LOG_LEVEL_ERROR, +-}; + + #ifdef ENABLE_LOGGING + #define _usbi_log(level, fmt...) usbi_log(level, __FUNCTION__, fmt) diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild index ab135ef752c1..3aba7dc20ca3 100644 --- a/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild +++ b/dev-libs/libusb-compat/libusb-compat-0.1.4.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/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild,v 1.8 2012/06/17 18:23:10 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild,v 1.9 2012/07/01 17:57:12 ssuominen Exp $ EAPI=4 inherit eutils @@ -23,6 +23,9 @@ DOCS="AUTHORS ChangeLog NEWS README" src_prepare() { epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch + + has_version dev-libs/libusbx && \ + epatch "${FILESDIR}"/${PN/-compat}-0.1-libusbx.patch } src_configure() { |