[GStreamer] Bump internal jhbuild versions to 1.6.3
authorphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Feb 2016 08:09:57 +0000 (08:09 +0000)
committerphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 Feb 2016 08:09:57 +0000 (08:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=149594

Reviewed by Michael Catanzaro.

.:

* Source/cmake/FindGStreamer.cmake: Check gst-gl version for the latest stable release of GStreamer.

Tools:

* gtk/jhbuild.modules: Bump to GStreamer 1.6.3.
* gtk/patches/gst-plugins-bad-fix-faad2-version-check.patch: Removed.
* gtk/patches/gst-plugins-bad-remove-gnustep-support.patch: Removed.
* gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch: Removed.

LayoutTests:

* platform/gtk/TestExpectations: Skipping new failing tests for now.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196804 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
LayoutTests/ChangeLog
LayoutTests/platform/gtk/TestExpectations
Source/cmake/FindGStreamer.cmake
Tools/ChangeLog
Tools/gtk/jhbuild.modules
Tools/gtk/patches/gst-plugins-bad-fix-faad2-version-check.patch [deleted file]
Tools/gtk/patches/gst-plugins-bad-remove-gnustep-support.patch [deleted file]
Tools/gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch [deleted file]

index 97a65ab..248a8f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-02-18  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] Bump internal jhbuild versions to 1.6.3
+        https://bugs.webkit.org/show_bug.cgi?id=149594
+
+        Reviewed by Michael Catanzaro.
+
+        * Source/cmake/FindGStreamer.cmake: Check gst-gl version for the latest stable release of GStreamer.
+
 2016-02-18  Anders Carlsson  <andersca@apple.com>
 
         Get rid of the "All Source (target WebProcess)" scheme.
index 70def5f..33b77e5 100644 (file)
@@ -1,3 +1,12 @@
+2016-02-18  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] Bump internal jhbuild versions to 1.6.3
+        https://bugs.webkit.org/show_bug.cgi?id=149594
+
+        Reviewed by Michael Catanzaro.
+
+        * platform/gtk/TestExpectations: Skipping new failing tests for now.
+
 2016-02-18  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r196790.
index 70b2048..4f01158 100644 (file)
@@ -482,7 +482,6 @@ webkit.org/b/141466 fast/media/mq-pointer-matchMedia.html [ Failure ]
 webkit.org/b/141466 fast/media/mq-pointer-styling.html [ Failure ]
 webkit.org/b/141466 fast/media/mq-pointer.html [ Failure ]
 
-webkit.org/b/141468 [ Release ] http/tests/media/hls/hls-audio-tracks-locale-selection.html [ Failure ]
 webkit.org/b/116259 http/tests/cache/willsendrequest-returns-null-for-memory-cache-load.html [ Failure ]
 webkit.org/b/141469 [ Release ] http/tests/media/hls/hls-progress.html [ Failure ]
 webkit.org/b/141423 svg/css/getComputedStyle-basic.xhtml [ Failure ]
@@ -567,8 +566,6 @@ webkit.org/b/146718 accessibility/aria-hidden-false-works-in-subtrees.html [ Fai
 
 webkit.org/b/146719 accessibility/aria-roledescription.html [ Failure ]
 
-webkit.org/b/146720 [ Release ] http/tests/media/hls/hls-accessiblity-describes-video.html [ Failure ]
-webkit.org/b/146720 [ Release ] http/tests/media/hls/video-controller-getStartDate.html [ Failure ]
 webkit.org/b/146720 media/accessiblity-describes-video.html [ Failure ]
 
 webkit.org/b/146724 fast/text/word-break-keep-all.html [ ImageOnlyFailure ]
@@ -646,6 +643,31 @@ webkit.org/b/153833 css3/touch-action/touch-action-manipulation-fast-clicks.html
 webkit.org/b/153833 fast/events/can-click-element-on-page-with-active-pseudo-class-and-search-field.html [ Skip ]
 webkit.org/b/153833 fast/shadow-dom/touch-event-ios.html [ Skip ]
 
+# Tests failing with GStreamer 1.6.3
+webkit.org/b/154390 http/tests/media/reload-after-dialog.html [ Timeout Failure ]
+webkit.org/b/154390 http/tests/media/video-referer.html [ Failure ]
+webkit.org/b/154390 http/tests/media/video-cancel-load.html [ Timeout Failure ]
+webkit.org/b/154390 http/tests/media/video-play-stall-before-meta-data.html [ Failure ]
+webkit.org/b/154390 http/tests/media/video-useragent.html [ Failure ]
+webkit.org/b/154390 http/tests/media/video-buffered-range-contains-currentTime.html [ Timeout Failure ]
+webkit.org/b/154390 http/tests/media/video-load-suspend.html [ Timeout Failure ]
+webkit.org/b/154390 http/tests/media/video-query-url.html [ Failure ]
+webkit.org/b/154390 http/tests/media/video-error-abort.html [ Timeout Failure ]
+webkit.org/b/154390 http/tests/media/remove-while-loading.html [ Timeout Failure ]
+webkit.org/b/154390 http/tests/media/video-throttled-load-metadata.html [ Failure ]
+webkit.org/b/154390 http/tests/media/video-served-as-text.html [ Failure ]
+webkit.org/b/154390 http/tests/media/video-load-twice.html [ Timeout Failure ]
+webkit.org/b/154390 http/tests/media/video-auth.html [ Failure ]
+webkit.org/b/154390 http/tests/media/video-redirect.html [ Failure ]
+webkit.org/b/154390 http/tests/media/hls/video-controller-getStartDate.html [ Timeout Failure ]
+webkit.org/b/154390 http/tests/media/hls/hls-audio-tracks-locale-selection.html [ Timeout Failure ]
+webkit.org/b/154390 http/tests/media/hls/hls-video-resize.html [ Timeout Failure ]
+webkit.org/b/154390 http/tests/media/hls/hls-audio-tracks.html [ Timeout Failure ]
+webkit.org/b/154390 http/tests/media/hls/hls-audio-tracks-has-audio.html [ Timeout Failure ]
+webkit.org/b/154390 http/tests/media/hls/hls-accessiblity-describes-video.html [ Timeout Failure ]
+webkit.org/b/154390 http/tests/media/hls/video-cookie.html [ Failure ]
+
+
 #////////////////////////////////////////////////////////////////////////////////////////
 # End of Expected failures
 #////////////////////////////////////////////////////////////////////////////////////////
@@ -1027,7 +1049,6 @@ webkit.org/b/132254 fast/sub-pixel/simple-clipping.html [ ImageOnlyFailure Crash
 webkit.org/b/132257 fast/history/form-submit-in-frame-via-onclick.html [ Timeout Pass ]
 webkit.org/b/132260 fast/workers/worker-close.html [ Timeout Pass ]
 webkit.org/b/132261 html5lib/generated/run-tests16-data.html [ Timeout Pass ]
-webkit.org/b/132262 http/tests/media/video-redirect.html [ Timeout Pass ]
 webkit.org/b/132267 mathml/wbr-in-mroot-crash.html [ Timeout Pass ]
 webkit.org/b/132272 fast/dom/gc-10.html [ Failure Pass ]
 webkit.org/b/132279 perf/mouse-event.html [ Failure Pass ]
@@ -1296,8 +1317,6 @@ webkit.org/b/116958 http/tests/navigation/slowtimerredirect-basic.html [ Pass Sl
 
 webkit.org/b/119264 transitions/created-while-suspended.html [ Pass Slow ]
 
-Bug(GTK) [ Release ] http/tests/media/hls/video-cookie.html [ Pass Slow ]
-
 webkit.org/b/149916 http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation.html [ Pass Slow ]
 webkit.org/b/149916 inspector/codemirror/prettyprinting-css.html [ Pass Slow ]
 webkit.org/b/149916 inspector/codemirror/prettyprinting-css-rules.html [ Pass Timeout ]
@@ -2280,8 +2299,6 @@ webkit.org/b/137109 accessibility/legend-children-are-visible.html [ Failure ]
 webkit.org/b/137695 media/video-controls-audiotracks-trackmenu.html [ Failure ]
 webkit.org/b/138074 media/video-volume-slider-drag.html [ Failure ]
 
-webkit.org/b/138073 [ Release ] http/tests/media/hls/hls-audio-tracks.html [ Failure ]
-
 # Font is clipped incorrectly
 webkit.org/b/138077 editing/caret/color-span-inside-editable-background.html [ ImageOnlyFailure ]
 webkit.org/b/138077 fast/layers/parent-clipping-overflow-is-overwritten-by-child-clipping.html [ ImageOnlyFailure ]
index acd1243..31109e5 100644 (file)
@@ -85,7 +85,7 @@ FIND_GSTREAMER_COMPONENT(GSTREAMER_BASE gstreamer-base-1.0 gstbase-1.0)
 FIND_GSTREAMER_COMPONENT(GSTREAMER_APP gstreamer-app-1.0 gstapp-1.0)
 FIND_GSTREAMER_COMPONENT(GSTREAMER_AUDIO gstreamer-audio-1.0 gstaudio-1.0)
 FIND_GSTREAMER_COMPONENT(GSTREAMER_FFT gstreamer-fft-1.0 gstfft-1.0)
-FIND_GSTREAMER_COMPONENT(GSTREAMER_GL gstreamer-gl-1.0>=1.5.0 gstgl-1.0)
+FIND_GSTREAMER_COMPONENT(GSTREAMER_GL gstreamer-gl-1.0>=1.6.0 gstgl-1.0)
 FIND_GSTREAMER_COMPONENT(GSTREAMER_MPEGTS gstreamer-mpegts-1.0>=1.4.0 gstmpegts-1.0)
 FIND_GSTREAMER_COMPONENT(GSTREAMER_PBUTILS gstreamer-pbutils-1.0 gstpbutils-1.0)
 FIND_GSTREAMER_COMPONENT(GSTREAMER_TAG gstreamer-tag-1.0 gsttag-1.0)
index f6db8f3..642ac17 100644 (file)
@@ -1,3 +1,15 @@
+2016-02-18  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] Bump internal jhbuild versions to 1.6.3
+        https://bugs.webkit.org/show_bug.cgi?id=149594
+
+        Reviewed by Michael Catanzaro.
+
+        * gtk/jhbuild.modules: Bump to GStreamer 1.6.3.
+        * gtk/patches/gst-plugins-bad-fix-faad2-version-check.patch: Removed.
+        * gtk/patches/gst-plugins-bad-remove-gnustep-support.patch: Removed.
+        * gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch: Removed.
+
 2016-02-18  Brent Fulgham  <bfulgham@apple.com>
 
         Extend HashCountedSet with a method to efficiently set the count of an entry
index 449f71d..6cbf4f6 100644 (file)
     <dependencies>
       <dep package="orc"/>
     </dependencies>
-    <branch module="gstreamer/gstreamer-1.4.4.tar.xz" version="1.4.4"
+    <branch module="gstreamer/gstreamer-${version}.tar.xz" version="1.6.3"
             repo="gstreamer"
-            hash="sha256:f0e305d91a93d05bf9e332cd4256ca07d77f5186a4d73847b7ae6db218f2c237"
-            md5sum="98f4a6d45a28dd195144baef0244ba38"/>
+            hash="sha256:22f9568d67b87cf700a111f381144bd37cb93790a77e4e331db01fe854a37f24"
+            md5sum="b4cdeb2b9cb20dd6ac022a4f417eae0d"/>
   </autotools>
 
   <autotools id="gst-plugins-base"
     <dependencies>
       <dep package="gstreamer"/>
     </dependencies>
-    <branch module="gst-plugins-base/gst-plugins-base-1.4.4.tar.xz" version="1.4.4"
+    <branch module="gst-plugins-base/gst-plugins-base-${version}.tar.xz" version="1.6.3"
             repo="gstreamer"
-            hash="sha256:49cd9e8f23c416b1607b43837a09833fa03e0106929d81ead2ddfde6c0ade44b"
-            md5sum="0c42eca8f9e4efd56d2ce8e9249ce4a1">
-      <patch file="gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch" strip="1"/>
-    </branch>
+            hash="sha256:b6154f8fdba4877e95efd94610ef0ada4f0171cd12eb829a3c3c97345d9c7a75"
+            md5sum="3ddde0ad598ef69f58d6a2e87f8b460f"/>
   </autotools>
 
   <autotools id="gst-plugins-good" autogenargs="--disable-examples --disable-soup --disable-gtk-doc">
       <dep package="gst-plugins-base"/>
     </dependencies>
 
-    <branch module="gst-plugins-good/gst-plugins-good-1.4.4.tar.xz" version="1.4.4"
+    <branch module="gst-plugins-good/gst-plugins-good-${version}.tar.xz" version="1.6.3"
             repo="gstreamer"
-            hash="sha256:2df90e99da45211c7b2525ae4ac34830a9e7784bd48c072c406c0cf014bdb277"
-            md5sum="673cf9276952bd3937dafd817c9ead2b">
-    </branch>
+            hash="sha256:24b19db70b2a83461ebddfe20033db432dadfdb5d4b54ffb1dfa0d830134a177"
+            md5sum="a1958df7aa498b42793e2f2048673815"/>
   </autotools>
 
   <autotools id="gst-plugins-bad" autogenargs="--disable-examples --disable-gtk-doc">
     <dependencies>
       <dep package="gst-plugins-base"/>
     </dependencies>
-    <branch module="gst-plugins-bad/gst-plugins-bad-1.4.4.tar.xz" version="1.4.4"
+    <branch module="gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" version="1.6.3"
             repo="gstreamer"
-            hash="sha256:e41b36105c0a13a2cb1ff9f559714e839b82dc3841484cd664790fb7947e55c7"
-            md5sum="972c6e22dd2e44fcf0b04b9d810a56be">
-      <patch file="gst-plugins-bad-remove-gnustep-support.patch" strip="1"/>
-      <patch file="gst-plugins-bad-fix-faad2-version-check.patch" strip="1"/>
-    </branch>
+            hash="sha256:971b29101d6a9c5e3fe94d99d977a227f58f0b2d29b6ca2c7f292052542b3a61"
+            md5sum="4857adcafe41e4b9b8805cf88303bd55"/>
   </autotools>
 
   <autotools id="gst-libav" autogenargs="--with-libav-extra-configure='--disable-yasm' --disable-gtk-doc">
     <dependencies>
       <dep package="gst-plugins-base"/>
     </dependencies>
-    <branch module="gst-libav/gst-libav-1.4.4.tar.xz" version="1.4.4"
+    <branch module="gst-libav/gst-libav-${version}.tar.xz" version="1.6.3"
             repo="gstreamer"
-            hash="sha256:2ec7285e5ec6731963b0955487cceb9eb04e285ca682f3ef575996c068cde8aa"
-            md5sum="64a3e2cda2687132cadca4efdc63f3b4"/>
+            hash="sha256:857b9c060a0337de38c6d26238c47352433c02eabf26c2f860c854dbc35bd4ab"
+            md5sum="cfe9a06913d4fd4067e9e47f6e05fac2"/>
   </autotools>
 
   <autotools id="xserver" autogenargs="--disable-xinerama --enable-glx --enable-composite --disable-xorg --disable-dmx --disable-xnest --disable-xquartz --disable-xwin --disable-xephyr --disable-xfake --disable-xfbdev --disable-install-setuid --disable-unit-tests --disable-present --enable-unix-transport --enable-tcp-transport --disable-local-transport --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb --with-xkb-bin-directory=/usr/bin --without-dtrace">
diff --git a/Tools/gtk/patches/gst-plugins-bad-fix-faad2-version-check.patch b/Tools/gtk/patches/gst-plugins-bad-fix-faad2-version-check.patch
deleted file mode 100644 (file)
index c037f1e..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1f738ca5b8711ca5532a326cd646312e60484863 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Wed, 13 May 2015 16:23:26 +0200
-Subject: [PATCH] fix faad2 version check
-
-On fedora 22, the output of cpp inserts extra debug comments, which
-makes our regexp for the faad2 version check fail. This in turn causes
-it to compile with the wrong arguments passed which then causes stack
-corruption and crashes.
-
-Fix this by only checking for the version (which should be by itself on
-a single line). This is potentially less safe, it might be possible that
-a similar string would appear in a later version in the header file.
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=748571
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f5ce28c..d295253 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2008,9 +2008,9 @@ AG_GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
-       AC_MSG_CHECKING([Checking FAAD2 version in $faad_hdr])
-       for minor in 10 9 8 7 6 5 0; do
-         if test x$faad2_minor_version = "x"; then
--          AC_EGREP_CPP([GST_CHECK_FAAD_VERSION \"2\.$minor\"], [
-+          AC_EGREP_CPP([\"2\.$minor\"$], [
-               #include <$faad_hdr>
--              GST_CHECK_FAAD_VERSION FAAD2_VERSION
-+              FAAD2_VERSION
-             ], [
-               faad2_minor_version=$minor
-             ])
diff --git a/Tools/gtk/patches/gst-plugins-bad-remove-gnustep-support.patch b/Tools/gtk/patches/gst-plugins-bad-remove-gnustep-support.patch
deleted file mode 100644 (file)
index fb2ab25..0000000
+++ /dev/null
@@ -1,325 +0,0 @@
-From 13c8517570c3550b5c46a3cb0ff7f8b7888a4ddf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Thu, 13 Nov 2014 11:58:07 +0100
-Subject: gl/cocoa: Remove GNUStep support
-
-Until gcc and GNUStep properly support Objective-C blocks and other
-"new" features of Objective-C we can't properly support them without
-making the code much more ugly.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=739152
-
-diff --git a/configure.ac b/configure.ac
-index fdb6c88..120cd44 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -611,7 +611,7 @@ AC_ARG_ENABLE([glx],
-      esac],[NEED_GLX=auto])
- AC_ARG_ENABLE([cocoa],
--     [  --enable-cocoa          Enable Cocoa support (using GNUstep on non OS X platforms) @<:@default=auto@:>@],
-+     [  --enable-cocoa          Enable Cocoa support @<:@default=auto@:>@],
-      [case "${enableval}" in
-        yes)  NEED_COCOA=yes ;;
-        no)   NEED_COCOA=no ;;
-@@ -653,7 +653,6 @@ save_LIBS="$LIBS"
- HAVE_GL=no
- HAVE_GLES2=no
- HAVE_GLU=no
--HAVE_GNUSTEP_COCOA=no
- HAVE_WAYLAND_EGL=no
- HAVE_EGL_RPI=no
-@@ -744,35 +743,6 @@ case $host in
-   ;;
- esac
--case $host in
--  *-darwin* ) ;;
--  *)
--    AC_PATH_PROG([GNUSTEP_CONFIG],[gnustep-config])
--    if test "x$GNUSTEP_CONFIG" != "x"; then
--      GNUSTEP_HOST="`$GNUSTEP_CONFIG --variable=GNUSTEP_HOST`"
--      case $host in
--        *-mingw* )
--          case $GNUSTEP_HOST in
--            *-mingw* )
--              HAVE_GNUSTEP_COCOA=yes
--            ;;
--          esac
--          ;;
--        * )
--          HAVE_GNUSTEP_COCOA=yes
--        ;;
--      esac
--    fi
--  ;;
--esac
--
--AC_MSG_CHECKING([for GNUstep])
--if test "x$HAVE_GNUSTEP_COCOA" = "xyes" ; then
--  AC_MSG_RESULT([yes])
--else
--  AC_MSG_RESULT([no])
--fi
--
- CPPFLAGS="$save_CPPFLAGS"
- LIBS="$save_LIBS"
-@@ -1009,19 +979,6 @@ case $host in
-         fi
-       fi
-     fi
--
--    dnl GNUstep provides the Cocoa API on unix
--    if test "x$NEED_COCOA" != "xno"; then
--      if test "x$HAVE_GNUSTEP_COCOA" = "xyes" ; then
--        GNUSTEP_OBJCFLAGS="`$GNUSTEP_CONFIG --objc-flags`"
--        GNUSTEP_LIBS="`$GNUSTEP_CONFIG --gui-libs`"
--        GL_LIBS="$GL_LIBS $GNUSTEP_LIBS -lgnustep-gui -lgnustep-base"
--        GL_OBJCFLAGS="$GL_OBJCFLAGS $GNUSTEP_OBJCFLAGS"
--
--        USE_COCOA=yes
--        HAVE_WINDOW_COCOA=yes
--      fi
--    fi
-     ;;
-   *-darwin*)
-     if test "x$HAVE_IOS" = "xyes"; then
-@@ -1114,17 +1071,6 @@ case $host in
-         fi
-       fi
-     fi
--
--    dnl GNUstep provides the Cocoa API on win32
--    if test "x$HAVE_GNUSTEP_COCOA" = "xyes" ; then
--      GNUSTEP_CFLAGS="`$GNUSTEP_CONFIG --objc-flags`"
--      GNUSTEP_LIBS="`$GNUSTEP_CONFIG --gui-libs`"
--      GL_LIBS="$GL_LIBS $GNUSTEP_LIBS -lgnustep-gui -lgnustep-base"
--      GL_OBJCFLAGS="$OBJCFLAGS $GNUSTEP_CFLAGS"
--
--      USE_COCOA=yes
--      HAVE_WINDOW_COCOA=yes
--    fi
-     ;;
-   *)
-     AC_MSG_WARN([Don't know how to check for OpenGL on your platform.])
-diff --git a/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m b/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m
-index 94da0bc..84e3a99 100644
---- a/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m
-+++ b/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m
-@@ -40,7 +40,6 @@ static GstGLPlatform gst_gl_context_cocoa_get_gl_platform (GstGLContext * contex
- G_DEFINE_TYPE (GstGLContextCocoa, gst_gl_context_cocoa, GST_GL_TYPE_CONTEXT);
--#ifndef GNUSTEP
- static GMutex nsapp_lock;
- static GCond nsapp_cond;
-@@ -96,16 +95,12 @@ gst_gl_window_cocoa_nsapp_iteration (gpointer data)
-   return TRUE;
- }
--#endif
- static void
- gst_gl_context_cocoa_class_init (GstGLContextCocoaClass * klass)
- {
-   GstGLContextClass *context_class = (GstGLContextClass *) klass;
--
--#ifndef GNUSTEP
-   NSAutoreleasePool* pool = nil;
--#endif
-   g_type_class_add_private (klass, sizeof (GstGLContextCocoaPrivate));
-@@ -121,7 +116,6 @@ gst_gl_context_cocoa_class_init (GstGLContextCocoaClass * klass)
-   context_class->get_gl_platform =
-       GST_DEBUG_FUNCPTR (gst_gl_context_cocoa_get_gl_platform);
--#ifndef GNUSTEP
-   pool = [[NSAutoreleasePool alloc] init];
-   /* [NSApplication sharedApplication] will usually be
-@@ -191,7 +185,6 @@ gst_gl_context_cocoa_class_init (GstGLContextCocoaClass * klass)
-   }
-   [pool release];
--#endif
- }
- static void
-@@ -219,9 +212,7 @@ gst_gl_context_cocoa_create_context (GstGLContext *context, GstGLAPI gl_api,
-   GstGLWindowCocoa *window_cocoa = GST_GL_WINDOW_COCOA (window);
-   __block NSOpenGLContext *glContext = nil;
--#ifndef GNUSTEP
-   priv->source_id = g_timeout_add (200, gst_gl_window_cocoa_nsapp_iteration, NULL);
--#endif
-   priv->gl_context = nil;
-   if (other_context)
-@@ -243,9 +234,6 @@ gst_gl_context_cocoa_create_context (GstGLContext *context, GstGLAPI gl_api,
-     pool = [[NSAutoreleasePool alloc] init];
--#ifdef GNUSTEP
--    [NSApplication sharedApplication];
--#endif
-     rect.origin.x = 0;
-     rect.origin.y = 0;
-     rect.size.width = 320;
-@@ -265,7 +253,6 @@ gst_gl_context_cocoa_create_context (GstGLContext *context, GstGLAPI gl_api,
-     [window_handle setContentView:glView];
--#ifndef GNUSTEP
-     glContext = [[NSOpenGLContext alloc] initWithFormat:fmt
-       shareContext:context_cocoa->priv->external_gl_context];
-@@ -275,10 +262,6 @@ gst_gl_context_cocoa_create_context (GstGLContext *context, GstGLAPI gl_api,
-     [glContext setView:glView];
--#else
--    /* FIXME try to make context sharing work in GNUstep */
--    context_cocoa->priv->gl_context = glContext;
--#endif
-     [pool release];
-   });
-@@ -300,11 +283,7 @@ gst_gl_context_cocoa_create_context (GstGLContext *context, GstGLAPI gl_api,
-    */
-   NS_DURING {
-     if (glContext) {
--#ifdef GNUSTEP
--      const long swapInterval = 1;
--#else
-       const GLint swapInterval = 1;
--#endif
-       [glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval];
-     }
-   } NS_HANDLER {
-diff --git a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
-index 0771662..d776477 100644
---- a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
-+++ b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
-@@ -257,11 +257,9 @@ draw_cb (gpointer data)
-       x += 20;
-       y += 20;
--#ifndef GNUSTEP
-       [priv->internal_win_id setFrame:windowRect display:NO];
-       GST_DEBUG ("make the window available\n");
-       [priv->internal_win_id makeMainWindow];
--#endif
-       [priv->internal_win_id orderFrontRegardless];
-@@ -457,17 +455,6 @@ close_window_cb (gpointer data)
- }
- - (void) applicationWillTerminate:(NSNotification *)aNotification {
--#ifdef GNUSTEP
--  /* fixes segfault with gst-launch-1.0 -e ... and sending SIGINT (Ctrl-C)
--   * which causes GNUstep to run a signal handler in the main thread.
--   * However that thread has never been 'registered' with GNUstep so
--   * the autorelease magic of objective-c causes a segfault from accessing
--   * a null NSThread object somewhere deep in GNUstep.
--   *
--   * I put it here because this is the first time we can register the thread.
--   */
--  GSRegisterCurrentThread();
--#endif
- }
- @end
-@@ -488,9 +475,7 @@ close_window_cb (gpointer data)
-   window_cocoa = window;
--#ifndef GNUSTEP
-   [self setWantsLayer:NO];
--#endif
-   /* Get notified about changes */
-   [self setPostsFrameChangedNotifications:YES];
-diff --git a/tests/examples/gl/cocoa/cocoa-videooverlay.m b/tests/examples/gl/cocoa/cocoa-videooverlay.m
-index 683abe1..9c5fc9a 100755
---- a/tests/examples/gl/cocoa/cocoa-videooverlay.m
-+++ b/tests/examples/gl/cocoa/cocoa-videooverlay.m
-@@ -136,15 +136,8 @@ static void end_stream_cb(GstBus* bus, GstMessage* message, MainWindow* window)
- static gpointer thread_func (MainWindow* window)
- {
--#ifdef GNUSTEP
--  GSRegisterCurrentThread();
--#endif
--
-   g_main_loop_run ([window loop]);
--#ifdef GNUSTEP
--  GSUnregisterCurrentThread();
--#endif
-   return NULL;
- }
-@@ -172,10 +165,6 @@ int main(int argc, char **argv)
-   NSAutoreleasePool *pool=nil;
-   NSRect rect;
-   MainWindow *window=nil;
--  
--#ifdef GNUSTEP
--  GstState state;
--#endif
-   g_print("app created\n");
-@@ -203,18 +192,8 @@ int main(int argc, char **argv)
-   if (!ok)
-     g_warning("could not link videosrc to videosink\n");
--#ifdef GNUSTEP
--  gst_element_set_state (pipeline, GST_STATE_PAUSED);
--  state = GST_STATE_PAUSED;
--  gst_element_get_state (pipeline, &state, &state, GST_CLOCK_TIME_NONE);
--  g_print("pipeline paused\n");
--  GSRegisterCurrentThread();
--#endif
--
-   pool = [[NSAutoreleasePool alloc] init];
--#ifndef GNUSTEP
-   [NSApplication sharedApplication];
--#endif
-   rect.origin.x = 0; rect.origin.y = 0;
-   rect.size.width = width; rect.size.height = height;
-@@ -236,7 +215,6 @@ int main(int argc, char **argv)
-   [window orderFront:window];
--#ifndef GNUSTEP
-   while (![window isClosed]) {
-     NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask
-       untilDate:[NSDate dateWithTimeIntervalSinceNow:1]
-@@ -244,7 +222,6 @@ int main(int argc, char **argv)
-     if (event)
-       [NSApp sendEvent:event];
-   }
--#endif
-   g_thread_join (loop_thread);
-@@ -252,9 +229,5 @@ int main(int argc, char **argv)
-   [pool release];
--#ifdef GNUSTEP
--  GSUnregisterCurrentThread();
--#endif
--
-   return 0;
- }
--- 
-2.0.0.rc2
-
diff --git a/Tools/gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch b/Tools/gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch
deleted file mode 100644 (file)
index e3ddb72..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From dfc34c58411f50b37b2e1300560ae8a0b6a9a7d4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
-Date: Tue, 7 Apr 2015 16:43:59 +0100
-Subject: [PATCH] rtp: rtcpbuffer: fix typo in enum
-
-and in docs. Spotted by Rob Swain.
----
- gst-libs/gst/rtp/gstrtcpbuffer.h | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/gst-libs/gst/rtp/gstrtcpbuffer.h b/gst-libs/gst/rtp/gstrtcpbuffer.h
-index b5ff4a1..47378cf 100644
---- a/gst-libs/gst/rtp/gstrtcpbuffer.h
-+++ b/gst-libs/gst/rtp/gstrtcpbuffer.h
-@@ -59,6 +59,9 @@ typedef enum
-   GST_RTCP_TYPE_PSFB    = 206
- } GstRTCPType;
-+/* FIXME 2.0: backwards compatibility define for enum typo */
-+#define GST_RTCP_RTPFB_TYPE_RCTP_SR_REQ GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ
-+
- /**
-  * GstRTCPFBType:
-  * @GST_RTCP_FB_TYPE_INVALID: Invalid type
-@@ -66,7 +69,7 @@ typedef enum
-  * @GST_RTCP_RTPFB_TYPE_TMMBR: Temporary Maximum Media Stream Bit Rate Request
-  * @GST_RTCP_RTPFB_TYPE_TMMBN: Temporary Maximum Media Stream Bit Rate
-  *    Notification
-- * @GST_RTCP_RTPFB_TYPE_RTCP_SR_SEQ: Request an SR packet for early
-+ * @GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ: Request an SR packet for early
-  *    synchronization
-  * @GST_RTCP_PSFB_TYPE_PLI: Picture Loss Indication
-  * @GST_RTCP_PSFB_TYPE_SLI: Slice Loss Indication
-@@ -89,7 +92,7 @@ typedef enum
-   GST_RTCP_RTPFB_TYPE_TMMBR       = 3,
-   GST_RTCP_RTPFB_TYPE_TMMBN       = 4,
-   /* RTPFB types assigned in RFC 6051 */
--  GST_RTCP_RTPFB_TYPE_RCTP_SR_REQ = 5,
-+  GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ = 5,
-   /* PSFB types */
-   GST_RTCP_PSFB_TYPE_PLI          = 1,
-   GST_RTCP_PSFB_TYPE_SLI          = 2,
--- 
-2.1.4
-