[libcrystalhd/f15/master] Add patch to link against the tarball library

[Bastien Nocera]

commit 0376a23636ba92164049afd7cd72e97537c5f5e2
Author: Bastien Nocera <hadess at hadess.net>
Date:   Mon Mar 14 22:12:54 2011 +0000

    Add patch to link against the tarball library

 ...-plugin-build-against-system-libcrystalhd.patch |   59 ++++++++++++++++++++
 libcrystalhd.spec                                  |    5 ++
 2 files changed, 64 insertions(+), 0 deletions(-)
---
diff --git a/0001-making-gst-plugin-build-against-system-libcrystalhd.patch b/0001-making-gst-plugin-build-against-system-libcrystalhd.patch
new file mode 100644
index 0000000..6340908
--- /dev/null
+++ b/0001-making-gst-plugin-build-against-system-libcrystalhd.patch
@@ -0,0 +1,59 @@
+From bb811baa136ab6b933ebb2eaec8bd420cfc72671 Mon Sep 17 00:00:00 2001
+From: Narendra Sankar <nsankar at broadcom.com>
+Date: Tue, 13 Jul 2010 13:29:51 -0700
+Subject: [PATCH] making gst plugin build against system libcrystalhd
+
+Use installed library headers rather than local dev one.
+
+Signed-off-by: Jarod Wilson <jarod at redhat.com>
+---
+ filters/gst/gst-plugin/autogen.sh      |    7 +++++++
+ filters/gst/gst-plugin/src/Makefile.am |    7 ++-----
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+ mode change 100644 => 100755 filters/gst/gst-plugin/autogen.sh
+
+diff --git a/filters/gst/gst-plugin/autogen.sh b/filters/gst/gst-plugin/autogen.sh
+old mode 100644
+new mode 100755
+index 9d84a03..9347924
+--- a/filters/gst/gst-plugin/autogen.sh
++++ b/filters/gst/gst-plugin/autogen.sh
+@@ -57,6 +57,13 @@ tool_run "$autoheader"
+ tool_run "$autoconf"
+ tool_run "$automake" "-a -c"
+ 
++if test ! -f /usr/include/libcrystalhd/libcrystalhd_if.h;
++then
++  echo libcrystalhd is not installed
++  echo install it from source or a binary package and re-run this script
++  exit 1
++fi 
++
+ # if enable exists, add an -enable option for each of the lines in that file
+ if test -f enable; then
+   for a in `cat enable`; do
+diff --git a/filters/gst/gst-plugin/src/Makefile.am b/filters/gst/gst-plugin/src/Makefile.am
+index 47c5653..ba31b4c 100644
+--- a/filters/gst/gst-plugin/src/Makefile.am
++++ b/filters/gst/gst-plugin/src/Makefile.am
+@@ -3,15 +3,12 @@
+ ROOTDIR    = ../../../..
+ CC = g++
+ CPP = g++
+-INCLUDES = -I./ -I/usr/include
+-INCLUDES += -I$(ROOTDIR)/include
+-INCLUDES += -I$(ROOTDIR)/include/link
+-INCLUDES += -I$(ROOTDIR)/linux_lib/libcrystalhd
++INCLUDES = -I./ -I/usr/include -I/usr/include/libcrystalhd
+ 
+ BCMDEC_CFLAGS = $(INCLUDES) -D__LINUX_USER__ -DWMV_FILE_HANDLING
+ BCMDEC_CFLAGS += -O2  -g -Wall
+ 
+-BCMDEC_LDFLAGS = -L$(ROOTDIR)/linux_lib/libcrystalhd -lcrystalhd
++BCMDEC_LDFLAGS = -lcrystalhd
+ 
+ ##############################################################################
+ # change libgstplugin.la to something more suitable, e.g. libmysomething.la  #
+-- 
+1.7.4.1
+
diff --git a/libcrystalhd.spec b/libcrystalhd.spec
index 448f98c..4461992 100644
--- a/libcrystalhd.spec
+++ b/libcrystalhd.spec
@@ -17,6 +17,8 @@ Requires:       crystalhd-firmware
 URL:            http://www.broadcom.com/support/crystal_hd/
 # Patch generated from http://git.wilsonet.com/crystalhd.git/
 Patch0:         libcrystalhd-updates.patch
+# To build against the tarball library
+Patch1:         0001-making-gst-plugin-build-against-system-libcrystalhd.patch
 ExcludeArch:    s390 s390x
 BuildRequires:  autoconf automake
 
@@ -57,6 +59,7 @@ Requires:      %{name} = %{version}-%{release}
 Requires:      gstreamer-plugins-base
 BuildRequires: gstreamer-devel >= %{_gst}
 BuildRequires: gstreamer-plugins-base-devel >= %{_gstpb}
+BuildRequires: automake autoconf libtool
 
 %description -n gstreamer-plugin-crystalhd
 Gstreamer crystalhd decoder plugin
@@ -64,6 +67,7 @@ Gstreamer crystalhd decoder plugin
 %prep
 %setup -q -n 07032010
 %patch0 -p1
+%patch1 -p1 -R
 cp %{SOURCE1} %{SOURCE4} .
 
 %build
@@ -73,6 +77,7 @@ pushd linux_lib/libcrystalhd/ > /dev/null 2>&1
 make %{?_smp_mflags}
 popd > /dev/null 2>&1
 pushd filters/gst/gst-plugin/ > /dev/null 2>&1
+NOCONFIGURE=1 ./autogen.sh
 %configure
 
 make %{?_smp_mflags}