Changes of Revision 2
| [-] | Changed | vlc.spec |
|
x 1 2 # norootforbuild3 4 +%bcond_with ggi5 +6 %define libvlc 57 %define libvlccore 48 9 Name: vlc10 -Version: 1.1.4.111 -Release: 1.pm.3.112 -Summary: VLC - Video Lan Client (preview of the upcoming version)13 +Version: 1.1.514 +Release: 915 +Summary: VLC - Video Lan Client16 URL: http://www.videolan.org/17 License: GNU General Public License (GPL)18 Group: Productivity/Multimedia/Video/Players19 20 21 Patch0: %{name}-fix_font_path.patch22 Patch1: %{name}-no_return_in_non_void.patch23 +Patch2: %{name}-1.1.5-assert.diff24 +Patch3: %{name}-buffer_overflow_in_real_demuxer.patch25 26 Requires: vlc-noX = %{version}-%{release}27 Requires: vlc-qt = %{version}-%{release}28 29 BuildRequires: gnutls-devel flac-devel gnome-vfs2-devel30 BuildRequires: libass-devel libavahi-devel libcaca-devel libcddb-devel31 BuildRequires: libcdio-devel libdvbpsi-devel libdvdnav-devel libdvdread-devel32 -BuildRequires: libebml-devel libfluidsynth-devel libkate-devel33 +BuildRequires: libebml-devel fluidsynth-devel libkate-devel34 BuildRequires: libmatroska-devel libmodplug-devel libmpcdec-devel35 BuildRequires: libmpeg2-devel libmtp-devel libnotify-devel libproxy-devel36 BuildRequires: librsvg-devel libshout-devel libsmbclient-devel 37 38 BuildRequires: libxml2-devel live-devel portaudio-devel 39 BuildRequires: sqlite3-devel taglib-devel valgrind-devel zvbi-devel40 BuildRequires: libprojectM-devel libfaad-devel41 +BuildRequires: SDL-devel42 43 %if %suse_version >= 112044 BuildRequires: libva-devel45 %endif46 47 %if %suse_version <= 112048 -BuildRequires: goom2k4-devel libtar-devel49 +BuildRequires: goom2k4-devel50 %endif51 52 %if %suse_version >= 111053 54 BuildRequires: libnotify155 %endif56 57 +%if %suse_version > 113058 +BuildRequires: gtk2-devel59 +%endif60 +61 ### --enabled ####62 -BuildRequires: DirectFB-devel libggi-devel libid3tag-devel63 +BuildRequires: ncurses-devel64 +BuildRequires: aalib-devel65 +BuildRequires: libdca-devel66 +BuildRequires: DirectFB-devel libid3tag-devel67 +%if %{with ggi}68 +BuildRequires: libggi-devel69 +%endif70 BuildRequires: mozilla-xulrunner192-devel71 -BuildRequires: pcre-devel vcdimager-devel xosd-devel72 -%if %suse_version > 112073 BuildRequires: opencv-devel74 -%else75 -BuildRequires: gtk2-devel76 -%endif77 +BuildRequires: pcre-devel vcdimager-devel xosd-devel78 +79 80 %if %suse_version >= 112081 BuildRequires: lirc-devel82 83 %setup -q -n %{name}-%{version}84 %patch0 -p185 %patch1 -p186 +%patch2 -p187 +%patch3 -p188 89 90 %build91 92 --enable-directfb \93 --enable-faad \94 --enable-fbosd \95 +%if %{with ggi}96 --enable-ggi \97 +%endif98 --enable-id3tag \99 --enable-lirc \100 --enable-mozilla \101 --enable-ncurses \102 --enable-omxil \103 -%if %suse_version > 1120104 --enable-opencv \105 -%endif106 --enable-pvr \107 --enable-real \108 --enable-realrtsp \109 110 --enable-wma-fixed \111 --enable-xosd112 113 -%__make %{?jobs:-j%jobs}114 +%__make V=1 %{?jobs:-j%jobs}115 116 117 %install118 119 %postun -n libvlccore%{libvlccore} -p /sbin/ldconfig120 121 122 +123 %files124 %defattr(-,root,root)125 %dir %{_docdir}/vlc126 127 %{_libdir}/vlc/plugins/gui/libskins2_plugin.so128 %{_libdir}/vlc/plugins/gui/libfbosd_plugin.so129 %{_libdir}/vlc/plugins/misc/libnotify_plugin.so130 +%{_libdir}/vlc/plugins/misc/libxscreensaver_plugin.so131 %{_libdir}/vlc/plugins/misc/libsvg_plugin.so132 %{_libdir}/vlc/plugins/misc/libxosd_plugin.so133 %{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so134 135 %{_libdir}/vlc/plugins/codec/libflac_plugin.so136 %{_libdir}/vlc/plugins/codec/libinvmem_plugin.so137 %{_libdir}/vlc/plugins/codec/libkate_plugin.so138 +%if %suse_version >= 1130139 %{_libdir}/vlc/plugins/codec/liblibass_plugin.so140 +%endif141 %{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so142 %{_libdir}/vlc/plugins/codec/liblpcm_plugin.so143 %{_libdir}/vlc/plugins/codec/libmpeg_audio_plugin.so144 145 %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so146 %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so147 %{_libdir}/vlc/plugins/video_filter/libnoise_plugin.so148 -%if %suse_version > 1120149 %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so150 %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so151 -%endif152 %{_libdir}/vlc/plugins/video_filter/libosdmenu_plugin.so153 %{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so154 %{_libdir}/vlc/plugins/video_filter/libpsychedelic_plugin.so155 156 %{_libdir}/vlc/plugins/video_output/libaa_plugin.so157 %{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so158 %{_libdir}/vlc/plugins/video_output/libfb_plugin.so159 +%if %{with ggi}160 %{_libdir}/vlc/plugins/video_output/libggi_plugin.so161 +%endif162 %{_libdir}/vlc/plugins/video_output/libsnapshot_plugin.so163 %{_libdir}/vlc/plugins/video_output/libvmem_plugin.so164 %{_libdir}/vlc/plugins/video_output/libvout_wrapper_plugin.so165 166 167 168 %changelog169 -* Mon Oct 04 2010 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 1.1.4.1170 +* Sat Jan 1 2011 detlef@links2linux.de171 +- fix BuildRequires for Factory/SLES11172 +* Fri Dec 31 2010 detlef@links2linux.de173 +- add buffer_overflow_in_real_demuxer.patch (VideoLAN-SA-1007)174 +* Sun Dec 19 2010 lnussel@suse.de175 +- enable verbose build176 +- fix build with new libgupnp177 +- enable libtar in > 11.2 too178 +* Sun Nov 14 2010 detlef@links2linux.de179 +- new upstream version <1.1.4>180 + * Security:181 + - Fix a Windows crash on accessing Network Shared files/drives,.182 + VideoLAN-SA-1006183 + * Access:184 + - Support for RTP access for H264 streams by specifying the demux in the MRL185 + * Services Discovery:186 + - Integration in the playlist, of a list of web shows, provided by channels.com187 + * Demuxers:188 + - Game Music Emu (GME) plugin rewritten, using the proper C API189 + - DVDnav and DVDread fixes for encoding and misc issues190 + - Playback of live http .Webm streams191 + - Taglib thread-safety fix192 + * Decoders:193 + - Fix decoding of H264 using DxVA2 using Intel IGP, thanks to the donation from194 + "Puget Systems"195 + * Skins:196 + - Add an icon to VLC on Linux197 + * Video Output:198 + - fix a bug that could lead to 100%% CPU usage on XCB199 + * Interfaces:200 + - fix for Qt bug where VLC didn't exit properly on some Windows XP configuration201 |
||
| [+] | Added | vlc-1.1.5-assert.diff ^ |
| @@ -0,0 +1,13 @@ +Index: vlc-1.1.5/modules/services_discovery/upnp_intel.cpp +=================================================================== +--- vlc-1.1.5.orig/modules/services_discovery/upnp_intel.cpp ++++ vlc-1.1.5/modules/services_discovery/upnp_intel.cpp +@@ -39,6 +39,8 @@ + #include <vlc_plugin.h> + #include <vlc_services_discovery.h> + ++#include <assert.h> ++ + + // Constants + const char* MEDIA_SERVER_DEVICE_TYPE = "urn:schemas-upnp-org:device:MediaServer:1"; | ||
| [+] | Added | vlc-buffer_overflow_in_real_demuxer.patch ^ |
| @@ -0,0 +1,59 @@ +diff -Nur vlc-1.1.5-orig/modules/demux/real.c vlc-1.1.5/modules/demux/real.c +--- vlc-1.1.5-orig/modules/demux/real.c 2010-12-31 18:54:19.593763216 +0100 ++++ vlc-1.1.5/modules/demux/real.c 2010-12-31 19:00:41.758761481 +0100 +@@ -252,11 +252,9 @@ + if( tk->p_subpackets[ j ] ) + block_Release( tk->p_subpackets[ j ] ); + } +- if( tk->i_subpackets ) +- { +- free( tk->p_subpackets ); +- free( tk->p_subpackets_timecode ); +- } ++ ++ free( tk->p_subpackets ); ++ free( tk->p_subpackets_timecode ); + if( tk->p_sipr_packet ) + block_Release( tk->p_sipr_packet ); + free( tk ); +@@ -637,6 +635,11 @@ + + for( int i = 0; i < i_num; i++ ) + { ++ int i_index = tk->i_subpacket_h * i + ++ ((tk->i_subpacket_h + 1) / 2) * (y&1) + (y>>1); ++ if( i_index >= tk->i_subpackets ) ++ return; ++ + block_t *p_block = block_New( p_demux, tk->i_subpacket_size ); + if( !p_block ) + return; +@@ -649,9 +652,6 @@ + + p_buf += tk->i_subpacket_size; + +- int i_index = tk->i_subpacket_h * i + +- ((tk->i_subpacket_h + 1) / 2) * (y&1) + (y>>1); +- + if( tk->p_subpackets[i_index] != NULL ) + { + msg_Dbg(p_demux, "p_subpackets[ %d ] not null!", i_index ); +@@ -671,14 +671,16 @@ + + for( int i = 0; i < tk->i_subpacket_h / 2; i++ ) + { ++ int i_index = (i * 2 * tk->i_frame_size / tk->i_coded_frame_size) + y; ++ if( i_index >= tk->i_subpackets ) ++ return; ++ + block_t *p_block = block_New( p_demux, tk->i_coded_frame_size); + if( !p_block ) + return; + if( &p_buf[tk->i_coded_frame_size] > &p_sys->buffer[p_sys->i_buffer] ) + return; + +- int i_index = (i * 2 * tk->i_frame_size / tk->i_coded_frame_size) + y; +- + memcpy( p_block->p_buffer, p_buf, tk->i_coded_frame_size ); + p_block->i_dts = + p_block->i_pts = i_index == 0 ? i_pts : VLC_TS_INVALID; | ||
| Changed | vlc-1.1.5.tar.bz2 ^ | |