gst-plugins-base: Update to 1.3.1

2014-05-18 17:31:02 +04:00
parent bb6ecc1850
commit 96851a7410
6 changed files with 82 additions and 44 deletions
--- a/mingw-w64-gst-plugins-base/0001-fix-test-compilation.mingw.patch
+++ b/mingw-w64-gst-plugins-base/0001-fix-test-compilation.mingw.patch
@@ -1,34 +0,0 @@
--- gst-plugins-base-1.0.6/tests/check/Makefile.am.orig	2012-10-25 14:55:18 +0400
-+++ gst-plugins-base-1.0.6/tests/check/Makefile.am	2013-04-09 15:24:40 +0400
-@@ -88,6 +88,16 @@
- cxx_checks =
- endif
- 
-+if HAVE_SYS_SOCKET_H
-+multifdsink_checks = \
-+	elements/multifdsink
-+multisocketsink_checks = \
-+	elements/multisocketsink
-+else
-+multifdsink_checks =
-+multisocketsink_checks =
-+endif
-+
- check_PROGRAMS = \
- 	$(check_ogg) \
- 	$(check_vorbis) \
-@@ -122,12 +132,12 @@
- 	elements/appsrc             \
- 	elements/audiorate          \
- 	elements/audioresample      \
-	elements/multifdsink        \
-	elements/multisocketsink    \
-+	$(multifdsink_checks)       \
-+	$(multisocketsink_checks)   \
- 	elements/playbin            \
- 	elements/playbin-complex    \
- 	$(check_pango)              \
- 	$(check_subparse)           \
- 	elements/videoconvert       \
- 	elements/videorate          \
- 	elements/videoscale         \
--- a/mingw-w64-gst-plugins-base/0006-disable-sse-detection.mingw.patch
+++ b/mingw-w64-gst-plugins-base/0006-disable-sse-detection.mingw.patch
@@ -0,0 +1,11 @@
+--- gst-plugins-base-1.2.4/configure.ac.orig	2014-04-30 15:10:52.750643300 +0000
+++ gst-plugins-base-1.2.4/configure.ac	2014-04-30 15:10:56.684142700 +0000
+@@ -173,7 +173,7 @@
+ 
+ dnl check for GCC specific SSE headers
+ dnl these are used by the speex resampler code
+-AC_CHECK_HEADERS([xmmintrin.h emmintrin.h])
+dnl AC_CHECK_HEADERS([xmmintrin.h emmintrin.h])
+ 
+ dnl used in gst/tcp
+ AC_CHECK_HEADERS([sys/socket.h],
--- a/mingw-w64-gst-plugins-base/0007-link-to-ws2.all.patch
+++ b/mingw-w64-gst-plugins-base/0007-link-to-ws2.all.patch
@@ -0,0 +1,28 @@
+--- gst-plugins-base-1.3.1/configure.ac.orig	2014-05-04 14:08:43.218715000 +0000
+++ gst-plugins-base-1.3.1/configure.ac	2014-05-04 14:54:48.638878800 +0000
+@@ -180,6 +180,14 @@
+   [HAVE_SYS_SOCKET_H="yes"], [HAVE_SYS_SOCKET_H="no"], [AC_INCLUDES_DEFAULT])
+ AM_CONDITIONAL(HAVE_SYS_SOCKET_H, test "x$HAVE_SYS_SOCKET_H" = "xyes")
+ 
+dnl used in gst-libs/gst/rtsp
+AC_CHECK_HEADERS([winsock2.h], [HAVE_WINSOCK2_H=yes], [HAVE_WINSOCK2_H=no], [AC_INCLUDES_DEFAULT])
+AM_CONDITIONAL(HAVE_WINSOCK2_H, test "x$HAVE_WINSOCK2_H" = "xyes")
+if test "x$HAVE_WINSOCK2_H" = "xyes"; then
+  WIN32_LIBS="-lws2_32"
+  AC_SUBST(WIN32_LIBS)
+fi
+
+ dnl used in gst-libs/gst/pbutils and associated unit test
+ AC_CHECK_HEADERS([process.h sys/types.h sys/wait.h sys/stat.h], [], [], [AC_INCLUDES_DEFAULT])
+ 
+--- gst-plugins-base-1.3.1/gst-libs/gst/rtsp/Makefile.am.orig	2013-04-26 06:20:28.000000000 +0000
+++ gst-plugins-base-1.3.1/gst-libs/gst/rtsp/Makefile.am	2014-05-04 14:56:48.681122200 +0000
+@@ -35,7 +35,7 @@
+ 
+ libgstrtsp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS)
+ libgstrtsp_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) $(GIO_LIBS) $(LIBM)
+-libgstrtsp_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+libgstrtsp_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) $(WIN32_LIBS)
+ 
+ BUILT_SOURCES = $(built_headers) $(built_sources)
+ EXTRA_DIST = gstrtsp-marshal.list
--- a/mingw-w64-gst-plugins-base/0008-fix-w32-examples.all.patch
+++ b/mingw-w64-gst-plugins-base/0008-fix-w32-examples.all.patch
@@ -0,0 +1,13 @@
+--- gst-plugins-base-1.3.1/tests/examples/playback/playback-test.c.orig	2014-05-04 15:01:45.245781100 +0000
+++ gst-plugins-base-1.3.1/tests/examples/playback/playback-test.c	2014-05-04 15:04:04.256433200 +0000
+@@ -2130,8 +2130,8 @@
+     g_error ("Couldn't create native window needed for GstVideoOverlay!");
+ 
+ #if defined (GDK_WINDOWING_WIN32)
+-  app->embed_xid = GDK_WINDOW_HWND (window);
+-  g_print ("Window realize: video window HWND = %lu\n", app->embed_xid);
+  app->embed_xid = (guintptr) GDK_WINDOW_HWND (window);
+  g_print ("Window realize: video window HWND = %" G_GUINTPTR_FORMAT "\n", app->embed_xid);
+ #elif defined (GDK_WINDOWING_QUARTZ)
+   app->embed_xid = (guintptr) gdk_quartz_window_get_nsview (window);
+   g_print ("Window realize: video window NSView = %p\n", app->embed_xid);
--- a/mingw-w64-gst-plugins-base/0009-fix-casting-error.patch
+++ b/mingw-w64-gst-plugins-base/0009-fix-casting-error.patch
@@ -0,0 +1,11 @@
+--- gst-plugins-base-1.3.1/gst/playback/gstplaybin2.c.orig	2014-05-18 16:13:43.062000000 +0400
+++ gst-plugins-base-1.3.1/gst/playback/gstplaybin2.c	2014-05-18 16:14:14.683200000 +0400
+@@ -3213,7 +3213,7 @@
+       gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM,
+       _uridecodebin_event_probe, group, NULL);
+   g_object_set_data (G_OBJECT (pad), "playbin.event_probe_id",
+-      (gpointer) group_id_probe_handler);
+      (gpointer) (guintptr) group_id_probe_handler);
+ 
+   if (changed) {
+     int signal;
--- a/mingw-w64-gst-plugins-base/PKGBUILD
+++ b/mingw-w64-gst-plugins-base/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=gst-plugins-base
 _mingw_suff=mingw-w64-${CARCH}
 pkgname="${_mingw_suff}-${_realname}"
-pkgver=1.2.4
-pkgrel=2
+pkgver=1.3.1
+pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Base Plugins (mingw-w64)"
 arch=('any')
 url="http://gstreamer.freedesktop.org/"
@@ -23,24 +23,33 @@ depends=("${_mingw_suff}-libvorbis"
        )
 options=(!libtool strip staticlibs)
 source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz
-    0001-fix-test-compilation.mingw.patch
-    0002-fix-test-running.mingw.patch
-    0003-fix-riff-includes.mingw.patch
-    0004-fix-X-detection.mingw.patch
-    give-cc-to-gir-scanner.mingw.patch)
-md5sums=('278e0a1872ecb981e91830b2cb7f3e98'
-         '0510d015349c55c3b713ca53566c403a'
+        0002-fix-test-running.mingw.patch
+        0003-fix-riff-includes.mingw.patch
+        0004-fix-X-detection.mingw.patch
+        0006-disable-sse-detection.mingw.patch
+        0007-link-to-ws2.all.patch
+        0008-fix-w32-examples.all.patch
+        0009-fix-casting-error.patch
+        give-cc-to-gir-scanner.mingw.patch)
+md5sums=('40eb46219b64dc1998c1a005195c0b6c'
         '006091acfeedd194fa804ea36958ea3c'
         '571194f25c8c765b5b5e5739df1271ae'
         'e4d0591f928ce2034ecfe859f4938587'
+         'ee35e5a95bdcb9e7f7f5a8848dd6dc4c'
+         '745cfb58b510b98c38400e9e263d442c'
+         'c8405c21a780105e908ed340453b7cc0'
+         '59679a91af5eea1f303c6ee59441b04a'
         '4d45f704f60a5c63b6c4c7d448d2b152')

 prepare() {
  cd ${srcdir}/${_realname}-${pkgver}
-  patch -p1 -i ${srcdir}/0001-fix-test-compilation.mingw.patch
  patch -p1 -i ${srcdir}/0002-fix-test-running.mingw.patch
  patch -p1 -i ${srcdir}/0003-fix-riff-includes.mingw.patch
  patch -p1 -i ${srcdir}/0004-fix-X-detection.mingw.patch
+  patch -p1 -i ${srcdir}/0006-disable-sse-detection.mingw.patch
+  patch -p1 -i ${srcdir}/0007-link-to-ws2.all.patch
+  patch -p1 -i ${srcdir}/0008-fix-w32-examples.all.patch
+  patch -p1 -i ${srcdir}/0009-fix-casting-error.patch
  patch -p1 -i ${srcdir}/give-cc-to-gir-scanner.mingw.patch

  NOCONFIGURE=1 ./autogen.sh