From 57896cad7d286cfe3c4e115efdd61db82b2a6c40 Mon Sep 17 00:00:00 2001 From: "ossy@webkit.org" Date: Wed, 18 Mar 2015 09:32:43 +0000 Subject: [PATCH] [EFL] Bump gstreamer version to 1.4.4 https://bugs.webkit.org/show_bug.cgi?id=142782 Reviewed by Philippe Normand. * efl/jhbuild.modules: * efl/patches/gst-libav.patch: * efl/patches/gst-plugins-bad-remove-gnustep-support.patch: Added. * efl/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch: Removed. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181690 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 12 + Tools/efl/jhbuild.modules | 62 ++-- Tools/efl/patches/gst-libav.patch | 4 +- .../gst-plugins-bad-remove-gnustep-support.patch | 325 +++++++++++++++++++++ ...k-in-configure-from-passing-under-aarch64.patch | 34 --- 5 files changed, 369 insertions(+), 68 deletions(-) create mode 100644 Tools/efl/patches/gst-plugins-bad-remove-gnustep-support.patch delete mode 100644 Tools/efl/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 8410322..7a4b4ed 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,15 @@ +2015-03-18 Csaba Osztrogonác + + [EFL] Bump gstreamer version to 1.4.4 + https://bugs.webkit.org/show_bug.cgi?id=142782 + + Reviewed by Philippe Normand. + + * efl/jhbuild.modules: + * efl/patches/gst-libav.patch: + * efl/patches/gst-plugins-bad-remove-gnustep-support.patch: Added. + * efl/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch: Removed. + 2015-03-17 Tim Horton Fix the iOS build. diff --git a/Tools/efl/jhbuild.modules b/Tools/efl/jhbuild.modules index ee48870..2b6f9aa 100644 --- a/Tools/efl/jhbuild.modules +++ b/Tools/efl/jhbuild.modules @@ -218,63 +218,61 @@ md5sum="9c0cfef285d5c4a5c80d00904ddab380"/> - - - - - + + + autogenargs="--disable-examples --disable-gtk-doc"> - - + - + - - + + + - + - + + + - + - + - + +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/efl/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch b/Tools/efl/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch deleted file mode 100644 index 79ede5e..0000000 --- a/Tools/efl/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ad090272c831b5c62f0b310c776e76e3b1ffc88d Mon Sep 17 00:00:00 2001 -From: Iain Lane -Date: Fri, 15 Nov 2013 14:17:03 +0000 -Subject: [PATCH] Prevent the NEON check in configure from passing under - aarch64. - -The test verifies that the NEON C intrinsics work, but the rest of the -codebase uses lots of direct ARMv7 NEON assembly. The same intrinsics -work in A64, but the assembly is slightly different. - -Prevent the check from passing so that we don't use this where it won't -work. - -Patch originally by William Grant - -https://bugzilla.gnome.org/show_bug.cgi?id=712367 ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index e5c223f..0495371 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -190,6 +190,7 @@ AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[ - #include - int32x4_t testfunc(int16_t *a, int16_t *b) { -+ asm volatile ("vmull.s16 q0, d0, d0" : : : "q0"); - return vmull_s16(vld1_s16(a), vld1_s16(b)); - } - ]])], --- -1.8.4.3 \ No newline at end of file -- 1.8.3.1