Commit e8e868c1 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'libusb-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot 

Fix merge conflicts in CHANGES
parents 6620ca7d 6caec6f3

CHANGES

+5 −2
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 


	X.org updated to 7.5.



	New packages: librsync, lmbench, netperf, squid

	New packages: librsync, libusb-compat, lmbench, netperf, squid



	Updated/fixed packages: busybox, dnsmasq, dosfstools,

	e2fsprogs, fbv, freetype, iperf, iptables, iw, less, libdrm,

	libgcrypt, libglib2, libpng, libxml2, matchbox, mdadm, memstat,

	mtd-utils, nano, openssl, php, pppd, qt, radvd, setserial,

	squashfs, wget, xlib_libX11, xlib_libXfont

	squashfs, usb_modeswith, wget, xlib_libX11, xlib_libXfont



	Issues resolved (http://bugs.uclibc.org):
@@ -24,6 +24,9 @@ 
	#805: [PATCH] mdadm - version update

	#817: integrator926_defconfig uses unsupported uboot board name

	#851: Add option to specify --sysroot value for external toolchain

	#1093: Upgrade libusb to v1.0.3 and add new libusb-compat

               package for compatibility with old packages that expect

               the pre-1.0 API.

	#1105: Add new netperf package

	#1111: Bump wget to 1.12 and migrate to Makefile.autotools.in

	#1117: Bump nano to 2.2.3 and migrate to Makefile.autotools.in

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ source "package/libaio/Config.in" 
source "package/libraw1394/Config.in"

source "package/tslib/Config.in"

source "package/libusb/Config.in"

source "package/libusb-compat/Config.in"

endmenu



menu "Java"

package/libusb-compat/Config.in

0 → 100644
+7 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_LIBUSB_COMPAT

	bool "libusb-compat"

	depends on BR2_PACKAGE_LIBUSB

	help

	  libusb-0.1 compatibility layer for libusb-1.0.



	  http://libusb.sourceforge.net/

package/libusb-compat/libusb-compat-0.1.3-pkgconfig.patch

0 → 100644
+10 −0
Original line number Diff line number Diff line 
--- libusb-compat-0.1.3.orig/libusb.pc.in	2008-06-18 00:13:02.000000000 +0100

+++ libusb-compat-0.1.3/libusb.pc.in	2009-09-16 12:06:50.000000000 +0100

@@ -9,6 +9,7 @@ emulated_by=libusb-1.0

 Name: libusb

 Description: USB access library (libusb-1.0 compat wrapper)

 Version: @LIBUSB01_VERSION@

+Requires: libusb-1.0

 Libs: -L${libdir} -lusb

 Cflags: -I${includedir}

package/libusb-compat/libusb-compat.mk

0 → 100644
+14 −0
Original line number Diff line number Diff line 
#############################################################

#

# libusb-compat

#

#############################################################

LIBUSB_COMPAT_VERSION = 0.1.3

LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2

LIBUSB_COMPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION)

LIBUSB_COMPAT_LIBTOOL_PATCH = NO

LIBUSB_COMPAT_DEPENDENCIES = host-pkg-config libusb

LIBUSB_COMPAT_INSTALL_STAGING = YES

LIBUSB_COMPAT_INSTALL_TARGET = YES



$(eval $(call AUTOTARGETS,package,libusb-compat))