From 492d82a0ae107b516bc91786636d04c81b74e703 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 26 Jun 2022 15:42:29 +1000
Subject: [PATCH] avrdude: bump version

---
 ...{avrdude-6.3.recipe => avrdude-7.0.recipe} |  6 +--
 ...dude-6.3.patchset => avrdude-7.0.patchset} | 48 +++++++++++++++----
 2 files changed, 41 insertions(+), 13 deletions(-)
 rename dev-embedded/avrdude/{avrdude-6.3.recipe => avrdude-7.0.recipe} (93%)
 rename dev-embedded/avrdude/patches/{avrdude-6.3.patchset => avrdude-7.0.patchset} (50%)

diff --git a/dev-embedded/avrdude/avrdude-6.3.recipe b/dev-embedded/avrdude/avrdude-7.0.recipe
similarity index 93%
rename from dev-embedded/avrdude/avrdude-6.3.recipe
rename to dev-embedded/avrdude/avrdude-7.0.recipe
index 95a7ea4be..e1390f854 100644
--- a/dev-embedded/avrdude/avrdude-6.3.recipe
+++ b/dev-embedded/avrdude/avrdude-7.0.recipe
@@ -3,11 +3,11 @@ DESCRIPTION="AVRDUDE is an utility to download/upload/manipulate the ROM and \
 EEPROM contents of AVR microcontrollers using the in-system programming \
 technique (ISP)."
 HOMEPAGE="http://www.nongnu.org/avrdude/"
-COPYRIGHT="2003-2016 Brian S. Dean"
+COPYRIGHT="2003-2022 Brian S. Dean"
 LICENSE="GNU GPL v2"
-REVISION="5"
+REVISION="1"
 SOURCE_URI="http://download.savannah.gnu.org/releases/avrdude/avrdude-$portVersion.tar.gz"
-CHECKSUM_SHA256="0f9f731b6394ca7795b88359689a7fa1fba818c6e1d962513eb28da670e0a196"
+CHECKSUM_SHA256="c0ef65d98d6040ca0b4f2b700d51463c2a1f94665441f39d15d97442dbb79b54"
 PATCHES="avrdude-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
diff --git a/dev-embedded/avrdude/patches/avrdude-6.3.patchset b/dev-embedded/avrdude/patches/avrdude-7.0.patchset
similarity index 50%
rename from dev-embedded/avrdude/patches/avrdude-6.3.patchset
rename to dev-embedded/avrdude/patches/avrdude-7.0.patchset
index 0297eaf5e..bd0dd6d01 100644
--- a/dev-embedded/avrdude/patches/avrdude-6.3.patchset
+++ b/dev-embedded/avrdude/patches/avrdude-7.0.patchset
@@ -1,27 +1,27 @@
-From a7d0f4047f70c6975f821deb913eb57c607d9a1d Mon Sep 17 00:00:00 2001
+From 690019648d4c8f26d60fb1807f133c4422d5a2df Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sun, 9 Apr 2017 17:12:13 +0000
+Date: Sat, 25 Jun 2022 23:37:08 +1000
 Subject: Fix haiku build
 
 
 diff --git a/Makefile.am b/Makefile.am
-index 6f32061..447e7cc 100644
+index 1516222..5790814 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -66,7 +66,7 @@ avrdude_CFLAGS   = @ENABLE_WARNINGS@
+@@ -62,7 +62,7 @@ avrdude_CFLAGS   = @ENABLE_WARNINGS@
  libavrdude_a_CFLAGS   = @ENABLE_WARNINGS@
  libavrdude_la_CFLAGS  = $(libavrdude_a_CFLAGS)
  
--avrdude_LDADD  = $(top_builddir)/$(noinst_LIBRARIES) @LIBUSB_1_0@ @LIBUSB@ @LIBFTDI1@ @LIBFTDI@ @LIBHID@ @LIBELF@ @LIBPTHREAD@ -lm
-+avrdude_LDADD  = $(top_builddir)/$(noinst_LIBRARIES) @LIBUSB_1_0@ @LIBUSB@ @LIBFTDI1@ @LIBFTDI@ @LIBHID@ @LIBELF@
+-avrdude_LDADD  = $(top_builddir)/$(noinst_LIBRARIES) @LIBUSB_1_0@ @LIBHIDAPI@ @LIBUSB@ @LIBFTDI1@ @LIBFTDI@ @LIBHID@ @LIBELF@ @LIBPTHREAD@ -lm
++avrdude_LDADD  = $(top_builddir)/$(noinst_LIBRARIES) @LIBUSB_1_0@ @LIBHIDAPI@ @LIBUSB@ @LIBFTDI1@ @LIBFTDI@ @LIBHID@ @LIBELF@
  
  bin_PROGRAMS = avrdude
  
 diff --git a/configure.ac b/configure.ac
-index a98776e..b498a84 100644
+index ae60e3f..f15fec0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -95,6 +95,7 @@ AC_SUBST(LIBELF, $LIBELF)
+@@ -97,6 +97,7 @@ AC_SUBST(LIBELF, $LIBELF)
  
  AC_SEARCH_LIBS([gethostent], [nsl])
  AC_SEARCH_LIBS([setsockopt], [socket])
@@ -29,7 +29,7 @@ index a98776e..b498a84 100644
  AH_TEMPLATE([HAVE_LIBUSB],
              [Define if USB support is enabled via libusb])
  AC_CHECK_LIB([usb], [usb_get_string_simple], [have_libusb=yes])
-@@ -175,11 +176,7 @@ else
+@@ -210,11 +211,7 @@ else
  fi
  AC_CHECK_HEADERS([pthread.h])
  # as there exits header file only pthread implementations for Windows, check if we have a library
@@ -43,5 +43,33 @@ index a98776e..b498a84 100644
  AC_CHECK_HEADERS([limits.h stdlib.h string.h])
  AC_CHECK_HEADERS([fcntl.h sys/ioctl.h sys/time.h termios.h unistd.h])
 -- 
-2.7.0
+2.36.1
+
+
+From e29b19f1f7a423387449f03dd1b5a1a45841ea3f Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sat, 25 Jun 2022 23:46:10 +1000
+Subject: Don't restore termios settings
+
+
+diff --git a/ser_posix.c b/ser_posix.c
+index 2c5d45b..2aeaad8 100644
+--- a/ser_posix.c
++++ b/ser_posix.c
+@@ -395,11 +395,13 @@ static void ser_close(union filedescriptor *fd)
+    * restore original termios settings from ser_open
+    */
+   if (saved_original_termios) {
++#ifndef __HAIKU__
+     int rc = tcsetattr(fd->ifd, TCSANOW | TCSADRAIN, &original_termios);
+     if (rc) {
+       avrdude_message(MSG_INFO, "%s: ser_close(): can't reset attributes for device: %s\n",
+                       progname, strerror(errno));
+     }
++#endif
+     saved_original_termios = 0;
+   }
+ 
+-- 
+2.36.1