diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/libusb/libusb-0.1.8 | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/libusb/libusb-0.1.8')
-rw-r--r-- | recipes/libusb/libusb-0.1.8/amd64-fPIC.patch | 11 | ||||
-rw-r--r-- | recipes/libusb/libusb-0.1.8/configure.patch | 99 | ||||
-rw-r--r-- | recipes/libusb/libusb-0.1.8/pkgconfig.patch | 68 |
3 files changed, 178 insertions, 0 deletions
diff --git a/recipes/libusb/libusb-0.1.8/amd64-fPIC.patch b/recipes/libusb/libusb-0.1.8/amd64-fPIC.patch new file mode 100644 index 0000000000..b8cfdbe697 --- /dev/null +++ b/recipes/libusb/libusb-0.1.8/amd64-fPIC.patch @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2004-03-27 16:34:18.371955584 +0100 ++++ Makefile.in 2004-03-27 16:34:07.796563288 +0100 +@@ -54,7 +54,7 @@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + +-CFLAGS = $(CFLAGS_EXT) ++CFLAGS = $(CFLAGS_EXT) -fPIC + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CXX = @CXX@ diff --git a/recipes/libusb/libusb-0.1.8/configure.patch b/recipes/libusb/libusb-0.1.8/configure.patch new file mode 100644 index 0000000000..6f014a9dcd --- /dev/null +++ b/recipes/libusb/libusb-0.1.8/configure.patch @@ -0,0 +1,99 @@ +--- libusb-0.1.8/configure.in~configure.patch 2004-02-12 03:27:18.000000000 +1100 ++++ libusb-0.1.8/configure.in 2004-11-03 20:17:45.949802575 +1100 +@@ -1,10 +1,11 @@ + # This configure.in is based off of the one that glib uses + + # require atleast autoconf 2.13 +-AC_PREREQ(2.13) ++AC_PREREQ(2.57) + + # init autoconf (and check for presence of usb.c) +-AC_INIT(usb.c) ++AC_INIT ++AC_CONFIG_SRCDIR([usb.c]) + + AH_TOP( + #undef LINUX_API +@@ -29,8 +30,8 @@ + + dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they + dnl are available for $ac_help expansion (don't we all *love* autoconf?) +-ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], +- [AC_DIVERT_PUSH(NOTICE)]) ++dnl ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++dnl [AC_DIVERT_PUSH(NOTICE)]) + + # + # The following version number definitions apply to libusb +@@ -52,7 +53,7 @@ + LIBUSB_BINARY_AGE=4 + LIBUSB_VERSION=$LIBUSB_MAJOR_VERSION.$LIBUSB_MINOR_VERSION.$LIBUSB_MICRO_VERSION + dnl +-AC_DIVERT_POP()dnl ++dnl AC_DIVERT_POP()dnl + + AC_SUBST(LIBUSB_MAJOR_VERSION) + AC_SUBST(LIBUSB_MINOR_VERSION) +@@ -81,7 +82,7 @@ + AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) + + # Specify a configuration file +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS([config.h]) + + AC_DEFINE_UNQUOTED(LIBUSB_MAJOR_VERSION, $LIBUSB_MAJOR_VERSION) + AC_DEFINE_UNQUOTED(LIBUSB_MINOR_VERSION, $LIBUSB_MINOR_VERSION) +@@ -149,14 +150,14 @@ + + dnl figure debugging default, prior to $ac_help setup + dnl +-ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], +- [AC_DIVERT_PUSH(NOTICE)]) ++dnl ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++dnl [AC_DIVERT_PUSH(NOTICE)]) + if test `expr $LIBUSB_MINOR_VERSION \% 2` = 1 ; then + debug_default=yes + else + debug_default=minimum + fi +-AC_DIVERT_POP()dnl ++dnl AC_DIVERT_POP()dnl + + dnl declare --enable-* args and collect ac_help strings + AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default) +@@ -207,15 +208,11 @@ + + if test "$os_support" = "bsd"; then + AC_MSG_CHECKING(if dev/usb/usb.h uses new naming convention) +- AC_TRY_COMPILE( +- [#include <dev/usb/usb.h>], +- [int main(void) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dev/usb/usb.h>]], [[int main(void) + { + int a = ((struct usb_ctl_request *)0L)->ucr_addr; + return 0; +- }], +- [AC_MSG_RESULT(yes)], +- [AC_MSG_RESULT(no) ++ }]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) + AC_DEFINE_UNQUOTED(HAVE_OLD_DEV_USB_USB_H)]) + fi + +@@ -246,7 +243,7 @@ + + AM_CONDITIONAL(BUILD_DOCS, test "$build_docs" != "no") + +-AC_OUTPUT([ ++AC_CONFIG_FILES([ + Makefile + doc/Makefile + libusb.spec +@@ -255,5 +252,6 @@ + README + INSTALL.libusb + usb.h +-],[chmod +x libusb-config]) +- ++]) ++AC_CONFIG_COMMANDS([default],[[chmod +x libusb-config]],[[]]) ++AC_OUTPUT diff --git a/recipes/libusb/libusb-0.1.8/pkgconfig.patch b/recipes/libusb/libusb-0.1.8/pkgconfig.patch new file mode 100644 index 0000000000..737c89edb0 --- /dev/null +++ b/recipes/libusb/libusb-0.1.8/pkgconfig.patch @@ -0,0 +1,68 @@ +--- libusb-0.1.8.orig/libusb.pc.in ++++ libusb-0.1.8/libusb.pc.in +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: libusb ++Description: USB access library ++Version: @VERSION@ ++Libs: -L${libdir} -lusb ++Cflags: -I${includedir} ++ +--- libusb-0.1.8.orig/configure.in ++++ libusb-0.1.8/configure.in +@@ -219,6 +219,26 @@ + AC_DEFINE_UNQUOTED(HAVE_OLD_DEV_USB_USB_H)]) + fi + ++#pkg-config: pkg-config is a tool to simplify checks for libraries and versions. ++pkgconfig_msg="no (http://www.freedesktop.org/software/pkgconfig)" ++try_pkgconfig=true ++have_pkgconfig=false ++AC_ARG_WITH(pkgconfig, [ --without-pkgconfig don't use pkg-config],[ ++ if test x$withval = xno; then ++ try_pkgconfig=false ++ pkgconfig_msg="no (not requested)" ++ fi]) ++if $try_pkgconfig; then ++ AC_PATH_PROG(PKG_CONFIG,pkg-config) ++ if test -n "${PKG_CONFIG}"; then ++ have_pkgconfig=true ++ pkgconfig_msg="yes" ++ fi ++fi ++# guessing directory to install *.pc into ++pkgconfigdir='${libdir}/pkgconfig' ++AC_SUBST(pkgconfigdir) ++ + # Check if the user wants to enable documentation + AC_MSG_CHECKING(if we should build the documentation) + AC_ARG_ENABLE(build-docs, [ --disable-build-docs turn off building documentation], +@@ -249,6 +269,7 @@ + AC_OUTPUT([ + Makefile + doc/Makefile ++ libusb.pc + libusb.spec + libusb-config + tests/Makefile +--- libusb-0.1.8.orig/Makefile.am ++++ libusb-0.1.8/Makefile.am +@@ -12,11 +12,13 @@ + + bin_SCRIPTS = libusb-config + +-EXTRA_DIST = LICENSE libusb.spec.in libusb.spec libusb-config.in README.in README INSTALL.libusb.in INSTALL.libusb ++EXTRA_DIST = LICENSE libusb.spec.in libusb.spec libusb-config.in README.in README INSTALL.libusb.in INSTALL.libusb libusb.pc.in + EXTRA_libusb_la_SOURCE = linux.c linux.h bsd.c darwin.c + + lib_LTLIBRARIES = libusb.la + ++pkgconfig_DATA= libusb.pc ++ + if LINUX_API + OS_SUPPORT = linux.c linux.h + else |