From: Samuel Martin <s.martin49@gmail.com>
Date: Mon, 12 Jan 2015 21:26:04 +0000 (+0100)
Subject: package/libftdi: rename patches to the new naming convention
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=667b16a3ea25055b650ffc4b9d3da5be4a79dcc0;p=buildroot.git

package/libftdi: rename patches to the new naming convention

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/libftdi/0001_pkgconfig_libusb.patch b/package/libftdi/0001_pkgconfig_libusb.patch
new file mode 100644
index 0000000000..389291de00
--- /dev/null
+++ b/package/libftdi/0001_pkgconfig_libusb.patch
@@ -0,0 +1,47 @@
+---
+ configure.in |   35 +++++++++++------------------------
+ 1 file changed, 11 insertions(+), 24 deletions(-)
+
+--- a/configure.in
++++ b/configure.in
+@@ -8,30 +8,17 @@
+ AM_PROG_LIBTOOL
+ AC_PROG_CXX
+ 
+-dnl check for libusb-config
+-AC_CHECK_TOOL(HAVELIBUSB, libusb-config)
+-
+-if test ! -z "$HAVELIBUSB"; then
+-   LIBUSB_CFLAGS=`$HAVELIBUSB --cflags`
+-   LIBUSB_LIBS=`$HAVELIBUSB --libs`
+-
+-   CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
+-   LIBS="$LIBS $LIBUSB_LIBS"
+-else
+-   AC_MSG_ERROR([*** libusb-config not found. You need a working libusb installation.])
+-fi
+-
+-dnl check for version of libusb
+-AC_MSG_CHECKING([if libusb version is >= 0.1.7])
+-libusb_version_needed="1007"
+-libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
++dnl check for libusb
++PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.11)
++CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
++LIBS="$LIBS $LIBUSB_LIBS"
+ 
+-if test $libusb_version -lt $libusb_version_needed; then
+-   AC_MSG_RESULT(no)
+-   AC_MSG_ERROR([*** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7.])
+-else
+-   AC_MSG_RESULT(yes)
+-fi
++dnl Check for recent pkg-config which supports Requires.private
++case `$PKG_CONFIG --version` in
++0.?|0.1[0-7]) PKGCONFIG_REQUIRES="Requires"; ;;
++*) PKGCONFIG_REQUIRES="Requires.private"; ;;
++esac
++AC_SUBST(PKGCONFIG_REQUIRES)
+ 
+ ENABLE_ASYNC_MODE=0
+ AC_ARG_WITH(async-mode,
diff --git a/package/libftdi/libftdi-0.19-01_pkgconfig_libusb.patch b/package/libftdi/libftdi-0.19-01_pkgconfig_libusb.patch
deleted file mode 100644
index 389291de00..0000000000
--- a/package/libftdi/libftdi-0.19-01_pkgconfig_libusb.patch
+++ /dev/null
@@ -1,47 +0,0 @@
----
- configure.in |   35 +++++++++++------------------------
- 1 file changed, 11 insertions(+), 24 deletions(-)
-
---- a/configure.in
-+++ b/configure.in
-@@ -8,30 +8,17 @@
- AM_PROG_LIBTOOL
- AC_PROG_CXX
- 
--dnl check for libusb-config
--AC_CHECK_TOOL(HAVELIBUSB, libusb-config)
--
--if test ! -z "$HAVELIBUSB"; then
--   LIBUSB_CFLAGS=`$HAVELIBUSB --cflags`
--   LIBUSB_LIBS=`$HAVELIBUSB --libs`
--
--   CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
--   LIBS="$LIBS $LIBUSB_LIBS"
--else
--   AC_MSG_ERROR([*** libusb-config not found. You need a working libusb installation.])
--fi
--
--dnl check for version of libusb
--AC_MSG_CHECKING([if libusb version is >= 0.1.7])
--libusb_version_needed="1007"
--libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
-+dnl check for libusb
-+PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.11)
-+CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
-+LIBS="$LIBS $LIBUSB_LIBS"
- 
--if test $libusb_version -lt $libusb_version_needed; then
--   AC_MSG_RESULT(no)
--   AC_MSG_ERROR([*** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7.])
--else
--   AC_MSG_RESULT(yes)
--fi
-+dnl Check for recent pkg-config which supports Requires.private
-+case `$PKG_CONFIG --version` in
-+0.?|0.1[0-7]) PKGCONFIG_REQUIRES="Requires"; ;;
-+*) PKGCONFIG_REQUIRES="Requires.private"; ;;
-+esac
-+AC_SUBST(PKGCONFIG_REQUIRES)
- 
- ENABLE_ASYNC_MODE=0
- AC_ARG_WITH(async-mode,