From 1789bf99440b00437e6e749e7ae274d2273a093f Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 6 Jul 2006 21:11:59 +0000
Subject: [PATCH] update to 2.2.1. Also include a patch to fix a SNAFU by the
 maintainers, which are not willing to fix it (apparently)

svn path=/nixpkgs/trunk/; revision=5626
---
 pkgs/development/libraries/libgphoto2/default.nix  |  8 +++++---
 .../libraries/libgphoto2/libgphoto2-2.2.1.patch    | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch

diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index bcddc648b7c..0776f5780aa 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -1,11 +1,13 @@
 {stdenv, fetchurl, pkgconfig, libusb}:
 
 stdenv.mkDerivation {
-  name = "libgphoto2-2.1.99";
+  name = "libgphoto2-2.2.1";
 
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libgphoto2-2.1.99.tar.bz2;
-    md5 = "3c6d9cb65661915e07491a6f9215d5a9";
+    url = http://surfnet.dl.sourceforge.net/sourceforge/gphoto/libgphoto2-2.2.1.tar.bz2;
+    md5 = "69827311733e39fafa9f77bb05e55b77";
   };
   buildInputs = [pkgconfig libusb];
+
+  patches = [./libgphoto2-2.2.1.patch];
 }
diff --git a/pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch b/pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch
new file mode 100644
index 00000000000..8d39d663719
--- /dev/null
+++ b/pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch
@@ -0,0 +1,14 @@
+diff -ruN libgphoto2-2.2.1/packaging/generic/print-camera-list.c libgphoto2-2.2.1.new/packaging/generic/print-camera-list.c
+--- libgphoto2-2.2.1/packaging/generic/print-camera-list.c	2006-04-19 03:54:05.000000000 +0200
++++ libgphoto2-2.2.1.new/packaging/generic/print-camera-list.c	2006-07-06 22:54:42.000000000 +0200
+@@ -48,8 +48,8 @@
+ #include <time.h>
+ #include <string.h>
+ 
+-#include <gphoto2/gphoto2-camera.h>
+-#include <gphoto2/gphoto2-port-log.h>
++#include <gphoto2-camera.h>
++#include <gphoto2-port-log.h>
+ 
+ #ifndef TRUE
+ #define TRUE  (0==0)