Modified: trunk/Tools/efl/jhbuild.modules (199648 => 199649)
--- trunk/Tools/efl/jhbuild.modules 2016-04-18 05:13:13 UTC (rev 199648)
+++ trunk/Tools/efl/jhbuild.modules 2016-04-18 05:36:31 UTC (rev 199649)
@@ -213,10 +213,10 @@
<dependencies>
<dep package="orc"/>
</dependencies>
- <branch module="gstreamer/gstreamer-1.4.4.tar.xz" version="1.4.4"
+ <branch module="gstreamer/gstreamer-1.6.3.tar.xz" version="1.6.3"
repo="gstreamer"
- hash="sha256:f0e305d91a93d05bf9e332cd4256ca07d77f5186a4d73847b7ae6db218f2c237"
- md5sum="98f4a6d45a28dd195144baef0244ba38"/>
+ hash="sha256:22f9568d67b87cf700a111f381144bd37cb93790a77e4e331db01fe854a37f24"
+ md5sum="b4cdeb2b9cb20dd6ac022a4f417eae0d"/>
</autotools>
<autotools id="gst-plugins-base"
@@ -225,11 +225,10 @@
<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-1.6.3.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"/>
+ hash="sha256:b6154f8fdba4877e95efd94610ef0ada4f0171cd12eb829a3c3c97345d9c7a75"
+ md5sum="3ddde0ad598ef69f58d6a2e87f8b460f">
</branch>
</autotools>
@@ -238,10 +237,10 @@
<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-1.6.3.tar.xz" version="1.6.3"
repo="gstreamer"
- hash="sha256:2df90e99da45211c7b2525ae4ac34830a9e7784bd48c072c406c0cf014bdb277"
- md5sum="673cf9276952bd3937dafd817c9ead2b">
+ hash="sha256:24b19db70b2a83461ebddfe20033db432dadfdb5d4b54ffb1dfa0d830134a177"
+ md5sum="a1958df7aa498b42793e2f2048673815">
</branch>
</autotools>
@@ -249,11 +248,10 @@
<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-1.6.3.tar.xz" version="1.6.3"
repo="gstreamer"
- hash="sha256:e41b36105c0a13a2cb1ff9f559714e839b82dc3841484cd664790fb7947e55c7"
- md5sum="972c6e22dd2e44fcf0b04b9d810a56be">
- <patch file="gst-plugins-bad-remove-gnustep-support.patch" strip="1"/>
+ hash="sha256:971b29101d6a9c5e3fe94d99d977a227f58f0b2d29b6ca2c7f292052542b3a61"
+ md5sum="4857adcafe41e4b9b8805cf88303bd55">
</branch>
</autotools>
@@ -261,10 +259,10 @@
<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-1.6.3.tar.xz" version="1.6.3"
repo="gstreamer"
- hash="sha256:2ec7285e5ec6731963b0955487cceb9eb04e285ca682f3ef575996c068cde8aa"
- md5sum="64a3e2cda2687132cadca4efdc63f3b4">
+ hash="sha256:857b9c060a0337de38c6d26238c47352433c02eabf26c2f860c854dbc35bd4ab"
+ md5sum="cfe9a06913d4fd4067e9e47f6e05fac2">
<patch file="gst-libav.patch" strip="1"/>
</branch>
</autotools>
Modified: trunk/Tools/efl/patches/gst-libav.patch (199648 => 199649)
--- trunk/Tools/efl/patches/gst-libav.patch 2016-04-18 05:13:13 UTC (rev 199648)
+++ trunk/Tools/efl/patches/gst-libav.patch 2016-04-18 05:36:31 UTC (rev 199649)
@@ -1,10 +1,9 @@
--- a/gst-libs/ext/libav/libavcodec/arm/videodsp_armv5te.S
+++ b/gst-libs/ext/libav/libavcodec/arm/videodsp_armv5te.S
-@@ -26,6 +26,7 @@ function ff_prefetch_arm, export=1
+@@ -27,6 +27,7 @@
subs r2, r2, #1
pld [r0]
add r0, r0, r1
+ it ne
- bne X(ff_prefetch_arm)
+ bne 1b
bx lr
- endfunc
Deleted: trunk/Tools/efl/patches/gst-plugins-bad-remove-gnustep-support.patch (199648 => 199649)
--- trunk/Tools/efl/patches/gst-plugins-bad-remove-gnustep-support.patch 2016-04-18 05:13:13 UTC (rev 199648)
+++ trunk/Tools/efl/patches/gst-plugins-bad-remove-gnustep-support.patch 2016-04-18 05:36:31 UTC (rev 199649)
@@ -1,325 +0,0 @@
-From 13c8517570c3550b5c46a3cb0ff7f8b7888a4ddf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <[email protected]>
-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
-
