From 8e2a39ee89809c42953a209bb013052878b12164 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Thu, 28 Jul 2022 17:57:46 +0300 Subject: [PATCH] replace libusb --- libusb/PKGBUILD | 50 +++++++++++------ libusb/PKGBUILD-aur | 47 ++++++++++++++++ libusb/REPLACED-build | 1 + libusb/clean | 2 +- libusb/configure | 122 ++++++++++++++++++++++++++++++++++++++++++ libusb/deps | 3 +- libusb/time | 8 +-- 7 files changed, 211 insertions(+), 22 deletions(-) create mode 100644 libusb/PKGBUILD-aur create mode 100644 libusb/REPLACED-build create mode 100644 libusb/configure diff --git a/libusb/PKGBUILD b/libusb/PKGBUILD index b8f5b03..3eb92cf 100644 --- a/libusb/PKGBUILD +++ b/libusb/PKGBUILD @@ -7,39 +7,57 @@ pkgname=libusb pkgver=1.0.26 -pkgrel=01 -pkgdesc="Library that provides generic access to USB devices w/o systemd" +_pkgver=1.0.26.r18.gff8fe939 +pkgrel=02 +pkgdesc="A cross-platform library to access USB devices w/o systemd - git version" arch=(x86_64) url="https://libusb.info/" -depends=('glibc') -makedepends=() -provides=('libusb-1.0.so') -#options=(debug) -source=("https://github.com/${pkgname}/${pkgname}/releases/download/v$pkgver/${pkgname}-$pkgver.tar.bz2") +depends=(glibc 'libudev.so') +makedepends=(git automake autoconf) +provides=("libusb=$_pkgver" 'libusb-1.0.so') +conflicts=(libusb-git) +#options=(staticlibs debug) ## uncomment this line to have the debug pkg produced +options=(staticlibs) +source=("git+https://github.com/$pkgname/$pkgname.git") prepare() { - cd $pkgname-$pkgver + cd $pkgname autoreconf -fiv } +_pkgver() { + cd "$pkgname" + + _tag=$(git tag -l --sort -v:refname | sed '/rc[0-9]*/d' | head -n1) + _rev=$(git rev-list --count $_tag..HEAD) + _hash=$(git rev-parse --short HEAD) + printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^v//' +} + build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr + cd "$pkgname" + + ./bootstrap.sh + ./configure \ + --prefix="/usr" make } check() { - make -k check -C $pkgname-$pkgver + make -k check -C $pkgname } -package () { +package() { depends+=(libudev.so) - make DESTDIR="$pkgdir" install -C $pkgname-$pkgver - install -vDm 644 $pkgname-$pkgver/{AUTHORS,ChangeLog,README} -t "$pkgdir/usr/share/doc/$pkgname/" + cd "$pkgname" + + make DESTDIR="$pkgdir" install -C $pkgname + install -vDm 644 $srcdir/$pkgname/{AUTHORS,ChangeLog,README} -t "$pkgdir/usr/share/doc/$pkgname/" + } #---- license gpg-key sha256sums ---- -license=('LGPL2.1') +license=(LGPL2.1) -sha256sums=(12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5) # libusb-1.0.26.tar.bz2 +sha256sums=(SKIP) diff --git a/libusb/PKGBUILD-aur b/libusb/PKGBUILD-aur new file mode 100644 index 0000000..d1df9d4 --- /dev/null +++ b/libusb/PKGBUILD-aur @@ -0,0 +1,47 @@ +# Maintainer: Chocobo1 + +pkgname=libusb-git +pkgver=1.0.26.r3.gba698478 +pkgrel=1 +pkgdesc="A cross-platform library to access USB devices" +arch=('i686' 'x86_64') +url="https://libusb.info/" +license=('LGPL') +depends=('glibc' 'libudev.so') +makedepends=('git') +provides=("libusb=$pkgver" 'libusb-1.0.so') +conflicts=('libusb') +options=('staticlibs') +source=("git+https://github.com/libusb/libusb.git") +sha256sums=('SKIP') + + +pkgver() { + cd "libusb" + + _tag=$(git tag -l --sort -v:refname | sed '/rc[0-9]*/d' | head -n1) + _rev=$(git rev-list --count $_tag..HEAD) + _hash=$(git rev-parse --short HEAD) + printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^v//' +} + +build() { + cd "libusb" + + ./bootstrap.sh + ./configure \ + --prefix="/usr" + make +} + +check() { + cd "libusb" + + make check +} + +package() { + cd "libusb" + + make DESTDIR="$pkgdir" install +} diff --git a/libusb/REPLACED-build b/libusb/REPLACED-build new file mode 100644 index 0000000..ccb1693 --- /dev/null +++ b/libusb/REPLACED-build @@ -0,0 +1 @@ +this pkgrel is based more on the AUR pkg built from git as libusb stable appeared having some trouble with devices this later build seems to solve. This PKGBUILD is a merge between Arch - nosystemd and AUR libusb-git pkg diff --git a/libusb/clean b/libusb/clean index 95ef69a..a3e6593 100644 --- a/libusb/clean +++ b/libusb/clean @@ -1 +1 @@ -rm -rvf {src,pkg,libus*bz2} +rm -rf {src,pkg,libusb} diff --git a/libusb/configure b/libusb/configure new file mode 100644 index 0000000..1f8f4de --- /dev/null +++ b/libusb/configure @@ -0,0 +1,122 @@ +`configure' configures libusb-1.0 1.0.26 to adapt to many kinds of systems. + +Usage: ./configure [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print `checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for `--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or `..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [/usr/local] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, `make install' will install all the files in +`/usr/local/bin', `/usr/local/lib' etc. You can specify +an installation prefix other than `/usr/local' using `--prefix', +for instance `--prefix=$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/libusb-1.0] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + --enable-udev use udev for device enumeration and hotplug support + (recommended) [default=yes] + --enable-eventfd use eventfd for signalling [default=auto] + --enable-timerfd use timerfd for timing [default=auto] + --disable-log disable all logging + --enable-debug-log start with debug message logging enabled + [default=no] + --enable-system-log output logging messages to the systemwide log, if + supported by the OS [default=no] + --enable-examples-build build example applications [default=no] + --enable-tests-build build test applications [default=no] + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CXX C++ compiler command + CXXFLAGS C++ compiler flags + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. + CXXCPP C++ preprocessor + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to . +libusb-1.0 home page: . diff --git a/libusb/deps b/libusb/deps index e505a9f..27eba6a 100644 --- a/libusb/deps +++ b/libusb/deps @@ -1,4 +1,3 @@ +git autoconf automake -gettext -intltool diff --git a/libusb/time b/libusb/time index 0d2601b..65d7679 100644 --- a/libusb/time +++ b/libusb/time @@ -1,3 +1,5 @@ -real 0m12.730s -user 0m14.646s -sys 0m1.389s + +real 0m22.995s +user 0m18.634s +sys 0m1.395s +