Changes of Revision 4
[-] | Changed | vlc.spec |
x 1
2 %define libvlccore 4 3 4 Name: vlc 5 -Version: 1.1.5 6 -Release: 9 7 +Version: 1.1.6 8 +Release: 13 9 Summary: VLC - Video Lan Client 10 URL: http://www.videolan.org/ 11 License: GNU General Public License (GPL) 12
13 Patch0: %{name}-fix_font_path.patch 14 Patch1: %{name}-no_return_in_non_void.patch 15 Patch2: %{name}-1.1.5-assert.diff 16 -Patch3: %{name}-buffer_overflow_in_real_demuxer.patch 17 +Patch4: %{name}-aboutmessage.patch 18 +Patch6: %{name}-opencv22.patch 19 +Patch7: %{name}-errno_h.patch 20 +Patch8: %{name}-asserts_h.patch 21 22 Requires: vlc-noX = %{version}-%{release} 23 Requires: vlc-qt = %{version}-%{release} 24
25 BuildRequires: gnutls-devel flac-devel gnome-vfs2-devel 26 BuildRequires: libass-devel libavahi-devel libcaca-devel libcddb-devel 27 BuildRequires: libcdio-devel libdvbpsi-devel libdvdnav-devel libdvdread-devel 28 -BuildRequires: libebml-devel fluidsynth-devel libkate-devel 29 +BuildRequires: libebml-devel libkate-devel 30 BuildRequires: libmatroska-devel libmodplug-devel libmpcdec-devel 31 BuildRequires: libmpeg2-devel libmtp-devel libnotify-devel libproxy-devel 32 BuildRequires: librsvg-devel libshout-devel libsmbclient-devel 33
34 BuildRequires: libprojectM-devel libfaad-devel 35 BuildRequires: SDL-devel 36 37 +%ifnarch ppc 38 +BuildRequires: fluidsynth-devel 39 +%endif 40 + 41 %if %suse_version >= 1120 42 BuildRequires: libva-devel 43 %endif 44
45 BuildRequires: goom2k4-devel 46 %endif 47 48 -%if %suse_version >= 1110 49 +%if %suse_version >= 1120 50 BuildRequires: libpulse-devel 51 %endif 52 53
54 With this plugin, you enable video content withing the Mozilla Browser Suites 55 56 57 -%if %suse_version >= 1110 58 +%if %suse_version >= 1120 59 %package aout-pulse 60 Summary: VLC Audio Out for Pulse Audio 61 Group: System/Libraries 62
63 %patch0 -p1 64 %patch1 -p1 65 %patch2 -p1 66 -%patch3 -p1 67 +%patch4 -p1 68 +%patch6 -p1 69 +%patch7 -p1 70 +%patch8 -p1 71 72 73 %build 74 +export SUSE_ASNEEDED=1 75 %configure \ 76 --docdir=%{_docdir}/%{name} \ 77 %if 0 78
79 %if %{with ggi} 80 --enable-ggi \ 81 %endif 82 +%ifarch ppc 83 + --disable-fluidsynth \ 84 +%endif 85 --enable-id3tag \ 86 --enable-lirc \ 87 --enable-mozilla \ 88
89 %{_datadir}/vlc/skins2/winamp2.xml 90 %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so 91 %{_libdir}/vlc/plugins/audio_output/libaout_sdl_plugin.so 92 +%ifnarch ppc 93 %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so 94 +%endif 95 %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so 96 %{_libdir}/vlc/plugins/control/liblirc_plugin.so 97 %dir %{_libdir}/vlc/plugins/gui 98
99 %if %suse_version >= 1130 || 0%{?sles_version} >= 11 100 %{_libdir}/vlc/plugins/codec/liblibass_plugin.so 101 %endif 102 +%ifarch ppc 103 +%if %suse_version = 1110 104 +%{_libdir}/vlc/plugins/codec/liblibass_plugin.so 105 +%endif 106 +%endif 107 %{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so 108 %{_libdir}/vlc/plugins/codec/liblpcm_plugin.so 109 %{_libdir}/vlc/plugins/codec/libmpeg_audio_plugin.so 110
111 %{_libdir}/pkgconfig/libvlc.pc 112 %{_libdir}/pkgconfig/vlc-plugin.pc 113 114 -%if %suse_version >= 1110 115 +%if %suse_version >= 1120 116 %files aout-pulse 117 %defattr(-,root,root) 118 %{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so 119
120 121 122 %changelog 123 -* Sat Jan 1 2011 detlef@links2linux.de 124 -- fix BuildRequires for Factory/SLES11 125 -* Fri Dec 31 2010 detlef@links2linux.de 126 -- add buffer_overflow_in_real_demuxer.patch (VideoLAN-SA-1007) 127 -* Sun Dec 19 2010 lnussel@suse.de 128 -- enable verbose build 129 -- fix build with new libgupnp 130 -- enable libtar in > 11.2 too 131 -* Sun Nov 14 2010 detlef@links2linux.de 132 -- new upstream version <1.1.4> 133 - * Security: 134 - - Fix a Windows crash on accessing Network Shared files/drives,. 135 - VideoLAN-SA-1006 136 - * Access: 137 - - Support for RTP access for H264 streams by specifying the demux in the MRL 138 - * Services Discovery: 139 - - Integration in the playlist, of a list of web shows, provided by channels.com 140 - * Demuxers: 141 - - Game Music Emu (GME) plugin rewritten, using the proper C API 142 - - DVDnav and DVDread fixes for encoding and misc issues 143 - - Playback of live http .Webm streams 144 - - Taglib thread-safety fix 145 - * Decoders: 146 - - Fix decoding of H264 using DxVA2 using Intel IGP, thanks to the donation from 147 - "Puget Systems" 148 - * Skins: 149 - - Add an icon to VLC on Linux 150 - * Video Output: 151 - - fix a bug that could lead to 100%% CPU usage on XCB 152 - * Interfaces: 153 - - fix for Qt bug where VLC didn't exit properly on some Windows XP configuration 154 - - fixes on luatelnet and luarc 155 - * libLVC: 156 - - add libvlc_media_new_fd() to play directly file descriptors (not Win32/Win64) 157 - - Miscellaneous fixes 158 - * Translations: 159 - - Update translations for Walloon, Lithuanian, Spanish, Turkish, Estonian, Dutch, 160 - Bengali, German, Polish, Brazillian Portuguese, Japanese, Italian, Galician, 161 - French and Ukrainian 162 - - Major update and activation on Windows of Modern Greek 163 - - New Asturian translation 164 - * Miscellaneous crashes and fixes in various plugins (telnet, live555, theora and 165 - TS-mux, Qt) 166 -* Sun Oct 31 2010 detlef@links2linux.de 167 -- fixed summary 168 -* Mon Oct 4 2010 Manfred.Tremmel@iiv.de 169 -- fixed building against openSUSE 11.1 and 11.2 170 -* Fri Oct 1 2010 detlef@links2linux.de 171 -- new upstream version <1.1.4> 172 - * Demuxer: 173 - - Fix crash when closing rtsp streams 174 - * Translations: 175 - - New Armenian translation 176 -* Sat Aug 28 2010 detlef@links2linux.de 177 -- new upstream version <1.1.4> 178 - * Update translations for Lithuanian, Bengali, Slovak, French, Dutch, Ukranian 179 - Polish, Simplified Chinese, German and Galician 180 -* Fri Aug 20 2010 rwooninck@opensuse.org 181 -- new upstream version <1.1.3> 182 -* Thu Jul 29 2010 rwooninck@opensuse.org 183 -- new upstream version <1.1.2> 184 -* Thu Jul 22 2010 rwooninck@opensuse.org 185 -- new upstream version <1.1.1> 186 -* Tue Jun 22 2010 rwooninck@opensuse.org 187 -- new upstream version <1.1.0> 188 -* Wed Jun 16 2010 rwooninck@opensuse.org 189 -- new upstream version <1.1.0-rc4> 190 -* Mon Jun 14 2010 detlef@links2linux.de 191 -- new upstream version <1.1.0-rc3> 192 -* Sun May 30 2010 detlef@links2linux.de 193 -- new upstream version <1.1.0-rc> 194 -* Thu May 13 2010 detlef@links2linux.de 195 -- add "--enable-run-as-root" 196 -* Fri Apr 23 2010 detlef@links2linux.de 197 -- new upstream version <1.0.6> 198 - * Access: 199 - - Fix crash on FTP URI with no file path 200 - * Decoders/Packetizers: 201 |
||
[+] | Added | vlc-aboutmessage.patch ^ |
@@ -0,0 +1,13 @@ +diff -Nur vlc-1.1.5-orig/modules/gui/qt4/dialogs/help.cpp vlc-1.1.5/modules/gui/qt4/dialogs/help.cpp +--- vlc-1.1.5-orig/modules/gui/qt4/dialogs/help.cpp 2011-01-14 12:46:06.485861797 +0100 ++++ vlc-1.1.5/modules/gui/qt4/dialogs/help.cpp 2011-01-14 12:49:00.302611676 +0100 +@@ -117,8 +117,7 @@ + "VLC uses its internal codecs and works on essentially every " + "popular platform.\n\n" ) + + qtr( "This version of VLC was compiled by:\n " ) +- + qfu( VLC_CompileBy() )+ " on " + qfu( VLC_CompileHost() ) + +- + " ("__DATE__" "__TIME__").\n" ++ + "PackMan on OBS ( Jan 14 2011 00:00:00 )\n" + + qtr( "Compiler: " ) + qfu( VLC_Compiler() ) + ".\n" + + qtr( "You are using the Qt4 Interface.\n\n" ) + + qtr( "Copyright (C) " ) + COPYRIGHT_YEARS | ||
[+] | Added | vlc-asserts_h.patch ^ |
@@ -0,0 +1,11 @@ +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-errno_h.patch ^ |
@@ -0,0 +1,11 @@ +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> | ||
[+] | Added | vlc-opencv22.patch ^ |
@@ -0,0 +1,12 @@ +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-1.1.6.tar.bz2 ^ |