Mercurial > mxe-octave

changeset 1474:fc0c8dbcc6a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
portability fix for package gstreamer and plugins using upstream patches
author Tony Theodore <tonyt@logyst.com>
date Sun, 05 Dec 2010 22:14:01 +1100
parents e03dac290c62
children 72864135031e
files src/gst-plugins-base-1-fix-sh.patch src/gst-plugins-base.mk src/gst-plugins-good-1-fix-sh.patch src/gst-plugins-good.mk src/gstreamer-1-fix-sh.patch src/gstreamer.mk
diffstat 6 files changed, 79 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gst-plugins-base-1-fix-sh.patch	Sun Dec 05 22:14:01 2010 +1100
@@ -0,0 +1,19 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+This patch has been taken from:
+http://cgit.freedesktop.org/gstreamer/common/commit/?id=9aa18ac420a19332ec215be14a6b966cc45948cf
+
+diff --git a/m4/gst-package-release-datetime.m4 b/m4/gst-package-release-datetime.m4
+index e0b9334..126919b 100644
+--- a/common/m4/gst-package-release-datetime.m4
++++ b/common/m4/gst-package-release-datetime.m4
+@@ -37,7 +37,7 @@ AC_DEFUN([AG_GST_SET_PACKAGE_RELEASE_DATETIME],
+       GST_PACKAGE_RELEASE_DATETIME=$1
+     else
+       dnl we assume the .doap file contains the date as YYYY-MM-DD
+-      YYYY_MM_DD=`. "${srcdir}/common/extract-release-date-from-doap-file" $3 $2`;
++      YYYY_MM_DD=`sh "${srcdir}/common/extract-release-date-from-doap-file" $3 $2`;
+       if test "x$YYYY_MM_DD" != "x"; then
+         GST_PACKAGE_RELEASE_DATETIME=$YYYY_MM_DD
+       else
--- a/src/gst-plugins-base.mk	Sun Dec 05 22:08:16 2010 +1100
+++ b/src/gst-plugins-base.mk	Sun Dec 05 22:14:01 2010 +1100
@@ -22,6 +22,8 @@
     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' {} \;
+    # following autoconf call is only required for release 0.10.31
+    cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gst-plugins-good-1-fix-sh.patch	Sun Dec 05 22:14:01 2010 +1100
@@ -0,0 +1,19 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+This patch has been taken from:
+http://cgit.freedesktop.org/gstreamer/common/commit/?id=9aa18ac420a19332ec215be14a6b966cc45948cf
+
+diff --git a/m4/gst-package-release-datetime.m4 b/m4/gst-package-release-datetime.m4
+index e0b9334..126919b 100644
+--- a/common/m4/gst-package-release-datetime.m4
++++ b/common/m4/gst-package-release-datetime.m4
+@@ -37,7 +37,7 @@ AC_DEFUN([AG_GST_SET_PACKAGE_RELEASE_DATETIME],
+       GST_PACKAGE_RELEASE_DATETIME=$1
+     else
+       dnl we assume the .doap file contains the date as YYYY-MM-DD
+-      YYYY_MM_DD=`. "${srcdir}/common/extract-release-date-from-doap-file" $3 $2`;
++      YYYY_MM_DD=`sh "${srcdir}/common/extract-release-date-from-doap-file" $3 $2`;
+       if test "x$YYYY_MM_DD" != "x"; then
+         GST_PACKAGE_RELEASE_DATETIME=$YYYY_MM_DD
+       else
--- a/src/gst-plugins-good.mk	Sun Dec 05 22:08:16 2010 +1100
+++ b/src/gst-plugins-good.mk	Sun Dec 05 22:14:01 2010 +1100
@@ -25,6 +25,8 @@
     # The value for WAVE_FORMAT_DOLBY_AC3_SPDIF comes from vlc and mplayer:
     #   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
+    # following autoconf call is only required for release 0.10.26
+    cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gstreamer-1-fix-sh.patch	Sun Dec 05 22:14:01 2010 +1100
@@ -0,0 +1,35 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+This patch has been taken from:
+http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=d569bf420d5f915c6a3901b193b69757991f4da8
+
+diff --git a/configure.ac b/configure.ac
+index 7a1d69f..7d0dd5c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -236,7 +236,7 @@ AC_LANG_PUSH([C++])
+ AC_TRY_COMPILE([ class Foo { int bar; };], , working_cxx=yes, working_cxx=no)
+ AC_LANG_POP([C++])
+ AC_MSG_NOTICE([working c++ compiler found: $working_cxx])
+-AM_CONDITIONAL(HAVE_CXX, test "x$working_cxx" == "xyes")
++AM_CONDITIONAL(HAVE_CXX, test "x$working_cxx" = "xyes")
+ 
+ dnl Perl is used in building documentation and in the version checks
+ AC_PATH_PROG(PERL_PATH, perl, no)
+ 
+http://cgit.freedesktop.org/gstreamer/common/commit/?id=9aa18ac420a19332ec215be14a6b966cc45948cf
+
+diff --git a/m4/gst-package-release-datetime.m4 b/m4/gst-package-release-datetime.m4
+index e0b9334..126919b 100644
+--- a/common/m4/gst-package-release-datetime.m4
++++ b/common/m4/gst-package-release-datetime.m4
+@@ -37,7 +37,7 @@ AC_DEFUN([AG_GST_SET_PACKAGE_RELEASE_DATETIME],
+       GST_PACKAGE_RELEASE_DATETIME=$1
+     else
+       dnl we assume the .doap file contains the date as YYYY-MM-DD
+-      YYYY_MM_DD=`. "${srcdir}/common/extract-release-date-from-doap-file" $3 $2`;
++      YYYY_MM_DD=`sh "${srcdir}/common/extract-release-date-from-doap-file" $3 $2`;
+       if test "x$YYYY_MM_DD" != "x"; then
+         GST_PACKAGE_RELEASE_DATETIME=$YYYY_MM_DD
+       else
--- a/src/gstreamer.mk	Sun Dec 05 22:08:16 2010 +1100
+++ b/src/gstreamer.mk	Sun Dec 05 22:14:01 2010 +1100
@@ -21,6 +21,8 @@
 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
+    # following autoconf call is only required for release 0.10.31
+    cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \