cleanup

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

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

@@ -1,60 +0,0 @@
-diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
-index 15586cc..c1a16b7 100644
---- a/modules/access/mms/mmstu.c
-+++ b/modules/access/mms/mmstu.c
-@@ -1572,6 +1572,7 @@ static void *KeepAliveThread( void *p_data )
-         msleep( 10 * CLOCK_FREQ );
-     }
-     assert(0);
-+    return NULL; /* dead code, but the compiler can't know */
- }
- 
- static void KeepAliveStart( access_t *p_access )
-diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
-index a3357d6..1ede179 100644
---- a/modules/access/live555.cpp
-+++ b/modules/access/live555.cpp
-@@ -1975,6 +1975,7 @@ static void* TimeoutPrevention( void *p_data )
-         msleep (((int64_t)p_timeout->p_sys->i_timeout - 2) * CLOCK_FREQ);
-     }
-     assert(0); /* dead code */
-+    return NULL; /* dead code, but the compiler can't know */
- }
- 
- /*****************************************************************************
-diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
-index 613f6c0..32e346f 100644
---- a/modules/stream_out/rtp.c
-+++ b/modules/stream_out/rtp.c
-@@ -1507,6 +1507,7 @@ static void *rtp_listen_thread( void *data )
-     }
- 
-     assert( 0 );
-+    return NULL; /* dead code, but the compiler can't know */
- }
- 
- 
-diff --git a/src/misc/events.c b/src/misc/events.c
-index e3b1ee0..20480c2 100644
---- a/src/misc/events.c
-+++ b/src/misc/events.c
-@@ -265,6 +265,7 @@ int vlc_event_attach( vlc_event_manager_t * p_em,
-     FOREACH_END()
-     /* Unknown event = BUG */
-     assert( 0 );
-+    return 0;
- }
- 
- /**
-diff --git a/src/video_output/display.c b/src/video_output/display.c
-index c743836..9b778ea 100644
---- a/src/video_output/display.c
-+++ b/src/video_output/display.c
-@@ -555,6 +555,7 @@ static void *VoutDisplayEventKeyDispatch(void *data)
- 
-         vlc_restorecancel(cancel);
-     }
-+    return NULL;
- }
- 
- static void VoutDisplayEventKey(vout_display_t *vd, int key)

vlc.changes

@@ -12,7 +12,7 @@ Wed Sep 25 19:38:09 UTC 2013 - dimstar@opensuse.org
       manually.
   + LOTS of updates all over. See NEWS for a full overview.
 - Rebase fix_font_path.patch.
-- Rebase 0001-no-return-in-non-void.patch.
+- Drop 0001-no-return-in-non-void.patch: no longer needed.
 - Drop vlc-avcodec-encoder-single-threaded.patch: fixed upstream.
 - Drop ppc64_altivec.patch: fixed upstream.
 

vlc.spec

@@ -35,7 +35,6 @@ 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
@@ -253,7 +252,6 @@ Extends VLC with Pulse Audio Support for Audio Out
 %prep
 %setup -q -n %{name}-%{_version}
 %patch1 -p1
-%patch3 -p1
 rm -rf contrib
 
 %build