Update to 0.7.5. No brief list of changes, but ChangeLog shows that it's

mostly fixes to build with newer gcc and ffmpeg versions.

7 files changed, 20 insertions, 81 deletions

diff --git a/x11/nucleo/Makefile b/x11/nucleo/Makefile
index d33837fc453..312a4cf670b 100644
--- a/x11/nucleo/Makefile
+++ b/x11/nucleo/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2009/06/12 17:24:54 ahoka Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/14 20:23:16 hasso Exp $
 #
 
-DISTNAME=	nucleo-0.7.1
-PKGREVISION=	4
+DISTNAME=	nucleo-0.7.5
 CATEGORIES=	x11
-MASTER_SITES=	http://www.lri.fr/~cardona/sources/nucleo/
+MASTER_SITES=	http://insitu.lri.fr/metisse/download/nucleo/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/x11/nucleo/distinfo b/x11/nucleo/distinfo
index 381960f48cb..0263fe29671 100644
--- a/x11/nucleo/distinfo
+++ b/x11/nucleo/distinfo
@@ -1,21 +1,18 @@
-$NetBSD: distinfo,v 1.4 2008/12/21 12:53:24 obache Exp $
+$NetBSD: distinfo,v 1.5 2009/07/14 20:23:16 hasso Exp $
 
-SHA1 (nucleo-0.7.1.tar.bz2) = 81bcf54ca73167462f63604430375a48c19f67e9
-RMD160 (nucleo-0.7.1.tar.bz2) = cc82c676422a4b07607f6da404064646be707dca
-Size (nucleo-0.7.1.tar.bz2) = 815922 bytes
+SHA1 (nucleo-0.7.5.tar.bz2) = 9a32d7dd1c6ad6348efa6bdc691cb46207a148c0
+RMD160 (nucleo-0.7.5.tar.bz2) = e997d319a425434b9aa32cc472d33e0d68917f8c
+Size (nucleo-0.7.5.tar.bz2) = 865714 bytes
 SHA1 (patch-aa) = de7e9bb9ab4bca00ef72269357027d6e1748c6cb
 SHA1 (patch-ab) = 6b38f25a856a30826662a3019966250ca8526903
 SHA1 (patch-ac) = 2fb7982057e412ce7c25f7d4193af30f41b2d545
 SHA1 (patch-ad) = b9e94e3183c7d861396e44eefb881ce8b40c4c25
-SHA1 (patch-ae) = cb835eba01172aebe1ce77a6cc46575cc985e688
+SHA1 (patch-ae) = 85c35c140c7c9a72d363b9003f7a765327570c11
 SHA1 (patch-af) = 64499e4601441df1e204afbfb002df5daf3b7a00
 SHA1 (patch-ag) = d2136fa5913c75629920561931af57b9a4065059
 SHA1 (patch-ah) = 259ed0a5785d8f478eff32e53c8f3424fc6fa395
 SHA1 (patch-ai) = 6328c96d45675765c16b4248560a6d918f64bfe4
 SHA1 (patch-aj) = f627182b2feec55f5d8fc60ac8c6e32b846e658a
-SHA1 (patch-ak) = 0f9f442082548e20ed030988b211f59a5eb9827b
+SHA1 (patch-ak) = b88dcb5d6cbc7e23a9b299c6e41e8e605f0bb96f
 SHA1 (patch-al) = 6684c1b1a3b85defaed2a7457fe4ef1f7c79c117
 SHA1 (patch-am) = 1abd0f40ffe2c9ea42fde983bc784d3a10d1ec02
-SHA1 (patch-an) = 552414ada9cae067a180daad4be44204499110ea
-SHA1 (patch-ao) = a7a99b89b42a3f18233fe672d777881abc7528ac
-SHA1 (patch-ap) = 6a3c9631e962e8c03ea07b54e5e22d1830881b31
diff --git a/x11/nucleo/patches/patch-ae b/x11/nucleo/patches/patch-ae
index 58639e78b4f..28342abc200 100644
--- a/x11/nucleo/patches/patch-ae
+++ b/x11/nucleo/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.1 2007/06/12 16:16:57 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2009/07/14 20:23:17 hasso Exp $
 
---- nucleo/utils/AppUtils.cxx.orig	2007-06-12 14:46:52.000000000 +0000
-+++ nucleo/utils/AppUtils.cxx
-@@ -19,8 +19,7 @@
- #include <iostream>
- #include <stdexcept>
+--- nucleo/utils/AppUtils.cxx.orig	2009-07-14 22:42:58 +0300
++++ nucleo/utils/AppUtils.cxx	2009-07-14 22:43:26 +0300
+@@ -21,8 +21,7 @@
+ #include <cstdlib>
+ #include <cstring>
  
 -extern char* optarg ;
 -extern int optind ;
diff --git a/x11/nucleo/patches/patch-ak b/x11/nucleo/patches/patch-ak
index f317b8d0fe1..031404eb60b 100644
--- a/x11/nucleo/patches/patch-ak
+++ b/x11/nucleo/patches/patch-ak
@@ -1,10 +1,10 @@
-$NetBSD: patch-ak,v 1.1 2007/06/12 16:16:58 joerg Exp $
+$NetBSD: patch-ak,v 1.2 2009/07/14 20:23:17 hasso Exp $
 
---- tests/test-Base64.cxx.orig	2007-06-12 15:04:30.000000000 +0000
-+++ tests/test-Base64.cxx
-@@ -14,6 +14,8 @@
- 
+--- tests/test-Base64.cxx.orig	2009-07-14 22:44:22 +0300
++++ tests/test-Base64.cxx	2009-07-14 22:44:43 +0300
+@@ -15,6 +15,8 @@
  #include <iostream>
+ #include <cstdlib>
  
 +#include <unistd.h>
 +
diff --git a/x11/nucleo/patches/patch-an b/x11/nucleo/patches/patch-an
deleted file mode 100644
index 0c8f109c979..00000000000
--- a/x11/nucleo/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2008/12/21 12:53:24 obache Exp $
-
---- nucleo/plugins/ffmpeg/ffmpegImageSink.H.orig	2008-01-29 13:54:23.000000000 +0000
-+++ nucleo/plugins/ffmpeg/ffmpegImageSink.H
-@@ -19,7 +19,7 @@
- #include <stdint.h>
- 
- extern "C" {
--#include <avformat.h>
-+#include <libavformat/avformat.h>
- }
- 
- namespace nucleo {
diff --git a/x11/nucleo/patches/patch-ao b/x11/nucleo/patches/patch-ao
deleted file mode 100644
index 896bb7e7441..00000000000
--- a/x11/nucleo/patches/patch-ao
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2008/12/21 12:53:24 obache Exp $
-
---- nucleo/plugins/ffmpeg/ffmpegImageSink.cxx.orig	2008-01-29 13:54:23.000000000 +0000
-+++ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx
-@@ -235,14 +235,14 @@ namespace nucleo {
- 	 int port = uri.port ;
- 	 if (!port) port = 1234 ;
- 	 sender = new UdpSender(uri.host.c_str(), port) ;
--	 if (init_put_byte(&(format_context->pb), buffer, buffer_size,
-+	 if (init_put_byte(format_context->pb, buffer, buffer_size,
- 				    1, (void *)this,
- 				    0, udp_callback, 0) < 0) {
- 	   std::cerr << "ffmpegImageSink: init_put_byte failed" << std::endl ;
- 	   return false ;
- 	 }
--	 format_context->pb.is_streamed = 1 ; // no seek
--	 format_context->pb.max_packet_size = buffer_size ;
-+	 format_context->pb->is_streamed = 1 ; // no seek
-+	 format_context->pb->max_packet_size = buffer_size ;
-     }
-     
-     av_write_header(format_context) ;
-@@ -340,7 +340,7 @@ namespace nucleo {
- 	 if (vstream->codec) {
- 	   avcodec_close(vstream->codec) ;
- 	   av_write_trailer(format_context) ;
--	   if (!sender) url_fclose(&format_context->pb) ;
-+	   if (!sender) url_fclose(format_context->pb) ;
- 	 }
- 	 av_freep(&vstream) ;
-     }
diff --git a/x11/nucleo/patches/patch-ap b/x11/nucleo/patches/patch-ap
deleted file mode 100644
index 346e34fd9de..00000000000
--- a/x11/nucleo/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2008/12/21 12:53:24 obache Exp $
-
---- nucleo/plugins/ffmpeg/ffmpegImageSource.H.orig	2008-01-29 13:54:23.000000000 +0000
-+++ nucleo/plugins/ffmpeg/ffmpegImageSource.H
-@@ -18,7 +18,7 @@
- #include <stdint.h>
- 
- extern "C" {
--#include <avformat.h>
-+#include <libavformat/avformat.h>
- }
- 
- namespace nucleo {