WIP

.github/workflows/CI.yml

@@ -16,23 +16,32 @@ jobs:
   linux:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/pyo3/maturin
+#      image: ghcr.io/pyo3/maturin
+      image: konstin2/maturin
     strategy:
       matrix:
         target: [x86_64
 #          , x86, aarch64, armv7, s390x, ppc64le
         ]
     steps:
       - uses: actions/checkout@v3
+#        with:
+#          submodules: 'true'
         # checkout sets permissions on .git, so we have to fix it
       - name: Setup git config
         run: git config --global --add safe.directory '*'
-#      - uses: actions/setup-python@v4
-#        with:
-#          python-version: '3.10'
+      - name: Git submodule init
+        run: git submodule sync --recursive && git submodule update --init --force; ls -la evdev-rs/evdev-sys/libevdev
+#      - name: foo
+#        run: apt-get update && apt-get install libc6
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+#          python-version: '3.7'
 
       - name: Setup build env
         run: rustup default stable
+
       - name: Build wheels
         run: maturin build --release --out dist --find-interpreter
 

Cargo.toml

@@ -9,13 +9,13 @@ integration = []
 
 [lib]
 name = "map2"
-crate-type = ["lib","cdylib"]
-proc-macro = true
+crate-type = ["lib", "cdylib"]
+#proc-macro = true
 
 [dependencies]
 anyhow = "1.0"
 clap = "4.4.8"
-evdev-rs = { path = "evdev-rs", features = ["serde", "libevdev-1-10"] }
+evdev-rs = { path = "evdev-rs", features = ["serde"] }
 futures = "0.3"
 input-linux-sys = "0.3.1"
 itertools = "0.10.0"
@@ -37,7 +37,7 @@ atty = "0.2"
 indoc = "1.0"
 futures-intrusive = "0.4.0"
 ncurses = "5.101.0"
-pyo3 = { version = "0.20.0", extension-module = ["extension-module"],  default = ["extension-module"] }
+pyo3 = { version = "0.20.0", extension-module = ["extension-module"], default = ["extension-module"] }
 pyo3-asyncio = { version = "0.20.0", features = ["attributes", "tokio-runtime", "testing"] }
 oneshot = "0.1.2"
 thread_tryjoin = "0.2.1"

evdev-rs/Cargo.toml

@@ -17,12 +17,10 @@ a library interface to the callers, thus avoiding erroneous ioctls, etc.
 
 [features]
 default = []
-# Use features from libevdev version 1.10 and greater (libevdev_property_disable)
-libevdev-1-10 = ["evdev-sys/libevdev-1-10"]
 
 [dependencies]
 serde = { version = "1.0", default-features = false, features=["derive"], optional = true }
-evdev-sys = { path = "evdev-sys", version = "0.2.5" }
+evdev-sys = { path = "evdev-sys", version = "0.2.2" }
 libc = "0.2.67"
 bitflags = "1.2.1"
 log = "0.4.8"

evdev-rs/evdev-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "evdev-sys"
-version = "0.2.5"
+version = "0.2.2"
 authors = ["Nayan Deshmukh <[email protected]"]
 build = "build.rs"
 license = "MIT/Apache-2.0"
@@ -14,9 +14,6 @@ Raw bindings to libevdev
 High level Rust bindings are available in the `evdev` crate
 """
 
-[features]
-libevdev-1-10 = []
-
 [dependencies]
 libc = "0.2.67"