ports/146856: [PATCH] net-im/libpurple: fix 'make build' with WITHOUT_GSTREAMER defined

[Sunpoet Po-Chuan Hsieh]

>Number:         146856
>Category:       ports
>Synopsis:       [PATCH] net-im/libpurple: fix 'make build' with WITHOUT_GSTREAMER defined
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 23 08:30:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.1-PRERELEASE amd64
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0: Wed May 19 00:13:00 CST 2010
>Description:
Fix 'make build' with WITHOUT_GSTREAMER defined.

Added file(s):
- files/patch-libpurple-media-backend-fs2.h

Port maintainer (marcus at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
No gstreamer installed.

% cd /usr/ports/net-im/libpurple
% make WITHOUT_GSTREAMER=yes
...
gmake[4]: Entering directory `/usr/ports/works/usr/ports/net-im/libpurple/work/pidgin-2.7.0/libpurple'
/bin/sh ../libtool --silent  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I..  -DDATADIR=\"/usr/local/share\" -DLIBDIR=\"/usr/local/lib/purple-2/\" -DLOCALEDIR=\"/usr/local/share/locale\" -DSYSCONFDIR=\"/usr/local/etc\" -D_REENTRANT -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include   -Wall  -DPURPLE_DISABLE_DEPRECATED -DPIDGIN_DISABLE_DEPRECATED -DFINCH_DISABLE_DEPRECATED -DGNT_DISABLE_DEPRECATED -Waggregate-return -Wcast-align -Wdeclaration-after-statement -Wendif-labels -Werror-implicit-function-declaration -Wextra -Wno-sign-compare -Wno-unused-parameter -Wformat-security -Winit-self -Wmissing-declarations -Wmissing-noreturn -Wmissing-prototypes -Wpointer-arith -Wundef  -I/usr/local/include/libxml2 -I/usr/local/include      -I/usr/local/include     -I/usr/local/include   -g -O2 -pipe -s -mmmx -msse -msse2 -msse3 -march=nocona -mtune=nocona -march=nocona -D_XOPEN_SOURCE_EXTENDED -fno-strict-aliasing -MT backend-fs2.lo -MD -MP -MF .deps/backend-fs2.Tpo -c 
 -o backend-fs2.lo `test -f 'media/backend-fs2.c' || echo './'`media/backend-fs2.c
In file included from ./internal.h:50,
                 from media/backend-fs2.c:27:
/usr/local/include/libintl.h:91:25: warning: "__APPLE_CC__" is not defined
/usr/local/include/libintl.h:113:24: warning: "__APPLE_CC__" is not defined
In file included from media/backend-fs2.c:29:
media/backend-fs2.h:62:21: error: gst/gst.h: No such file or directory
In file included from media/backend-fs2.c:29:
media/backend-fs2.h:63: error: expected '=', ',', ';', 'asm' or '__attribute__' before '*' token
media/backend-fs2.h:66: error: expected '=', ',', ';', 'asm' or '__attribute__' before '*' token
gmake[4]: *** [backend-fs2.lo] Error 1
gmake[4]: Leaving directory `/usr/ports/works/usr/ports/net-im/libpurple/work/pidgin-2.7.0/libpurple'
gmake[3]: *** [all-recursive] Error 1
gmake[3]: Leaving directory `/usr/ports/works/usr/ports/net-im/libpurple/work/pidgin-2.7.0/libpurple'
gmake[2]: *** [all] Error 2
gmake[2]: Leaving directory `/usr/ports/works/usr/ports/net-im/libpurple/work/pidgin-2.7.0/libpurple'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory `/usr/ports/works/usr/ports/net-im/libpurple/work/pidgin-2.7.0'
gmake: *** [all] Error 2
*** Error code 1

Stop in /usr/ports/net-im/libpurple.

>Fix:

--- libpurple-2.7.0_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-im/libpurple/files/patch-libpurple-media-backend-fs2.h /usr/ports/sunpoet/libpurple/files/patch-libpurple-media-backend-fs2.h
--- /usr/ports/net-im/libpurple/files/patch-libpurple-media-backend-fs2.h	1970-01-01 08:00:00.000000000 +0800
+++ /usr/ports/sunpoet/libpurple/files/patch-libpurple-media-backend-fs2.h	2010-05-23 16:08:41.000000000 +0800
@@ -0,0 +1,18 @@
+--- libpurple/media/backend-fs2.h.orig	2010-05-22 16:51:01.677902000 +0800
++++ libpurple/media/backend-fs2.h	2010-05-23 16:07:07.000000000 +0800
+@@ -59,6 +59,7 @@
+  * Temporary function in order to be able to test while
+  * integrating with PurpleMedia
+  */
++#ifdef USE_GSTREAMER
+ #include <gst/gst.h>
+ GstElement *purple_media_backend_fs2_get_src(
+ 		PurpleMediaBackendFs2 *self,
+@@ -70,6 +71,7 @@
+ 		const gchar *sess_id, double level);
+ void purple_media_backend_fs2_set_output_volume(PurpleMediaBackendFs2 *self,
+ 		const gchar *sess_id, const gchar *who, double level);
++#endif
+ /* end tmp */
+ 
+ G_END_DECLS
--- libpurple-2.7.0_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: