diff --git a/.gitignore b/.gitignore index edff8a3..b0825c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,22 @@ .DS_Store -objdir +avrdude avrdude-6.3.tar.gz avrdude-6.3 +avrdude-6.3.0-arduino18-x86_64-pc-linux-gnu.tar.bz2 +eudev-3.1.3 +hidapi libelf-0.8.13.tar.gz libelf-0.8.13 -libusb-1.0.20.tar.bz2 -libusb-1.0.20 +libusb-1.0.24.tar.bz2 +libusb-1.0.24 libusb-compat-0.1.5.tar.bz2 libusb-compat-0.1.5 libusb-win32-bin-1.2.6.0.zip libusb-win32-bin-1.2.6.0 +ncurses-6.2.tar.gz +ncurses-6.2 +objdir +readline-6.3.tar.gz +readline-6.3 +eudev-3.2.9 +v3.2.9.tar.gz diff --git a/libhidapi.build.bash b/libhidapi.build.bash index 163f52e..aa9e757 100755 --- a/libhidapi.build.bash +++ b/libhidapi.build.bash @@ -26,9 +26,9 @@ fi if [[ $TARGET_OS == "GNU/Linux" ]] ; then -wget https://github.com/gentoo/eudev/archive/v3.1.3.tar.gz -tar xvf v3.1.3.tar.gz -cd eudev-3.1.3 +wget https://github.com/gentoo/eudev/archive/v3.2.9.tar.gz +tar xvf v3.2.9.tar.gz +cd eudev-3.2.9 sed -i 's|foreign 1.13|foreign 1.11|g' configure.ac ./autogen.sh ./configure --enable-static --disable-gudev --disable-introspection --disable-shared --disable-blkid --disable-kmod --disable-manpages --prefix=$PREFIX $CONFARGS @@ -40,12 +40,13 @@ rm -rf eudev fi -git clone https://github.com/signal11/hidapi.git --depth 1 +git clone https://github.com/signal11/hidapi.git --branch autotools --depth 1 export CFLAGS="-I$PREFIX/include -I$PREFIX/include/hidapi -I$PREFIX/include/libelf -I$PREFIX/include/ncurses -I$PREFIX/include/ncursesw -I$PREFIX/include/readline -I$PREFIX/include/libusb-1.0 $CFLAGS" export LDFLAGS="-L$PREFIX/lib $LDFLAGS" cd hidapi +sed -i '/AC_CONFIG_MACRO_DIR/ s/^#*/#/' configure.ac # Fix build error CONFARGS="--prefix=$PREFIX --enable-static --disable-shared" export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig diff --git a/libncurses-5.9.build.bash b/libncurses-6.2.build.bash similarity index 88% rename from libncurses-5.9.build.bash rename to libncurses-6.2.build.bash index 3e5abe8..a6c42f0 100755 --- a/libncurses-5.9.build.bash +++ b/libncurses-6.2.build.bash @@ -25,16 +25,16 @@ if [[ $OS == "Msys" || $OS == "Cygwin" || $CROSS_COMPILE_HOST == "i686-w64-mingw exit 0 fi -if [[ ! -f ncurses-5.9.tar.gz ]] ; +if [[ ! -f ncurses-6.2.tar.gz ]] ; then - wget https://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz + wget https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.2.tar.gz fi -tar xfv ncurses-5.9.tar.gz +tar xfv ncurses-6.2.tar.gz -cd ncurses-5.9 +cd ncurses-6.2 -for p in ../ncurses-patches/*.patch; do echo Applying $p; patch -p1 < $p; done +#for p in ../ncurses-patches/*.patch; do echo Applying $p; patch -p1 < $p; done # patches not necessary anymore CONFARGS="--prefix=$PREFIX --disable-shared --without-debug --without-ada --with-termlib --enable-termcap" if [[ $CROSS_COMPILE != "" ]] ; then diff --git a/libusb-1.0.20.build.bash b/libusb-1.0.24.build.bash similarity index 86% rename from libusb-1.0.20.build.bash rename to libusb-1.0.24.build.bash index 37d930f..560fa1a 100755 --- a/libusb-1.0.20.build.bash +++ b/libusb-1.0.24.build.bash @@ -20,14 +20,14 @@ cd objdir PREFIX=`pwd` cd - -if [[ ! -f libusb-1.0.20.tar.bz2 ]] ; +if [[ ! -f libusb-1.0.24.tar.bz2 ]] ; then - wget https://github.com/libusb/libusb/releases/download/v1.0.20/libusb-1.0.20.tar.bz2 + wget https://github.com/libusb/libusb/releases/download/v1.0.24/libusb-1.0.24.tar.bz2 fi -tar xfv libusb-1.0.20.tar.bz2 +tar xfv libusb-1.0.24.tar.bz2 -cd libusb-1.0.20 +cd libusb-1.0.24 CONFARGS="--prefix=$PREFIX --disable-udev --enable-static --disable-shared" if [[ $CROSS_COMPILE != "" ]] ; then CONFARGS="$CONFARGS --host=$CROSS_COMPILE_HOST" diff --git a/package-avrdude.bash b/package-avrdude.bash index 3a2e47b..b2e3da5 100755 --- a/package-avrdude.bash +++ b/package-avrdude.bash @@ -85,12 +85,12 @@ else fi -rm -rf avrdude-6.3 libusb-1.0.20 libusb-compat-0.1.5 libusb-win32-bin-1.2.6.0 libelf-0.8.13 objdir ncurses-5.9 readline-6.3 hidapi +rm -rf avrdude-6.3 libusb-1.0.24 libusb-compat-0.1.5 libusb-win32-bin-1.2.6.0 libelf-0.8.13 objdir ncurses-6.2 readline-6.3 hidapi -./libusb-1.0.20.build.bash +./libusb-1.0.24.build.bash ./libusb-compat-0.1.5.build.bash ./libelf-0.8.13.build.bash -./libncurses-5.9.build.bash +./libncurses-6.2.build.bash ./libhidapi.build.bash ./avrdude-6.3.build.bash