From: Manolis Ragkousis <manolis837@gmail.com>
To: Guix-devel <Guix-devel@gnu.org>
Subject: [PATCH] gnu: Add dfu-programmer
Date: Mon, 29 Sep 2014 13:46:04 +0300 [thread overview]
Message-ID: <CAFtzXzN8U88Pu=1yyH_VMjPP7ExmvQJc4x7LEbx5WeGJMKqCDQ@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 43 bytes --]
Another programmer for avr chips.
Manolis
[-- Attachment #2: 0001-gnu-Add-dfu-programmer.patch --]
[-- Type: text/x-patch, Size: 5164 bytes --]
From 8f0da7d367be1995f8980992a647adedd85d2f1c Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Mon, 29 Sep 2014 13:27:30 +0300
Subject: [PATCH] gnu: Add dfu-programmer
* gnu/packages/dfu-programmer.scm: New file
* gnu-system.am (GNU_SYSTEM_MODULES): Add dfu-programmer.scm
* gnu/packages/patches/dfu-programmer-fix-libusb.patch: New patch.
* gnu-system.am (dist_patch_DATA): Add it.
---
gnu-system.am | 2 +
gnu/packages/dfu-programmer.scm | 48 ++++++++++++++++++
.../patches/dfu-programmer-fix-libusb.patch | 57 ++++++++++++++++++++++
3 files changed, 107 insertions(+)
create mode 100644 gnu/packages/dfu-programmer.scm
create mode 100644 gnu/packages/patches/dfu-programmer-fix-libusb.patch
diff --git a/gnu-system.am b/gnu-system.am
index e774f50..a30e7d4 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -71,6 +71,7 @@ GNU_SYSTEM_MODULES = \
gnu/packages/datamash.scm \
gnu/packages/dc.scm \
gnu/packages/dejagnu.scm \
+ gnu/packages/dfu-programmer.scm \
gnu/packages/dictionaries.scm \
gnu/packages/disk.scm \
gnu/packages/docbook.scm \
@@ -318,6 +319,7 @@ dist_patch_DATA = \
gnu/packages/patches/cursynth-wave-rand.patch \
gnu/packages/patches/dbus-localstatedir.patch \
gnu/packages/patches/diffutils-gets-undeclared.patch \
+ gnu/packages/patches/dfu-programmer-fix-libusb.patch \
gnu/packages/patches/doxygen-test.patch \
gnu/packages/patches/doxygen-tmake.patch \
gnu/packages/patches/emacs-configure-sh.patch \
diff --git a/gnu/packages/dfu-programmer.scm b/gnu/packages/dfu-programmer.scm
new file mode 100644
index 0000000..e8e69a5
--- /dev/null
+++ b/gnu/packages/dfu-programmer.scm
@@ -0,0 +1,48 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages dfu-programmer)
+ #:use-module (guix licenses)
+ #:use-module (guix download)
+ #:use-module (guix packages)
+ #:use-module (gnu packages)
+ #:use-module (guix build-system gnu)
+ #:use-module (gnu packages libusb))
+
+(define-public dfu-programmer
+ (package
+ (name "dfu-programmer")
+ (version "0.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/dfu-programmer/dfu-programmer-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "17lglglk5xrqd2n0impg5bkq4j96qc51cw3kzcghzmzmn6fvg3gf"))
+ (patches (list (search-patch "dfu-programmer-fix-libusb.patch")))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("libusb" ,libusb)))
+ (home-page "http://dfu-programmer.github.io/")
+ (synopsis "Dfu-programmer for Atmel chips")
+ (description
+ "Dfu-programmer is a multi-platform command-line programmer for Atmel (8051, AVR, XMEGA & AVR32)
+ chips with a USB bootloader supporting ISP")
+ (license gpl2+)))
diff --git a/gnu/packages/patches/dfu-programmer-fix-libusb.patch b/gnu/packages/patches/dfu-programmer-fix-libusb.patch
new file mode 100644
index 0000000..e9e21f3
--- /dev/null
+++ b/gnu/packages/patches/dfu-programmer-fix-libusb.patch
@@ -0,0 +1,57 @@
+Dfu-programmer cannot cannot find libusb. This patch fixes that.
+
+diff --git a/src/dfu-device.h b/src/dfu-device.h
+index bbdfa99..31af0e8 100644
+--- a/src/dfu-device.h
++++ b/src/dfu-device.h
+@@ -6,7 +6,7 @@
+ #endif
+ #include <stdint.h>
+ #ifdef HAVE_LIBUSB_1_0
+-#include <libusb.h>
++#include <libusb-1.0/libusb.h>
+ #else
+ #include <usb.h>
+ #endif
+
+diff --git a/src/main.c b/src/main.c
+index ef2aa16..dcc3636 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -24,7 +24,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #ifdef HAVE_LIBUSB_1_0
+-#include <libusb.h>
++#include <libusb-1.0/libusb.h>
+ #else
+ #include <usb.h>
+ #endif
+
+diff --git a/src/dfu.c b/src/dfu.c
+index 7dbcc57..952e896 100644
+--- a/src/dfu.c
++++ b/src/dfu.c
+@@ -27,7 +27,7 @@
+ #include <stdlib.h>
+ #include <stddef.h>
+ #ifdef HAVE_LIBUSB_1_0
+-#include <libusb.h>
++#include <libusb-1.0/libusb.h>
+ #else
+ #include <usb.h>
+ #endif
+
+diff --git a/src/dfu.h b/src/dfu.h
+index 2a159e8..63510f2 100644
+--- a/src/dfu.h
++++ b/src/dfu.h
+@@ -25,7 +25,7 @@
+ # include <config.h>
+ #endif
+ #ifdef HAVE_LIBUSB_1_0
+-#include <libusb.h>
++#include <libusb-1.0/libusb.h>
+ #else
+ #include <usb.h>
+ #endif
--
2.1.1
next reply other threads:[~2014-09-29 10:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-29 10:46 Manolis Ragkousis [this message]
2014-09-29 16:09 ` [PATCH] gnu: Add dfu-programmer Ludovic Courtès
2014-10-01 6:22 ` Manolis Ragkousis
2014-10-02 8:47 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFtzXzN8U88Pu=1yyH_VMjPP7ExmvQJc4x7LEbx5WeGJMKqCDQ@mail.gmail.com' \
--to=manolis837@gmail.com \
--cc=Guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.