[media] Update to 1.14.1. MER#1907

sailfishos · May 25, 2018 · 0b9fc9c · 0b9fc9c
1 parent b664e7e
commit 0b9fc9c
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 103 deletions.
diff --git a/gst-plugins-bad b/gst-plugins-bad
diff --git a/rpm/0001-Set-video-branch-to-NULL-after-finishing-video-recor.patch b/rpm/0001-Set-video-branch-to-NULL-after-finishing-video-recor.patch
@@ -14,7 +14,7 @@ diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
 index c77585a..c101637 100644
 --- a/gst/camerabin2/gstcamerabin2.c
 +++ b/gst/camerabin2/gstcamerabin2.c
-@@ -976,10 +976,10 @@ gst_camera_bin_video_reset_elements (gpointer u_data)
+@@ -953,10 +953,10 @@ gst_camera_bin_video_reset_elements (gpointer u_data)
    gst_camera_bin_finish_video_file (camerabin);
 
    /* reset element states to clear eos/flushing pads */

diff --git a/rpm/0002-Keep-video-branch-in-NULL-state.patch b/rpm/0002-Keep-video-branch-in-NULL-state.patch
@@ -17,7 +17,7 @@ diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
 index c101637..87d293d 100644
 --- a/gst/camerabin2/gstcamerabin2.c
 +++ b/gst/camerabin2/gstcamerabin2.c
-@@ -410,6 +410,15 @@ gst_camera_bin_start_capture (GstCameraBin2 * camerabin)
+@@ -387,6 +387,15 @@ gst_camera_bin_start_capture (GstCameraBin2 * camerabin)
      g_free (location);
    }
 
@@ -33,7 +33,7 @@ index c101637..87d293d 100644
    g_signal_emit_by_name (camerabin->src, "start-capture", NULL);
    if (camerabin->mode == MODE_VIDEO) {
      camerabin->audio_send_newseg = TRUE;
-@@ -980,10 +989,15 @@ gst_camera_bin_video_reset_elements (gpointer u_data)
+@@ -957,10 +966,15 @@ gst_camera_bin_video_reset_elements (gpointer u_data)
    gst_element_set_state (camerabin->videobin_capsfilter, GST_STATE_NULL);
    if (camerabin->video_filter) {
      gst_element_set_state (camerabin->video_filter, GST_STATE_NULL);
@@ -49,7 +49,7 @@ index c101637..87d293d 100644
 
    if (camerabin->audio_src) {
      gst_element_set_state (camerabin->audio_capsfilter, GST_STATE_READY);
-@@ -1662,6 +1676,7 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera)
+@@ -1647,6 +1661,7 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera)
       */
      gst_element_set_locked_state (camera->videosink, TRUE);
      gst_element_set_locked_state (camera->imagesink, TRUE);

diff --git a/rpm/0003-photography-add-missing-vmethods.patch b/rpm/0003-photography-add-missing-vmethods.patch
@@ -35,7 +35,7 @@ diff --git a/gst-libs/gst/interfaces/photography.h b/gst-libs/gst/interfaces/pho
 index e65c0d9..7113387 100644
 --- a/gst-libs/gst/interfaces/photography.h
 +++ b/gst-libs/gst/interfaces/photography.h
-@@ -504,6 +504,18 @@ typedef void (*GstPhotographyCapturePrepared) (gpointer data,
+@@ -502,6 +502,18 @@ typedef void (*GstPhotographyCapturePrepared) (gpointer data,
   * @set_config: vmethod to set all configuration parameters at once
   * @get_config: vmethod to get all configuration parameters at once
   * @get_image_capture_supported_caps: vmethod to get caps describing supported image capture formats
@@ -54,35 +54,24 @@ index e65c0d9..7113387 100644
   *
   * #GstPhotographyInterface interface.
   */
-@@ -559,6 +571,30 @@ typedef struct _GstPhotographyInterface
-     GstPhotographyNoiseReduction * noise_reduction);
-   gboolean (*set_noise_reduction) (GstPhotography * photo,
-     GstPhotographyNoiseReduction noise_reduction);
-+  gboolean (*set_exposure_mode) (GstPhotography * photo,
-+    GstPhotographyExposureMode exposure_mode);
-+  gboolean (*get_exposure_mode) (GstPhotography * photo,
-+    GstPhotographyExposureMode * exposure_mode);
-+  gboolean (*set_analog_gain) (GstPhotography * photo,
-+    gfloat analog_gain);
-+  gboolean (*get_analog_gain) (GstPhotography * photo,
-+    gfloat * analog_gain);
-+  gboolean (*set_lens_focus) (GstPhotography * photo,
-+    gfloat lens_focus);
-+  gboolean (*get_lens_focus) (GstPhotography * photo,
-+    gfloat * lens_focus);
-+  gboolean (*set_color_temperature) (GstPhotography * photo,
-+    guint color_temperature);
-+  gboolean (*get_color_temperature) (GstPhotography * photo,
-+    guint * color_temperature);
-+  gboolean (*set_min_exposure_time) (GstPhotography * photo,
-+    guint min_exposure_time);
-+  gboolean (*get_min_exposure_time) (GstPhotography * photo,
-+    guint * min_exposure_time);
-+  gboolean (*set_max_exposure_time) (GstPhotography * photo,
-+    guint max_exposure_time);
-+  gboolean (*get_max_exposure_time) (GstPhotography * photo,
-+    guint * max_exposure_time);
+@@ -546,6 +558,19 @@ typedef struct _GstPhotographyInterface
+   gboolean (*get_noise_reduction)    (GstPhotography * photo, GstPhotographyNoiseReduction * noise_reduction);
+   gboolean (*set_noise_reduction)    (GstPhotography * photo, GstPhotographyNoiseReduction noise_reduction);
 
++  gboolean (*set_exposure_mode) (GstPhotography * photo, GstPhotographyExposureMode exposure_mode);
++  gboolean (*get_exposure_mode) (GstPhotography * photo, GstPhotographyExposureMode * exposure_mode);
++  gboolean (*set_analog_gain) (GstPhotography * photo, gfloat analog_gain);
++  gboolean (*get_analog_gain) (GstPhotography * photo, gfloat * analog_gain);
++  gboolean (*set_lens_focus) (GstPhotography * photo, gfloat lens_focus);
++  gboolean (*get_lens_focus) (GstPhotography * photo, gfloat * lens_focus);
++  gboolean (*set_color_temperature) (GstPhotography * photo, guint color_temperature);
++  gboolean (*get_color_temperature) (GstPhotography * photo, guint * color_temperature);
++  gboolean (*set_min_exposure_time) (GstPhotography * photo, guint min_exposure_time);
++  gboolean (*get_min_exposure_time) (GstPhotography * photo, guint * min_exposure_time);
++  gboolean (*set_max_exposure_time) (GstPhotography * photo, guint max_exposure_time);
++  gboolean (*get_max_exposure_time) (GstPhotography * photo, guint * max_exposure_time);
++
+   /* FIXME: remove padding, not needed for interfaces */
    /*< private > */
    gpointer _gst_reserved[GST_PADDING];
 -- 

diff --git a/rpm/0004-camerabin-install-GST_PHOTOGRAPHY_PROP_EXPOSURE_MODE.patch b/rpm/0004-camerabin-install-GST_PHOTOGRAPHY_PROP_EXPOSURE_MODE.patch
@@ -12,7 +12,7 @@ diff --git a/gst-libs/gst/interfaces/photography.c b/gst-libs/gst/interfaces/pho
 index 0d58752..ddfb044 100644
 --- a/gst-libs/gst/interfaces/photography.c
 +++ b/gst-libs/gst/interfaces/photography.c
-@@ -727,4 +727,12 @@ gst_photography_iface_class_init (gpointer g_class)
+@@ -723,4 +723,12 @@ gst_photography_iface_class_init (gpointer g_class)
            "Which noise reduction modes are enabled (0 = disabled)",
            GST_TYPE_PHOTOGRAPHY_NOISE_REDUCTION,
            0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));

diff --git a/rpm/0005-Downgrade-mpeg4videoparse-to-prevent-it-from-being-p.patch b/rpm/0005-Downgrade-mpeg4videoparse-to-prevent-it-from-being-p.patch
@@ -12,15 +12,15 @@ diff --git a/gst/videoparsers/plugin.c b/gst/videoparsers/plugin.c
 index 79d1df6..bac4141 100644
 --- a/gst/videoparsers/plugin.c
 +++ b/gst/videoparsers/plugin.c
-@@ -45,7 +45,7 @@ plugin_init (GstPlugin * plugin)
+@@ -46,7 +46,7 @@ plugin_init (GstPlugin * plugin)
    ret |= gst_element_register (plugin, "mpegvideoparse",
        GST_RANK_PRIMARY + 1, GST_TYPE_MPEGVIDEO_PARSE);
    ret |= gst_element_register (plugin, "mpeg4videoparse",
 -      GST_RANK_PRIMARY + 1, GST_TYPE_MPEG4VIDEO_PARSE);
 +      GST_RANK_NONE, GST_TYPE_MPEG4VIDEO_PARSE);
    ret |= gst_element_register (plugin, "pngparse",
        GST_RANK_PRIMARY, GST_TYPE_PNG_PARSE);
-   ret |= gst_element_register (plugin, "h265parse",
+   ret |= gst_element_register (plugin, "jpeg2000parse",
 -- 
 1.8.4.rc3
 
diff --git a/rpm/gst-plugins-bad.spec b/rpm/gst-plugins-bad.spec
@@ -6,7 +6,7 @@
 
 Summary:     GStreamer streaming media framework "bad" plug-ins
 Name:        %{gstreamer}%{majorminor}-plugins-bad
-Version:     1.10.4
+Version:     1.14.1
 Release:     1
 License:     LGPLv2+
 Group:       Applications/Multimedia
@@ -137,15 +137,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_libdir}/gstreamer-%{majorminor}/libgstjpegformat.so
-%{_libdir}/gstreamer-%{majorminor}/libgstrawparse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstshm.so
-%{_libdir}/gstreamer-%{majorminor}/libgstcamerabin2.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvideoparsersbad.so
-%{_libdir}/gstreamer-%{majorminor}/libgstaudiomixer.so
 %{_libdir}/gstreamer-%{majorminor}/libgstcompositor.so
 %{_libdir}/gstreamer-%{majorminor}/libgsthls.so
 %{_libdir}/gstreamer-%{majorminor}/libgstmpegtsdemux.so
-%{_libdir}/gstreamer-%{majorminor}/libgstopengl.so
 %{_libdir}/gstreamer-%{majorminor}/libgstopusparse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstaiff.so
 %{_libdir}/gstreamer-%{majorminor}/libgstnetsim.so
@@ -156,18 +152,26 @@ rm -rf $RPM_BUILD_ROOT
 #%{_libdir}/gstreamer-%{majorminor}/libgstsmoothstreaming.so
 %{_libdir}/gstreamer-%{majorminor}/libgsttimecode.so
 %{_libdir}/gstreamer-%{majorminor}/libgstwebp.so
+%{_libdir}/gstreamer-%{majorminor}/libgstaudiobuffersplit.so
+%{_libdir}/gstreamer-%{majorminor}/libgstaudiolatency.so
+%{_libdir}/gstreamer-%{majorminor}/libgstaudiomixmatrix.so
+%{_libdir}/gstreamer-%{majorminor}/libgstcamerabin.so
+%{_libdir}/gstreamer-%{majorminor}/libgstipcpipeline.so
+%{_libdir}/gstreamer-%{majorminor}/libgstlegacyrawparse.so
+%{_libdir}/gstreamer-%{majorminor}/libgstopenglmixers.so
+%{_libdir}/gstreamer-%{majorminor}/libgstproxy.so
 %{_libdir}/libgstphotography-%{majorminor}.so.*
 %{_libdir}/libgstcodecparsers-%{majorminor}.so.*
 %{_libdir}/libgstinsertbin-%{majorminor}.so.*
 %{_libdir}/libgsturidownloader-%{majorminor}.so.*
 %{_libdir}/libgstbasecamerabinsrc-%{majorminor}.so.*
 %{_libdir}/libgstmpegts-%{majorminor}.so.*
-%{_libdir}/libgstbadbase-%{majorminor}.so.*
 %{_libdir}/libgstbadvideo-%{majorminor}.so.*
-%{_libdir}/libgstgl-%{majorminor}.so.*
 %{_libdir}/libgstadaptivedemux-%{majorminor}.so.*
 %{_libdir}/libgstbadaudio-%{majorminor}.so.*
 %{_libdir}/libgstplayer-%{majorminor}.so.*
+%{_libdir}/libgstisoff-%{majorminor}.so.*
+%{_libdir}/libgstwebrtc-%{majorminor}.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -177,12 +181,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgstmpegts-%{majorminor}.so
 %{_libdir}/libgsturidownloader-%{majorminor}.so
 %{_libdir}/libgstbasecamerabinsrc-%{majorminor}.so
-%{_libdir}/libgstbadbase-%{majorminor}.so
 %{_libdir}/libgstbadvideo-%{majorminor}.so
-%{_libdir}/libgstgl-%{majorminor}.so
 %{_libdir}/libgstadaptivedemux-%{majorminor}.so
 %{_libdir}/libgstbadaudio-%{majorminor}.so
 %{_libdir}/libgstplayer-%{majorminor}.so
+%{_libdir}/libgstisoff-%{majorminor}.so
+%{_libdir}/libgstwebrtc-%{majorminor}.so
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/photography-enumtypes.h
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/photography.h
 %{_includedir}/gstreamer-%{majorminor}/gst/codecparsers/gsth264parser.h
@@ -211,63 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gstreamer-%{majorminor}/gst/uridownloader/gstfragment.h
 %{_includedir}/gstreamer-%{majorminor}/gst/uridownloader/gsturidownloader.h
 %{_includedir}/gstreamer-%{majorminor}/gst/uridownloader/gsturidownloader_debug.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/egl/gstgldisplay_egl.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/egl/gsteglimage.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/egl/gstglmemoryegl.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gl.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/all_functions.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/base.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/blending.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/eglimage.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/fbo.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/fixedfunction.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/gles.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/gstgl_compat.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/gstgl_gles2compat.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/opengl.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/shaders.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstgl_fwd.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglapi.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglbufferpool.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglcolorconvert.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglcontext.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstgldisplay.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglfeature.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglfilter.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglframebuffer.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglmemory.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglshader.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglupload.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglutils.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglwindow.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglrenderbuffer.h
 %if %{with X11}
 %{_includedir}/gstreamer-%{majorminor}/gst/gl/x11/gstgldisplay_x11.h
 %endif
-%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudioaggregator.h
-%{_includedir}/gstreamer-%{majorminor}/gst/base/gstaggregator.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/egl/gstegl.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/egl/gstglcontext_egl.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/buffers.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/debug.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/query.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/sync.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/glprototypes/vao.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstgl_enums.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglbasefilter.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglbasememory.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglbuffer.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglcontrolbindingproxy.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstgldebug.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglformat.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglmemorypbo.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstgloverlaycompositor.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglquery.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglshaderstrings.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglsl.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglslstage.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglsyncmeta.h
-%{_includedir}/gstreamer-%{majorminor}/gst/gl/gstglviewconvert.h
 %{_includedir}/gstreamer-%{majorminor}/gst/player/gstplayer-g-main-context-signal-dispatcher.h
 %{_includedir}/gstreamer-%{majorminor}/gst/player/gstplayer-media-info.h
 %{_includedir}/gstreamer-%{majorminor}/gst/player/gstplayer-signal-dispatcher.h
@@ -279,13 +229,30 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gstreamer-%{majorminor}/gst/player/player.h
 %{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideoaggregator.h
 %{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideoaggregatorpad.h
+%{_includedir}/gstreamer-%{majorminor}/gst/audio/audio-bad-prelude.h
+%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstnonstreamaudiodecoder.h
+%{_includedir}/gstreamer-%{majorminor}/gst/basecamerabinsrc/basecamerabinsrc-prelude.h
+%{_includedir}/gstreamer-%{majorminor}/gst/codecparsers/codecparsers-prelude.h
+%{_includedir}/gstreamer-%{majorminor}/gst/interfaces/photography-prelude.h
+%{_includedir}/gstreamer-%{majorminor}/gst/isoff/gstisoff.h
+%{_includedir}/gstreamer-%{majorminor}/gst/mpegts/mpegts-prelude.h
+%{_includedir}/gstreamer-%{majorminor}/gst/player/player-prelude.h
+%{_includedir}/gstreamer-%{majorminor}/gst/uridownloader/uridownloader-prelude.h
+%{_includedir}/gstreamer-%{majorminor}/gst/video/video-bad-prelude.h
+%{_includedir}/gstreamer-%{majorminor}/gst/webrtc/dtlstransport.h
+%{_includedir}/gstreamer-%{majorminor}/gst/webrtc/icetransport.h
+%{_includedir}/gstreamer-%{majorminor}/gst/webrtc/rtcsessiondescription.h
+%{_includedir}/gstreamer-%{majorminor}/gst/webrtc/rtpreceiver.h
+%{_includedir}/gstreamer-%{majorminor}/gst/webrtc/rtpsender.h
+%{_includedir}/gstreamer-%{majorminor}/gst/webrtc/rtptransceiver.h
+%{_includedir}/gstreamer-%{majorminor}/gst/webrtc/webrtc-enumtypes.h
+%{_includedir}/gstreamer-%{majorminor}/gst/webrtc/webrtc.h
+%{_includedir}/gstreamer-%{majorminor}/gst/webrtc/webrtc_fwd.h
 %{_libdir}/pkgconfig/gstreamer-plugins-bad-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-codecparsers-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-insertbin-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-mpegts-%{majorminor}.pc
-%{_libdir}/pkgconfig/gstreamer-gl-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-bad-audio-%{majorminor}.pc
-%{_libdir}/pkgconfig/gstreamer-bad-base-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-bad-video-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-player-%{majorminor}.pc
-%{_libdir}/gstreamer-%{majorminor}/include/gst/gl/gstglconfig.h
+%{_libdir}/pkgconfig/gstreamer-webrtc-%{majorminor}.pc