Changes - j0ke.net Open Build Service

Changes of Revision 4

[-] [+]	Changed	vlc.spec
@@ -6,8 +6,8 @@ %define libvlccore 4 Name: vlc -Version: 1.1.5 -Release: 9 +Version: 1.1.6 +Release: 13 Summary: VLC - Video Lan Client URL: http://www.videolan.org/ License: GNU General Public License (GPL) @@ -18,7 +18,10 @@ Patch0: %{name}-fix_font_path.patch Patch1: %{name}-no_return_in_non_void.patch Patch2: %{name}-1.1.5-assert.diff -Patch3: %{name}-buffer_overflow_in_real_demuxer.patch +Patch4: %{name}-aboutmessage.patch +Patch6: %{name}-opencv22.patch +Patch7: %{name}-errno_h.patch +Patch8: %{name}-asserts_h.patch Requires: vlc-noX = %{version}-%{release} Requires: vlc-qt = %{version}-%{release} @@ -35,7 +38,7 @@ BuildRequires: gnutls-devel flac-devel gnome-vfs2-devel BuildRequires: libass-devel libavahi-devel libcaca-devel libcddb-devel BuildRequires: libcdio-devel libdvbpsi-devel libdvdnav-devel libdvdread-devel -BuildRequires: libebml-devel fluidsynth-devel libkate-devel +BuildRequires: libebml-devel libkate-devel BuildRequires: libmatroska-devel libmodplug-devel libmpcdec-devel BuildRequires: libmpeg2-devel libmtp-devel libnotify-devel libproxy-devel BuildRequires: librsvg-devel libshout-devel libsmbclient-devel @@ -45,6 +48,10 @@ BuildRequires: libprojectM-devel libfaad-devel BuildRequires: SDL-devel +%ifnarch ppc +BuildRequires: fluidsynth-devel +%endif + %if %suse_version >= 1120 BuildRequires: libva-devel %endif @@ -53,7 +60,7 @@ BuildRequires: goom2k4-devel %endif -%if %suse_version >= 1110 +%if %suse_version >= 1120 BuildRequires: libpulse-devel %endif @@ -162,7 +169,7 @@ With this plugin, you enable video content withing the Mozilla Browser Suites -%if %suse_version >= 1110 +%if %suse_version >= 1120 %package aout-pulse Summary: VLC Audio Out for Pulse Audio Group: System/Libraries @@ -183,10 +190,14 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 +%patch4 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build +export SUSE_ASNEEDED=1 %configure \ --docdir=%{_docdir}/%{name} \ %if 0 @@ -201,6 +212,9 @@ %if %{with ggi} --enable-ggi \ %endif +%ifarch ppc + --disable-fluidsynth \ +%endif --enable-id3tag \ --enable-lirc \ --enable-mozilla \ @@ -282,7 +296,9 @@ %{_datadir}/vlc/skins2/winamp2.xml %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so %{_libdir}/vlc/plugins/audio_output/libaout_sdl_plugin.so +%ifnarch ppc %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so +%endif %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so %{_libdir}/vlc/plugins/control/liblirc_plugin.so %dir %{_libdir}/vlc/plugins/gui @@ -436,6 +452,11 @@ %if %suse_version >= 1130 \|\| 0%{?sles_version} >= 11 %{_libdir}/vlc/plugins/codec/liblibass_plugin.so %endif +%ifarch ppc +%if %suse_version = 1110 +%{_libdir}/vlc/plugins/codec/liblibass_plugin.so +%endif +%endif %{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so %{_libdir}/vlc/plugins/codec/liblpcm_plugin.so %{_libdir}/vlc/plugins/codec/libmpeg_audio_plugin.so @@ -771,7 +792,7 @@ %{_libdir}/pkgconfig/libvlc.pc %{_libdir}/pkgconfig/vlc-plugin.pc -%if %suse_version >= 1110 +%if %suse_version >= 1120 %files aout-pulse %defattr(-,root,root) %{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so @@ -788,303 +809,3 @@ %changelog -* Sat Jan 1 2011 detlef@links2linux.de -- fix BuildRequires for Factory/SLES11 -* Fri Dec 31 2010 detlef@links2linux.de -- add buffer_overflow_in_real_demuxer.patch (VideoLAN-SA-1007) -* Sun Dec 19 2010 lnussel@suse.de -- enable verbose build -- fix build with new libgupnp -- enable libtar in > 11.2 too -* Sun Nov 14 2010 detlef@links2linux.de -- new upstream version <1.1.4> - * Security: - - Fix a Windows crash on accessing Network Shared files/drives,. - VideoLAN-SA-1006 - * Access: - - Support for RTP access for H264 streams by specifying the demux in the MRL - * Services Discovery: - - Integration in the playlist, of a list of web shows, provided by channels.com - * Demuxers: - - Game Music Emu (GME) plugin rewritten, using the proper C API - - DVDnav and DVDread fixes for encoding and misc issues - - Playback of live http .Webm streams - - Taglib thread-safety fix - * Decoders: - - Fix decoding of H264 using DxVA2 using Intel IGP, thanks to the donation from - "Puget Systems" - * Skins: - - Add an icon to VLC on Linux - * Video Output: - - fix a bug that could lead to 100%% CPU usage on XCB - * Interfaces: - - fix for Qt bug where VLC didn't exit properly on some Windows XP configuration - - fixes on luatelnet and luarc - * libLVC: - - add libvlc_media_new_fd() to play directly file descriptors (not Win32/Win64) - - Miscellaneous fixes - * Translations: - - Update translations for Walloon, Lithuanian, Spanish, Turkish, Estonian, Dutch, - Bengali, German, Polish, Brazillian Portuguese, Japanese, Italian, Galician, - French and Ukrainian - - Major update and activation on Windows of Modern Greek - - New Asturian translation - * Miscellaneous crashes and fixes in various plugins (telnet, live555, theora and - TS-mux, Qt) -* Sun Oct 31 2010 detlef@links2linux.de -- fixed summary -* Mon Oct 4 2010 Manfred.Tremmel@iiv.de -- fixed building against openSUSE 11.1 and 11.2 -* Fri Oct 1 2010 detlef@links2linux.de -- new upstream version <1.1.4> - * Demuxer: - - Fix crash when closing rtsp streams - * Translations: - - New Armenian translation -* Sat Aug 28 2010 detlef@links2linux.de -- new upstream version <1.1.4> - * Update translations for Lithuanian, Bengali, Slovak, French, Dutch, Ukranian - Polish, Simplified Chinese, German and Galician -* Fri Aug 20 2010 rwooninck@opensuse.org -- new upstream version <1.1.3> -* Thu Jul 29 2010 rwooninck@opensuse.org -- new upstream version <1.1.2> -* Thu Jul 22 2010 rwooninck@opensuse.org -- new upstream version <1.1.1> -* Tue Jun 22 2010 rwooninck@opensuse.org -- new upstream version <1.1.0> -* Wed Jun 16 2010 rwooninck@opensuse.org -- new upstream version <1.1.0-rc4> -* Mon Jun 14 2010 detlef@links2linux.de -- new upstream version <1.1.0-rc3> -* Sun May 30 2010 detlef@links2linux.de -- new upstream version <1.1.0-rc> -* Thu May 13 2010 detlef@links2linux.de -- add "--enable-run-as-root" -* Fri Apr 23 2010 detlef@links2linux.de -- new upstream version <1.0.6> - * Access: - - Fix crash on FTP URI with no file path - * Decoders/Packetizers:
[-] [+]	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 ^