logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 96a56c95010bd62c02bffd2e1cbb0e84dece8f37
parent 69124d0baaf866063db65cdae56673067fcce973
Author: Michael Forney <mforney@mforney.org>
Date:   Sat,  3 Nov 2018 01:23:59 -0700

Remove unused libusb

This was added for ccid and pcsc, but I never quite finished those
up. So, remove it for now. We can always revert if we need it again.

Diffstat:

M.gitmodules3---
Mpkg/gen.lua1-
Dpkg/libusb/config.h54------------------------------------------------------
Dpkg/libusb/gen.lua13-------------
Dpkg/libusb/rev1-
Dpkg/libusb/src1-
6 files changed, 0 insertions(+), 73 deletions(-)

diff --git a/.gitmodules b/.gitmodules @@ -116,9 +116,6 @@ [submodule "pkg/libpng/src"] path = pkg/libpng/src url = https://github.com/glennrp/libpng -[submodule "pkg/libusb/src"] - path = pkg/libusb/src - url = https://github.com/libusb/libusb [submodule "pkg/loksh/src"] path = pkg/loksh/src url = https://github.com/dimkr/loksh diff --git a/pkg/gen.lua b/pkg/gen.lua @@ -43,7 +43,6 @@ subgen 'libpciaccess' subgen 'libpng' subgen 'libressl' subgen 'libtermkey' -subgen 'libusb' subgen 'libxkbcommon' subgen 'loksh' subgen 'lpeg' diff --git a/pkg/libusb/config.h b/pkg/libusb/config.h @@ -1,54 +0,0 @@ -#define DEFAULT_VISIBILITY __attribute__((visibility("default"))) -/* #undef ENABLE_DEBUG_LOGGING */ -#define ENABLE_LOGGING 1 -#define HAVE_ASM_TYPES_H 1 -#define HAVE_DECL_TFD_CLOEXEC 1 -#define HAVE_DECL_TFD_NONBLOCK 1 -#define HAVE_DLFCN_H 1 -#define HAVE_INTTYPES_H 1 -/* #undef HAVE_LIBUDEV */ -/* #undef HAVE_LIBUDEV_H */ -#define HAVE_LINUX_NETLINK_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_PIPE2 1 -#define HAVE_POLL_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRINGS_H 1 -#define HAVE_STRING_H 1 -#define HAVE_STRUCT_TIMESPEC 1 -/* #undef HAVE_SYSLOG_FUNC */ -/* #undef HAVE_SYSLOG_H */ -#define HAVE_SYS_SOCKET_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_SYS_TIME_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_UNISTD_H 1 -#define LT_OBJDIR ".libs/" -/* #undef OS_DARWIN */ -/* #undef OS_HAIKU */ -#define OS_LINUX 1 -/* #undef OS_NETBSD */ -/* #undef OS_OPENBSD */ -/* #undef OS_SUNOS */ -/* #undef OS_WINDOWS */ -#define PACKAGE "libusb" -#define PACKAGE_BUGREPORT "libusb-devel@lists.sourceforge.net" -#define PACKAGE_NAME "libusb" -#define PACKAGE_STRING "libusb 1.0.22" -#define PACKAGE_TARNAME "libusb" -#define PACKAGE_URL "http://libusb.info" -#define PACKAGE_VERSION "1.0.22" -#define POLL_NFDS_TYPE nfds_t -#define STDC_HEADERS 1 -#define THREADS_POSIX 1 -#define USBI_TIMERFD_AVAILABLE 1 -/* #undef USE_SYSTEM_LOGGING_FACILITY */ -/* #undef USE_UDEV */ -#define VERSION "1.0.22" -/* #undef WINVER */ -#define _GNU_SOURCE 1 -/* #undef _WIN32_WINNT */ -#ifndef __cplusplus -/* #undef inline */ -#endif diff --git a/pkg/libusb/gen.lua b/pkg/libusb/gen.lua @@ -1,13 +0,0 @@ -cflags{ - '-I $dir', - '-I $srcdir/libusb', -} - -pkg.hdrs = copy('$outdir/include', '$srcdir/libusb', {'libusb.h'}) - -lib('libusb-1.0.a', [[libusb/( - core.c descriptor.c hotplug.c io.c strerror.c sync.c - os/(poll_posix.c threads_posix.c linux_usbfs.c linux_netlink.c) -)]]) - -fetch 'git' diff --git a/pkg/libusb/rev b/pkg/libusb/rev @@ -1 +0,0 @@ -3 diff --git a/pkg/libusb/src b/pkg/libusb/src @@ -1 +0,0 @@ -Subproject commit 0034b2afdcdb1614e78edaa2a9e22d5936aeae5d