summaryrefslogtreecommitdiff
path: root/libusb
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
committerChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
commit2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch)
treebf879bea7ef8517ba8c3d1286ef300401d3d484c /libusb
parent101e2f1623def0a355d20aacb8bd93810703e834 (diff)
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'libusb')
-rw-r--r--libusb/libusb-0.1.8/amd64-fPIC.patch11
-rw-r--r--libusb/libusb-0.1.8/configure.patch99
-rw-r--r--libusb/libusb-0.1.8/pkgconfig.patch68
-rw-r--r--libusb/libusb_0.1.8.bb0
4 files changed, 0 insertions, 178 deletions
diff --git a/libusb/libusb-0.1.8/amd64-fPIC.patch b/libusb/libusb-0.1.8/amd64-fPIC.patch
deleted file mode 100644
index b8cfdbe697..0000000000
--- a/libusb/libusb-0.1.8/amd64-fPIC.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/libusb/libusb-0.1.8/configure.patch b/libusb/libusb-0.1.8/configure.patch
deleted file mode 100644
index 6f014a9dcd..0000000000
--- a/libusb/libusb-0.1.8/configure.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- 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/libusb/libusb-0.1.8/pkgconfig.patch b/libusb/libusb-0.1.8/pkgconfig.patch
deleted file mode 100644
index 737c89edb0..0000000000
--- a/libusb/libusb-0.1.8/pkgconfig.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- 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
diff --git a/libusb/libusb_0.1.8.bb b/libusb/libusb_0.1.8.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/libusb/libusb_0.1.8.bb
+++ /dev/null