avatar
gvm has added 3ca5640a33
Updated to release 1.16.0, adjusted BReqs and file lists, dropped unr...

...ecognized configure option, silenced rpmlint warnings

... ... --- a/.abf.yml
... ... +++ b/.abf.yml
... ... @@ -1,2 +1,2 @@
1 1
sources:
2
  gstreamer-1.12.4.tar.xz: 71ed76a339252d551c5da6bdcb641c31bea77612
2
  gstreamer-1.16.0.tar.xz: c90c3bb6fae73412a75ab15dfc815ced1f410b2d
view file @ 3ca5640a33
... ... index 57bf01073ef0e247a7d76cae4096b4a8bfe98f34..7a36fe140b8458eab0f5d92fb8d46d3ee6449971 100644
... ... --- a/gstreamer-inspect-rpm-format.patch
... ... +++ b/gstreamer-1.16.0-inspect-rpm-format.patch
... ... @@ -1,7 +1,7 @@
1
diff -urN gstreamer-1.8.3/tools/gst-inspect.c gstreamer-1.8.3-patched/tools/gst-inspect.c
2
--- gstreamer-1.8.3/tools/gst-inspect.c	2016-03-24 21:36:30.000000000 +1000
3
+++ gstreamer-1.8.3-patched/tools/gst-inspect.c	2016-09-30 13:14:34.765969760 +1000
4
@@ -1335,9 +1335,225 @@
1
diff -rupN gstreamer-1.16.0.old/tools/gst-inspect.c gstreamer-1.16.0/tools/gst-inspect.c
2
--- gstreamer-1.16.0.old/tools/gst-inspect.c	2019-04-12 00:58:09.000000000 +0200
3
+++ gstreamer-1.16.0/tools/gst-inspect.c	2019-05-23 20:09:41.065631781 +0200
4
@@ -1726,11 +1726,227 @@ print_tracer_info (GstPluginFeature * fe
5 5
   return 0;
6 6
 }
7 7
 
... ... @@ -9,7 +9,7 @@ diff -urN gstreamer-1.8.3/tools/gst-inspect.c gstreamer-1.8.3-patched/tools/gst-
9 9
+print_gst_structure_append_field (GList * strings, const char *field)
10 10
+{
11 11
+  GList *s;
12
+
12
+  
13 13
+  //g_message ("adding '%s' to the string", field);
14 14
+
15 15
+  for (s = strings; s != NULL; s = s->next) {
... ... @@ -43,7 +43,7 @@ diff -urN gstreamer-1.8.3/tools/gst-inspect.c gstreamer-1.8.3-patched/tools/gst-
43 43
+  guint new_items, i;
44 44
+
45 45
+  if (num_items == 1)
46
+    return strings;
46
+   return strings;
47 47
+
48 48
+  //g_message ("creating %d new items", num_items);
49 49
+
... ... @@ -220,15 +220,18 @@ diff -urN gstreamer-1.8.3/tools/gst-inspect.c gstreamer-1.8.3-patched/tools/gst-
220 220
+  }
221 221
+  g_list_free (strings);
222 222
+}
223
 
224
 static void
223
+
224
 /* NOTE: Not coloring output from automatic install functions, as their output
225
  * is meant for machines, not humans.
226
  */
227
-static void
225 228
-print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
226 229
+print_plugin_automatic_install_info_codecs (GstElementFactory * factory,
227 230
+    gboolean rpm_format)
228 231
 {
229 232
   GstPadDirection direction;
230 233
   const gchar *type_name;
231
@@ -1363,6 +1579,13 @@
234
@@ -1756,6 +1972,12 @@ print_plugin_automatic_install_info_code
232 235
     return;
233 236
   }
234 237
 
... ... @@ -237,19 +240,18 @@ diff -urN gstreamer-1.8.3/tools/gst-inspect.c gstreamer-1.8.3-patched/tools/gst-
240 240
+	if ((gst_plugin_feature_get_rank (GST_PLUGIN_FEATURE (factory))) == GST_RANK_NONE)
241 241
+      return;
242 242
+  }
243
+
244 243
+
245 244
   /* decoder/demuxer sink pads should always be static and there should only
246 245
    * be one, the same applies to encoders/muxers and source pads */
247 246
   static_templates = gst_element_factory_get_static_pad_templates (factory);
248
@@ -1399,15 +1622,20 @@
247
@@ -1792,15 +2014,20 @@ print_plugin_automatic_install_info_code
249 248
     gst_structure_remove_field (s, "rate");
250 249
     gst_structure_remove_field (s, "depth");
251 250
     gst_structure_remove_field (s, "clock-rate");
252 251
-    s_str = gst_structure_to_string (s);
253 252
-    g_print ("%s-%s\n", type_name, s_str);
254 253
-    g_free (s_str);
255
+    if (!rpm_format) {
254
+	if (!rpm_format) {
256 255
+      s_str = gst_structure_to_string (s);
257 256
+      g_print ("%s-%s\n", type_name, s_str);
258 257
+      g_free (s_str);
... ... @@ -267,12 +269,12 @@ diff -urN gstreamer-1.8.3/tools/gst-inspect.c gstreamer-1.8.3-patched/tools/gst-
269 269
 {
270 270
   const gchar *const *protocols;
271 271
 
272
@@ -1416,13 +1644,19 @@
272
@@ -1809,13 +2036,19 @@ print_plugin_automatic_install_info_prot
273 273
     switch (gst_element_factory_get_uri_type (factory)) {
274 274
       case GST_URI_SINK:
275 275
         while (*protocols != NULL) {
276 276
-          g_print ("urisink-%s\n", *protocols);
277
+          if (!rpm_format)
277
+			if (!rpm_format)
278 278
+            g_print ("urisink-%s\n", *protocols);
279 279
+          else
280 280
+            g_print ("gstreamer1(urisink-%s)\n", *protocols);
... ... @@ -282,14 +284,14 @@ diff -urN gstreamer-1.8.3/tools/gst-inspect.c gstreamer-1.8.3-patched/tools/gst-
284 284
       case GST_URI_SRC:
285 285
         while (*protocols != NULL) {
286 286
-          g_print ("urisource-%s\n", *protocols);
287
+          if (!rpm_format)
287
+			if (!rpm_format)
288 288
+            g_print ("urisource-%s\n", *protocols);
289 289
+          else
290 290
+            g_print ("gstreamer1(urisource-%s)\n", *protocols);
291 291
           ++protocols;
292 292
         }
293 293
         break;
294
@@ -1433,7 +1667,7 @@
294
@@ -1826,7 +2059,7 @@ print_plugin_automatic_install_info_prot
295 295
 }
296 296
 
297 297
 static void
... ... @@ -298,12 +300,12 @@ diff -urN gstreamer-1.8.3/tools/gst-inspect.c gstreamer-1.8.3-patched/tools/gst-
300 300
 {
301 301
   GList *features, *l;
302 302
 
303
@@ -1452,11 +1686,15 @@
303
@@ -1845,11 +2078,15 @@ print_plugin_automatic_install_info (Gst
304 304
     if (feature_plugin == plugin) {
305 305
       GstElementFactory *factory;
306 306
 
307 307
-      g_print ("element-%s\n", gst_plugin_feature_get_name (feature));
308
+      if (!rpm_format)
308
+    if (!rpm_format)
309 309
+        g_print ("element-%s\n", gst_plugin_feature_get_name (feature));
310 310
+      else
311 311
+        g_print ("gstreamer1(element-%s)\n",
... ... @@ -317,7 +319,7 @@ diff -urN gstreamer-1.8.3/tools/gst-inspect.c gstreamer-1.8.3-patched/tools/gst-
319 319
     }
320 320
     if (feature_plugin)
321 321
       gst_object_unref (feature_plugin);
322
@@ -1478,7 +1716,7 @@
322
@@ -1871,7 +2108,7 @@ print_all_plugin_automatic_install_info
323 323
     plugin = (GstPlugin *) (plugins->data);
324 324
     plugins = g_list_next (plugins);
325 325
 
... ... @@ -326,7 +328,7 @@ diff -urN gstreamer-1.8.3/tools/gst-inspect.c gstreamer-1.8.3-patched/tools/gst-
328 328
   }
329 329
   gst_plugin_list_free (orig_plugins);
330 330
 }
331
@@ -1490,6 +1728,7 @@
331
@@ -1938,6 +2175,7 @@ main (int argc, char *argv[])
332 332
   gboolean do_print_blacklist = FALSE;
333 333
   gboolean plugin_name = FALSE;
334 334
   gboolean print_aii = FALSE;
... ... @@ -334,17 +336,17 @@ diff -urN gstreamer-1.8.3/tools/gst-inspect.c gstreamer-1.8.3-patched/tools/gst-
336 336
   gboolean uri_handlers = FALSE;
337 337
   gboolean check_exists = FALSE;
338 338
   gchar *min_version = NULL;
339
@@ -1508,6 +1747,9 @@
339
@@ -1958,6 +2196,9 @@ main (int argc, char *argv[])
340 340
               "or all plugins provide.\n                                       "
341 341
               "Useful in connection with external automatic plugin "
342 342
               "installation mechanisms"), NULL},
343
+    {"rpm", '\0', 0, G_OPTION_ARG_NONE, &print_aii_rpm,
344
+        N_("Print the machine-parsable list of features of a plugin in RPM "
343
+  {"rpm", '
344
+      N_("Print the machine-parsable list of features of a plugin in RPM "
345 345
+              "Provides compatible-format"), NULL},
346 346
     {"plugin", '\0', 0, G_OPTION_ARG_NONE, &plugin_name,
347 347
         N_("List the plugin contents"), NULL},
348 348
     {"types", 't', 0, G_OPTION_ARG_STRING, &types,
349
@@ -1650,7 +1892,7 @@
349
@@ -2113,7 +2354,7 @@ main (int argc, char *argv[])
350 350
       /* if there is such a plugin, print out info */
351 351
       if (plugin) {
352 352
         if (print_aii) {
... ... @@ -353,7 +355,7 @@ diff -urN gstreamer-1.8.3/tools/gst-inspect.c gstreamer-1.8.3-patched/tools/gst-
355 355
         } else {
356 356
           print_plugin_info (plugin);
357 357
           print_plugin_features (plugin);
358
@@ -1663,13 +1905,16 @@
358
@@ -2126,19 +2367,25 @@ main (int argc, char *argv[])
359 359
 
360 360
           if (plugin) {
361 361
             if (print_aii) {
... ... @@ -370,5 +372,15 @@ diff -urN gstreamer-1.8.3/tools/gst-inspect.c gstreamer-1.8.3-patched/tools/gst-
372 372
+            else
373 373
+              g_printerr (_("Could not load plugin file: %s\n"), error->message);
374 374
             g_clear_error (&error);
375
             return -1;
375
             exit_code = -1;
376
             goto done;
376 377
           }
378
         } else {
379
-          g_printerr (_("No such element or plugin '%s'\n"), arg);
380
+          if (!print_aii_rpm)
381
+            g_printerr (_("No such element or plugin '%s'\n"), arg);
382
+          else
383
+            g_printerr (_("No such element or plugin '%s'\n"), arg);
384
           exit_code = -1;
385
           goto done;
386
         }
view file @ 3ca5640a33
... ... --- a/gstreamer1.0.spec
... ... +++ b/gstreamer1.0.spec
... ... @@ -1,28 +1,29 @@
1
%define oname	gstreamer
2
%define api	1.0
3
%define name	%{oname}%{api}
4
%define vname	%{oname}10
1
%define	oname	gstreamer
2
%define	api	1.0
3
%define	name	%{oname}%{api}
4
%define	vname	%{oname}10
5 5
6
%define major		0
7
%define libname		%mklibname %{oname} %{api} %{major}
8
%define girname		%mklibname gst-gir %{api}
9
%define devname		%mklibname %{name} -d
6
%define	major		0
7
%define	libname		%mklibname %{oname} %{api} %{major}
8
%define	girname		%mklibname gst-gir %{api}
9
%define	devname		%mklibname %{name} -d
10 10
11 11
%bcond_with docs
12 12
13 13
Summary:	GStreamer Streaming-media framework runtime
14 14
Name:		%{oname}%{api}
15
Version:	1.12.4
16
Release:	4
15
Version:	1.16.0
16
Release:	1
17 17
License:	LGPLv2+
18 18
Group:		Sound
19 19
Url:		http://gstreamer.freedesktop.org/
20 20
Source0:	http://gstreamer.freedesktop.org/src/gstreamer/%{oname}-%{version}.tar.xz
21 21
Source1:	gstreamer.prov
22
Patch0:		gstreamer-inspect-rpm-format.patch
22
Patch0:		gstreamer-1.16.0-inspect-rpm-format.patch
23
# TODO: Switch to meson build system
23 24
BuildRequires:	chrpath
24
BuildRequires:	bison
25
BuildRequires:	flex
25
BuildRequires:	bison >= 2.4
26
BuildRequires:	flex >= 2.5.31
26 27
%ifarch %{ix86}
27 28
BuildRequires:	nasm
28 29
%endif
... ... @@ -34,7 +35,8 @@ BuildRequires: gtk-doc >= 0.7
35 35
BuildRequires:	python-pyxml
36 36
BuildRequires:	transfig
37 37
%endif
38
BuildRequires:	gettext-devel
38
BuildRequires:	gettext-devel >= 0.17
39
BuildRequires:	pkgconfig(bash-completion)
39 40
BuildRequires:	pkgconfig(check)
40 41
BuildRequires:	pkgconfig(gio-2.0) >= 2.32.0
41 42
BuildRequires:	pkgconfig(glib-2.0) >= 2.32.0
... ... @@ -85,8 +87,12 @@ plugins.
87 87
%{_datadir}/bash-completion/completions/gst-inspect-1.0
88 88
%{_datadir}/bash-completion/completions/gst-launch-1.0
89 89
%{_datadir}/bash-completion/helpers/gst
90
%{_datadir}/gdb/auto-load%{_libdir}/libgstreamer-1.0.so.0.1600.0-gdb.py
91
%{_datadir}/gstreamer-1.0/gdb/glib_gobject_helper.py
92
%{_datadir}/gstreamer-1.0/gdb/gst_gdb.py
90 93
%{_libdir}/gstreamer-1.0/gst-ptp-helper
91 94
%{_libdir}/gstreamer-1.0/gst-completion-helper
95
92 96
#----------------------------------------------------------------------------
93 97
94 98
%package -n %{libname}
... ... @@ -106,6 +112,7 @@ plugins.
112 112
This package contains the libraries.
113 113
114 114
%files -n %{libname}
115
%doc COPYING
115 116
%dir %{_libdir}/%{oname}-%{api}
116 117
%{_libdir}/libgstbase-%{api}.so.%{major}*
117 118
%{_libdir}/libgstcheck-%{api}.so.%{major}*
... ... @@ -127,6 +134,7 @@ Requires: %{libname} = %{version}-%{release}
134 134
GObject Introspection interface libraries for %{name}.
135 135
136 136
%files -n %{girname}
137
%doc COPYING
137 138
%{_libdir}/girepository-1.0/Gst-%{api}.typelib
138 139
%{_libdir}/girepository-1.0/GstBase-%{api}.typelib
139 140
%{_libdir}/girepository-1.0/GstCheck-%{api}.typelib
... ... @@ -147,17 +155,17 @@ GStreamer is a streaming-media framework, based on graphs of filters which
155 155
operate on media data. Applications using this library can do anything
156 156
from real-time sound processing to playing videos, and just about anything
157 157
else media-related.  Its plugin-based architecture means that new data
158
types or processing capabilities can be added simply by installing new   
158
types or processing capabilities can be added simply by installing new
159 159
plugins.
160 160
161 161
This package contains the libraries and includes files necessary to develop
162 162
applications and plugins for GStreamer.
163 163
164 164
%files -n %{devname}
165
%doc ChangeLog
166
%if %{with docs}
167
%doc installed-docs/*
168
%endif
165
%doc ChangeLog COPYING
166
#if %%{with docs}
167
#%%doc installed-docs/*
168
#endif
169 169
%{_prefix}/lib/rpm/%{_vendor}/%{name}.prov
170 170
%dir %{_includedir}/%{oname}-%{api}
171 171
%dir %{_includedir}/%{oname}-%{api}/gst
... ... @@ -179,9 +187,9 @@ applications and plugins for GStreamer.
187 187
%{_libdir}/pkgconfig/gstreamer-check-%{api}.pc
188 188
%{_libdir}/pkgconfig/gstreamer-net-%{api}.pc
189 189
%{_libdir}/pkgconfig/gstreamer-controller-%{api}.pc
190
## we specify the API docs as regular files since %docs doesn't fail when
190
## We specify the API docs as regular files since %%docs doesn't fail when
191 191
#  files aren't found anymore for RPM >= 4
192
#  we list all of the files we really need to trap incomplete doc builds
192
#  We list all of the files we really need to trap incomplete doc builds
193 193
#  then we catch the rest with *, you can safely ignore the errors from this
194 194
## gstreamer API
195 195
%{_datadir}/gtk-doc/html/*
... ... @@ -198,6 +206,7 @@ applications and plugins for GStreamer.
206 206
%setup -q -n %{oname}-%{version}
207 207
%apply_patches
208 208
209
209 210
%build
210 211
%configure2_5x \
211 212
	--enable-debug \
... ... @@ -209,10 +218,8 @@ applications and plugins for GStreamer.
218 218
	--disable-examples \
219 219
	--disable-rpath \
220 220
%if %{with docs}
221
	--enable-docbook \
222 221
	--enable-gtk-doc \
223 222
%else
224
	--disable-docbook \
225 223
	--disable-gtk-doc \
226 224
%endif
227 225
%ifarch %{mips}
... ... @@ -227,9 +234,9 @@ applications and plugins for GStreamer.
234 234
235 235
mkdir -p %{buildroot}%{_var}/cache/%{oname}-%{api}
236 236
237
%if %{with docs}
238
mv %{buildroot}%{_datadir}/doc/%{oname}-%{api}/ installed-docs
239
%endif
237
#if %%{with docs}
238
#mv %%{buildroot}%%{_datadir}/doc/%%{oname}-%%{api}/ installed-docs
239
#endif
240 240
241 241
#gw really remove rpath for rpmlint
242 242
chrpath -d %{buildroot}{%{_bindir}/gst-{inspect,launch,typefind}-1.0,%{_libdir}/{*.so,%{oname}-%{api}/*.so}}
... ... @@ -237,4 +244,7 @@ chrpath -d %{buildroot}{%{_bindir}/gst-{inspect,launch,typefind}-1.0,%{_libdir}/
244 244
# Add the provides script
245 245
install -m0755 -D %{SOURCE1} %{buildroot}%{_prefix}/lib/rpm/%{_vendor}/%{name}.prov
246 246
247
# Fix perms
248
chmod -x %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/libgstreamer-1.0.so.0.1600.0-gdb.py
249
247 250
%find_lang %{oname}-%{api}

Comments