diff --git a/vlc-1.0-bugfix-bp_zip_qt4.patch b/vlc-1.0-bugfix-bp_zip_qt4.patch new file mode 100644 index 0000000..ff438f5 --- /dev/null +++ b/vlc-1.0-bugfix-bp_zip_qt4.patch @@ -0,0 +1,40 @@ +diff --git a/modules/access/zip/zipstream.c b/modules/access/zip/zipstream.c +index 0250312..59b3f74 100644 +--- a/modules/access/zip/zipstream.c ++++ b/modules/access/zip/zipstream.c +@@ -205,8 +205,8 @@ int StreamOpen( vlc_object_t *p_this ) + if( !p_sys->zipFile ) + { + msg_Warn( s, "unable to open file" ); +- free( p_sys ); + free( p_sys->fileFunctions ); ++ free( p_sys ); + return VLC_EGENERIC; + } + +@@ -214,8 +214,8 @@ int StreamOpen( vlc_object_t *p_this ) + char *psz_tmp; + if( asprintf( &psz_tmp, "%s.xspf", s->psz_path ) == -1 ) + { +- free( p_sys ); + free( p_sys->fileFunctions ); ++ free( p_sys ); + return VLC_ENOMEM; + } + p_sys->psz_path = s->psz_path; +diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp +index 97aca1a..31b990a 100644 +--- a/modules/gui/qt4/main_interface.cpp ++++ b/modules/gui/qt4/main_interface.cpp +@@ -1134,8 +1134,8 @@ void MainInterface::dropEventPlay( QDropEvent *event, bool b_play ) + + if( s.length() > 0 ) { + playlist_Add( THEPL, qtu(s), NULL, +- PLAYLIST_APPEND | (first ? PLAYLIST_GO: 0), +- PLAYLIST_END, true, false ); ++ PLAYLIST_APPEND | (first ? PLAYLIST_GO: PLAYLIST_PREPARSE), ++ PLAYLIST_END, true, pl_Unlocked ); + first = false; + RecentsMRL::getInstance( p_intf )->addRecent( s ); + } + diff --git a/vlc.spec b/vlc.spec index f413e43..ad1d6b6 100644 --- a/vlc.spec +++ b/vlc.spec @@ -22,6 +22,7 @@ Patch1: 0001-Default-libv4l2-to-true.patch Patch2: 0002-Default-aout-for-pulse.patch Patch3: 300_all_pic.patch Patch4: 310_all_mmx_pic.patch +Patch5: vlc-1.0-bugfix-bp_zip_qt4.patch& BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -236,6 +237,7 @@ VLC plugin for libdc1394 %patch3 -p1 -b .dmo_pic sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in %patch4 -p1 -b .mmx_pic +%patch5 -p1 -b .bp5 rm modules/access/videodev2.h