Also fix the logging of libusb Signed-off-by: Remy Bohmer <[email protected]> --- patches/libusb-1.0.2/libusb-1.0.1-pkg-config.diff | 22 --------- patches/libusb-1.0.2/series | 1 patches/libusb-1.0.3/libusb-1.0.1-pkg-config.diff | 22 +++++++++ patches/libusb-1.0.3/series | 1 patches/libusb-compat-0.1.2/libusb-compat-0.1.0-pkgconfig.diff | 24 ---------- patches/libusb-compat-0.1.2/series | 1 patches/libusb-compat-0.1.3/libusb-compat-0.1.0-pkgconfig.diff | 24 ++++++++++ patches/libusb-compat-0.1.3/series | 1 rules/libusb-compat.make | 2 rules/libusb.make | 4 + 10 files changed, 52 insertions(+), 50 deletions(-)
Index: ptxdist-1.99.svn/rules/libusb.make =================================================================== --- ptxdist-1.99.svn.orig/rules/libusb.make 2009-09-26 10:40:26.000000000 +0200 +++ ptxdist-1.99.svn/rules/libusb.make 2009-09-26 10:55:47.000000000 +0200 @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_LIBUSB) += libusb # # Paths and names # -LIBUSB_VERSION := 1.0.2 +LIBUSB_VERSION := 1.0.3 LIBUSB := libusb-$(LIBUSB_VERSION) LIBUSB_SUFFIX := tar.bz2 LIBUSB_URL := $(PTXCONF_SETUP_SFMIRROR)/libusb/$(LIBUSB).$(LIBUSB_SUFFIX) @@ -56,6 +56,8 @@ endif ifdef PTXCONF_LIBUSB_DISABLE_LOG LIBUSB_AUTOCONF += --disable-log +else +LIBUSB_AUTOCONF += --enable-log endif # ---------------------------------------------------------------------------- Index: ptxdist-1.99.svn/rules/libusb-compat.make =================================================================== --- ptxdist-1.99.svn.orig/rules/libusb-compat.make 2009-09-26 10:40:26.000000000 +0200 +++ ptxdist-1.99.svn/rules/libusb-compat.make 2009-09-26 10:55:47.000000000 +0200 @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_LIBUSB_COMPAT) += lib # # Paths and names # -LIBUSB_COMPAT_VERSION := 0.1.2 +LIBUSB_COMPAT_VERSION := 0.1.3 LIBUSB_COMPAT := libusb-compat-$(LIBUSB_COMPAT_VERSION) LIBUSB_COMPAT_SUFFIX := tar.bz2 LIBUSB_COMPAT_URL := $(PTXCONF_SETUP_SFMIRROR)/libusb/$(LIBUSB_COMPAT).$(LIBUSB_COMPAT_SUFFIX) Index: ptxdist-1.99.svn/patches/libusb-1.0.2/libusb-1.0.1-pkg-config.diff =================================================================== --- ptxdist-1.99.svn.orig/patches/libusb-1.0.2/libusb-1.0.1-pkg-config.diff 2009-09-26 10:40:26.000000000 +0200 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Subject: libusb needs librt and libpthread - -Add missing dependencies. - -Signed-off-by: Robert Schwebel <[email protected]> - ---- - libusb-1.0.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libusb-1.0.1/libusb-1.0.pc.in -=================================================================== ---- libusb-1.0.1.orig/libusb-1.0.pc.in -+++ libusb-1.0.1/libusb-1.0.pc.in -@@ -6,6 +6,6 @@ included...@includedir@ - Name: libusb-1.0 - Description: C API for USB device access from Linux userspace - Version: @VERSION@ --Libs: -L${libdir} -lusb-1.0 -+Libs: -L${libdir} -lusb-1.0 -lrt -lpthread - Cflags: -I${includedir}/libusb-1.0 - Index: ptxdist-1.99.svn/patches/libusb-1.0.2/series =================================================================== --- ptxdist-1.99.svn.orig/patches/libusb-1.0.2/series 2009-09-26 10:40:26.000000000 +0200 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libusb-1.0.1-pkg-config.diff Index: ptxdist-1.99.svn/patches/libusb-1.0.3/libusb-1.0.1-pkg-config.diff =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ ptxdist-1.99.svn/patches/libusb-1.0.3/libusb-1.0.1-pkg-config.diff 2009-09-26 10:55:47.000000000 +0200 @@ -0,0 +1,22 @@ +Subject: libusb needs librt and libpthread + +Add missing dependencies. + +Signed-off-by: Robert Schwebel <[email protected]> + +--- + libusb-1.0.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: libusb-1.0.1/libusb-1.0.pc.in +=================================================================== +--- libusb-1.0.1.orig/libusb-1.0.pc.in ++++ libusb-1.0.1/libusb-1.0.pc.in +@@ -6,6 +6,6 @@ included...@includedir@ + Name: libusb-1.0 + Description: C API for USB device access from Linux userspace + Version: @VERSION@ +-Libs: -L${libdir} -lusb-1.0 ++Libs: -L${libdir} -lusb-1.0 -lrt -lpthread + Cflags: -I${includedir}/libusb-1.0 + Index: ptxdist-1.99.svn/patches/libusb-1.0.3/series =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ ptxdist-1.99.svn/patches/libusb-1.0.3/series 2009-09-26 10:55:47.000000000 +0200 @@ -0,0 +1 @@ +libusb-1.0.1-pkg-config.diff Index: ptxdist-1.99.svn/patches/libusb-compat-0.1.2/libusb-compat-0.1.0-pkgconfig.diff =================================================================== --- ptxdist-1.99.svn.orig/patches/libusb-compat-0.1.2/libusb-compat-0.1.0-pkgconfig.diff 2009-09-26 10:40:26.000000000 +0200 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Subject: add dependency -From: Robert Schwebel <[email protected]> - -Add dependency to libusb-1.0; the emulated_by mechanics does not seem to -work. - -Signed-off-by: Robert Schwebel <[email protected]> - ---- - libusb.pc.in | 1 + - 1 file changed, 1 insertion(+) - -Index: libusb-compat-0.1.0/libusb.pc.in -=================================================================== ---- libusb-compat-0.1.0.orig/libusb.pc.in -+++ libusb-compat-0.1.0/libusb.pc.in -@@ -7,6 +7,7 @@ emulated=1 - emulated_by=libusb-1.0 - - Name: libusb -+Requires: libusb-1.0 - Description: USB access library (libusb-1.0 compat wrapper) - Version: @LIBUSB01_VERSION@ - Libs: -L${libdir} -lusb Index: ptxdist-1.99.svn/patches/libusb-compat-0.1.2/series =================================================================== --- ptxdist-1.99.svn.orig/patches/libusb-compat-0.1.2/series 2009-09-26 10:40:26.000000000 +0200 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libusb-compat-0.1.0-pkgconfig.diff Index: ptxdist-1.99.svn/patches/libusb-compat-0.1.3/libusb-compat-0.1.0-pkgconfig.diff =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ ptxdist-1.99.svn/patches/libusb-compat-0.1.3/libusb-compat-0.1.0-pkgconfig.diff 2009-09-26 10:55:47.000000000 +0200 @@ -0,0 +1,24 @@ +Subject: add dependency +From: Robert Schwebel <[email protected]> + +Add dependency to libusb-1.0; the emulated_by mechanics does not seem to +work. + +Signed-off-by: Robert Schwebel <[email protected]> + +--- + libusb.pc.in | 1 + + 1 file changed, 1 insertion(+) + +Index: libusb-compat-0.1.0/libusb.pc.in +=================================================================== +--- libusb-compat-0.1.0.orig/libusb.pc.in ++++ libusb-compat-0.1.0/libusb.pc.in +@@ -7,6 +7,7 @@ emulated=1 + emulated_by=libusb-1.0 + + Name: libusb ++Requires: libusb-1.0 + Description: USB access library (libusb-1.0 compat wrapper) + Version: @LIBUSB01_VERSION@ + Libs: -L${libdir} -lusb Index: ptxdist-1.99.svn/patches/libusb-compat-0.1.3/series =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ ptxdist-1.99.svn/patches/libusb-compat-0.1.3/series 2009-09-26 10:55:47.000000000 +0200 @@ -0,0 +1 @@ +libusb-compat-0.1.0-pkgconfig.diff -- ptxdist mailing list [email protected]
