Package: getstream
Version: 20081204-1
Severity: normal
Tags: patch
User: vor...@debian.org
Usertags: multiarch
Hi Herve,
getstream needs an update for building in a multiarch environment, because
the Makefile hard-codes include paths for glib-2.0 headers. It should
instead use the output of pkg-config, which is the standard query interface
for this information.
A fix for this issue is attached; it's been uploaded to Ubuntu with the
following changelog:
* debian/patches/use-pkgconfig: use pkg-config to query the correct header
path for glib-2.0 instead of hard-coding a path, fixing a build failure
under multiarch. LP: #749147.
Please consider applying this in Debian as well.
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -u getstream-20081204/debian/control getstream-20081204/debian/control
--- getstream-20081204/debian/control
+++ getstream-20081204/debian/control
@@ -2,7 +2,7 @@
Section: net
Priority: extra
Maintainer: Herve Rousseau <he...@moulticast.net>
-Build-Depends: debhelper (>= 5), libevent-dev, libglib2.0-dev, dpatch
+Build-Depends: debhelper (>= 5), libevent-dev, libglib2.0-dev, dpatch, pkg-config
Vcs-Git: git://hydra.gt.owl.de/getstream.git
Standards-Version: 3.8.3
Homepage: http://silicon-verl.de/home/flo/projects/streaming/
diff -u getstream-20081204/debian/patches/00list getstream-20081204/debian/patches/00list
--- getstream-20081204/debian/patches/00list
+++ getstream-20081204/debian/patches/00list
@@ -1,0 +2 @@
+use-pkgconfig
--- getstream-20081204.orig/debian/patches/use-pkgconfig.dpatch
+++ getstream-20081204/debian/patches/use-pkgconfig.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use-pkgconfig.dpatch by Steve Langasek <steve.langa...@linaro.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use pkg-config instead of hard-coding a glib header path, to fix
+## DP: build failure under multiarch.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/Makefile getstream-20081204/Makefile
+--- getstream-20081204~/Makefile 2008-12-04 06:21:07.000000000 -0800
++++ getstream-20081204/Makefile 2011-04-11 10:19:09.659399230 -0700
+@@ -1,6 +1,6 @@
+ CC=gcc
+-CFLAGS=-O0 -g -Wall -I. -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/
+-LDFLAGS=-levent -lglib-2.0 -lpthread
++CFLAGS=-O0 -g -Wall -I. $(shell pkg-config --cflags glib-2.0)
++LDFLAGS=-levent $(shell pkg-config --libs glib-2.0) -lpthread
+ OBJ-getstream=getstream.o fe.o crc32.o \
+ libhttp.o libconf.o config.o util.o logging.o \
+ stream.o input.o \
