From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ee0-x22f.google.com ([2a00:1450:4013:c00::22f]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WZyKf-0000Cw-LO for ptxdist@pengutronix.de; Tue, 15 Apr 2014 10:03:24 +0200 Received: by mail-ee0-f47.google.com with SMTP id b15so7344557eek.20 for ; Tue, 15 Apr 2014 01:02:59 -0700 (PDT) From: Alexander Aring Date: Tue, 15 Apr 2014 10:02:32 +0200 Message-Id: <1397548954-19093-1-git-send-email-alex.aring@gmail.com> Subject: [ptxdist] [PATCH 1/3] libusb: rename libusbx to libusb Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Alexander Aring Signed-off-by: Alexander Aring --- Maybe next year we have a libusbx again. :-) .../0001-libusb-needs-librt-and-libpthread.patch} | 13 ++++++------- patches/libusb-1.0.18/series | 1 + patches/libusbx-1.0.18/series | 1 - rules/libusb.make | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) rename patches/{libusbx-1.0.18/0001-libusbx-libusb-needs-librt-and-libpthread.patch => libusb-1.0.18/0001-libusb-needs-librt-and-libpthread.patch} (73%) create mode 100644 patches/libusb-1.0.18/series delete mode 100644 patches/libusbx-1.0.18/series diff --git a/patches/libusbx-1.0.18/0001-libusbx-libusb-needs-librt-and-libpthread.patch b/patches/libusb-1.0.18/0001-libusb-needs-librt-and-libpthread.patch similarity index 73% rename from patches/libusbx-1.0.18/0001-libusbx-libusb-needs-librt-and-libpthread.patch rename to patches/libusb-1.0.18/0001-libusb-needs-librt-and-libpthread.patch index 2ee3f72..2d0ebb5 100644 --- a/patches/libusbx-1.0.18/0001-libusbx-libusb-needs-librt-and-libpthread.patch +++ b/patches/libusb-1.0.18/0001-libusb-needs-librt-and-libpthread.patch @@ -1,10 +1,9 @@ -From e5c3ffc155a33a9d8f97dc1524be9a776d4ed656 Mon Sep 17 00:00:00 2001 +From 57ec2296445225a11706b1a1eaae56b37a06c9eb Mon Sep 17 00:00:00 2001 From: Alexander Aring Date: Fri, 28 Mar 2014 12:04:23 +0100 -Subject: [PATCH] libusbx: libusb needs librt and libpthread +Subject: [PATCH] libusb: needs librt and libpthread -This patch is taken from the old libusb package and changes to apply the -libusbx package. Original commit msg from patch is: +Original commit msg from older libusb package: Add missing dependencies. @@ -19,11 +18,11 @@ Signed-off-by: Alexander Aring 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libusb-1.0.pc.in b/libusb-1.0.pc.in -index 7bc33c1..0c6fea7 100644 +index aa023b3..eded053 100644 --- a/libusb-1.0.pc.in +++ b/libusb-1.0.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ - Name: libusbx-1.0 + Name: libusb-1.0 Description: C API for USB device access from Linux, Mac OS X, Windows and OpenBSD/NetBSD userspace Version: @VERSION@ -Libs: -L${libdir} -lusb-1.0 @@ -31,5 +30,5 @@ index 7bc33c1..0c6fea7 100644 Libs.private: @LIBS@ Cflags: -I${includedir}/libusb-1.0 -- -1.9.1 +1.9.2 diff --git a/patches/libusb-1.0.18/series b/patches/libusb-1.0.18/series new file mode 100644 index 0000000..ea8d389 --- /dev/null +++ b/patches/libusb-1.0.18/series @@ -0,0 +1 @@ +0001-libusb-needs-librt-and-libpthread.patch diff --git a/patches/libusbx-1.0.18/series b/patches/libusbx-1.0.18/series deleted file mode 100644 index 4284244..0000000 --- a/patches/libusbx-1.0.18/series +++ /dev/null @@ -1 +0,0 @@ -0001-libusbx-libusb-needs-librt-and-libpthread.patch diff --git a/rules/libusb.make b/rules/libusb.make index addc4d8..0699cc1 100644 --- a/rules/libusb.make +++ b/rules/libusb.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_LIBUSB) += libusb # Paths and names # LIBUSB_VERSION := 1.0.18 -LIBUSB_MD5 := f2ccd0589dde901dfd5607459f77bf44 -LIBUSB := libusbx-$(LIBUSB_VERSION) +LIBUSB_MD5 := 4a6d049923efc6496f1d383054dac1a6 +LIBUSB := libusb-$(LIBUSB_VERSION) LIBUSB_SUFFIX := tar.bz2 -LIBUSB_URL := $(call ptx/mirror, SF, libusbx/$(LIBUSB).$(LIBUSB_SUFFIX)) +LIBUSB_URL := $(call ptx/mirror, SF, libusb/$(LIBUSB).$(LIBUSB_SUFFIX)) LIBUSB_SOURCE := $(SRCDIR)/$(LIBUSB).$(LIBUSB_SUFFIX) LIBUSB_DIR := $(BUILDDIR)/$(LIBUSB) LIBUSB_LICENSE := LGPLv2.1 -- 1.9.2 -- ptxdist mailing list ptxdist@pengutronix.de