diff options
author | obache <obache@pkgsrc.org> | 2008-12-21 12:53:24 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2008-12-21 12:53:24 +0000 |
commit | 46ac1875c438648babc9c42453c8ece09d500dd3 (patch) | |
tree | c6d2909d51e73749d2f3c9fb084a45b2f8a50725 /x11 | |
parent | d2ac708fe4624e58caedbada7a0e808a13627c8e (diff) | |
download | pkgsrc-46ac1875c438648babc9c42453c8ece09d500dd3.tar.gz |
Try to fix build failure with ffmpeg-snapshot, PR 40212.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/nucleo/distinfo | 5 | ||||
-rw-r--r-- | x11/nucleo/patches/patch-an | 13 | ||||
-rw-r--r-- | x11/nucleo/patches/patch-ao | 31 | ||||
-rw-r--r-- | x11/nucleo/patches/patch-ap | 13 |
4 files changed, 61 insertions, 1 deletions
diff --git a/x11/nucleo/distinfo b/x11/nucleo/distinfo index e4089d59579..381960f48cb 100644 --- a/x11/nucleo/distinfo +++ b/x11/nucleo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2008/05/07 02:53:41 bjs Exp $ +$NetBSD: distinfo,v 1.4 2008/12/21 12:53:24 obache Exp $ SHA1 (nucleo-0.7.1.tar.bz2) = 81bcf54ca73167462f63604430375a48c19f67e9 RMD160 (nucleo-0.7.1.tar.bz2) = cc82c676422a4b07607f6da404064646be707dca @@ -16,3 +16,6 @@ SHA1 (patch-aj) = f627182b2feec55f5d8fc60ac8c6e32b846e658a SHA1 (patch-ak) = 0f9f442082548e20ed030988b211f59a5eb9827b 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-an b/x11/nucleo/patches/patch-an new file mode 100644 index 00000000000..0c8f109c979 --- /dev/null +++ b/x11/nucleo/patches/patch-an @@ -0,0 +1,13 @@ +$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 new file mode 100644 index 00000000000..896bb7e7441 --- /dev/null +++ b/x11/nucleo/patches/patch-ao @@ -0,0 +1,31 @@ +$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 new file mode 100644 index 00000000000..346e34fd9de --- /dev/null +++ b/x11/nucleo/patches/patch-ap @@ -0,0 +1,13 @@ +$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 { |