[packages/gstreamer-libav] Fix linking with internal ffmpeg. Release 2

[megabajt]

commit 9e1b31c6a4f7911645945a7f7b2b3ec7dd4770bd
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date:   Thu Dec 10 23:17:00 2015 +0100

    Fix linking with internal ffmpeg. Release 2

 gstreamer-libav.spec |  4 +++-
 link-crystalhd.patch | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer-libav.spec b/gstreamer-libav.spec
index 691ca51..da6b50f 100644
--- a/gstreamer-libav.spec
+++ b/gstreamer-libav.spec
@@ -15,7 +15,7 @@ Summary:	GStreamer Streaming-media framework plug-in using libav
 Summary(pl.UTF-8):	Wtyczka do środowiska obróbki strumieni GStreamer używająca libav
 Name:		gstreamer-libav
 Version:	1.6.1
-Release:	1
+Release:	2
 %if %{with gpl}
 License:	GPL v2+
 %else
@@ -24,6 +24,7 @@ License:	LGPL v2+
 Group:		Libraries
 Source0:	http://gstreamer.freedesktop.org/src/gst-libav/%{gstname}-%{version}.tar.xz
 # Source0-md5:	058b22411e1690eee5b71d1ab44eab25
+Patch0:		link-crystalhd.patch
 URL:		http://gstreamer.net/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake >= 1:1.14
@@ -100,6 +101,7 @@ Dokumentacja API do wtyczki GStreamera libav.
 
 %prep
 %setup -q -n %{gstname}-%{version}
+%{!?with_system_ffmpeg:%patch0 -p1}
 
 %build
 %{__libtoolize}
diff --git a/link-crystalhd.patch b/link-crystalhd.patch
new file mode 100644
index 0000000..c4c47d6
--- /dev/null
+++ b/link-crystalhd.patch
@@ -0,0 +1,38 @@
+--- gst-libav-1.6.1/configure.ac.crystalhd	2015-12-10 22:05:00.805989084 +0100
++++ gst-libav-1.6.1/configure.ac	2015-12-10 22:15:19.024305997 +0100
+@@ -241,6 +241,11 @@ if test "x$HAVE_LZMA" = "xno"; then
+     AC_WARN([lzma not found, tiff reader will not be able to read lzma files])
+ fi
+ 
++dnl *** Check for crystalhd
++AC_MSG_CHECKING([for crystalhd])
++AC_CHECK_HEADERS([libcrystalhd/libcrystalhd_if.h],[HAVE_CRYSTALHD=yes],[HAVE_CRYSTALHD=no])
++AM_CONDITIONAL(HAVE_CRYSTALHD, test "x$HAVE_CRYSTALHD" = "xyes")
++
+ AC_ARG_ENABLE(gpl,
+               [AC_HELP_STRING([--enable-gpl], [build a GPL licensed gst-libav])])
+ AM_CONDITIONAL(GST_LIBAV_ENABLE_GPL, test "x$enable_gpl" = "xyes")
+--- gst-libav-1.6.1/ext/libav/Makefile.am.crystalhd	2015-12-10 22:15:53.568283264 +0100
++++ gst-libav-1.6.1/ext/libav/Makefile.am	2015-12-10 22:16:45.042575294 +0100
+@@ -12,6 +12,12 @@ else
+     LZMA_LIBS =
+ endif
+ 
++if HAVE_CRYSTALHD
++    CRYSTALHD_LIBS = -lcrystalhd
++else
++    CRYSTALHD_LIBS =
++endif
++
+ libgstlibav_la_SOURCES = gstav.c	\
+ 			  gstavprotocol.c	\
+ 			  gstavcodecmap.c	\
+@@ -33,7 +39,7 @@ libgstlibav_la_CFLAGS = $(LIBAV_CFLAGS)
+ libgstlibav_la_LIBADD = $(LIBAV_LIBS) $(GST_PLUGINS_BASE_LIBS) \
+ 	-lgstaudio-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
+ 	-lgstpbutils-$(GST_API_VERSION) $(GST_BASE_LIBS) \
+-	$(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS) $(LZMA_LIBS)
++	$(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS) $(LZMA_LIBS) $(CRYSTALHD_LIBS)
+ libgstlibav_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
+ libgstlibav_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gstreamer-libav.git/commitdiff/9e1b31c6a4f7911645945a7f7b2b3ec7dd4770bd