[packages/gstreamer-libav] up to 1.14.2

[atler]

commit 105243b196602cd8422c0c9ae1cf39e043279f1b
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Sep 9 14:33:03 2018 +0200

    up to 1.14.2
    
    - dropped crystalhd patch (crystalhd is explicitly disabled in internal libav)
    - dirty fix for messed up linking

 gstreamer-libav.spec | 13 +++++++------
 link-crystalhd.patch | 38 --------------------------------------
 link.patch           | 11 +++++++++++
 3 files changed, 18 insertions(+), 44 deletions(-)
---
diff --git a/gstreamer-libav.spec b/gstreamer-libav.spec
index b828325..ced0933 100644
--- a/gstreamer-libav.spec
+++ b/gstreamer-libav.spec
@@ -14,8 +14,8 @@
 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.12.4
-Release:	2
+Version:	1.14.2
+Release:	1
 %if %{with gpl}
 License:	GPL v2+
 %else
@@ -23,8 +23,8 @@ License:	LGPL v2+
 %endif
 Group:		Libraries
 Source0:	https://gstreamer.freedesktop.org/src/gst-libav/%{gstname}-%{version}.tar.xz
-# Source0-md5:	8a851bf2e475e90a3fdac9506e3e4dbd
-Patch0:		link-crystalhd.patch
+# Source0-md5:	da3d4655268bc6766a261065ca737590
+Patch0:		link.patch
 URL:		https://gstreamer.freedesktop.org/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake >= 1:1.14
@@ -46,13 +46,14 @@ BuildRequires:	ffmpeg-devel >= %{ffmpeg_ver}
 # libav dependencies
 BuildRequires:	SDL-devel
 BuildRequires:	bzip2-devel
+BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xz-devel
 BuildRequires:	zlib-devel
 %ifarch %{ix86} %{x8664}
 BuildRequires:	yasm
 %endif
-%if %{with vdpau}
 BuildRequires:	libvdpau-devel
+%if %{with vdpau}
 BuildRequires:	xorg-lib-libXvMC-devel
 %endif
 %endif
@@ -106,7 +107,7 @@ Dokumentacja API do wtyczki GStreamera libav.
 
 %prep
 %setup -q -n %{gstname}-%{version}
-%{!?with_system_ffmpeg:%patch0 -p1}
+%patch0 -p1
 
 %build
 %{__libtoolize}
diff --git a/link-crystalhd.patch b/link-crystalhd.patch
deleted file mode 100644
index c4c47d6..0000000
--- a/link-crystalhd.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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)
- 
diff --git a/link.patch b/link.patch
new file mode 100644
index 0000000..ed2cad4
--- /dev/null
+++ b/link.patch
@@ -0,0 +1,11 @@
+--- gst-libav-1.14.2.orig/ext/libav/Makefile.am	2018-09-09 14:03:44.854038903 +0200
++++ gst-libav-1.14.2/ext/libav/Makefile.am	2018-09-09 14:05:02.174150234 +0200
+@@ -22,7 +28,7 @@
+ libgstlibav_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
+ 	-lgstaudio-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
+ 	-lgstpbutils-$(GST_API_VERSION) $(GST_BASE_LIBS) \
+-	 $(LIBAV_LIBS) $(WIN32_LIBS) -lz $(BZ2_LIBS) $(LZMA_LIBS)
++	 $(LIBAV_LIBS) $(WIN32_LIBS) -lz $(BZ2_LIBS) $(LZMA_LIBS) -lvdpau -lX11
+ libgstlibav_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
+ 
+ if HAVE_LIBAV_UNINSTALLED
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gstreamer-libav.git/commitdiff/105243b196602cd8422c0c9ae1cf39e043279f1b