Accepting request 201847 from home:wolfi323:branches:multimedia:libs

- Re-add and adapt 0001-no-return-in-non-void.patch: fixes build on openSUSE versions other than Factory (esp. 12.3)
Without this the build fails the post build checks (several no-return-in-nonvoid-function errors), see f.e.:
https://build.opensuse.org/package/show/KDE:Distro:Factory/vlc

OBS-URL: https://build.opensuse.org/request/show/201847
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=48

0001-no-return-in-non-void.patch

@@ -0,0 +1,92 @@
+diff --git a/modules/access/v4l2/demux.c b/modules/access/v4l2/demux.c
+index 73af8ce..8ffad6f 100644
+--- a/modules/access/v4l2/demux.c
++++ b/modules/access/v4l2/demux.c
+@@ -629,6 +629,7 @@ static void *MmapThread (void *data)
+     }
+ 
+     assert (0);
++    return NULL; /* dead code, but the compiler can't know */
+ }
+ 
+ static void *ReadThread (void *data)
+@@ -691,6 +692,7 @@ static void *ReadThread (void *data)
+ #endif
+     }
+     assert (0);
++    return NULL; /* dead code, but the compiler can't know */
+ }
+ 
+ static int DemuxControl( demux_t *demux, int query, va_list args )
+diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
+index 8d7dc6e..cc924aa 100644
+--- a/modules/control/dbus/dbus.c
++++ b/modules/control/dbus/dbus.c
+@@ -880,6 +880,7 @@ static void *Run( void *data )
+         vlc_restorecancel( canc );
+     }
+     assert(0);
++    return NULL; /* dead code, but the compiler can't know */
+ }
+ 
+ static void   wakeup_main_loop( void *p_data )
+diff --git a/modules/control/motion.c b/modules/control/motion.c
+index 72d7ec6..49c5620 100644
+--- a/modules/control/motion.c
++++ b/modules/control/motion.c
+@@ -190,6 +190,7 @@ static void *RunIntf( void *data )
+         vlc_restorecancel( canc );
+     }
+     assert(0);
++    return NULL; /* dead code, but the compiler can't know */
+ }
+ #undef LOW_THRESHOLD
+ #undef HIGH_THRESHOLD
+diff --git a/modules/control/motionlib.c b/modules/control/motionlib.c
+index 9d24ced..b087410 100644
+--- a/modules/control/motionlib.c
++++ b/modules/control/motionlib.c
+@@ -196,6 +196,7 @@ static int GetOrientation( motion_sensors_t *motion )
+     default:
+         assert( 0 );
+     }
++    return 0; /* dead code, but the compiler can't know */
+ }
+ 
+ /*****************************************************************************
+diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
+index 62c89b7..81f884a 100644
+--- a/modules/stream_out/rtp.c
++++ b/modules/stream_out/rtp.c
+@@ -1501,6 +1501,7 @@ static void *rtp_listen_thread( void *data )
+     }
+ 
+     assert( 0 );
++    return NULL; /* dead code, but the compiler can't know */
+ }
+ 
+ 
+diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c
+index 0baa2bc..6b788cb 100644
+--- a/modules/visualization/visual/visual.c
++++ b/modules/visualization/visual/visual.c
+@@ -366,6 +366,7 @@ static void *Thread( void *data )
+         vlc_restorecancel( canc );
+     }
+     assert(0);
++    return NULL;
+ }
+ 
+ static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf )
+diff --git a/src/misc/events.c b/src/misc/events.c
+index b430ee5..29c387f 100644
+--- a/src/misc/events.c
++++ b/src/misc/events.c
+@@ -271,6 +271,7 @@ int vlc_event_attach( vlc_event_manager_t * p_em,
+     FOREACH_END()
+     /* Unknown event = BUG */
+     assert( 0 );
++    return 0;
+ }
+ 
+ /**

vlc.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct  2 9:11:58 UTC 2013 - wbauer@tmo.at
+
+- Re-add and adapt 0001-no-return-in-non-void.patch: fixes build on
+  openSUSE versions other than Factory
+
 -------------------------------------------------------------------
 Wed Oct  2 08:20:45 UTC 2013 - guillaume@opensuse.org
 

vlc.spec

@@ -41,6 +41,7 @@ Release:        0
 %define _version 2.1.0
 Source:         http://download.videolan.org/vlc/%{_version}/vlc-%{_version}.tar.xz
 Patch1:         fix_font_path.patch
+Patch3:         0001-no-return-in-non-void.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  aalib-devel
 BuildRequires:  alsa-devel
@@ -261,6 +262,7 @@ Extends VLC with Pulse Audio Support for Audio Out
 %prep
 %setup -q -n %{name}-%{_version}
 %patch1 -p1
+%patch3 -p1
 rm -rf contrib
 
 %build