summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Vatagin <pavelvat@gmail.com>2017-02-19 15:16:32 (GMT)
committerPavel Vatagin <pavelvat@gmail.com>2017-07-15 20:59:43 (GMT)
commitd944eeca1a7cefe4b5f164d7bc916494728e0bce (patch)
tree66470088e3453e1ca7c5a3cc7766a99873975ec6
parentd66a2e92e07470e4cfa32cf84b4fc3acbe85ac1b (diff)
downloadmxe-d944eeca1a7cefe4b5f164d7bc916494728e0bce.zip
mxe-d944eeca1a7cefe4b5f164d7bc916494728e0bce.tar.gz
mxe-d944eeca1a7cefe4b5f164d7bc916494728e0bce.tar.bz2
update gstreamer
-rw-r--r--plugins/apps/clementine_qt4.mk3
-rw-r--r--src/gst-libav.mk4
-rw-r--r--src/gst-plugins-bad.mk20
-rw-r--r--src/gst-plugins-base-1-intrinsics.patch31
-rw-r--r--src/gst-plugins-base.mk20
-rw-r--r--src/gst-plugins-good.mk20
-rw-r--r--src/gst-plugins-ugly.mk22
-rw-r--r--src/gstreamer.mk21
8 files changed, 50 insertions, 91 deletions
diff --git a/plugins/apps/clementine_qt4.mk b/plugins/apps/clementine_qt4.mk
index f271ea8..78d2c14 100644
--- a/plugins/apps/clementine_qt4.mk
+++ b/plugins/apps/clementine_qt4.mk
@@ -55,13 +55,12 @@ define $(PKG)_BUILD
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/libgstisomp4.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/libgstlame.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/libgstlibav.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
- $(INSTALL) '$(PREFIX)/$(TARGET)/bin/libgstmad.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/libgstmms.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/libgstogg.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/libgstopus.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/libgstplayback.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/libgstreplaygain.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
- $(INSTALL) '$(PREFIX)/$(TARGET)/bin/libgstsouphttpsrc.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
+ $(INSTALL) '$(PREFIX)/$(TARGET)/bin/libgstsoup.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/libgstspectrum.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/libgstspeex.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/libgsttaglib.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
diff --git a/src/gst-libav.mk b/src/gst-libav.mk
index bfcac38..7405155 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.6.2
-$(PKG)_CHECKSUM := 2597acc00171006d49f0d300440a87df51b113d557466e532153abc740db3469
+$(PKG)_VERSION := 1.12.2
+$(PKG)_CHECKSUM := 5bb735b9bb218b652ae4071ea6f6be8eaae55e9d3233aec2f36b882a27542db3
$(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 3a6e409..b65e706 100644
--- a/src/gst-plugins-bad.mk
+++ b/src/gst-plugins-bad.mk
@@ -1,10 +1,10 @@
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := gst-plugins-bad
-$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/
+$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gst-plugins-bad.html
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.6.2
-$(PKG)_CHECKSUM := 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe
+$(PKG)_VERSION := 1.12.2
+$(PKG)_CHECKSUM := 9c2c7edde4f59d74eb414e0701c55131f562e5c605a3ce9b091754f106c09e37
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
@@ -16,18 +16,16 @@ $(PKG)_DEPS := gcc chromaprint faad2 fdk-aac gst-plugins-base gstreamer gtk3
$(PKG)_UPDATE = $(subst gstreamer/refs,gst-plugins-bad/refs,$(gstreamer_UPDATE))
define $(PKG)_BUILD
- find '$(1)' -name Makefile.in \
- -exec $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' {} \; \
- -exec $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' {} \;
- cd '$(1)' && ./configure \
+ cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
$(MXE_CONFIGURE_OPTS) \
--disable-debug \
--disable-examples \
--disable-opengl \
- --mandir='$(1)/sink' \
- --docdir='$(1)/sink' \
- --with-html-dir='$(1)/sink'
- $(MAKE) -C '$(1)' -j '$(JOBS)' install
+ --mandir='$(BUILD_DIR)/sink' \
+ --docdir='$(BUILD_DIR)/sink' \
+ --with-html-dir='$(BUILD_DIR)/sink'
+ $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS)
+ $(MAKE) -C '$(BUILD_DIR)' -j 1 install
# some .dlls are installed to lib - no obvious way to change
$(if $(BUILD_SHARED),
diff --git a/src/gst-plugins-base-1-intrinsics.patch b/src/gst-plugins-base-1-intrinsics.patch
deleted file mode 100644
index 2ecdc81..0000000
--- a/src/gst-plugins-base-1-intrinsics.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-From 50e29104baadb7bd536cd75dce964743ff04518c Mon Sep 17 00:00:00 2001
-From: Timothy Gu <timothygu99@gmail.com>
-Date: Sat, 10 May 2014 17:48:40 -0700
-Subject: [PATCH] Add -msse2 for audioresample
-
-Needed with gcc 4.9. This will break non-x86 compilation -- I know.
-
-Signed-off-by: Timothy Gu <timothygu99@gmail.com>
----
- gst/audioresample/Makefile.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gst/audioresample/Makefile.in b/gst/audioresample/Makefile.in
-index 607115d..ae0056d 100644
---- a/gst/audioresample/Makefile.in
-+++ b/gst/audioresample/Makefile.in
-@@ -538,7 +538,8 @@ libgstaudioresample_la_CFLAGS = \
- $(GST_PLUGINS_BASE_CFLAGS) \
- $(GST_BASE_CFLAGS) \
- $(GST_CFLAGS) \
-- $(ORC_CFLAGS)
-+ $(ORC_CFLAGS) \
-+ -msse2
-
- libgstaudioresample_la_LIBADD = \
- $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
---
-1.9.1
-
diff --git a/src/gst-plugins-base.mk b/src/gst-plugins-base.mk
index 6b3a0d7..0b12e2c 100644
--- a/src/gst-plugins-base.mk
+++ b/src/gst-plugins-base.mk
@@ -1,10 +1,10 @@
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := gst-plugins-base
-$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/
+$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gst-plugins-base.html
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.6.2
-$(PKG)_CHECKSUM := c75dd400e451526ed71e1c4955e33d470a2581f5e71ecf84920a41c0a5c75322
+$(PKG)_VERSION := 1.12.2
+$(PKG)_CHECKSUM := 5067dce3afe197a9536fea0107c77213fab536dff4a213b07fc60378d5510675
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
@@ -13,18 +13,16 @@ $(PKG)_DEPS := gcc glib gstreamer liboil libxml2 ogg pango theora vorbis
$(PKG)_UPDATE = $(subst gstreamer/refs,gst-plugins-base/refs,$(gstreamer_UPDATE))
define $(PKG)_BUILD
- find '$(1)' -name Makefile.in \
- -exec $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' {} \; \
- -exec $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' {} \;
- cd '$(1)' && ./configure \
+ cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
$(MXE_CONFIGURE_OPTS) \
--disable-debug \
--disable-examples \
--disable-x \
- --mandir='$(1)/sink' \
- --docdir='$(1)/sink' \
- --with-html-dir='$(1)/sink'
- $(MAKE) -C '$(1)' -j '$(JOBS)' install
+ --mandir='$(BUILD_DIR)/sink' \
+ --docdir='$(BUILD_DIR)/sink' \
+ --with-html-dir='$(BUILD_DIR)/sink'
+ $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS)
+ $(MAKE) -C '$(BUILD_DIR)' -j 1 install
# some .dlls are installed to lib - no obvious way to change
$(if $(BUILD_SHARED),
diff --git a/src/gst-plugins-good.mk b/src/gst-plugins-good.mk
index 6c893c9..98888a7 100644
--- a/src/gst-plugins-good.mk
+++ b/src/gst-plugins-good.mk
@@ -1,10 +1,10 @@
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := gst-plugins-good
-$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/
+$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gst-plugins-good.html
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.6.2
-$(PKG)_CHECKSUM := 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92
+$(PKG)_VERSION := 1.12.2
+$(PKG)_CHECKSUM := 5591ee7208ab30289a30658a82b76bf87169c927572d9b794f3a41ed48e1ee96
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
@@ -14,23 +14,21 @@ $(PKG)_DEPS := gcc cairo flac gdk-pixbuf glib gst-plugins-base gstreamer jpe
$(PKG)_UPDATE = $(subst gstreamer/refs,gst-plugins-good/refs,$(gstreamer_UPDATE))
define $(PKG)_BUILD
- find '$(1)' -name Makefile.in \
- -exec $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' {} \; \
- -exec $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' {} \;
# The value for WAVE_FORMAT_DOLBY_AC3_SPDIF comes from vlc and mplayer:
# https://www.videolan.org/developers/vlc/doc/doxygen/html/vlc__codecs_8h-source.html
# https://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2004-August/019283.html
- cd '$(1)' && ./configure \
+ cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
$(MXE_CONFIGURE_OPTS) \
--disable-debug \
--disable-examples \
--disable-aalib \
$(if $(BUILD_SHARED), --disable-shout2) \
--disable-x \
- --mandir='$(1)/sink' \
- --docdir='$(1)/sink' \
- --with-html-dir='$(1)/sink'
- $(MAKE) -C '$(1)' -j '$(JOBS)' install CFLAGS='-DWAVE_FORMAT_DOLBY_AC3_SPDIF=0x0092'
+ --mandir='$(BUILD_DIR)/sink' \
+ --docdir='$(BUILD_DIR)/sink' \
+ --with-html-dir='$(BUILD_DIR)/sink'
+ $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS) CFLAGS='-DWAVE_FORMAT_DOLBY_AC3_SPDIF=0x0092'
+ $(MAKE) -C '$(BUILD_DIR)' -j 1 install CFLAGS='-DWAVE_FORMAT_DOLBY_AC3_SPDIF=0x0092'
# some .dlls are installed to lib - no obvious way to change
$(if $(BUILD_SHARED),
diff --git a/src/gst-plugins-ugly.mk b/src/gst-plugins-ugly.mk
index e44df4a..8a77431 100644
--- a/src/gst-plugins-ugly.mk
+++ b/src/gst-plugins-ugly.mk
@@ -1,31 +1,29 @@
#This file is part of MXE. See LICENSE.md for licensing information.
PKG := gst-plugins-ugly
-$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/
+$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gst-plugins-ugly.html
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.6.2
-$(PKG)_CHECKSUM := e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845
+$(PKG)_VERSION := 1.12.2
+$(PKG)_CHECKSUM := 1cc3942bbf3ea87da3e35437d4e014e991b103db22a6174f62a98c89c3f5f466
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc a52dec gst-plugins-base gstreamer lame libcdio libdvdread \
- libmad opencore-amr twolame x264
+ opencore-amr twolame x264
$(PKG)_UPDATE = $(subst gstreamer/refs,gst-plugins-ugly/refs,$(gstreamer_UPDATE))
define $(PKG)_BUILD
- find '$(1)' -name Makefile.in \
- -exec $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' {} \; \
- -exec $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' {} \;
- cd '$(1)' && ./configure \
+ cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
$(MXE_CONFIGURE_OPTS) \
--disable-debug \
--disable-examples \
--disable-opengl \
- --mandir='$(1)/sink' \
- --docdir='$(1)/sink' \
- --with-html-dir='$(1)/sink'
- $(MAKE) -C '$(1)' -j '$(JOBS)' install
+ --mandir='$(BUILD_DIR)/sink' \
+ --docdir='$(BUILD_DIR)/sink' \
+ --with-html-dir='$(BUILD_DIR)/sink'
+ $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS)
+ $(MAKE) -C '$(BUILD_DIR)' -j 1 install
# some .dlls are installed to lib - no obvious way to change
$(if $(BUILD_SHARED),
diff --git a/src/gstreamer.mk b/src/gstreamer.mk
index 7f83d4f..ea059c7 100644
--- a/src/gstreamer.mk
+++ b/src/gstreamer.mk
@@ -1,10 +1,10 @@
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := gstreamer
-$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/
+$(PKG)_WEBSITE := https://gstreamer.freedesktop.org/modules/gstreamer.html
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.6.2
-$(PKG)_CHECKSUM := 5896716bd8e089dba452932a2eff2bb6f6c9d58ff64a96635d157f1ffaf8feb2
+$(PKG)_VERSION := 1.12.2
+$(PKG)_CHECKSUM := 9fde3f39a2ea984f9e07ce09250285ce91f6e3619d186889f75b5154ecf994ba
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
@@ -12,24 +12,23 @@ $(PKG)_DEPS := gcc glib libxml2 pthreads
define $(PKG)_UPDATE
$(WGET) -q -O- 'https://cgit.freedesktop.org/gstreamer/gstreamer/refs/tags' | \
- $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9]\.[02468]\.[0-9][^']*\\)'.*,\\1,p" | \
+ $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9]\..[02468]\.[0-9][^']*\\)'.*,\\1,p" | \
$(SORT) -Vr | \
head -1
endef
define $(PKG)_BUILD
- $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' '$(1)'/gst/Makefile.in
- $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' '$(1)'/gst/Makefile.in
- cd '$(1)' && ./configure \
+ cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
$(MXE_CONFIGURE_OPTS) \
--disable-debug \
--disable-check \
--disable-tests \
--disable-examples \
- --mandir='$(1)/sink' \
- --docdir='$(1)/sink' \
- --with-html-dir='$(1)/sink'
- $(MAKE) -C '$(1)' -j '$(JOBS)' install
+ --mandir='$(BUILD_DIR)/sink' \
+ --docdir='$(BUILD_DIR)/sink' \
+ --with-html-dir='$(BUILD_DIR)/sink'
+ $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS)
+ $(MAKE) -C '$(BUILD_DIR)' -j 1 install
# some .dlls are installed to lib - no obvious way to change
$(if $(BUILD_SHARED),