Changes - j0ke.net Open Build Service

Changes of Revision 9

[-] [+]	Deleted	vlc.changes
@@ -1,5 +0,0 @@ -------------------------------------------------------------------- -Sat Mar 12 21:30:21 UTC 2011 - cs@linux-administrator.com - -- re-import -
[-] [+]	Changed	vlc.spec ^
@@ -6,7 +6,7 @@ %define libvlccore 4 Name: vlc -Version: 1.1.7 +Version: 1.1.8 Release: 16 Summary: VLC - Video Lan Client URL: http://www.videolan.org/ @@ -21,9 +21,8 @@ Patch3: %{name}-opencv22.patch Patch4: %{name}-errno_h.patch Patch5: %{name}-asserts_h.patch -Patch6: %{name}-matroska_110.patch # pbleser adds X-KDE-Protocols=http,ftp,smb,sftp to vlc.desktop to enable proper streaming in KDE, thanks to martin.frueh@online.de -Patch7: vlc-add_X-KDE-Protocols_to_desktop.patch +Patch7: %{name}-add_X-KDE-Protocols_to_desktop.patch Requires: vlc-noX = %{version}-%{release} Requires: vlc-qt = %{version}-%{release} @@ -199,7 +198,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch7 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') x 1 @@ -6,7 +6,7 @@ 2 %define libvlccore 4 3 4 Name: vlc 5 -Version: 1.1.7 6 +Version: 1.1.8 7 Release: 16 8 Summary: VLC - Video Lan Client 9 URL: http://www.videolan.org/ 10 @@ -21,9 +21,8 @@ 11 Patch3: %{name}-opencv22.patch 12 Patch4: %{name}-errno_h.patch 13 Patch5: %{name}-asserts_h.patch 14 -Patch6: %{name}-matroska_110.patch 15 # pbleser adds X-KDE-Protocols=http,ftp,smb,sftp to vlc.desktop to enable proper streaming in KDE, thanks to martin.frueh@online.de 16 -Patch7: vlc-add_X-KDE-Protocols_to_desktop.patch 17 +Patch7: %{name}-add_X-KDE-Protocols_to_desktop.patch 18 19 Requires: vlc-noX = %{version}-%{release} 20 Requires: vlc-qt = %{version}-%{release} 21 @@ -199,7 +198,6 @@ 22 %patch3 -p1 23 %patch4 -p1 24 %patch5 -p1 25 -%patch6 -p1 26 %patch7 27 28 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') 29
[-] [+]	Changed	vlc-buildcompare.patch ^
@@ -1,34 +1,7 @@ -Index: vlc-1.1.7/share/Makefile.am -=================================================================== ---- vlc-1.1.7.orig/share/Makefile.am -+++ vlc-1.1.7/share/Makefile.am -@@ -88,7 +88,7 @@ skins2_default_vlt_FILES = \ - - skins2/default.vlt: $(skins2_default_vlt_FILES) - mkdir -p skins2 -- tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/ -+ (cd $(srcdir)/skins2; find default -print0 \| sort -z \| tar cvv --exclude .svn --no-recursion --null -T -) \| gzip -n > skins2/default.vlt - - DIST_http = \ - http/.hosts \ -Index: vlc-1.1.7/share/Makefile.in -=================================================================== ---- vlc-1.1.7.orig/share/Makefile.in -+++ vlc-1.1.7/share/Makefile.in -@@ -1402,7 +1402,7 @@ uninstall-am: uninstall-dist_appdataDATA - - skins2/default.vlt: $(skins2_default_vlt_FILES) - mkdir -p skins2 -- tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/ -+ (cd $(srcdir)/skins2; find default -print0 \| sort -z \| tar cvv --exclude .svn --no-recursion --null -T -) \| gzip -n > skins2/default.vlt - - .lua.luac: - $(AM_V_at)for f in $(EXTRA_DIST); do \ -Index: vlc-1.1.7/configure -=================================================================== ---- vlc-1.1.7.orig/configure -+++ vlc-1.1.7/configure -@@ -48133,12 +48133,12 @@ _ACEOF +diff -Nur vlc-1.1.8-orig/configure vlc-1.1.8/configure +--- vlc-1.1.8-orig/configure 2011-03-26 08:21:26.626945001 +0100 ++++ vlc-1.1.8/configure 2011-03-26 08:25:49.246945000 +0100 +@@ -48139,12 +48139,12 @@ cat >>confdefs.h <<_ACEOF @@ -39,22 +12,21 @@ cat >>confdefs.h <<_ACEOF -#define VLC_COMPILE_HOST "`hostname -f 2>/dev/null \|\| hostname`" -+#define VLC_COMPILE_HOST "OBS" ++#define VLC_COMPILE_HOST "PMOBS" _ACEOF -Index: vlc-1.1.7/configure.ac -=================================================================== ---- vlc-1.1.7.orig/configure.ac -+++ vlc-1.1.7/configure.ac -@@ -4736,8 +4736,8 @@ AC_SUBST(VERSION_MINOR) +diff -Nur vlc-1.1.8-orig/configure.ac vlc-1.1.8/configure.ac +--- vlc-1.1.8-orig/configure.ac 2011-03-26 08:21:26.676945001 +0100 ++++ vlc-1.1.8/configure.ac 2011-03-26 08:26:22.758945000 +0100 +@@ -4738,8 +4738,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, "OBS", [host which 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
[-] [+]	Deleted	vlc-matroska_110.patch ^
@@ -1,89 +0,0 @@ -diff -urN vlc-1.1.7.orig/modules/demux/mkv/matroska_segment.cpp vlc-1.1.7/modules/demux/mkv/matroska_segment.cpp ---- vlc-1.1.7.orig/modules/demux/mkv/matroska_segment.cpp 2011-02-02 13:45:56.115863316 +0100 -+++ vlc-1.1.7/modules/demux/mkv/matroska_segment.cpp 2011-02-02 13:55:23.957416146 +0100 -@@ -220,74 +220,6 @@ - } - ep->Up(); - } -- else if( MKV_IS_ID( el, KaxTagGeneral ) ) -- { -- msg_Dbg( &sys.demuxer, "\| + General" ); -- ep->Down(); -- while( ( el = ep->Get() ) != NULL ) -- { -- msg_Dbg( &sys.demuxer, "\| \| + Unknown (%s)", typeid( el ).name() ); -- } -- ep->Up(); -- } -- else if( MKV_IS_ID( el, KaxTagGenres ) ) -- { -- msg_Dbg( &sys.demuxer, "\| + Genres" ); -- ep->Down(); -- while( ( el = ep->Get() ) != NULL ) -- { -- msg_Dbg( &sys.demuxer, "\| \| + Unknown (%s)", typeid( el ).name() ); -- } -- ep->Up(); -- } -- else if( MKV_IS_ID( el, KaxTagAudioSpecific ) ) -- { -- msg_Dbg( &sys.demuxer, "\| + Audio Specific" ); -- ep->Down(); -- while( ( el = ep->Get() ) != NULL ) -- { -- msg_Dbg( &sys.demuxer, "\| \| + Unknown (%s)", typeid( el ).name() ); -- } -- ep->Up(); -- } -- else if( MKV_IS_ID( el, KaxTagImageSpecific ) ) -- { -- msg_Dbg( &sys.demuxer, "\| + Images Specific" ); -- ep->Down(); -- while( ( el = ep->Get() ) != NULL ) -- { -- msg_Dbg( &sys.demuxer, "\| \| + Unknown (%s)", typeid( el ).name() ); -- } -- ep->Up(); -- } -- else if( MKV_IS_ID( el, KaxTagMultiComment ) ) -- { -- msg_Dbg( &sys.demuxer, "\| + Multi Comment" ); -- } -- else if( MKV_IS_ID( el, KaxTagMultiCommercial ) ) -- { -- msg_Dbg( &sys.demuxer, "\| + Multi Commercial" ); -- } -- else if( MKV_IS_ID( el, KaxTagMultiDate ) ) -- { -- msg_Dbg( &sys.demuxer, "\| + Multi Date" ); -- } -- else if( MKV_IS_ID( el, KaxTagMultiEntity ) ) -- { -- msg_Dbg( &sys.demuxer, "\| + Multi Entity" ); -- } -- else if( MKV_IS_ID( el, KaxTagMultiIdentifier ) ) -- { -- msg_Dbg( &sys.demuxer, "\| + Multi Identifier" ); -- } -- else if( MKV_IS_ID( el, KaxTagMultiLegal ) ) -- { -- msg_Dbg( &sys.demuxer, "\| + Multi Legal" ); -- } -- else if( MKV_IS_ID( el, KaxTagMultiTitle ) ) -- { -- msg_Dbg( &sys.demuxer, "\| + Multi Title" ); -- } - else - { - msg_Dbg( &sys.demuxer, "\| + LoadTag Unknown (%s)", typeid( *el ).name() ); -diff -urN vlc-1.1.7.orig/modules/demux/mkv/mkv.hpp vlc-1.1.7/modules/demux/mkv/mkv.hpp ---- vlc-1.1.7.orig/modules/demux/mkv/mkv.hpp 2011-02-02 13:45:56.114863318 +0100 -+++ vlc-1.1.7/modules/demux/mkv/mkv.hpp 2011-02-02 13:46:08.647832555 +0100 -@@ -92,7 +92,6 @@ - #include "matroska/KaxSegment.h" - #include "matroska/KaxTag.h" - #include "matroska/KaxTags.h" --#include "matroska/KaxTagMulti.h" - #include "matroska/KaxTracks.h" - #include "matroska/KaxTrackAudio.h" - #include "matroska/KaxTrackVideo.h"
	Changed	vlc-1.1.8.tar.bz2 ^