aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2023-10-30 23:00:07 +0900
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>2023-10-30 23:00:07 +0900
commitdfa3a18cfe5e067c2ef8b57cc846c773f30fb19c (patch)
tree6d6bbc9dd3c99550e38a38e4fc3854707b8b80e9
parente5133b71942403e67a39b22f6455c89f1d2c620e (diff)
downloadlibhinoko-dfa3a18cfe5e067c2ef8b57cc846c773f30fb19c.tar.gz
change dependency on libhinawa to version 4.0
The new version of libhinawa has been released as the final stable release. * https://git.kernel.org/pub/scm/libs/ieee1394/libhinawa.git/tag/?h=4.0.0 This commit switches dependency on libhinawa to 4.0 release. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-rw-r--r--.github/workflows/build.yml8
-rw-r--r--README.rst2
-rw-r--r--doc/hinoko.toml.in4
-rw-r--r--meson.build2
-rwxr-xr-xsamples/iso-ir-single2
-rwxr-xr-xsamples/iso-it2
-rw-r--r--src/meson.build2
7 files changed, 11 insertions, 11 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4301655..70b8205 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,11 +35,11 @@ jobs:
[wrap-git]
directory = libhinawa
url = https://git.kernel.org/pub/scm/libs/ieee1394/libhinawa.git
- revision = 2.6.1
+ revision = 4.0.0
depth = 1
[provide]
- hinawa = hinawa_dep
+ dependency_names = hinawa
EOF
- name: Initialization for build.
run: |
@@ -90,11 +90,11 @@ jobs:
[wrap-git]
directory = libhinawa
url = https://git.kernel.org/pub/scm/libs/ieee1394/libhinawa.git
- revision = 2.6.1
+ revision = 4.0.0
depth = 1
[provide]
- hinawa = hinawa_dep
+ dependency_names = hinawa
EOF
- name: Initialization for build.
run: |
diff --git a/README.rst b/README.rst
index 15bc0ab..de91d49 100644
--- a/README.rst
+++ b/README.rst
@@ -44,7 +44,7 @@ Dependencies
- Glib 2.44.0 or later
- GObject Introspection 1.32.1 or later
-- Libhinawa 2.6.0 or later
+- Libhinawa 4.0.0 or later
- Linux kernel 3.4 or later
Requirements to build
diff --git a/doc/hinoko.toml.in b/doc/hinoko.toml.in
index 350f50d..ec0b110 100644
--- a/doc/hinoko.toml.in
+++ b/doc/hinoko.toml.in
@@ -13,7 +13,7 @@ search_index=true
dependencies = [
"GLib-2.0",
"GObject-2.0",
- "Hinawa-3.0",
+ "Hinawa-4.0",
]
[dependencies."GLib-2.0"]
@@ -26,7 +26,7 @@ name = "GObject"
description = "The base type system and object class"
docs_url = "https://docs.gtk.org/gobject/"
-[dependencies."Hinawa-3.0"]
+[dependencies."Hinawa-4.0"]
name = "Hinawa"
description = "Operate 1394 OHCI hardware for asynchronous communication with GObject Introspection support"
docs_url = "https://alsa-project.github.io/gobject-introspection-docs/hinawa/"
diff --git a/meson.build b/meson.build
index 42649f7..c6579b6 100644
--- a/meson.build
+++ b/meson.build
@@ -10,7 +10,7 @@ minor_version = version[1].to_int()
micro_version = version[2].to_int()
hinawa_dependency = dependency('hinawa',
- version: '>=2.6.0'
+ version: '>=4.0.0'
)
hinawa_is_subproject = hinawa_dependency.type_name() != 'pkgconfig'
diff --git a/samples/iso-ir-single b/samples/iso-ir-single
index 6ed71a5..58d9bde 100755
--- a/samples/iso-ir-single
+++ b/samples/iso-ir-single
@@ -4,7 +4,7 @@ from threading import Timer
from struct import unpack
import gi
-gi.require_versions({'GLib': '2.0', 'Hinawa': '3.0', 'Hinoko': '0.0'})
+gi.require_versions({'GLib': '2.0', 'Hinawa': '4.0', 'Hinoko': '0.0'})
from gi.repository import GLib, Hinawa, Hinoko
class IsoIrSingle(Hinoko.FwIsoIrSingle):
diff --git a/samples/iso-it b/samples/iso-it
index 470626c..14155c3 100755
--- a/samples/iso-it
+++ b/samples/iso-it
@@ -4,7 +4,7 @@ from threading import Timer
from struct import unpack,pack
import gi
-gi.require_versions({'GLib': '2.0', 'Hinawa': '3.0', 'Hinoko': '0.0'})
+gi.require_versions({'GLib': '2.0', 'Hinawa': '4.0', 'Hinoko': '0.0'})
from gi.repository import GLib, Hinawa, Hinoko
class IsoIt(Hinoko.FwIsoIt):
diff --git a/src/meson.build b/src/meson.build
index 2d0d31e..1cfbcf8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -93,7 +93,7 @@ hinoko_gir = gnome.generate_gir(myself,
includes: [
'GLib-2.0',
'GObject-2.0',
- 'Hinawa-3.0',
+ 'Hinawa-4.0',
],
header: 'hinoko.h',
install: true,