diff options
author | wiz <wiz@pkgsrc.org> | 2013-04-23 13:22:22 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2013-04-23 13:22:22 +0000 |
commit | 12d07a791b51e741fde0af4c6fa39e213387ab20 (patch) | |
tree | 2ead6ca004c7ac3262f5aeea5bc92385923f909e | |
parent | d6479a47d5d8fbac08982e89a46df5fb56b617d9 (diff) | |
download | pkgsrc-12d07a791b51e741fde0af4c6fa39e213387ab20.tar.gz |
Add comment to patch-src_descriptors_dr__7c.c (accepted upstream).
Add portability fix for example from upstream, instead of not building it
(thanks, Jean-Paul Saman <jpsaman@videolan.org>).
No change to binary package, so no PKGREVISION bump.
-rw-r--r-- | multimedia/libdvbpsi/distinfo | 6 | ||||
-rw-r--r-- | multimedia/libdvbpsi/patches/patch-Makefile.in | 16 | ||||
-rw-r--r-- | multimedia/libdvbpsi/patches/patch-examples_dvbinfo_udp.c | 23 | ||||
-rw-r--r-- | multimedia/libdvbpsi/patches/patch-src_descriptors_dr__7c.c | 4 |
4 files changed, 29 insertions, 20 deletions
diff --git a/multimedia/libdvbpsi/distinfo b/multimedia/libdvbpsi/distinfo index 61abfb5fb08..40e35fa4226 100644 --- a/multimedia/libdvbpsi/distinfo +++ b/multimedia/libdvbpsi/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.9 2013/04/23 09:02:26 wiz Exp $ +$NetBSD: distinfo,v 1.10 2013/04/23 13:22:22 wiz Exp $ SHA1 (libdvbpsi-1.1.0.tar.bz2) = f83fde9986e90f93ad8ffd4a813be37c60e5137a RMD160 (libdvbpsi-1.1.0.tar.bz2) = 5f3b0d8ab7fc7adc00072b3cf388fc781b3aa946 Size (libdvbpsi-1.1.0.tar.bz2) = 443464 bytes -SHA1 (patch-Makefile.in) = 5e19ecbfce76b56ddbc6fde6e464e4bb47912155 -SHA1 (patch-src_descriptors_dr__7c.c) = b052b5297806592676a655f5ec1690da762c6263 +SHA1 (patch-examples_dvbinfo_udp.c) = d91ac355e7df022bd587b250c8f903d89914d2d7 +SHA1 (patch-src_descriptors_dr__7c.c) = ebd67c536ee7dcd1afade6145457c82781723db5 diff --git a/multimedia/libdvbpsi/patches/patch-Makefile.in b/multimedia/libdvbpsi/patches/patch-Makefile.in deleted file mode 100644 index d5ca347b8dd..00000000000 --- a/multimedia/libdvbpsi/patches/patch-Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.1 2013/01/21 14:41:27 wiz Exp $ - -dvbinfo example assumes SOL_IP*, which do not exist at least on NetBSD. -Since examples are not installed, just don't build them. - ---- Makefile.in.orig 2012-12-28 09:45:55.000000000 +0000 -+++ Makefile.in -@@ -282,7 +282,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = src examples misc -+SUBDIRS = src misc - DIST_SUBDIRS = $(SUBDIRS) doc wince - EXTRA_DIST = libdvbpsi.spec libdvbpsi.spec.in libdvbpsi.pc.in bootstrap - pkgconfigdir = $(libdir)/pkgconfig diff --git a/multimedia/libdvbpsi/patches/patch-examples_dvbinfo_udp.c b/multimedia/libdvbpsi/patches/patch-examples_dvbinfo_udp.c new file mode 100644 index 00000000000..7c7590fa1bb --- /dev/null +++ b/multimedia/libdvbpsi/patches/patch-examples_dvbinfo_udp.c @@ -0,0 +1,23 @@ +$NetBSD: patch-examples_dvbinfo_udp.c,v 1.1 2013/04/23 13:22:22 wiz Exp $ + +Portability fix from upstream (Jean-Paul Saman <jpsaman@videolan.org>). + +--- examples/dvbinfo/udp.c.orig 2013-02-20 11:25:27.000000000 +0000 ++++ examples/dvbinfo/udp.c +@@ -47,6 +47,16 @@ + # include <arpa/inet.h> + #endif + ++#ifndef SOL_IP ++# define SOL_IP IPPROTO_IP ++#endif ++#ifndef SOL_IPV6 ++# define SOL_IPV6 IPPROTO_IPV6 ++#endif ++#ifndef IPPROTO_IPV6 ++# define IPPROTO_IPV6 41 /* IANA */ ++#endif ++ + #include <assert.h> + + #include "udp.h" diff --git a/multimedia/libdvbpsi/patches/patch-src_descriptors_dr__7c.c b/multimedia/libdvbpsi/patches/patch-src_descriptors_dr__7c.c index e0ebc8b3f48..08cff3097c2 100644 --- a/multimedia/libdvbpsi/patches/patch-src_descriptors_dr__7c.c +++ b/multimedia/libdvbpsi/patches/patch-src_descriptors_dr__7c.c @@ -1,4 +1,6 @@ -$NetBSD: patch-src_descriptors_dr__7c.c,v 1.1 2013/02/26 11:27:28 joerg Exp $ +$NetBSD: patch-src_descriptors_dr__7c.c,v 1.2 2013/04/23 13:22:22 wiz Exp $ + +clang fix, accepted upstream. --- src/descriptors/dr_7c.c.orig 2013-02-25 14:29:08.000000000 +0000 +++ src/descriptors/dr_7c.c |