From: Gilbok Lee <gilbok.lee@samsung.com>
Date: Thu, 23 Jan 2020 07:25:51 +0000 (+0900)
Subject: Merge branch 'upstream/1.16' into tizen_gst_1.16.2
X-Git-Tag: submit/tizen/20200221.064623^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=20c1450e6f3c2fe3d5b6f4ed9c9ef3bd416cebe0;p=platform%2Fupstream%2Fgst-plugins-ugly.git

Merge branch 'upstream/1.16' into tizen_gst_1.16.2

Change-Id: I6e7d06aee81dc8dda405615debd45f0e9885c9a9
---

20c1450e6f3c2fe3d5b6f4ed9c9ef3bd416cebe0
diff --cc .gbs.conf
index 3033b861,00000000..8d1776ab
mode 100644,000000..100644
--- a/.gbs.conf
+++ b/.gbs.conf
@@@ -1,3 -1,0 +1,3 @@@
 +[general]
- upstream_branch = upstream/1.12
++upstream_branch = upstream/1.16
 +upstream_tag = ${upstreamversion}
diff --cc packaging/common.tar.gz
index c3aef173,00000000..fb8326ec
mode 100644,000000..100644
Binary files differ
diff --cc packaging/gst-plugins-ugly.spec
index 9fdcdef4,00000000..4d2f81f9
mode 100644,000000..100644
--- a/packaging/gst-plugins-ugly.spec
+++ b/packaging/gst-plugins-ugly.spec
@@@ -1,92 -1,0 +1,92 @@@
 +Name:       gst-plugins-ugly
 +Summary:    GStreamer plugins from the "ugly" set
- Version:    1.12.2
++Version:    1.16.2
 +Release:    0
 +Group:      Multimedia/Framework
 +License:    LGPL-2.1+
 +Source:     http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{version}.tar.xz
 +Source100:  common.tar.gz
 +
 +BuildRequires:  gettext-tools
 +BuildRequires:  which
 +BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 +BuildRequires:  pkgconfig(gstreamer-1.0)
 +BuildRequires:  pkgconfig(glib-2.0)
 +%if "%{tizen_profile_name}" != "tv"
 +BuildRequires:  pkgconfig(opencore-amrnb)
 +%endif
 +BuildRequires:  pkgconfig(opencore-amrwb)
 +
 +%description
 + GStreamer is a streaming media framework, based on graphs of filters
 + which operate on media data.  Applications using this library can do
 + anything from real-time sound processing to playing videos, and just
 + about anything else media-related.  Its plugin-based architecture means
 + that new data types or processing capabilities can be added simply by
 + installing new plug-ins.
 + .
 + This packages contains plugins from the "ugly" set, a set of
 + good-quality plug-ins that might pose distribution problems.
 +
 +%prep
 +%setup -q -n gst-plugins-ugly-%{version}
 +%setup -q -T -D -a 100
 +
 +%build
 +export V=1
 +NOCONFIGURE=1 ./autogen.sh
 +
 +export CFLAGS="\
 +%if "%{tizen_profile_name}" == "tv"
 +	-DTIZEN_FEATURE_TRUSTZONE\
 +%endif
 +	-DTIZEN_FEATURE_ASFDEMUX_CHECK_DATA_SIZE\
 +	-DTIZEN_FEATURE_ASFDEMUX_DISABLE_UNSUPPORTED_FORMAT\
 +	-DTIZEN_FEATURE_ASFDEMUX_POST_TAG_MSG\
 +	-fstack-protector-strong\
 +	-Wl,-z,relro\
 +	-D_FORTIFY_SOURCE=2"
 +
 +%configure \
 +%if "%{tizen_profile_name}" == "tv"
 + --disable-amrnb\
 + --disable-asfdemux\
 + --disable-lame\
 +%endif
 + --disable-static\
 + --disable-nls\
 + --with-html-dir=/tmp/dump\
 + --disable-examples\
 + --disable-dvdlpcmdec\
 + --disable-dvdsub\
 + --disable-iec958\
 + --disable-mpegstream\
 + --disable-synaesthesia\
 + --disable-a52dec\
 + --disable-cdio\
 + --disable-dvdread\
 + --disable-dvdnav\
 + --disable-mad\
 + --disable-mpeg2dec\
 + --disable-sidplay\
 + --disable-twolame\
 + --disable-realmedia\
 + --disable-xingmux\
 + --disable-x264\
 + --disable-gtk-doc\
 + --disable-gtk-doc-html
 +make %{?jobs:-j%jobs}
 +
 +%install
 +%make_install
 +
 +%files
 +%manifest %{name}.manifest
 +%defattr(-,root,root,-)
 +%license COPYING
 +%if "%{tizen_profile_name}" != "tv"
 +%{_libdir}/gstreamer-1.0/libgstasf.so
 +%{_libdir}/gstreamer-1.0/libgstamrnb.so
 +%exclude %{_datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs
 +%endif
 +%{_libdir}/gstreamer-1.0/libgstamrwbdec.so