update to 0.0.21 changes: bugfixesdiff -r1.9 -r1.10 pkgsrc/multimedia/farsight2/Makefile
(drochner)
@@ -1,18 +1,17 @@ | @@ -1,18 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.9 2010/06/13 22:45:04 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.10 2010/08/05 18:55:18 drochner Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= farsight2-0.0.17 | 4 | DISTNAME= farsight2-0.0.21 | |
5 | PKGREVISION= 4 | |||
6 | CATEGORIES= chat multimedia | 5 | CATEGORIES= chat multimedia | |
7 | MASTER_SITES= http://farsight.freedesktop.org/releases/farsight2/ | 6 | MASTER_SITES= http://farsight.freedesktop.org/releases/farsight2/ | |
8 | 7 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://farsight.freedesktop.org/wiki/ | 9 | HOMEPAGE= http://farsight.freedesktop.org/wiki/ | |
11 | COMMENT= Audio/video communications framework | 10 | COMMENT= Audio/video communications framework | |
12 | LICENSE= gnu-lgpl-v2.1 | 11 | LICENSE= gnu-lgpl-v2.1 | |
13 | 12 | |||
14 | PKG_DESTDIR_SUPPORT= user-destdir | 13 | PKG_DESTDIR_SUPPORT= user-destdir | |
15 | 14 | |||
16 | GNU_CONFIGURE= yes | 15 | GNU_CONFIGURE= yes | |
17 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
18 | USE_TOOLS+= gmake pkg-config | 17 | USE_TOOLS+= gmake pkg-config | |
@@ -20,29 +19,25 @@ USE_TOOLS+= gmake pkg-config | @@ -20,29 +19,25 @@ USE_TOOLS+= gmake pkg-config | |||
20 | PKGCONFIG_OVERRIDE+= farsight2.pc.in | 19 | PKGCONFIG_OVERRIDE+= farsight2.pc.in | |
21 | 20 | |||
22 | # optionally for gstreamer unit tests | 21 | # optionally for gstreamer unit tests | |
23 | # gstreamer-check-0.10 >= 0.10.23 (GStreamer Check unittest Library) | 22 | # gstreamer-check-0.10 >= 0.10.23 (GStreamer Check unittest Library) | |
24 | 23 | |||
25 | PY_PATCHPLIST= yes | 24 | PY_PATCHPLIST= yes | |
26 | .include "../../lang/python/pyversion.mk" | 25 | .include "../../lang/python/pyversion.mk" | |
27 | 26 | |||
28 | BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.16 | 27 | BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.16 | |
29 | .include "../../devel/py-gobject/buildlink3.mk" | 28 | .include "../../devel/py-gobject/buildlink3.mk" | |
30 | .include "../../lang/python/extension.mk" | 29 | .include "../../lang/python/extension.mk" | |
31 | BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 | 30 | BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 | |
32 | .include "../../devel/glib2/buildlink3.mk" | 31 | .include "../../devel/glib2/buildlink3.mk" | |
33 | BUILDLINK_API_DEPENDS.gst-plugins0.10-bad+= gst-plugins0.10-bad>=0.10.12 | |||
34 | .include "../../multimedia/gst-plugins0.10-bad/buildlink3.mk" | |||
35 | BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.23 | 32 | BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.23 | |
36 | .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" | 33 | .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" | |
37 | BUILDLINK_API_DEPENDS.gst-plugins0.10-good+= gst-plugins0.10-good>=0.10.7 | |||
38 | .include "../../multimedia/gst-plugins0.10-good/buildlink3.mk" | |||
39 | BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.23 | 34 | BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.23 | |
40 | .include "../../multimedia/gstreamer0.10/buildlink3.mk" | 35 | .include "../../multimedia/gstreamer0.10/buildlink3.mk" | |
41 | BUILDLINK_API_DEPENDS.gst-python+= ${PYPKGPREFIX}-gstreamer0.10>=0.10.10 | 36 | BUILDLINK_API_DEPENDS.gst-python+= ${PYPKGPREFIX}-gstreamer0.10>=0.10.10 | |
42 | .include "../../multimedia/py-gstreamer0.10/buildlink3.mk" | 37 | .include "../../multimedia/py-gstreamer0.10/buildlink3.mk" | |
43 | .include "../../net/gupnp-igd/buildlink3.mk" | 38 | .include "../../net/gupnp-igd/buildlink3.mk" | |
44 | BUILDLINK_API_DEPENDS.libnice+= libnice>=0.0.11 | 39 | BUILDLINK_API_DEPENDS.libnice+= libnice>=0.0.11 | |
45 | .include "../../net/libnice/buildlink3.mk" | 40 | .include "../../net/libnice/buildlink3.mk" | |
46 | .include "../../textproc/gtk-doc/buildlink3.mk" | 41 | .include "../../textproc/gtk-doc/buildlink3.mk" | |
47 | .include "../../x11/py-gtk2/buildlink3.mk" | 42 | .include "../../x11/py-gtk2/buildlink3.mk" | |
48 | .include "../../mk/bsd.pkg.mk" | 43 | .include "../../mk/bsd.pkg.mk" |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.1.1.1 2009/08/17 21:13:04 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.2 2010/08/05 18:55:18 drochner Exp $ | |
2 | include/gstreamer-0.10/gst/farsight/fs-base-conference.h | 2 | include/gstreamer-0.10/gst/farsight/fs-base-conference.h | |
3 | include/gstreamer-0.10/gst/farsight/fs-candidate.h | 3 | include/gstreamer-0.10/gst/farsight/fs-candidate.h | |
4 | include/gstreamer-0.10/gst/farsight/fs-codec.h | 4 | include/gstreamer-0.10/gst/farsight/fs-codec.h | |
5 | include/gstreamer-0.10/gst/farsight/fs-conference-iface.h | 5 | include/gstreamer-0.10/gst/farsight/fs-conference-iface.h | |
6 | include/gstreamer-0.10/gst/farsight/fs-element-added-notifier.h | 6 | include/gstreamer-0.10/gst/farsight/fs-element-added-notifier.h | |
7 | include/gstreamer-0.10/gst/farsight/fs-enum-types.h | 7 | include/gstreamer-0.10/gst/farsight/fs-enum-types.h | |
8 | include/gstreamer-0.10/gst/farsight/fs-interfaces.h | 8 | include/gstreamer-0.10/gst/farsight/fs-interfaces.h | |
9 | include/gstreamer-0.10/gst/farsight/fs-participant.h | 9 | include/gstreamer-0.10/gst/farsight/fs-participant.h | |
10 | include/gstreamer-0.10/gst/farsight/fs-plugin.h | 10 | include/gstreamer-0.10/gst/farsight/fs-plugin.h | |
11 | include/gstreamer-0.10/gst/farsight/fs-session.h | 11 | include/gstreamer-0.10/gst/farsight/fs-session.h | |
12 | include/gstreamer-0.10/gst/farsight/fs-stream-transmitter.h | 12 | include/gstreamer-0.10/gst/farsight/fs-stream-transmitter.h | |
13 | include/gstreamer-0.10/gst/farsight/fs-stream.h | 13 | include/gstreamer-0.10/gst/farsight/fs-stream.h | |
14 | include/gstreamer-0.10/gst/farsight/fs-transmitter.h | 14 | include/gstreamer-0.10/gst/farsight/fs-transmitter.h | |
@@ -17,42 +17,42 @@ lib/farsight2-0.0/libnice-transmitter.la | @@ -17,42 +17,42 @@ lib/farsight2-0.0/libnice-transmitter.la | |||
17 | lib/farsight2-0.0/librawudp-transmitter.la | 17 | lib/farsight2-0.0/librawudp-transmitter.la | |
18 | lib/gstreamer-0.10/libfsfunnel.la | 18 | lib/gstreamer-0.10/libfsfunnel.la | |
19 | lib/gstreamer-0.10/libfsmsnconference.la | 19 | lib/gstreamer-0.10/libfsmsnconference.la | |
20 | lib/gstreamer-0.10/libfsrtcpfilter.la | 20 | lib/gstreamer-0.10/libfsrtcpfilter.la | |
21 | lib/gstreamer-0.10/libfsrtpconference.la | 21 | lib/gstreamer-0.10/libfsrtpconference.la | |
22 | lib/gstreamer-0.10/libfsvideoanyrate.la | 22 | lib/gstreamer-0.10/libfsvideoanyrate.la | |
23 | lib/libgstfarsight-0.10.la | 23 | lib/libgstfarsight-0.10.la | |
24 | lib/pkgconfig/farsight2-0.10.pc | 24 | lib/pkgconfig/farsight2-0.10.pc | |
25 | ${PYSITELIB}/farsight.la | 25 | ${PYSITELIB}/farsight.la | |
26 | share/gtk-doc/html/farsight2-libs-0.10/FsBaseConference.html | 26 | share/gtk-doc/html/farsight2-libs-0.10/FsBaseConference.html | |
27 | share/gtk-doc/html/farsight2-libs-0.10/FsConference.html | 27 | share/gtk-doc/html/farsight2-libs-0.10/FsConference.html | |
28 | share/gtk-doc/html/farsight2-libs-0.10/FsElementAddedNotifier.html | 28 | share/gtk-doc/html/farsight2-libs-0.10/FsElementAddedNotifier.html | |
29 | share/gtk-doc/html/farsight2-libs-0.10/FsParticipant.html | 29 | share/gtk-doc/html/farsight2-libs-0.10/FsParticipant.html | |
30 | share/gtk-doc/html/farsight2-libs-0.10/FsSession.html | |||
31 | share/gtk-doc/html/farsight2-libs-0.10/FsStream.html | 30 | share/gtk-doc/html/farsight2-libs-0.10/FsStream.html | |
32 | share/gtk-doc/html/farsight2-libs-0.10/FsStreamTransmitter.html | 31 | share/gtk-doc/html/farsight2-libs-0.10/FsStreamTransmitter.html | |
33 | share/gtk-doc/html/farsight2-libs-0.10/FsTransmitter.html | 32 | share/gtk-doc/html/farsight2-libs-0.10/FsTransmitter.html | |
34 | share/gtk-doc/html/farsight2-libs-0.10/ch01.html | 33 | share/gtk-doc/html/farsight2-libs-0.10/ch01.html | |
35 | share/gtk-doc/html/farsight2-libs-0.10/ch02.html | 34 | share/gtk-doc/html/farsight2-libs-0.10/ch02.html | |
36 | share/gtk-doc/html/farsight2-libs-0.10/ch03.html | 35 | share/gtk-doc/html/farsight2-libs-0.10/ch03.html | |
37 | share/gtk-doc/html/farsight2-libs-0.10/ch04.html | 36 | share/gtk-doc/html/farsight2-libs-0.10/ch04.html | |
38 | share/gtk-doc/html/farsight2-libs-0.10/ch05.html | 37 | share/gtk-doc/html/farsight2-libs-0.10/ch05.html | |
39 | share/gtk-doc/html/farsight2-libs-0.10/ch06.html | 38 | share/gtk-doc/html/farsight2-libs-0.10/ch06.html | |
40 | share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-0.10.devhelp | 39 | share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-0.10.devhelp | |
41 | share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-0.10.devhelp2 | 40 | share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-0.10.devhelp2 | |
42 | share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsCandidate.html | 41 | share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsCandidate.html | |
43 | share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsCodec.html | 42 | share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsCodec.html | |
44 | share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsPlugin.html | 43 | share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsPlugin.html | |
45 | share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-Network-interfaces-discovery.html | 44 | share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-Network-interfaces-discovery.html | |
45 | share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-fs-session.html | |||
46 | share/gtk-doc/html/farsight2-libs-0.10/home.png | 46 | share/gtk-doc/html/farsight2-libs-0.10/home.png | |
47 | share/gtk-doc/html/farsight2-libs-0.10/index.html | 47 | share/gtk-doc/html/farsight2-libs-0.10/index.html | |
48 | share/gtk-doc/html/farsight2-libs-0.10/index.sgml | 48 | share/gtk-doc/html/farsight2-libs-0.10/index.sgml | |
49 | share/gtk-doc/html/farsight2-libs-0.10/left.png | 49 | share/gtk-doc/html/farsight2-libs-0.10/left.png | |
50 | share/gtk-doc/html/farsight2-libs-0.10/pt01.html | 50 | share/gtk-doc/html/farsight2-libs-0.10/pt01.html | |
51 | share/gtk-doc/html/farsight2-libs-0.10/pt02.html | 51 | share/gtk-doc/html/farsight2-libs-0.10/pt02.html | |
52 | share/gtk-doc/html/farsight2-libs-0.10/right.png | 52 | share/gtk-doc/html/farsight2-libs-0.10/right.png | |
53 | share/gtk-doc/html/farsight2-libs-0.10/style.css | 53 | share/gtk-doc/html/farsight2-libs-0.10/style.css | |
54 | share/gtk-doc/html/farsight2-libs-0.10/up.png | 54 | share/gtk-doc/html/farsight2-libs-0.10/up.png | |
55 | share/gtk-doc/html/farsight2-plugins-0.10/ch01.html | 55 | share/gtk-doc/html/farsight2-plugins-0.10/ch01.html | |
56 | share/gtk-doc/html/farsight2-plugins-0.10/ch02.html | 56 | share/gtk-doc/html/farsight2-plugins-0.10/ch02.html | |
57 | share/gtk-doc/html/farsight2-plugins-0.10/ch03.html | 57 | share/gtk-doc/html/farsight2-plugins-0.10/ch03.html | |
58 | share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-0.10.devhelp | 58 | share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-0.10.devhelp |
@@ -1,12 +1,11 @@ | @@ -1,12 +1,11 @@ | |||
1 | $NetBSD: distinfo,v 1.7 2010/06/16 12:11:10 obache Exp $ | 1 | $NetBSD: distinfo,v 1.8 2010/08/05 18:55:18 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (farsight2-0.0.17.tar.gz) = 6e4b3376b9f33ab659b231bbbb2155d4e1b202cc | 3 | SHA1 (farsight2-0.0.21.tar.gz) = baf51f52eeeb81214b376ce1b9f33a22ccac7298 | |
4 | RMD160 (farsight2-0.0.17.tar.gz) = bd6238a3376d0448e32fd0c50b80ccb3220132e2 | 4 | RMD160 (farsight2-0.0.21.tar.gz) = 198feb04be765cae836c09cc3492842e1788e56b | |
5 | Size (farsight2-0.0.17.tar.gz) = 1025565 bytes | 5 | Size (farsight2-0.0.21.tar.gz) = 1090456 bytes | |
6 | SHA1 (patch-aa) = f3e9c2de47d8c73a6e28b4c63feaded395f2a2ac | 6 | SHA1 (patch-aa) = 8bca15a47ff97f751cb04247369129090f64d892 | |
7 | SHA1 (patch-ab) = 27fd12ad2d1774cbeb7c11a4cee5b40e5ea97853 | 7 | SHA1 (patch-ab) = 27fd12ad2d1774cbeb7c11a4cee5b40e5ea97853 | |
8 | SHA1 (patch-ac) = ff7eabcbbad1a81eb10ff91ea459d439866edaee | 8 | SHA1 (patch-ac) = bb2b6a6eeb807d19b420eeec07f6b0b92203bff7 | |
9 | SHA1 (patch-ad) = cfeac35e148d96e122a280d4adca54b23c369cf9 | |||
10 | SHA1 (patch-ai) = 6459729f80f592a2a333d683b05a139b499f46c6 | 9 | SHA1 (patch-ai) = 6459729f80f592a2a333d683b05a139b499f46c6 | |
11 | SHA1 (patch-aj) = 816318707d1463df27b37734baedadb338452fb0 | 10 | SHA1 (patch-aj) = c8f92433243a5741403721bb248e4471a23583eb | |
12 | SHA1 (patch-ak) = 591ab7b6afefc84443280b01c765492007686ff6 | 11 | SHA1 (patch-ak) = 591ab7b6afefc84443280b01c765492007686ff6 |
@@ -1,15 +1,13 @@ | @@ -1,15 +1,13 @@ | |||
1 | $NetBSD: patch-aa,v 1.2 2010/06/16 12:11:10 obache Exp $ | 1 | $NetBSD: patch-aa,v 1.3 2010/08/05 18:55:18 drochner Exp $ | |
2 | 2 | |||
3 | https://bugs.freedesktop.org/show_bug.cgi?id=23378 | 3 | --- configure.orig 2010-06-01 21:12:47.000000000 +0000 | |
4 | ||||
5 | --- configure.orig 2010-01-05 17:15:11.000000000 +0000 | |||
6 | +++ configure | 4 | +++ configure | |
7 | @@ -15753,7 +15753,7 @@ rm -f core conftest.err conftest.$ac_obj | 5 | @@ -14450,7 +14450,7 @@ rm -f core conftest.err conftest.$ac_obj | |
8 | $as_echo "$flag_ok" >&6; } | 6 | $as_echo "$flag_ok" >&6; } | |
9 | 7 | |||
10 | 8 | |||
11 | - if test "x$ERROR_CFLAGS" == "x" | 9 | - if test "x$ERROR_CFLAGS" == "x" | |
12 | + if test "x$ERROR_CFLAGS" = "x" | 10 | + if test "x$ERROR_CFLAGS" = "x" | |
13 | then | 11 | then | |
14 | 12 | |||
15 | { $as_echo "$as_me:$LINENO: checking to see if compiler understands -errwarn=%all" >&5 | 13 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -errwarn=%all" >&5 |
@@ -1,15 +1,13 @@ | @@ -1,15 +1,13 @@ | |||
1 | $NetBSD: patch-ac,v 1.1.1.1 2009/08/17 21:13:04 wiz Exp $ | 1 | $NetBSD: patch-ac,v 1.2 2010/08/05 18:55:18 drochner Exp $ | |
2 | 2 | |||
3 | https://bugs.freedesktop.org/show_bug.cgi?id=23378 | 3 | --- common/glib-gen.mak.orig 2010-05-18 21:07:38.000000000 +0000 | |
4 | ||||
5 | --- common/glib-gen.mak.orig 2009-07-21 01:09:25.000000000 +0000 | |||
6 | +++ common/glib-gen.mak | 4 | +++ common/glib-gen.mak | |
7 | @@ -26,7 +26,7 @@ enum_headers=$(foreach h,$(glib_enum_hea | 5 | @@ -26,7 +26,7 @@ enum_headers=$(foreach h,$(glib_enum_hea | |
8 | $^ > $@ | 6 | $^ > $@ | |
9 | 7 | |||
10 | %-enumtypes.c: $(glib_enum_headers) | 8 | %-enumtypes.c: $(glib_enum_headers) | |
11 | - @if test "x$(glib_enum_headers)" == "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi | 9 | - @if test "x$(glib_enum_headers)" == "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi | |
12 | + @if test "x$(glib_enum_headers)" = "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi | 10 | + @if test "x$(glib_enum_headers)" = "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi | |
13 | glib-mkenums \ | 11 | $(AM_V_GEN)glib-mkenums \ | |
14 | --fhead "#include \"$*-enumtypes.h\"\n$(enum_headers)" \ | 12 | --fhead "#include \"$*-enumtypes.h\"\n$(enum_headers)" \ | |
15 | --fprod "\n/* enumerations from \"@filename@\" */" \ | 13 | --fprod "\n/* enumerations from \"@filename@\" */" \ |
@@ -1,12 +1,12 @@ | @@ -1,12 +1,12 @@ | |||
1 | $NetBSD: patch-aj,v 1.1 2009/08/27 18:39:19 hasso Exp $ | 1 | $NetBSD: patch-aj,v 1.2 2010/08/05 18:55:18 drochner Exp $ | |
2 | 2 | |||
3 | --- gst-libs/gst/farsight/fs-interfaces.c.orig 2009-08-27 21:16:13 +0300 | 3 | --- gst-libs/gst/farsight/fs-interfaces.c.orig 2010-05-31 19:20:03.000000000 +0000 | |
4 | +++ gst-libs/gst/farsight/fs-interfaces.c 2009-08-27 21:16:41 +0300 | 4 | +++ gst-libs/gst/farsight/fs-interfaces.c | |
5 | @@ -49,6 +49,7 @@ GST_DEBUG_CATEGORY_EXTERN (fs_base_confe | 5 | @@ -44,6 +44,7 @@ | |
6 | #include <net/if.h> | 6 | #include <sys/socket.h> | |
7 | #include <net/if_arp.h> | 7 | #include <ifaddrs.h> | |
8 | #include <arpa/inet.h> | 8 | #endif | |
9 | +#include <netinet/in.h> | 9 | +#include <netinet/in.h> | |
10 | 10 | |||
11 | /** | 11 | #include <gst/gst.h> | |
12 | * SECTION:fs-interfaces | 12 |