summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gst-libav.mk4
-rw-r--r--src/gst-plugins-bad.mk4
-rw-r--r--src/gst-plugins-base.mk4
-rw-r--r--src/gst-plugins-good.mk4
-rw-r--r--src/gst-plugins-ugly-1-fixes.patch104
-rw-r--r--src/gst-plugins-ugly.mk4
-rw-r--r--src/gstreamer.mk4
7 files changed, 12 insertions, 116 deletions
diff --git a/src/gst-libav.mk b/src/gst-libav.mk
index d3d3af0..c940a32 100644
--- a/src/gst-libav.mk
+++ b/src/gst-libav.mk
@@ -3,8 +3,8 @@
PKG := gst-libav
$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gst-libav.html
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.12.4
-$(PKG)_CHECKSUM := 2a56aa5d2d8cd912f2bce17f174713d2c417ca298f1f9c28ee66d4aa1e1d9e62
+$(PKG)_VERSION := 1.14.0
+$(PKG)_CHECKSUM := fb134b4d3e054746ef8b922ff157b0c7903d1fdd910708a45add66954da7ef89
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
diff --git a/src/gst-plugins-bad.mk b/src/gst-plugins-bad.mk
index 9805d51..6c2119a 100644
--- a/src/gst-plugins-bad.mk
+++ b/src/gst-plugins-bad.mk
@@ -3,8 +3,8 @@
PKG := gst-plugins-bad
$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gst-plugins-bad.html
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.12.4
-$(PKG)_CHECKSUM := 0c7857be16686d5c1ba6e34bd338664d3d4599d32714a8eca5c8a41a101e2d08
+$(PKG)_VERSION := 1.14.0
+$(PKG)_CHECKSUM := ed5e2badb6f2858f60017b93334d91fe58a0e3f85ed2f37f2e931416fafb4f9f
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
diff --git a/src/gst-plugins-base.mk b/src/gst-plugins-base.mk
index 1439dd1..1d1a036 100644
--- a/src/gst-plugins-base.mk
+++ b/src/gst-plugins-base.mk
@@ -3,8 +3,8 @@
PKG := gst-plugins-base
$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gst-plugins-base.html
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.12.4
-$(PKG)_CHECKSUM := 4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282
+$(PKG)_VERSION := 1.14.0
+$(PKG)_CHECKSUM := 7e904660ff56e02b036cf7fdfb77a50a540828ca9d2614d69ba931772e5b6940
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
diff --git a/src/gst-plugins-good.mk b/src/gst-plugins-good.mk
index ec8dcbf..5a8f8b8 100644
--- a/src/gst-plugins-good.mk
+++ b/src/gst-plugins-good.mk
@@ -3,8 +3,8 @@
PKG := gst-plugins-good
$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gst-plugins-good.html
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.12.4
-$(PKG)_CHECKSUM := 649f49bec60892d47ee6731b92266974c723554da1c6649f21296097715eb957
+$(PKG)_VERSION := 1.14.0
+$(PKG)_CHECKSUM := 6afa35747d528d3ab4ed8f5eac13f7235d7d28100d6a24dd78f81ec7c0d04688
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
diff --git a/src/gst-plugins-ugly-1-fixes.patch b/src/gst-plugins-ugly-1-fixes.patch
deleted file mode 100644
index a0d837b..0000000
--- a/src/gst-plugins-ugly-1-fixes.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-Contains ad hoc patches for cross building.
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
-Date: Wed, 28 Feb 2018 10:07:13 +0000
-Subject: [PATCH 1/1] x264enc: fix build with newer x264 with support for
- multiple bit depths
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-taken from:
-https://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/patch/?id=94562286b48a73bd0dc8f6f0bc4e47cb547831a9
-
-libx264 used to be built for one specific bit depth, and if we
-wanted to support multiple bit depths we would have to dynamically
-load the right .so from different paths. That has changed now, and
-libx264 can include support for multiple depths in the same lib,
-so we don't need to do the dlopen() dance any more. We'll keep
-the vtable stuff around until we can drop support for older x264.
-
-gstx264enc.c:2927:36: error: ‘x264_bit_depth’ undeclared
-
-https://bugzilla.gnome.org/show_bug.cgi?id=792111
-
-diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c
-index 1111111..2222222 100644
---- a/ext/x264/gstx264enc.c
-+++ b/ext/x264/gstx264enc.c
-@@ -117,7 +117,9 @@ struct _GstX264EncVTable
- {
- GModule *module;
-
-+#if X264_BUILD < 153
- const int *x264_bit_depth;
-+#endif
- const int *x264_chroma_format;
- void (*x264_encoder_close) (x264_t *);
- int (*x264_encoder_delayed_frames) (x264_t *);
-@@ -170,8 +172,9 @@ load_x264 (const gchar * filename)
- "' from '%s'. Incompatible version?", filename);
- goto error;
- }
--
-+#if X264_BUILD < 153
- LOAD_SYMBOL (x264_bit_depth);
-+#endif
- LOAD_SYMBOL (x264_chroma_format);
- LOAD_SYMBOL (x264_encoder_close);
- LOAD_SYMBOL (x264_encoder_delayed_frames);
-@@ -288,6 +291,7 @@ gst_x264_enc_add_x264_chroma_format (GstStructure * s,
- return ret;
- }
-
-+#if X264_BUILD < 153
- static gboolean
- load_x264_libraries (void)
- {
-@@ -326,6 +330,33 @@ load_x264_libraries (void)
- return TRUE;
- }
-
-+#else /* X264_BUILD >= 153 */
-+
-+static gboolean
-+load_x264_libraries (void)
-+{
-+#if X264_BIT_DEPTH == 0 /* all */
-+ vtable_8bit = &default_vtable;
-+ vtable_10bit = &default_vtable;
-+#elif X264_BIT_DEPTH == 8
-+ vtable_8bit = &default_vtable;
-+#elif X264_BIT_DEPTH == 10
-+ vtable_10bit = &default_vtable;
-+#else
-+#error "unexpected X264_BIT_DEPTH value"
-+#endif
-+
-+#ifdef HAVE_X264_ADDITIONAL_LIBRARIES
-+ GST_WARNING ("Ignoring configured additional libraries %s, using libx264 "
-+ "version enabled for multiple bit depths",
-+ HAVE_X264_ADDITIONAL_LIBRARIES);
-+#endif
-+
-+ return TRUE;
-+}
-+
-+#endif
-+
- enum
- {
- ARG_0,
-@@ -2897,7 +2928,9 @@ plugin_init (GstPlugin * plugin)
- * if needed. We can't initialize statically because these values are not
- * constant on Windows. */
- default_vtable.module = NULL;
-+#if X264_BUILD < 153
- default_vtable.x264_bit_depth = &x264_bit_depth;
-+#endif
- default_vtable.x264_chroma_format = &x264_chroma_format;
- default_vtable.x264_encoder_close = x264_encoder_close;
- default_vtable.x264_encoder_delayed_frames = x264_encoder_delayed_frames;
diff --git a/src/gst-plugins-ugly.mk b/src/gst-plugins-ugly.mk
index d694a23..dbc7a51 100644
--- a/src/gst-plugins-ugly.mk
+++ b/src/gst-plugins-ugly.mk
@@ -3,8 +3,8 @@
PKG := gst-plugins-ugly
$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gst-plugins-ugly.html
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.12.4
-$(PKG)_CHECKSUM := 1c165b8d888ed350acd8e6ac9f6fe06508e6fcc0a3afc6ccc9fbeb30df9be522
+$(PKG)_VERSION := 1.14.0
+$(PKG)_CHECKSUM := 3fb9ea5fc8a2de4b3eaec4128d71c6a2d81dd19befe1cd87cb833b98bcb542d1
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
diff --git a/src/gstreamer.mk b/src/gstreamer.mk
index 10501d3..2016a63 100644
--- a/src/gstreamer.mk
+++ b/src/gstreamer.mk
@@ -3,8 +3,8 @@
PKG := gstreamer
$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gstreamer.html
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.12.4
-$(PKG)_CHECKSUM := 5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674
+$(PKG)_VERSION := 1.14.0
+$(PKG)_CHECKSUM := fc361367f0d4b780a868a8833f9f30b9c9f4ac9faea4e6b251db8b4b0398466e
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)