From: Nicolas Thill Date: Thu, 25 Jan 2007 09:12:30 +0000 (+0000) Subject: update libusb to 0.1.12 and usbutils to 0.72 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3dbc96d09bead192eda2a5260b38e8de4438bbbf;p=openwrt%2Fsvn-archive%2Farchive.git update libusb to 0.1.12 and usbutils to 0.72 SVN-Revision: 6195 --- diff --git a/libs/libusb/Makefile b/libs/libusb/Makefile index ff47c7c813..7dc7932cb4 100644 --- a/libs/libusb/Makefile +++ b/libs/libusb/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libusb -PKG_VERSION:=0.1.10a +PKG_VERSION:=0.1.12 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/libusb -PKG_MD5SUM:=c6062b29acd2cef414bcc34e0decbdd1 +PKG_MD5SUM:=caf182cbc7565dac0fd72155919672e6 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -49,13 +49,18 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/usb.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libusb.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libusb.pc + $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libusb.pc endef define Build/UninstallDev rm -rf \ $(STAGING_DIR)/usr/bin/libusb-config \ $(STAGING_DIR)/usr/include/usb.h \ - $(STAGING_DIR)/usr/lib/libusb*.{a,so*} + $(STAGING_DIR)/usr/lib/libusb*.{a,so*} \ + $(STAGING_DIR)/usr/lib/pkgconfig/libusb.pc endef define Package/libusb/install diff --git a/libs/libusb/patches/01-no_libusbpp.patch b/libs/libusb/patches/01-no_libusbpp.patch index e9f48f14db..82116b7d25 100644 --- a/libs/libusb/patches/01-no_libusbpp.patch +++ b/libs/libusb/patches/01-no_libusbpp.patch @@ -1,6 +1,6 @@ ---- libusb-0.1.10a.dev/Makefile.in.old 2005-04-20 21:49:04.000000000 +0200 -+++ libusb-0.1.10a.dev/Makefile.in 2005-04-20 21:50:23.000000000 +0200 -@@ -16,7 +16,7 @@ +--- 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 @@ @@ -9,7 +9,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -@@ -71,8 +71,8 @@ +@@ -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 = @@ -20,7 +20,7 @@ binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) DEFAULT_INCLUDES = -@@ -80,8 +80,7 @@ +@@ -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 \ @@ -30,63 +30,64 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ -@@ -98,8 +97,8 @@ +@@ -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) ++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 \ -@@ -250,7 +249,7 @@ +@@ -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 = $(CFLAGS_EXT) + AM_CFLAGS = -Werror $(AM_CFLAGS_EXT) configincludedir = $(pkglibdir)/include bin_SCRIPTS = libusb-config -@@ -259,7 +258,7 @@ - apidocs/footer.html apidocs/doxygen.css apidocs/doxygen.png +@@ -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 - @BSD_API_TRUE@@LINUX_API_FALSE@OS_SUPPORT = bsd.c -@@ -269,24 +268,18 @@ +@@ -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 = ++include_HEADERS = libusb_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ -export-dynamic \ - $(LDADDS) + $(LDADDS) $(PREBIND_FLAGS) -libusbpp_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) \ - -export-dynamic \ -- $(LDADDS) -lusb $(QT_LDFLAGS) +- $(LDADDS) -lusb $(PREBIND_FLAGSPP) - all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -381,8 +374,6 @@ +@@ -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) @@ -95,7 +96,7 @@ install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" -@@ -415,7 +406,6 @@ +@@ -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@ diff --git a/utils/usbutils/Makefile b/utils/usbutils/Makefile index 672eb6354d..f247c2b0d5 100644 --- a/utils/usbutils/Makefile +++ b/utils/usbutils/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=usbutils -PKG_VERSION:=0.71 +PKG_VERSION:=0.72 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/linux-usb -PKG_MD5SUM:=479d7c7098ef44cc95e7978fd71c712c +PKG_MD5SUM:=ee345fe605ffcfce843dae4aed81122b PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)