libgusb: update to 0.3.1
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
This commit is contained in:
parent
f47b14a9e5
commit
a9be2c98d8
3 changed files with 3 additions and 66 deletions
|
@ -1,50 +0,0 @@
|
|||
Source: maxice8
|
||||
Upstream: no but feel free to get it upstream where it should be
|
||||
Reason: Conditionalize gobject intropection allowing cross compilation
|
||||
|
||||
Note that this isn't in upstreamable condition (missing checks for vapi depending on gir for example)
|
||||
and considering it is gnome-tech it is very unlikely that it will ever get merged
|
||||
--- gusb/meson.build
|
||||
+++ gusb/meson.build
|
||||
@@ -67,10 +67,17 @@ gusb = shared_library(
|
||||
install : true
|
||||
)
|
||||
|
||||
+deps = [ 'gio-2.0', 'libusb-1.0' ]
|
||||
+
|
||||
+with_gir = get_option('gir')
|
||||
+if with_gir
|
||||
+ deps += [ 'gobject-2.0' ]
|
||||
+endif
|
||||
+
|
||||
pkgg = import('pkgconfig')
|
||||
pkgg.generate(
|
||||
libraries : gusb,
|
||||
- requires : [ 'gio-2.0', 'gobject-2.0', 'libusb-1.0' ],
|
||||
+ requires : deps,
|
||||
subdirs : 'gusb-1',
|
||||
version : meson.project_version(),
|
||||
name : 'gusb',
|
||||
@@ -78,6 +85,7 @@ pkgg.generate(
|
||||
description : 'GUsb is a GLib binding for libusb1',
|
||||
)
|
||||
|
||||
+if with_gir
|
||||
libgusb_girtarget = gnome.generate_gir(gusb,
|
||||
sources : [
|
||||
gusb_version_h,
|
||||
@@ -119,6 +127,7 @@ libgusb_girtarget = gnome.generate_gir(gusb,
|
||||
)
|
||||
libgusb_gir = libgusb_girtarget[0]
|
||||
libgusb_typelib = libgusb_girtarget[1]
|
||||
+endif
|
||||
|
||||
if get_option('vapi')
|
||||
gnome.generate_vapi('gusb',
|
||||
--- meson_options.txt
|
||||
+++ meson_options.txt
|
||||
@@ -2,3 +2,4 @@ option('tests', type : 'boolean', value : true, description : 'Build self tests'
|
||||
option('vapi', type : 'boolean', value : true, description : 'Build VAPI')
|
||||
option('usb_ids', type : 'string', value : '/usr/share/hwdata/usb.ids', description : 'Path to usb.ids file')
|
||||
option('docs', type : 'boolean', value : true, description : 'Generate documentation')
|
||||
+option('gir', type : 'boolean', value : true, description : 'Generate gobject introspection data')
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/gusb/meson.build b/gusb/meson.build
|
||||
index 5276259..b6a04d5 100644
|
||||
--- gusb/meson.build
|
||||
+++ gusb/meson.build
|
||||
@@ -113,6 +113,7 @@ libgusb_girtarget = gnome.generate_gir(gusb,
|
||||
export_packages : 'gusb',
|
||||
extra_args : [
|
||||
'--c-include=gusb.h',
|
||||
+ '-DGUSB_COMPILATION',
|
||||
],
|
||||
link_with : gusb,
|
||||
dependencies : [
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'libgusb'
|
||||
pkgname=libgusb
|
||||
version=0.3.0
|
||||
revision=5
|
||||
version=0.3.1
|
||||
revision=1
|
||||
build_style=meson
|
||||
build_helper="gir"
|
||||
configure_args="-Ddocs=false -Dgir=$(vopt_if gir true false)
|
||||
|
@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
|||
license="LGPL-2.1-or-later"
|
||||
homepage="https://github.com/hughsie/libgusb"
|
||||
distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
|
||||
checksum=d8e7950f99b6ae4c3e9b8c65f3692b9635289e6cff8de40c4af41b2e9b348edc
|
||||
checksum=4b677a372e97748970b1bb3dac076da2d051e4376c5960e77b7159701c851fed
|
||||
|
||||
build_options="gir vala"
|
||||
build_options_default="gir vala"
|
||||
|
|
Loading…
Reference in a new issue