← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnomeradio/trusty

« back to all changes in this revision

Viewing changes to debian/patches/gnomeradio-gstreamer-1.0.patch

  • Committer: Package Import Robot
  • Author(s): POJAR GEORGE
  • Date: 2013-09-20 13:31:33 UTC
  • Revision ID: package-import@ubuntu.com-20130920133133-otwactksfjh4bwev
Tags: 1.8-2ubuntu23
https://launchpad.net/bugs/1232931
* Updated debian/patches/gnomeradio-tray_menu.patch:
  - Fixed menu item not update conform new order when we use move up[down]
    swap. (LP: #1232931)
  - Fixed conditional jump or move depends on uninitialized value.
  - Added function to switch to preset in settings preset list when changed
    them from tray menu.
  - Cleaned up the files relating to the tray icon. Neither gui.c, prefs.c nor
    record.c touch the internals of trayicon.c anymore.
* Updated debian/patches/gnomeradio-preferences.patch:
  - Added option to disable audio loopback mode in Preferences settings.
  - Moved in separate GOptionGroup all command line parameters which refers to
    audio loopback mode.
* Updated debian/patches/gnomeradio-device.patch: Not need radio_mute() when
  exit or session die, already is called in radio_stop().
* Updated debian/patches/gnomeradio-station_list.patch: Fixed pointer targets
  in passing argument differ in signedness.
* Removed the content against configure and Makefile.in, since we use
  autoreconf anyways, from:
  - debian/patches/gnomeradio-gstreamer-1.0.patch.
  - debian/patches/gnomeradio-volume_button.patch.
* Updated debian/patches/gnomeradio-volume_button.patch: Removed unused
  vol_down[up].xpm icons.
* debian/gnomeradio.1: Updated man page.   

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/gnomeradio-gstreamer-1.0.patch
1
 
## Description: Port to GStreamer 1.0 API.
2
 
## Origin: upstream, no
3
 
## Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnomeradio/+bug/1085118
4
 
## Author: Pojar George <geoubuntu@gmail.com> 
5
 
## Forwarded: no
6
 
Index: gnomeradio-1.8/configure
7
 
===================================================================
8
 
--- gnomeradio-1.8.orig/configure       2013-07-25 00:39:31.404182000 +0000
9
 
+++ gnomeradio-1.8/configure    2013-07-25 00:39:31.404182000 +0000
10
 
@@ -23128,12 +23128,12 @@
11
 
         pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
12
 
     else
13
 
         if test -n "$PKG_CONFIG" && \
14
 
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 gstreamer-plugins-base-0.10\"") >&5
15
 
-  ($PKG_CONFIG --exists --print-errors "gstreamer-0.10 gstreamer-plugins-base-0.10") 2>&5
16
 
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 gstreamer-plugins-base-1.0\"") >&5
17
 
+  ($PKG_CONFIG --exists --print-errors "gstreamer-1.0 gstreamer-plugins-base-1.0") 2>&5
18
 
   ac_status=$?
19
 
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
20
 
   (exit $ac_status); }; then
21
 
-  pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10 gstreamer-plugins-base-0.10" 2>/dev/null`
22
 
+  pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-1.0 gstreamer-plugins-base-1.0" 2>/dev/null`
23
 
 else
24
 
   pkg_failed=yes
25
 
 fi
26
 
@@ -23146,12 +23146,12 @@
27
 
         pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
28
 
     else
29
 
         if test -n "$PKG_CONFIG" && \
30
 
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 gstreamer-plugins-base-0.10\"") >&5
31
 
-  ($PKG_CONFIG --exists --print-errors "gstreamer-0.10 gstreamer-plugins-base-0.10") 2>&5
32
 
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 gstreamer-plugins-base-1.0\"") >&5
33
 
+  ($PKG_CONFIG --exists --print-errors "gstreamer-1.0 gstreamer-plugins-base-1.0") 2>&5
34
 
   ac_status=$?
35
 
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
36
 
   (exit $ac_status); }; then
37
 
-  pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10 gstreamer-plugins-base-0.10" 2>/dev/null`
38
 
+  pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-1.0 gstreamer-plugins-base-1.0" 2>/dev/null`
39
 
 else
40
 
   pkg_failed=yes
41
 
 fi
42
 
@@ -23170,14 +23170,14 @@
43
 
         _pkg_short_errors_supported=no
44
 
 fi
45
 
         if test $_pkg_short_errors_supported = yes; then
46
 
-               GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-0.10 gstreamer-plugins-base-0.10"`
47
 
+               GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-1.0 gstreamer-plugins-base-1.0"`
48
 
         else
49
 
-               GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-0.10 gstreamer-plugins-base-0.10"`
50
 
+               GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-1.0 gstreamer-plugins-base-1.0"`
51
 
         fi
52
 
        # Put the nasty error message in config.log where it belongs
53
 
        echo "$GSTREAMER_PKG_ERRORS" >&5
54
 
 
55
 
-       { { echo "$as_me:$LINENO: error: Package requirements (gstreamer-0.10 gstreamer-plugins-base-0.10) were not met:
56
 
+       { { echo "$as_me:$LINENO: error: Package requirements (gstreamer-1.0 gstreamer-plugins-base-1.0) were not met:
57
 
 
58
 
 $GSTREAMER_PKG_ERRORS
59
 
 
60
 
@@ -23188,7 +23188,7 @@
61
 
 and GSTREAMER_LIBS to avoid the need to call pkg-config.
62
 
 See the pkg-config man page for more details.
63
 
 " >&5
64
 
-echo "$as_me: error: Package requirements (gstreamer-0.10 gstreamer-plugins-base-0.10) were not met:
65
 
+echo "$as_me: error: Package requirements (gstreamer-1.0 gstreamer-plugins-base-1.0) were not met:
66
 
 
67
 
 $GSTREAMER_PKG_ERRORS
68
 
 
 
1
Description: Port to GStreamer 1.0 API.
 
2
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnomeradio/+bug/1085118
 
3
Author: POJAR GEORGE <geoubuntu@gmail.com>
69
4
Index: gnomeradio-1.8/configure.in
70
5
===================================================================
71
 
--- gnomeradio-1.8.orig/configure.in    2013-07-25 00:39:31.404182000 +0000
72
 
+++ gnomeradio-1.8/configure.in 2013-07-25 00:39:44.000000000 +0000
 
6
--- gnomeradio-1.8.orig/configure.in    2013-09-28 11:13:18.441641316 +0000
 
7
+++ gnomeradio-1.8/configure.in 2013-09-28 11:13:18.433641317 +0000
73
8
@@ -28,10 +28,14 @@
74
9
 AC_SUBST(GNOME_LIBS)
75
10
 AC_SUBST(LIRC)
88
23
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
89
24
Index: gnomeradio-1.8/src/record.c
90
25
===================================================================
91
 
--- gnomeradio-1.8.orig/src/record.c    2013-07-25 00:39:31.404182000 +0000
92
 
+++ gnomeradio-1.8/src/record.c 2013-07-25 00:39:43.000000000 +0000
 
26
--- gnomeradio-1.8.orig/src/record.c    2013-09-28 11:13:18.441641316 +0000
 
27
+++ gnomeradio-1.8/src/record.c 2013-09-28 11:13:18.433641317 +0000
93
28
@@ -191,13 +191,12 @@
94
29
 
95
30
        /* length */
107
42
 
108
43
Index: gnomeradio-1.8/src/rec_tech.c
109
44
===================================================================
110
 
--- gnomeradio-1.8.orig/src/rec_tech.c  2013-07-25 00:39:31.404182000 +0000
111
 
+++ gnomeradio-1.8/src/rec_tech.c       2013-07-25 00:44:54.208009639 +0000
 
45
--- gnomeradio-1.8.orig/src/rec_tech.c  2013-09-28 11:13:18.441641316 +0000
 
46
+++ gnomeradio-1.8/src/rec_tech.c       2013-09-28 11:13:18.437641316 +0000
112
47
@@ -25,7 +25,10 @@
113
48
 #include <fcntl.h>
114
49
 #include <math.h>
215
150
        g_object_set(G_OBJECT(filesink), "location", path, NULL);
216
151
Index: gnomeradio-1.8/src/Makefile.am
217
152
===================================================================
218
 
--- gnomeradio-1.8.orig/src/Makefile.am 2013-07-25 00:39:31.404182000 +0000
219
 
+++ gnomeradio-1.8/src/Makefile.am      2013-07-25 00:39:44.000000000 +0000
 
153
--- gnomeradio-1.8.orig/src/Makefile.am 2013-09-28 11:13:18.441641316 +0000
 
154
+++ gnomeradio-1.8/src/Makefile.am      2013-09-28 11:13:18.437641316 +0000
220
155
@@ -1,5 +1,5 @@
221
156
 INCLUDES = -I$(top_srcdir) -I$(includedir) \
222
157
-           $(GNOME_CFLAGS) $(GSTREAMER_CFLAGS) \
230
165
 
231
166
-gnomeradio_LDADD = $(GNOME_LIBS) $(GSTREAMER_LIBS) $(LIRC)
232
167
+gnomeradio_LDADD = $(GNOME_LIBS) $(GSTREAMER_LIBS) $(XML_LIBS) $(LIRC)
233
 
Index: gnomeradio-1.8/src/Makefile.in
234
 
===================================================================
235
 
--- gnomeradio-1.8.orig/src/Makefile.in 2013-07-25 00:39:31.404182000 +0000
236
 
+++ gnomeradio-1.8/src/Makefile.in      2013-07-25 00:39:31.404182000 +0000
237
 
@@ -247,7 +247,7 @@
238
 
 sysconfdir = @sysconfdir@
239
 
 target_alias = @target_alias@
240
 
 INCLUDES = -I$(top_srcdir) -I$(includedir) \
241
 
-           $(GNOME_CFLAGS) $(GSTREAMER_CFLAGS) \
242
 
+           $(GNOME_CFLAGS) $(GSTREAMER_CFLAGS) $(XML_CFLAGS) \
243
 
            -DG_LOG_DOMAIN=\"gnomeradio\" \
244
 
            -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
245
 
            -DDATADIR=\""$(datadir)/"\" \
246
 
@@ -277,7 +277,7 @@
247
 
             v4l1.c \
248
 
             v4l2.c
249
 
 
250
 
-gnomeradio_LDADD = $(GNOME_LIBS) $(GSTREAMER_LIBS) $(LIRC)
251
 
+gnomeradio_LDADD = $(GNOME_LIBS) $(GSTREAMER_LIBS) $(XML_LIBS) $(LIRC)
252
 
 all: all-am
253
 
 
254
 
 .SUFFIXES:
255
168
Index: gnomeradio-1.8/src/gui.c
256
169
===================================================================
257
 
--- gnomeradio-1.8.orig/src/gui.c       2013-07-25 00:39:31.404182000 +0000
258
 
+++ gnomeradio-1.8/src/gui.c    2013-07-25 00:39:44.000000000 +0000
 
170
--- gnomeradio-1.8.orig/src/gui.c       2013-09-28 11:13:18.441641316 +0000
 
171
+++ gnomeradio-1.8/src/gui.c    2013-09-28 11:13:18.437641316 +0000
259
172
@@ -27,6 +27,7 @@
260
173
 #include <dbus/dbus-glib.h>
261
174
 #include <dbus/dbus-glib-bindings.h>