Commit bd96dcc1 authored by gengyue's avatar gengyue

modified libinput to 1.10.x

parent 1f79a152
......@@ -14,6 +14,12 @@ HEADER_DIR=$TINA_DIR/prebuilt/gcc/linux-x86/arm/toolchain-sunxi-glibc/toolchain/
# It is the current directory.
WORK_DIR=$(pwd)
# change meson files before export variables.
cd $WORK_DIR/3rd-party/libinput-1.10.0
sudo patch -p1 < $WORK_DIR/libinput.patch
sed "s#current_path#$WORK_DIR#g" ../../libinput.txt > cross_compile.txt
meson --cross-file cross_compile.txt . builddir/ --prefix=$WORK_DIR/rootfs/usr/local --libdir=$WORK_DIR/rootfs/usr/local/lib
# export some system varibles
export STAGING_DIR=$PLATFORM_DIR/staging_dir
export CC=$(which arm-openwrt-linux-gcc)
......@@ -136,10 +142,9 @@ echo "================= 12/23: libevdev is compiled ... ==================="
# compile libinput
echo "================= 13/23: compiling libinput now ... ================="
cd $WORK_DIR/3rd-party/libinput-1.2.3
./configure --with-PACKAGE=no --enable-documentation=no --enable-event-gui=no --enable-tests=no --enable-libwacom=no CROSS_COMPILE="arm-openwrt-linux-muslgnueabi-" --prefix=$WORK_DIR/rootfs/usr/local/ --host="arm-openwrt-linux" --target=arm-openwrt-linux LDFLAGS="-L$WORK_DIR/rootfs/usr/local/lib -L$STAGING_DIR/target/usr/lib -L$STAGING_DIR/target/lib " CFLAG="-Wl,-rpath=$WORK_DIR/rootfs/usr/local/lib " CPPFLAGS="-I$WORK_DIR/rootfs/usr/local/include -I$STAGING_DIR/target/usr/include -I$TOOLCHAIN_DIR/usr/include -I$TOOLCHAIN_DIR/include "
make -j$NRJOBS
sudo make install
cd $WORK_DIR/3rd-party/libinput-1.10.0
ninja -C builddir/
sudo ninja -C builddir/ install
echo "================= 13/23: libinput is compiled ... ==================="
# compile libsqlite
......@@ -225,7 +230,7 @@ echo "================= 21/23: libmgncs4touch is compiled ... ============="
echo "================= 22/23: compiling mg-samples now ... ==============="
cd $WORK_DIR/mg-samples
./autogen.sh
./configure CROSS_COMPILE="arm-openwrt-linux-muslgnueabi-" --target=arm-openwrt-linux --host=arm-openwrt-linux --build=x86_64-linux-gnu --program-prefix= --program-suffix= --prefix=$WORK_DIR/rootfs/usr/local --exec-prefix=$WORK_DIR/rootfs/usr/local --bindir=$WORK_DIR/rootfs/usr/local/bin --sbindir=$WORK_DIR/rootfs/usr/local/sbin --libexecdir=$WORK_DIR/rootfs/usr/local/lib --sysconfdir=$WORK_DIR/rootfs/usr/local/etc --datadir=$WORK_DIR/rootfs/usr/local/share --localstatedir=$WORK_DIR/rootfs/var --mandir=$WORK_DIR/rootfs/usr/local/man --infodir=$WORK_DIR/rootfs/usr/local/info --disable-nls LDFLAGS="-L$WORK_DIR/rootfs/usr/local/lib -L$STAGING_DIR/target/usr/lib -L$STAGING_DIR/target/lib " CFLAGS="-Wl,-rpath=$WORK_DIR/rootfs/usr/local/lib:$STAGING_DIR/target/usr/lib " CPPFLAGS="-I$WORK_DIR/rootfs/usr/local/include -I$STAGING_DIR/target/usr/include -I$TOOLCHAIN_DIR/usr/include -I$TOOLCHAIN_DIR/include " MINIGUI_LIBS="-L$WORK_DIR/rootfs/usr/local/lib -ldrm -lminigui_ths -ljpeg -lm -lfreetype -lharfbuzzex" DRM_CFLAGS="-I$WORK_DIR/rootfs/usr/local/include " DRM_LIBS="-L$WORK_DIR/rootfs/usr/local/lib "
./configure CROSS_COMPILE="arm-openwrt-linux-muslgnueabi-" --target=arm-openwrt-linux --host=arm-openwrt-linux --build=x86_64-linux-gnu --program-prefix= --program-suffix= --prefix=$WORK_DIR/rootfs/usr/local --exec-prefix=$WORK_DIR/rootfs/usr/local --bindir=$WORK_DIR/rootfs/usr/local/bin --sbindir=$WORK_DIR/rootfs/usr/local/sbin --libexecdir=$WORK_DIR/rootfs/usr/local/lib --sysconfdir=$WORK_DIR/rootfs/usr/local/etc --datadir=$WORK_DIR/rootfs/usr/local/share --localstatedir=$WORK_DIR/rootfs/var --mandir=$WORK_DIR/rootfs/usr/local/man --infodir=$WORK_DIR/rootfs/usr/local/info --disable-nls LDFLAGS="-L$WORK_DIR/rootfs/usr/local/lib -L$STAGING_DIR/target/usr/lib -L$STAGING_DIR/target/lib " CFLAGS="-Wl,-rpath=$WORK_DIR/rootfs/usr/local/lib:$STAGING_DIR/target/usr/lib " CPPFLAGS="-I$WORK_DIR/rootfs/usr/local/include -I$STAGING_DIR/target/usr/include -I$TOOLCHAIN_DIR/usr/include -I$TOOLCHAIN_DIR/include " MINIGUI_LIBS="-L$WORK_DIR/rootfs/usr/local/lib -linput -ldrm -lminigui_ths -ljpeg -lm -lfreetype -lharfbuzzex" DRM_CFLAGS="-I$WORK_DIR/rootfs/usr/local/include " DRM_LIBS="-L$WORK_DIR/rootfs/usr/local/lib "
make -j$NRJOBS
sudo make install
echo "================= 22/23: mg-tests is compiled ... ==================="
......@@ -234,7 +239,7 @@ echo "================= 22/23: mg-tests is compiled ... ==================="
echo "================= 23/23: compiling mg-demos now ... ================="
cd $WORK_DIR/mg-demos
./autogen.sh
./configure CROSS_COMPILE="arm-openwrt-linux-muslgnueabi-" --target=arm-openwrt-linux --host=arm-openwrt-linux --build=x86_64-linux-gnu --program-prefix= --program-suffix= --prefix=$WORK_DIR/rootfs/usr/local --exec-prefix=$WORK_DIR/rootfs/usr/local --bindir=$WORK_DIR/rootfs/usr/local/bin --sbindir=$WORK_DIR/rootfs/usr/local/sbin --libexecdir=$WORK_DIR/rootfs/usr/local/lib --sysconfdir=$WORK_DIR/rootfs/usr/local/etc --datadir=$WORK_DIR/rootfs/usr/local/share --localstatedir=$WORK_DIR/rootfs/var --mandir=$WORK_DIR/rootfs/usr/local/man --infodir=$WORK_DIR/rootfs/usr/local/info --disable-nls LDFLAGS="-L$WORK_DIR/rootfs/usr/local/lib -L$STAGING_DIR/target/usr/lib -L$STAGING_DIR/target/lib " CFLAGS="-Wl,-rpath=$WORK_DIR/rootfs/usr/local/lib:$STAGING_DIR/target/usr/lib " CPPFLAGS="-I$WORK_DIR/rootfs/usr/local/include -I$STAGING_DIR/target/usr/include -I$TOOLCHAIN_DIR/usr/include -I$TOOLCHAIN_DIR/include " MINIGUI_LIBS="-L$WORK_DIR/rootfs/usr/local/lib -ldrm -lminigui_ths -ljpeg -lm -lfreetype -lharfbuzzex" DRM_CFLAGS="-I$WORK_DIR/rootfs/usr/local/include " DRM_LIBS="-L$WORK_DIR/rootfs/usr/local/lib "
./configure CROSS_COMPILE="arm-openwrt-linux-muslgnueabi-" --target=arm-openwrt-linux --host=arm-openwrt-linux --build=x86_64-linux-gnu --program-prefix= --program-suffix= --prefix=$WORK_DIR/rootfs/usr/local --exec-prefix=$WORK_DIR/rootfs/usr/local --bindir=$WORK_DIR/rootfs/usr/local/bin --sbindir=$WORK_DIR/rootfs/usr/local/sbin --libexecdir=$WORK_DIR/rootfs/usr/local/lib --sysconfdir=$WORK_DIR/rootfs/usr/local/etc --datadir=$WORK_DIR/rootfs/usr/local/share --localstatedir=$WORK_DIR/rootfs/var --mandir=$WORK_DIR/rootfs/usr/local/man --infodir=$WORK_DIR/rootfs/usr/local/info --disable-nls LDFLAGS="-L$WORK_DIR/rootfs/usr/local/lib -L$STAGING_DIR/target/usr/lib -L$STAGING_DIR/target/lib " CFLAGS="-Wl,-rpath=$WORK_DIR/rootfs/usr/local/lib:$STAGING_DIR/target/usr/lib " CPPFLAGS="-I$WORK_DIR/rootfs/usr/local/include -I$STAGING_DIR/target/usr/include -I$TOOLCHAIN_DIR/usr/include -I$TOOLCHAIN_DIR/include " MINIGUI_LIBS="-L$WORK_DIR/rootfs/usr/local/lib -linput -ldrm -lminigui_ths -ljpeg -lm -lfreetype -lharfbuzzex" DRM_CFLAGS="-I$WORK_DIR/rootfs/usr/local/include " DRM_LIBS="-L$WORK_DIR/rootfs/usr/local/lib "
make -j$NRJOBS
sudo make install
echo "================= 23/23: mg-demos is compiled ... ==================="
......@@ -62,9 +62,9 @@ tar xvJf util-linux_2.31.1.orig.tar.xz
rm -f util-linux_2.31.1.orig.tar.xz
# get libinput-dev
wget http://minigui.org/downloads/common/libinput_1.2.3.orig.tar.xz
tar xvJf libinput_1.2.3.orig.tar.xz
rm -f libinput_1.2.3.orig.tar.xz
wget http://minigui.org/downloads/common/libinput-1.10.0.tar.xz
tar xvJf libinput-1.10.0.tar.xz
rm -f libinput-1.10.0.tar.xz
# get libdrm-dev
wget http://minigui.org/downloads/common/libdrm_2.4.99.orig.tar.gz
......
diff -Naur ./meson_options.txt ../gengyue/meson_options.txt
--- ./meson_options.txt 2018-02-13 09:51:33.000000000 +0800
+++ ../gengyue/meson_options.txt 2020-04-13 16:26:22.721825431 +0800
@@ -4,17 +4,17 @@
description: 'udev base directory [default=$prefix/lib/udev]')
option('libwacom',
type: 'boolean',
- value: true,
+ value: false,
description: 'Use libwacom for tablet identification (default=true)')
option('debug-gui',
type: 'boolean',
- value: true,
+ value: false,
description: 'Enable the "debug-gui" feature in the libinput tool [default=true]')
option('tests',
type: 'boolean',
- value: true,
+ value: false,
description: 'Build the tests [default=true]')
option('documentation',
type: 'boolean',
- value: true,
+ value: false,
description: 'Build the documentation [default=true]')
[binaries]
c = 'arm-openwrt-linux-muslgnueabi-gcc'
cpp = 'arm-openwrt-linux-muslgnueabi-g++'
ar = 'arm-openwrt-linux-muslgnueabi-ar'
strip = 'arm-openwrt-linux-muslgnueabi-strip'
c_ld = 'arm-openwrt-linux-muslgnueabi-ld'
cpp_ld = 'arm-openwrt-linux-muslgnueabi-ld'
pkgconfig = 'pkg-config'
[host_machine]
system = 'linux'
cpu_family = 'arm'
cpu = 'R16-ARMv8'
endian = 'little'
[build_machine]
system = 'linux'
cpu_family = 'x86_64'
cpu = 'i686'
endian = 'little'
[properties]
c_args = ['-Icurrent_path/rootfs/usr/local/include']
c_link_args = ['-Lcurrent_path/rootfs/usr/local/lib']
cpp_args = ['-Icurrent_path/rootfs/usr/local/include']
cpp_link_args = ['-Lcurrent_path/rootfs/usr/local/lib']
[paths]
prefix = 'current_path/rootfs/usr/local'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment