Changes of Revision 6
| [-] | Changed | vlc.spec |
|
x 1 2 -%define libvlc 53 -%define libvlccore 44 -5 -Name: vlc6 -Version: 1.1.137 -Release: 11.68 -9 -License: GNU General Public License (GPL)10 -Summary: VLC - Video Lan Client11 -Url: http://www.videolan.org/12 -Group: Productivity/Multimedia/Video/Players13 +# vim: set ts=4 sw=4 et:14 +#15 +# spec file for vlc16 +#17 +# Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands18 +#19 +# All modifications and additions to the file contributed by third parties20 +# remain the property of their copyright owners, unless otherwise agreed21 +# upon. The license for this file, and modifications and additions to the22 +# file, is the same license as for the pristine package itself (unless the23 +# license for the pristine package is not an Open Source License, in which24 +# case the license is the MIT License). An "Open Source License" is a25 +# license that conforms to the Open Source Definition (Version 1.9)26 +# published by the Open Source Initiative.27 28 -Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.bz229 +# Please submit bugfixes or comments via email30 31 -Patch0: vlc-fix_font_path.patch32 -Patch1: vlc-no_return_in_non_void.patch33 -#Patch2: vlc-buildcompare.patch34 -Patch3: vlc-opencv22.patch35 -Patch4: vlc-errno_h.patch36 -Patch5: vlc-asserts_h.patch37 -38 -Requires: vlc-noX = %{version}39 -Requires: vlc-qt = %{version}40 -Recommends: freefont41 +%define pulseplugin 0%{suse_version} >= 114042 +%define withxcb 0%{suse_version} > 113143 +%define libvlc 544 +%define libvlccore 545 +%define conflicts vlc-beta46 47 +Summary: VLC - Video Lan Client48 +Name: vlc49 +Version: 2.0.250 +%define _version 2.0.251 +Release: 5.752 +URL: http://www.videolan.org/vlc/53 +Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}.tar.xz54 +Patch1: vlc-fix_font_path.patch55 +Patch2: vlc-buildcompare.patch56 +Patch3: 0001-no-return-in-non-void.patch57 +Patch4: vlc-autoconf-compat.patch58 +License: GPL-2.0+59 +Group: Productivity/Multimedia/Video/Players 60 BuildRoot: %{_tmppath}/%{name}-%{version}-build61 -62 -### base ###63 +BuildRequires: aalib-devel64 +BuildRequires: alsa-devel65 +BuildRequires: avahi-devel66 +BuildRequires: faad2-devel67 BuildRequires: fdupes68 -BuildRequires: fribidi-devel69 -BuildRequires: liba52-devel70 -BuildRequires: libffmpeg-devel71 -BuildRequires: libgcrypt-devel72 -BuildRequires: libmad-devel73 -BuildRequires: libqt4-devel74 -BuildRequires: lua-devel75 -BuildRequires: update-desktop-files76 -77 -### default enabled ####78 BuildRequires: flac-devel79 +BuildRequires: fluidsynth-devel80 +BuildRequires: freetype2-devel81 +BuildRequires: fribidi-devel82 +BuildRequires: gcc-c++83 +%if 0%{?suse_version} >= 114084 +BuildRequires: gdk-pixbuf-devel85 +%endif86 +BuildRequires: gettext-devel87 +BuildRequires: git88 BuildRequires: gnome-vfs2-devel89 BuildRequires: gnutls-devel90 +BuildRequires: gtk2-devel91 +BuildRequires: liba52-devel92 BuildRequires: libass-devel93 -BuildRequires: libavahi-devel94 +BuildRequires: libavc1394-devel95 +BuildRequires: libbluray-devel96 BuildRequires: libcaca-devel97 BuildRequires: libcddb-devel98 BuildRequires: libcdio-devel99 -BuildRequires: libdvbpsi-devel100 -BuildRequires: libdvdnav-devel101 -BuildRequires: libdvdread-devel102 -BuildRequires: libebml-devel103 -BuildRequires: libfaad-devel104 +%if 0%suse_version < 1140105 +BuildRequires: libdc1394_control12-devel106 +%endif107 +BuildRequires: libdc1394-devel108 +BuildRequires: libdca-devel109 +BuildRequires: libdvbpsi-devel 110 +BuildRequires: libdvdnav-devel 111 +BuildRequires: libdvdread-devel 112 +BuildRequires: libfaac-devel 113 +BuildRequires: libffmpeg-devel 114 +BuildRequires: libgcrypt-devel115 +BuildRequires: libjack-devel116 BuildRequires: libkate-devel117 +BuildRequires: libmad-devel 118 BuildRequires: libmatroska-devel119 BuildRequires: libmodplug-devel120 -BuildRequires: libmpcdec-devel121 -BuildRequires: libmpeg2-devel122 +BuildRequires: libmpeg2-devel 123 BuildRequires: libmtp-devel124 -BuildRequires: libprojectM-devel125 -BuildRequires: libproxy-devel126 +BuildRequires: libnotify-devel 127 +BuildRequires: libogg-devel 128 +%if 0%{suse_version} >= 1120129 +BuildRequires: libproxy-devel 130 +%endif131 +BuildRequires: libqt4-devel132 +BuildRequires: libraw1394-devel133 BuildRequires: librsvg-devel134 -BuildRequires: libschroedinger-devel >= 1.0.10135 +BuildRequires: libsamplerate-devel136 BuildRequires: libshout-devel137 BuildRequires: libsmbclient-devel138 -BuildRequires: libtag-devel139 +BuildRequires: libssh-devel140 +BuildRequires: libtheora-devel141 +BuildRequires: libtool142 BuildRequires: libtwolame-devel143 +%if 0%{suse_version} > 1100 144 BuildRequires: libudev-devel145 +%endif146 BuildRequires: libupnp-devel147 +%if 0%{?suse_version} > 1130148 BuildRequires: libv4l-devel149 -BuildRequires: live-devel150 -BuildRequires: sqlite3-devel151 -BuildRequires: valgrind-devel152 -BuildRequires: zvbi-devel153 -BuildRequires: libnotify-devel154 -BuildRequires: libxml2-devel155 -156 -%ifnarch ppc157 -BuildRequires: fluidsynth-devel158 %endif159 -160 -%if 0%{?suse_version} >= 1120161 +%if 0%{?suse_version} > 1130162 BuildRequires: libva-devel163 -BuildRequires: libvdpau-devel164 -%endif165 -166 -%if 0%{?suse_version} <= 1120167 -BuildRequires: goom2k4-devel168 -%endif169 -170 -%if 0%{?suse_version} >= 1140171 -BuildRequires: libpulse-devel172 %endif173 -174 -%if 0%{?suse_version} > 1130175 -BuildRequires: pkgconfig(gtk+-2.0)176 +BuildRequires: libvorbis-devel 177 +BuildRequires: libx264-devel178 +BuildRequires: libxml2-devel 179 +BuildRequires: libxvidcore-devel 180 +BuildRequires: lirc-devel181 +BuildRequires: live555-devel182 +%if 0%{?suse_version} >= 1220183 +BuildRequires: lua51-devel184 +%else185 +BuildRequires: lua-devel186 %endif187 -188 -BuildRequires: DirectFB-devel189 -BuildRequires: aalib-devel190 -BuildRequires: libdca-devel191 -BuildRequires: libid3tag-devel192 -### --enabled ####193 +BuildRequires: Mesa-devel194 BuildRequires: ncurses-devel195 -%if 0%{?suse_version} >= 1120196 -%if 0%{?suse_version} == 1140197 -BuildRequires: mozilla-xulrunner20-devel198 +BuildRequires: pcre-devel199 +BuildRequires: pulseaudio-devel200 +BuildRequires: schroedinger-devel 201 |
||
| [+] | Added | 0001-no-return-in-non-void.patch ^ |
| @@ -0,0 +1,60 @@ +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/demux/live555.cpp b/modules/demux/live555.cpp +index a3357d6..1ede179 100644 +--- a/modules/demux/live555.cpp ++++ b/modules/demux/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) | ||
| [+] | Deleted | vlc-asserts_h.patch ^ |
| @@ -1,11 +0,0 @@ -diff -Nur vlc-1.1.6-orig/modules/services_discovery/upnp_intel.cpp vlc-1.1.6/modules/services_discovery/upnp_intel.cpp ---- vlc-1.1.6-orig/modules/services_discovery/upnp_intel.cpp 2011-01-25 00:12:46.403632721 +0100 -+++ vlc-1.1.6/modules/services_discovery/upnp_intel.cpp 2011-01-25 00:33:19.756630952 +0100 -@@ -34,6 +34,7 @@ - # include "config.h" - #endif - -+#include <assert.h> - #include "upnp_intel.hpp" - - #include <vlc_plugin.h> | ||
| [+] | Added | vlc-autoconf-compat.patch ^ |
| @@ -0,0 +1,110 @@ +--- test/Makefile.am.orig 2012-04-04 20:36:27.936566467 +0200 ++++ test/Makefile.am 2012-04-04 20:36:33.391566272 +0200 +@@ -4,8 +4,8 @@ + + AUTOMAKE_OPTIONS = subdir-objects + +-extra_check_verbose = $(extra_check_verbose_$(V)) +-extra_check_verbose_ = $(extra_check_flags__$(AM_DEFAULT_VERBOSITY)) ++extra_check_verbose = ++extra_check_verbose_ = + extra_check_verbose_0 = @echo TEST $@ + extra_check_verbose__0 = $(extra_check_verbose_0) + +--- modules/gui/qt4/Modules.am.orig 2012-04-04 20:33:21.908573084 +0200 ++++ modules/gui/qt4/Modules.am 2012-04-04 20:34:09.460571393 +0200 +@@ -213,13 +213,13 @@ + + BUILT_SOURCES += $(nodist_SOURCES_qt4) + +-moc_verbose = $(moc_verbose_$(V)) +-moc_verbose_ = $(moc_verbose__$(AM_DEFAULT_VERBOSITY)) ++moc_verbose = ++moc_verbose_ = + moc_verbose_0 = @echo " MOC " $@; + moc_verbose__0 = $(moc_verbose_0) + +-uic_verbose = $(uic_verbose_$(V)) +-uic_verbose_ = $(uic_verbose__$(AM_DEFAULT_VERBOSITY)) ++uic_verbose = ++uic_verbose_ = + uic_verbose_0 = @echo " UIC " $@; + uic_verbose__0 = $(uic_verbose_0) + +--- Makefile.am.orig 2012-04-04 20:36:13.981566963 +0200 ++++ Makefile.am 2012-04-04 20:39:16.025560486 +0200 +@@ -77,11 +77,9 @@ + + ACLOCAL_AMFLAGS = -I m4 + AUTOMAKE_OPTIONS = \ +- 1.11 \ ++ 1.10 \ + -Wall \ +- check-news \ +- dist-xz \ +- no-dist-gzip ++ check-news + # std-options + + ChangeLog: Makefile.am +@@ -469,8 +467,8 @@ + uninstall-hook: + rm -f -- "$(DESTDIR)$(vlclibdir)/plugins/plugins.dat" + +-silentstd = $(silentstd_$(V)) +-silentstd_ = $(silentstd_$(AM_DEFAULT_VERBOSITY)) ++silentstd = ++silentstd_ = + silentstd_0 = 2>&1 >/dev/null + + ############################################################################### +--- configure.ac.orig 2012-04-04 19:03:21.841765198 +0200 ++++ configure.ac 2012-04-04 23:29:27.142197216 +0200 +@@ -24,12 +24,9 @@ + AC_CANONICAL_HOST + AC_PRESERVE_HELP_ORDER + +-AM_INIT_AUTOMAKE(tar-ustar color-tests) ++AM_INIT_AUTOMAKE(tar-ustar) + AM_CONFIG_HEADER(config.h) + +-# Disable with "./configure --disable-silent-rules" or "make V=1" +-AM_SILENT_RULES([yes]) +- + dnl Too many people are not aware of maintainer mode: + dnl If you want to use it, you definitely know what you are doing, so + dnl you can specify "--disable-maintainer-mode". But if you want the default +@@ -4298,20 +4295,6 @@ + modules/arm_neon/Makefile + ]) + +-AM_COND_IF([HAVE_WIN32], [ +- AC_CONFIG_FILES([ +- extras/package/win32/spad.nsi +- extras/package/win32/vlc.win32.nsi +- ]) +-]) +- +-AM_COND_IF([HAVE_DARWIN], [ +- AC_CONFIG_FILES([ +- extras/package/macosx/Info.plist +- extras/package/macosx/Resources/English.lproj/InfoPlist.strings +- ]) +-]) +- + dnl Generate makefiles + AC_OUTPUT + +--- share/Makefile.am.orig 2012-04-04 20:35:58.986567496 +0200 ++++ share/Makefile.am 2012-04-04 20:36:05.170567277 +0200 +@@ -137,8 +137,8 @@ + # + # LUA + # +-luac_verbose = $(luac_verbose_$(V)) +-luac_verbose_ = $(luac_verbose_$(AM_DEFAULT_VERBOSITY)) ++luac_verbose = ++luac_verbose_ = + luac_verbose_0 = @echo " LUAC $@"; + + .lua.luac: | ||
| [+] | Changed | vlc-buildcompare.patch ^ |
| @@ -1,56 +1,24 @@ ---- configure.orig 2011-04-12 01:54:08.000000000 +0200 -+++ configure 2011-05-22 21:56:09.000000000 +0200 -@@ -48989,12 +48989,12 @@ - - - cat >>confdefs.h <<_ACEOF --#define VLC_COMPILE_BY "`whoami`" -+#define VLC_COMPILE_BY "PackMan" - _ACEOF - - - cat >>confdefs.h <<_ACEOF --#define VLC_COMPILE_HOST "`hostname -f 2>/dev/null || hostname`" -+#define VLC_COMPILE_HOST "PMOBS" - _ACEOF - - ---- src/libvlc.c.orig 2011-01-27 16:50:31.000000000 +0100 -+++ src/libvlc.c 2011-05-22 21:56:17.000000000 +0200 -@@ -1922,9 +1922,7 @@ - - utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VLC_Version(), +--- src/config/help.c.orig 2012-04-03 08:18:01.158216498 +0200 ++++ src/config/help.c 2012-04-03 08:18:29.629215484 +0200 +@@ -788,8 +788,8 @@ + ShowConsole(); + utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VERSION_MESSAGE, psz_vlc_changeset ); - utf8_fprintf( stdout, _("Compiled by %s on %s (%s)\n"), - VLC_CompileBy(), VLC_CompileHost(), __DATE__" "__TIME__ ); -- utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); -+ utf8_fprintf( stdout, "Compiled by the Packman team -- http://packman.links2linux.org\n" ); ++ utf8_fprintf( stdout, _("Compiled by %s on %s\n"), ++ VLC_CompileBy(), VLC_CompileHost()); + utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); utf8_fprintf( stdout, "%s", LICENSE_MSG ); - - #ifdef WIN32 /* Pause the console because it's destroyed when we exit */ ---- configure.ac.orig 2011-04-11 17:00:32.000000000 +0200 -+++ configure.ac 2011-05-22 21:56:09.000000000 +0200 -@@ -4744,8 +4744,8 @@ - AC_SUBST(VERSION_REVISION) - AC_SUBST(VERSION_EXTRA) - AC_SUBST(COPYRIGHT_YEARS) --AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure]) --AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -f 2>/dev/null || hostname`", [host which ran configure]) -+AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "PackMan", [user who ran configure]) -+AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "PMOBS", [host which ran configure]) - AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler]) - dnl Win32 need s a numerical version_extra. - case $( echo ${VERSION_EXTRA}|wc -m ) in ---- modules/gui/qt4/dialogs/help.cpp.orig 2010-04-13 02:22:27.000000000 +0200 -+++ modules/gui/qt4/dialogs/help.cpp 2011-05-22 21:56:17.000000000 +0200 -@@ -117,9 +117,7 @@ - "VLC uses its internal codecs and works on essentially every " + PauseConsole(); +--- modules/gui/qt4/dialogs/help.cpp.orig 2012-04-03 08:18:36.056215256 +0200 ++++ modules/gui/qt4/dialogs/help.cpp 2012-04-03 08:18:49.710214770 +0200 +@@ -112,7 +112,7 @@ "popular platform.\n\n" ) + qtr( "This version of VLC was compiled by:\n " ) -- + qfu( VLC_CompileBy() )+ " on " + qfu( VLC_CompileHost() ) + + + qfu( VLC_CompileBy() )+ " on " + qfu( VLC_CompileHost() ) + - + " ("__DATE__" "__TIME__").\n" -- + qtr( "Compiler: " ) + qfu( VLC_Compiler() ) + ".\n" -+ + "the Packman team -- http://packman.links2linux.org\n" ++ + ".\n" + + qtr( "Compiler: " ) + qfu( VLC_Compiler() ) + ".\n" + qtr( "You are using the Qt4 Interface.\n\n" ) + qtr( "Copyright (C) " ) + COPYRIGHT_YEARS - + qtr( " by the VideoLAN Team.\n" ) | ||
| [+] | Deleted | vlc-errno_h.patch ^ |
| @@ -1,11 +0,0 @@ -diff -Nur vlc-1.1.6-orig/modules/control/lirc.c vlc-1.1.6/modules/control/lirc.c ---- vlc-1.1.6-orig/modules/control/lirc.c 2011-01-25 00:12:46.350633526 +0100 -+++ vlc-1.1.6/modules/control/lirc.c 2011-01-25 00:14:06.985881781 +0100 -@@ -31,6 +31,7 @@ - # include "config.h" - #endif - -+#include "errno.h" - #include <vlc_common.h> - #include <vlc_plugin.h> - #include <vlc_interface.h> | ||
| [+] | Changed | vlc-fix_font_path.patch ^ |
| @@ -1,7 +1,6 @@ -diff -Nur vlc-1.1.10-orig/modules/misc/freetype.c vlc-1.1.10/modules/misc/freetype.c ---- vlc-1.1.10-orig/modules/misc/freetype.c 2011-06-07 11:36:07.726672002 +0200 -+++ vlc-1.1.10/modules/misc/freetype.c 2011-06-07 11:37:52.884672000 +0200 -@@ -55,7 +55,7 @@ +--- modules/text_renderer/freetype.c.orig 2012-04-03 08:15:12.514222497 +0200 ++++ modules/text_renderer/freetype.c 2012-04-03 08:15:30.604221853 +0200 +@@ -58,7 +58,7 @@ # define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf" # define DEFAULT_FAMILY "Nokia Sans Bold" #else | ||
| [+] | Deleted | vlc-no_return_in_non_void.patch ^ |
| @@ -1,92 +0,0 @@ -From 8cd3f4aab6cde63402b5803d5fae0ae60b68c78a Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger <dominique@leuenberger.net> -Date: Tue, 4 May 2010 13:39:46 +0200 -Subject: [PATCH] no-return-in-non-void - ---- - modules/access/mms/mmstu.c | 1 + - modules/control/netsync.c | 2 ++ - modules/control/signals.c | 1 + - modules/demux/live555.cpp | 1 + - modules/stream_out/rtp.c | 1 + - src/modules/cache.c | 1 + - 6 files changed, 7 insertions(+), 0 deletions(-) - -Index: vlc-1.1.0-rc2/modules/access/mms/mmstu.c -=================================================================== ---- vlc-1.1.0-rc2.orig/modules/access/mms/mmstu.c -+++ vlc-1.1.0-rc2/modules/access/mms/mmstu.c -@@ -1570,6 +1570,7 @@ static void *KeepAliveThread( void *p_da - msleep( 10 * CLOCK_FREQ ); - } - assert(0); -+ return NULL; /* dead code, but the compiler can't know */ - } - - static void KeepAliveStart( access_t *p_access ) -Index: vlc-1.1.0-rc2/modules/control/netsync.c -=================================================================== ---- vlc-1.1.0-rc2.orig/modules/control/netsync.c -+++ vlc-1.1.0-rc2/modules/control/netsync.c -@@ -209,6 +209,7 @@ static void *Master(void *handle) - : "non-IPv4", /*date*/ 0); - #endif - } -+ return NULL; /* dead code, but the compiler does not know */ - } - - static void *Slave(void *handle) -@@ -268,6 +269,7 @@ static void *Slave(void *handle) - wait: - msleep(INTF_IDLE_SLEEP); - } -+ return NULL; /* dead code, but the compiler can't know */ - } - - static int InputEvent(vlc_object_t *object, char const *cmd, -Index: vlc-1.1.0-rc2/modules/control/signals.c -=================================================================== ---- vlc-1.1.0-rc2.orig/modules/control/signals.c -+++ vlc-1.1.0-rc2/modules/control/signals.c -@@ -129,4 +129,5 @@ static void *SigThread (void *data) - pthread_sigmask (SIG_UNBLOCK, &set, NULL); - for (;;) - pause (); -+ return NULL; /* dead code, but the compiler can't know */ - } -Index: vlc-1.1.0-rc2/modules/demux/live555.cpp -=================================================================== ---- vlc-1.1.0-rc2.orig/modules/demux/live555.cpp -+++ vlc-1.1.0-rc2/modules/demux/live555.cpp -@@ -1898,6 +1898,7 @@ static void* TimeoutPrevention( void *p_ - 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 */ - } - - /***************************************************************************** -Index: vlc-1.1.0-rc2/modules/stream_out/rtp.c -=================================================================== ---- vlc-1.1.0-rc2.orig/modules/stream_out/rtp.c -+++ vlc-1.1.0-rc2/modules/stream_out/rtp.c -@@ -1680,6 +1680,7 @@ static void *rtp_listen_thread( void *da - } - - assert( 0 ); -+ return NULL; /* dead code, but the compiler can't know */ - } - - -Index: vlc-1.1.0-rc2/src/modules/cache.c -=================================================================== ---- vlc-1.1.0-rc2.orig/src/modules/cache.c -+++ vlc-1.1.0-rc2/src/modules/cache.c -@@ -313,6 +313,7 @@ static int dummy_callback (vlc_object_t - { - (void) obj; (void)name; (void)oldval; (void)newval; (void)data; - assert (0); -+ return 0; /* dead code, but the compiler can't know */ - } - - | ||
| [+] | Deleted | vlc-opencv22.patch ^ |
| @@ -1,12 +0,0 @@ -diff -Nur vlc-1.1.5-orig/modules/video_filter/opencv_example.c vlc-1.1.5/modules/video_filter/opencv_example.c ---- vlc-1.1.5-orig/modules/video_filter/opencv_example.c 2011-01-19 07:05:56.109673336 +0100 -+++ vlc-1.1.5/modules/video_filter/opencv_example.c 2011-01-19 07:22:04.973670402 +0100 -@@ -191,7 +191,7 @@ - CvSeq *faces = cvHaarDetectObjects( p_img[0], p_sys->p_cascade, - p_sys->p_storage, 1.15, 5, - CV_HAAR_DO_CANNY_PRUNING, -- cvSize(20, 20) ); -+ cvSize(0, 0), cvSize(20, 20) ); - //create the video_filter_region_info_t struct - if (faces && (faces->total > 0)) - { | ||
| Changed | vlc-2.0.2.tar.xz ^ | |