From 36af48b452bd60a458cfd57a243f5eddc33b47f4 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 29 Jan 2013 18:09:28 +0000 Subject: [PATCH] remove libusb-legacy and point its users at libusb-compat git-svn-id: svn://svn.openwrt.org/openwrt/packages@35388 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- lang/pyusb/Makefile | 2 +- libs/libftdi/Makefile | 2 +- libs/libnfc/Makefile | 2 +- libs/libusb-legacy/Makefile | 90 ---------- libs/libusb-legacy/patches/000-debian_packed.patch | 52 ------ .../patches/001-debian_ansi_types.patch | 194 --------------------- libs/libusb-legacy/patches/002-no_libusbpp.patch | 106 ----------- .../patches/003-automake-compat.patch | 10 -- libs/libusb-legacy/patches/004-no_unused.patch | 11 -- libs/serdisplib/Makefile | 2 +- multimedia/ftpd-topfield/Makefile | 2 +- net/apcupsd/Makefile | 2 +- utils/avrdude/Makefile | 2 +- utils/avrusbboot/Makefile | 2 +- utils/dfu-util/Makefile | 2 +- utils/digitemp/Makefile | 2 +- utils/flashrom/Makefile | 2 +- utils/fowsr/Makefile | 2 +- utils/gnokii/Makefile | 2 +- utils/hplip/Makefile | 2 +- utils/huaweiaktbbo/Makefile | 2 +- utils/lcd4linux/Makefile | 4 +- utils/lcdproc/Makefile | 2 +- utils/nut/Makefile | 2 +- utils/owfs/Makefile | 2 +- utils/oww/Makefile | 2 +- utils/sane-backends/Makefile | 2 +- utils/sispmctl/Makefile | 2 +- 28 files changed, 23 insertions(+), 486 deletions(-) delete mode 100644 libs/libusb-legacy/Makefile delete mode 100644 libs/libusb-legacy/patches/000-debian_packed.patch delete mode 100644 libs/libusb-legacy/patches/001-debian_ansi_types.patch delete mode 100644 libs/libusb-legacy/patches/002-no_libusbpp.patch delete mode 100644 libs/libusb-legacy/patches/003-automake-compat.patch delete mode 100644 libs/libusb-legacy/patches/004-no_unused.patch diff --git a/lang/pyusb/Makefile b/lang/pyusb/Makefile index 9f2ca6265..3a879ff14 100644 --- a/lang/pyusb/Makefile +++ b/lang/pyusb/Makefile @@ -25,7 +25,7 @@ define Package/pyusb CATEGORY:=Languages TITLE:=pyusb URL:=http://pyusb.sourceforge.net - DEPENDS:=+python-mini +libusb + DEPENDS:=+python-mini +libusb-compat endef define Package/pyusb/description diff --git a/libs/libftdi/Makefile b/libs/libftdi/Makefile index 4e817fa2b..7b9d0fb0b 100644 --- a/libs/libftdi/Makefile +++ b/libs/libftdi/Makefile @@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk define Package/libftdi SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libusb + DEPENDS:=+libusb-compat TITLE:=library to talk to FTDI chips URL:=http://www.intra2net.com/en/developer/libftdi/ endef diff --git a/libs/libnfc/Makefile b/libs/libnfc/Makefile index 548ab8416..882554fb0 100644 --- a/libs/libnfc/Makefile +++ b/libs/libnfc/Makefile @@ -29,7 +29,7 @@ define Package/libnfc $(call Package/libnfc/Default) SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libusb +pcscd +ccid + DEPENDS:=+libusb-compat +pcscd +ccid endef define Package/libnfc/description diff --git a/libs/libusb-legacy/Makefile b/libs/libusb-legacy/Makefile deleted file mode 100644 index c4a01b387..000000000 --- a/libs/libusb-legacy/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libusb -PKG_VERSION:=0.1.12 -PKG_RELEASE:=3 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/libusb -PKG_MD5SUM:=caf182cbc7565dac0fd72155919672e6 -PKG_FIXUP:=autoreconf - -include $(INCLUDE_DIR)/uclibc++.mk -include $(INCLUDE_DIR)/package.mk - -PKG_INSTALL=1 - -define Package/libusb - SECTION:=libs - CATEGORY:=Libraries - TITLE:=A library for accessing Linux USB devices - URL:=http://libusb.sourceforge.net/ -endef - -define Package/libusbpp - SECTION:=libs - CATEGORY:=Libraries - TITLE:=A C++ library for accessing Linux USB devices - URL:=http://libusb.sourceforge.net/ - DEPENDS:=$(CXX_DEPENDS) +libusb -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-shared \ - --enable-static \ - ) -endef - -TARGET_CFLAGS += $(FPIC) - -define Build/InstallDev - $(INSTALL_DIR) $(2)/bin - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/libusb-config \ - $(2)/bin/ - $(SED) \ - 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ - $(2)/bin/libusb-config - - $(INSTALL_DIR) $(1)/usr/include - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/usb.h \ - $(1)/usr/include/ - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libusb*.{la,so*,a} \ - $(1)/usr/lib/ - - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libusb.pc \ - $(1)/usr/lib/pkgconfig/ -endef - -define Package/libusb/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libusb.so* \ - $(PKG_INSTALL_DIR)/usr/lib/libusb-*.so* \ - $(1)/usr/lib/ -endef - -define Package/libusbpp/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libusbpp.so* \ - $(PKG_INSTALL_DIR)/usr/lib/libusbpp-*.so* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libusb)) -$(eval $(call BuildPackage,libusbpp)) diff --git a/libs/libusb-legacy/patches/000-debian_packed.patch b/libs/libusb-legacy/patches/000-debian_packed.patch deleted file mode 100644 index 169de31b6..000000000 --- a/libs/libusb-legacy/patches/000-debian_packed.patch +++ /dev/null @@ -1,52 +0,0 @@ - ---- - usb.h.in | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - ---- a/usb.h.in -+++ b/usb.h.in -@@ -66,14 +66,14 @@ - struct usb_descriptor_header { - u_int8_t bLength; - u_int8_t bDescriptorType; --}; -+} __attribute__ ((packed)); - - /* String descriptor */ - struct usb_string_descriptor { - u_int8_t bLength; - u_int8_t bDescriptorType; - u_int16_t wData[1]; --}; -+} __attribute__ ((packed)); - - /* HID descriptor */ - struct usb_hid_descriptor { -@@ -85,7 +85,7 @@ - /* u_int8_t bReportDescriptorType; */ - /* u_int16_t wDescriptorLength; */ - /* ... */ --}; -+} __attribute__ ((packed)); - - /* Endpoint descriptor */ - #define USB_MAXENDPOINTS 32 -@@ -172,7 +172,7 @@ - u_int8_t iProduct; - u_int8_t iSerialNumber; - u_int8_t bNumConfigurations; --}; -+} __attribute__ ((packed)); - - struct usb_ctrl_setup { - u_int8_t bRequestType; -@@ -180,7 +180,7 @@ - u_int16_t wValue; - u_int16_t wIndex; - u_int16_t wLength; --}; -+} __attribute__ ((packed)); - - /* - * Standard requests - diff --git a/libs/libusb-legacy/patches/001-debian_ansi_types.patch b/libs/libusb-legacy/patches/001-debian_ansi_types.patch deleted file mode 100644 index 629ad9a2e..000000000 --- a/libs/libusb-legacy/patches/001-debian_ansi_types.patch +++ /dev/null @@ -1,194 +0,0 @@ - ---- - usb.h.in | 118 ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 60 insertions(+), 58 deletions(-) - ---- a/usb.h.in -+++ b/usb.h.in -@@ -13,8 +13,10 @@ - - #include - #include -+#include - #include - -+#include - #include - - /* -@@ -64,40 +66,40 @@ - - /* All standard descriptors have these 2 fields in common */ - struct usb_descriptor_header { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -+ uint8_t bLength; -+ uint8_t bDescriptorType; - } __attribute__ ((packed)); - - /* String descriptor */ - struct usb_string_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t wData[1]; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t wData[1]; - } __attribute__ ((packed)); - - /* HID descriptor */ - struct usb_hid_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t bcdHID; -- u_int8_t bCountryCode; -- u_int8_t bNumDescriptors; -- /* u_int8_t bReportDescriptorType; */ -- /* u_int16_t wDescriptorLength; */ -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t bcdHID; -+ uint8_t bCountryCode; -+ uint8_t bNumDescriptors; -+ /* uint8_t bReportDescriptorType; */ -+ /* uint16_t wDescriptorLength; */ - /* ... */ - } __attribute__ ((packed)); - - /* Endpoint descriptor */ - #define USB_MAXENDPOINTS 32 - struct usb_endpoint_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int8_t bEndpointAddress; -- u_int8_t bmAttributes; -- u_int16_t wMaxPacketSize; -- u_int8_t bInterval; -- u_int8_t bRefresh; -- u_int8_t bSynchAddress; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint8_t bEndpointAddress; -+ uint8_t bmAttributes; -+ uint16_t wMaxPacketSize; -+ uint8_t bInterval; -+ uint8_t bRefresh; -+ uint8_t bSynchAddress; - - unsigned char *extra; /* Extra descriptors */ - int extralen; -@@ -115,15 +117,15 @@ - /* Interface descriptor */ - #define USB_MAXINTERFACES 32 - struct usb_interface_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int8_t bInterfaceNumber; -- u_int8_t bAlternateSetting; -- u_int8_t bNumEndpoints; -- u_int8_t bInterfaceClass; -- u_int8_t bInterfaceSubClass; -- u_int8_t bInterfaceProtocol; -- u_int8_t iInterface; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint8_t bInterfaceNumber; -+ uint8_t bAlternateSetting; -+ uint8_t bNumEndpoints; -+ uint8_t bInterfaceClass; -+ uint8_t bInterfaceSubClass; -+ uint8_t bInterfaceProtocol; -+ uint8_t iInterface; - - struct usb_endpoint_descriptor *endpoint; - -@@ -141,14 +143,14 @@ - /* Configuration descriptor information.. */ - #define USB_MAXCONFIG 8 - struct usb_config_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t wTotalLength; -- u_int8_t bNumInterfaces; -- u_int8_t bConfigurationValue; -- u_int8_t iConfiguration; -- u_int8_t bmAttributes; -- u_int8_t MaxPower; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t wTotalLength; -+ uint8_t bNumInterfaces; -+ uint8_t bConfigurationValue; -+ uint8_t iConfiguration; -+ uint8_t bmAttributes; -+ uint8_t MaxPower; - - struct usb_interface *interface; - -@@ -158,28 +160,28 @@ - - /* Device descriptor */ - struct usb_device_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t bcdUSB; -- u_int8_t bDeviceClass; -- u_int8_t bDeviceSubClass; -- u_int8_t bDeviceProtocol; -- u_int8_t bMaxPacketSize0; -- u_int16_t idVendor; -- u_int16_t idProduct; -- u_int16_t bcdDevice; -- u_int8_t iManufacturer; -- u_int8_t iProduct; -- u_int8_t iSerialNumber; -- u_int8_t bNumConfigurations; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t bcdUSB; -+ uint8_t bDeviceClass; -+ uint8_t bDeviceSubClass; -+ uint8_t bDeviceProtocol; -+ uint8_t bMaxPacketSize0; -+ uint16_t idVendor; -+ uint16_t idProduct; -+ uint16_t bcdDevice; -+ uint8_t iManufacturer; -+ uint8_t iProduct; -+ uint8_t iSerialNumber; -+ uint8_t bNumConfigurations; - } __attribute__ ((packed)); - - struct usb_ctrl_setup { -- u_int8_t bRequestType; -- u_int8_t bRequest; -- u_int16_t wValue; -- u_int16_t wIndex; -- u_int16_t wLength; -+ uint8_t bRequestType; -+ uint8_t bRequest; -+ uint16_t wValue; -+ uint16_t wIndex; -+ uint16_t wLength; - } __attribute__ ((packed)); - - /* -@@ -250,7 +252,7 @@ - - void *dev; /* Darwin support */ - -- u_int8_t devnum; -+ uint8_t devnum; - - unsigned char num_children; - struct usb_device **children; -@@ -262,7 +264,7 @@ - char dirname[PATH_MAX + 1]; - - struct usb_device *devices; -- u_int32_t location; -+ uint32_t location; - - struct usb_device *root_dev; - }; - diff --git a/libs/libusb-legacy/patches/002-no_libusbpp.patch b/libs/libusb-legacy/patches/002-no_libusbpp.patch deleted file mode 100644 index 82116b7d2..000000000 --- a/libs/libusb-legacy/patches/002-no_libusbpp.patch +++ /dev/null @@ -1,106 +0,0 @@ ---- libusb-0.1.12/Makefile.in.old 2007-01-04 16:36:50.000000000 -0700 -+++ libusb-0.1.12/Makefile.in 2007-01-04 16:42:55.000000000 -0700 -@@ -17,7 +17,7 @@ - - - --SOURCES = $(libusb_la_SOURCES) $(libusbpp_la_SOURCES) -+SOURCES = $(libusb_la_SOURCES) - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ -@@ -73,8 +73,8 @@ - am_libusb_la_OBJECTS = usb.lo error.lo descriptors.lo $(am__objects_1) - libusb_la_OBJECTS = $(am_libusb_la_OBJECTS) - libusbpp_la_LIBADD = --am_libusbpp_la_OBJECTS = usbpp.lo --libusbpp_la_OBJECTS = $(am_libusbpp_la_OBJECTS) -+am_libusbpp_la_OBJECTS = -+libusbpp_la_OBJECTS = - binSCRIPT_INSTALL = $(INSTALL_SCRIPT) - SCRIPTS = $(bin_SCRIPTS) - DEFAULT_INCLUDES = -@@ -82,8 +82,7 @@ - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bsd.Plo ./$(DEPDIR)/darwin.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/descriptors.Plo ./$(DEPDIR)/error.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/linux.Plo ./$(DEPDIR)/usb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/usbpp.Plo -+@AMDEP_TRUE@ ./$(DEPDIR)/linux.Plo ./$(DEPDIR)/usb.Plo - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ -@@ -100,8 +99,8 @@ - CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(libusb_la_SOURCES) $(libusbpp_la_SOURCES) --DIST_SOURCES = $(am__libusb_la_SOURCES_DIST) $(libusbpp_la_SOURCES) -+SOURCES = $(libusb_la_SOURCES) -+DIST_SOURCES = $(am__libusb_la_SOURCES_DIST) - RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ -@@ -256,7 +255,7 @@ - # require automake 1.4 - # gnu strictness chokes on README being autogenerated - AUTOMAKE_OPTIONS = 1.4 foreign --SUBDIRS = . tests doc -+SUBDIRS = . - AM_CFLAGS = -Werror $(AM_CFLAGS_EXT) - configincludedir = $(pkglibdir)/include - bin_SCRIPTS = libusb-config -@@ -265,7 +264,7 @@ - apidocs/footer.html apidocs/doxygen.css apidocs/doxygen.png libusb.pc.in - - EXTRA_libusb_la_SOURCE = linux.c linux.h bsd.c darwin.c --lib_LTLIBRARIES = libusb.la libusbpp.la -+lib_LTLIBRARIES = libusb.la - pkgconfig_DATA = libusb.pc - @BSD_API_FALSE@@DARWIN_API_FALSE@@LINUX_API_FALSE@OS_SUPPORT = - @BSD_API_FALSE@@DARWIN_API_TRUE@@LINUX_API_FALSE@OS_SUPPORT = darwin.c -@@ -278,25 +277,19 @@ - AM_CPPFLAGS = -I. - AM_CXXFLAGS = - libusb_la_SOURCES = usb.c usbi.h error.c error.h descriptors.c $(OS_SUPPORT) --libusbpp_la_SOURCES = usbpp.cpp usbpp.h -+libusbpp_la_SOURCES = - libusbpp_la_DEPENDENCIES = libusb.la - - # Do not add usb.h to *_SOURCES, regardless of dependencies. - # It would be added to the dist tarball, which it shouldn't be. - nodist_include_HEADERS = usb.h --include_HEADERS = usbpp.h -+include_HEADERS = - libusb_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) \ - -export-dynamic \ - $(LDADDS) $(PREBIND_FLAGS) - --libusbpp_la_LDFLAGS = \ -- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -- -release $(LT_RELEASE) \ -- -export-dynamic \ -- $(LDADDS) -lusb $(PREBIND_FLAGSPP) -- - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -@@ -395,8 +388,6 @@ - done - libusb.la: $(libusb_la_OBJECTS) $(libusb_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libusb_la_LDFLAGS) $(libusb_la_OBJECTS) $(libusb_la_LIBADD) $(LIBS) --libusbpp.la: $(libusbpp_la_OBJECTS) $(libusbpp_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(libdir) $(libusbpp_la_LDFLAGS) $(libusbpp_la_OBJECTS) $(libusbpp_la_LIBADD) $(LIBS) - install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" -@@ -429,7 +420,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usb.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usbpp.Plo@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ diff --git a/libs/libusb-legacy/patches/003-automake-compat.patch b/libs/libusb-legacy/patches/003-automake-compat.patch deleted file mode 100644 index eaae25ad7..000000000 --- a/libs/libusb-legacy/patches/003-automake-compat.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -149,6 +149,7 @@ if test "x$enable_debug" = "xyes"; then - fi - - # Checks for programs. -+AC_PROG_CXX - AC_LANG_CPLUSPLUS - AC_PROG_CC - AM_PROG_CC_C_O diff --git a/libs/libusb-legacy/patches/004-no_unused.patch b/libs/libusb-legacy/patches/004-no_unused.patch deleted file mode 100644 index 8452d5b80..000000000 --- a/libs/libusb-legacy/patches/004-no_unused.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.am 2006-03-04 03:52:46.000000000 +0100 -+++ b/Makefile.am 2011-02-03 12:59:22.261341559 +0100 -@@ -4,7 +4,7 @@ - # gnu strictness chokes on README being autogenerated - AUTOMAKE_OPTIONS = 1.4 foreign - --SUBDIRS = . tests doc -+SUBDIRS = . - - AM_CFLAGS = -Werror - diff --git a/libs/serdisplib/Makefile b/libs/serdisplib/Makefile index 7ade455f4..26102a647 100644 --- a/libs/serdisplib/Makefile +++ b/libs/serdisplib/Makefile @@ -22,7 +22,7 @@ define Package/serdisplib CATEGORY:=Libraries TITLE:=A display control library URL:=http://serdisplib.sourceforge.net/ - DEPENDS:=+libusb + DEPENDS:=+libusb-compat endef define Package/serdisplib/description diff --git a/multimedia/ftpd-topfield/Makefile b/multimedia/ftpd-topfield/Makefile index c271cb4a0..89d01983a 100644 --- a/multimedia/ftpd-topfield/Makefile +++ b/multimedia/ftpd-topfield/Makefile @@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk define Package/ftpd-topfield SECTION:=multimedia CATEGORY:=Multimedia - DEPENDS:=@USB_SUPPORT +libusb + DEPENDS:=@USB_SUPPORT +libusb-compat TITLE:=Topfield PVR access via FTP URL:=http://puppy.sourceforge.net/ endef diff --git a/net/apcupsd/Makefile b/net/apcupsd/Makefile index d7bf85a0d..eb4de816c 100644 --- a/net/apcupsd/Makefile +++ b/net/apcupsd/Makefile @@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk define Package/apcupsd SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libpthread +libusb + DEPENDS:=+libpthread +libusb-compat TITLE:=UPS control software URL:=http://www.apcupsd.org/ endef diff --git a/utils/avrdude/Makefile b/utils/avrdude/Makefile index d3b0f13a1..b70c83eac 100644 --- a/utils/avrdude/Makefile +++ b/utils/avrdude/Makefile @@ -22,7 +22,7 @@ define Package/avrdude CATEGORY:=Utilities TITLE:=AVR Downloader/UploaDEr URL:=http://www.bsdhome.com/avrdude/ - DEPENDS:=+libncurses +libreadline +libusb + DEPENDS:=+libncurses +libreadline +libusb-compat endef define Package/avrdude/description diff --git a/utils/avrusbboot/Makefile b/utils/avrusbboot/Makefile index 2d3eb214f..91ea97ee9 100644 --- a/utils/avrusbboot/Makefile +++ b/utils/avrusbboot/Makefile @@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk define Package/avrusbboot SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libusb $(CXX_DEPENDS) + DEPENDS:=+libusb-compat $(CXX_DEPENDS) TITLE:=USB bootloader for Atmel AVR controllers URL:=http://www.fischl.de/avrusbboot/ endef diff --git a/utils/dfu-util/Makefile b/utils/dfu-util/Makefile index 4faa5e928..f58793489 100644 --- a/utils/dfu-util/Makefile +++ b/utils/dfu-util/Makefile @@ -24,7 +24,7 @@ define Package/dfu-util CATEGORY:=Utilities TITLE:=OpenMoko device flash utility URL:=http://wiki.openmoko.org/wiki/Dfu-util - DEPENDS:=+libusb + DEPENDS:=+libusb-compat endef define Package/dfu-util/description diff --git a/utils/digitemp/Makefile b/utils/digitemp/Makefile index cdbabaff6..2381581fe 100644 --- a/utils/digitemp/Makefile +++ b/utils/digitemp/Makefile @@ -44,7 +44,7 @@ endef define Package/digitemp-usb $(call Package/digitemp/Default) TITLE += (USB version) - DEPENDS += +libusb + DEPENDS += +libusb-compat endef define Package/digitemp-usb/description diff --git a/utils/flashrom/Makefile b/utils/flashrom/Makefile index c5f8dc19d..89ce6ca4f 100644 --- a/utils/flashrom/Makefile +++ b/utils/flashrom/Makefile @@ -25,7 +25,7 @@ define Package/flashrom TITLE:=FlashROM Utility URL:=http://www.flashrom.org/ # XXX: needs , only available on these arch right now - DEPENDS:=+zlib +pciutils +dmidecode +libftdi +libusb @(arm||armeb||i386||i686||x86_64) + DEPENDS:=+zlib +pciutils +dmidecode +libftdi +libusb-compat @(arm||armeb||i386||i686||x86_64) endef define Package/flashrom/description diff --git a/utils/fowsr/Makefile b/utils/fowsr/Makefile index 353bdb7aa..cda239b7c 100644 --- a/utils/fowsr/Makefile +++ b/utils/fowsr/Makefile @@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk define Package/fowsr SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libusb + DEPENDS:=+libusb-compat TITLE:=Fine Offset Wireless Weather Station Reader URL:=http://fowsr.googlecode.com/ endef diff --git a/utils/gnokii/Makefile b/utils/gnokii/Makefile index 8f62abeef..45f8f914b 100644 --- a/utils/gnokii/Makefile +++ b/utils/gnokii/Makefile @@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk define Package/gnokii SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libusb + DEPENDS:=+libusb-compat TITLE:=Gnokii - Datasuite for the mobile phones URL:=http://www.gnokii.org/ endef diff --git a/utils/hplip/Makefile b/utils/hplip/Makefile index 840855509..313ebff33 100644 --- a/utils/hplip/Makefile +++ b/utils/hplip/Makefile @@ -25,7 +25,7 @@ define Package/hplip CATEGORY:=Utilities TITLE:=HP Linux Imaging and Printing URL:=http://sourceforge.net/projects/hplip/ - DEPENDS+=+libjpeg +libtiff +libusb +cups +sane-libs + DEPENDS+=+libjpeg +libtiff +libusb-compat +cups +sane-libs endef define Package/hplip/description diff --git a/utils/huaweiaktbbo/Makefile b/utils/huaweiaktbbo/Makefile index bb9b3c341..81c4b5675 100644 --- a/utils/huaweiaktbbo/Makefile +++ b/utils/huaweiaktbbo/Makefile @@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk define Package/huaweiaktbbo SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libusb + DEPENDS:=+libusb-compat TITLE:=Huawei E156/E169/E220 activation tool endef diff --git a/utils/lcd4linux/Makefile b/utils/lcd4linux/Makefile index e5fe6cbe6..452ffebef 100644 --- a/utils/lcd4linux/Makefile +++ b/utils/lcd4linux/Makefile @@ -169,7 +169,7 @@ $(call Package/lcd4linux/Default) +LCD4LINUX_CUSTOM_NEEDS_libmysqlclient:libmysqlclient \ +LCD4LINUX_CUSTOM_NEEDS_libncurses:libncurses \ +LCD4LINUX_CUSTOM_NEEDS_libsqlite3:libsqlite3 \ - +LCD4LINUX_CUSTOM_NEEDS_libusb:libusb \ + +LCD4LINUX_CUSTOM_NEEDS_libusb:libusb-compat \ +LCD4LINUX_CUSTOM_NEEDS_libvncserver:libvncserver \ +LCD4LINUX_CUSTOM_NEEDS_serdisplib:serdisplib \ +LCD4LINUX_CUSTOM_NEEDS_st2205tool:st2205tool \ @@ -203,7 +203,7 @@ $(call Package/lcd4linux/Default) +libmysqlclient \ +libncurses \ +libsqlite3 \ - +libusb \ + +libusb-compat \ +libvncserver \ +serdisplib \ +st2205tool \ diff --git a/utils/lcdproc/Makefile b/utils/lcdproc/Makefile index b69ba5139..af88c407b 100644 --- a/utils/lcdproc/Makefile +++ b/utils/lcdproc/Makefile @@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk define Package/lcdproc SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libusb +libncurses +libftdi + DEPENDS:=+libusb-compat +libncurses +libftdi TITLE:=LCD Display daemon and client URL:=http://sourceforge.net/projects/lcdproc/ endef diff --git a/utils/nut/Makefile b/utils/nut/Makefile index 3fcfb7eab..bc618684f 100644 --- a/utils/nut/Makefile +++ b/utils/nut/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.6/ PKG_MD5SUM:=e6eac4fa04baff0d0a827d64efe81a7e -PKG_BUILD_DEPENDS:=libusb libnetsnmp +PKG_BUILD_DEPENDS:=libusb-compat libnetsnmp PKG_FIXUP:=autoreconf PKG_INSTALL:=1 diff --git a/utils/owfs/Makefile b/utils/owfs/Makefile index 7362a98d1..b35eec681 100644 --- a/utils/owfs/Makefile +++ b/utils/owfs/Makefile @@ -72,7 +72,7 @@ endef define Package/libow $(call Package/owfs/Library) - DEPENDS:=+libusb +libpthread + DEPENDS:=+libusb-compat +libpthread TITLE:=OWFS - common shared library endef diff --git a/utils/oww/Makefile b/utils/oww/Makefile index 1de241413..12a47fa69 100644 --- a/utils/oww/Makefile +++ b/utils/oww/Makefile @@ -25,7 +25,7 @@ define Package/oww CATEGORY:=Utilities TITLE:=One-wire weather URL:=http://oww.sourceforge.net/ - DEPENDS:=+libcurl +libusb + DEPENDS:=+libcurl +libusb-compat endef define Package/oww/description diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile index fcfaabd3b..5a99780b5 100644 --- a/utils/sane-backends/Makefile +++ b/utils/sane-backends/Makefile @@ -48,7 +48,7 @@ define Package/sane-libs $(call Package/sane-backends/Default) SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libjpeg +libtiff +libusb +libv4l +cups + DEPENDS:=+libjpeg +libtiff +libusb-compat +libv4l +cups TITLE+= (libraries) endef diff --git a/utils/sispmctl/Makefile b/utils/sispmctl/Makefile index 6c65156b7..ba7ea0418 100644 --- a/utils/sispmctl/Makefile +++ b/utils/sispmctl/Makefile @@ -24,7 +24,7 @@ define Package/sispmctl CATEGORY:=Utilities TITLE:=Silver Shield PM Control for Linux URL:=http://sispmctl.sourceforge.net/ - DEPENDS:=+libusb + DEPENDS:=+libusb-compat endef define Package/sispmctl/description -- 2.11.0