gstreamer and plugins: update 1.4.5 --> 1.6.2 and enable shared

4 files changed, 20 insertions, 53 deletions

diff --git a/src/gst-plugins-base.mk b/src/gst-plugins-base.mk
index a412045..1655ef1 100644
--- a/src/gst-plugins-base.mk
+++ b/src/gst-plugins-base.mk
@@ -3,8 +3,8 @@
 
 PKG             := gst-plugins-base
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.4.5
-$(PKG)_CHECKSUM := 77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d
+$(PKG)_VERSION  := 1.6.2
+$(PKG)_CHECKSUM := c75dd400e451526ed71e1c4955e33d470a2581f5e71ecf84920a41c0a5c75322
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
@@ -17,10 +17,7 @@ define $(PKG)_BUILD
         -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 \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(MXE_CONFIGURE_OPTS) \
         --disable-debug \
         --disable-examples \
         --disable-x \
@@ -29,5 +26,3 @@ define $(PKG)_BUILD
         --with-html-dir='$(1)/sink'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
-
-$(PKG)_BUILD_SHARED =
diff --git a/src/gst-plugins-good.mk b/src/gst-plugins-good.mk
index f96a87a..f65b3ef 100644
--- a/src/gst-plugins-good.mk
+++ b/src/gst-plugins-good.mk
@@ -3,13 +3,13 @@
 
 PKG             := gst-plugins-good
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.4.5
-$(PKG)_CHECKSUM := 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641
+$(PKG)_VERSION  := 1.6.2
+$(PKG)_CHECKSUM := 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc cairo flac glib gst-plugins-base gstreamer gtk2 \
-                   jpeg liboil libpng libshout libxml2 speex taglib wavpack
+$(PKG)_DEPS     := gcc cairo flac glib gst-plugins-base gstreamer jpeg \
+                   liboil libpng libshout libxml2 speex taglib wavpack
 
 $(PKG)_UPDATE = $(subst gstreamer/refs,gst-plugins-good/refs,$(gstreamer_UPDATE))
 
@@ -21,18 +21,18 @@ define $(PKG)_BUILD
     #   http://www.videolan.org/developers/vlc/doc/doxygen/html/vlc__codecs_8h-source.html
     #   http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2004-August/019283.html
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(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'
-endef
 
-$(PKG)_BUILD_SHARED =
+    # some .dlls are installed to lib - no obvious way to change
+    $(and $(BUILD_SHARED),
+    mv -v '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/')
+endef
diff --git a/src/gstreamer-1-fixes.patch b/src/gstreamer-1-fixes.patch
deleted file mode 100644
index 873dd2b..0000000
--- a/src/gstreamer-1-fixes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From 3c2f96d5bbadcff5724523612e5cf0e2d6a9ac51 Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Tue, 12 Nov 2013 02:49:49 +1100
-Subject: [PATCH] remove _chsize redefinition
-
-
-diff --git a/plugins/elements/gstfilesink.c b/plugins/elements/gstfilesink.c
-index 470ad5e..eb8dbe8 100644
---- a/plugins/elements/gstfilesink.c
-+++ b/plugins/elements/gstfilesink.c
-@@ -56,8 +56,6 @@
- #define lseek _lseeki64
- #undef off_t
- #define off_t guint64
--#undef ftruncate
--#define ftruncate _chsize
- #ifdef _MSC_VER                 /* Check if we are using MSVC, fileno is deprecated in favour */
- #define fileno _fileno          /* of _fileno */
- #endif
--- 
-1.8.4
-
diff --git a/src/gstreamer.mk b/src/gstreamer.mk
index 2509c35..d140921 100644
--- a/src/gstreamer.mk
+++ b/src/gstreamer.mk
@@ -3,8 +3,8 @@
 
 PKG             := gstreamer
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.4.5
-$(PKG)_CHECKSUM := 40801aa7f979024526258a0e94707ba42b8ab6f7d2206e56adbc4433155cb0ae
+$(PKG)_VERSION  := 1.6.2
+$(PKG)_CHECKSUM := 5896716bd8e089dba452932a2eff2bb6f6c9d58ff64a96635d157f1ffaf8feb2
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
@@ -21,10 +21,7 @@ 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 \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(MXE_CONFIGURE_OPTS) \
         --disable-debug \
         --disable-check \
         --disable-tests \
@@ -33,6 +30,8 @@ define $(PKG)_BUILD
         --docdir='$(1)/sink' \
         --with-html-dir='$(1)/sink'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
-endef
 
-$(PKG)_BUILD_SHARED =
+    # some .dlls are installed to lib - no obvious way to change
+    $(and $(BUILD_SHARED),
+    mv -v '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/')
+endef