|
[-]
[+]
|
Added |
vlc.changes
|
|
|
|
[-]
[+]
|
Changed |
vlc.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
vlc-1.1.5-assert.diff
^
|
| @@ -1,13 +0,0 @@
-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";
|
|
[-]
[+]
|
Deleted |
vlc-aboutmessage.patch
^
|
| @@ -1,13 +0,0 @@
-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-add_X-KDE-Protocols_to_desktop.patch
^
|
| @@ -0,0 +1,7 @@
+--- share/vlc.desktop.orig 2011-03-12 13:26:16.000000000 +0100
++++ share/vlc.desktop 2011-03-12 13:26:37.000000000 +0100
+@@ -54,3 +54,4 @@
+ Type=Application
+ Categories=AudioVideo;Player;
+ MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;application/ogg;application/x-ogg;application/x-matroska;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;application/x-extension-mp4;audio/mp4;video/mp4;video/mp4v-es;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;video/x-flv;
++X-KDE-Protocols=http,ftp,smb,sftp
|
|
[-]
[+]
|
Added |
vlc-buildcompare.patch
^
|
| @@ -0,0 +1,60 @@
+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
+
+
+ cat >>confdefs.h <<_ACEOF
+-#define VLC_COMPILE_BY "`whoami`"
++#define VLC_COMPILE_BY "PackMan"
+ _ACEOF
+
+
+ cat >>confdefs.h <<_ACEOF
+-#define VLC_COMPILE_HOST "`hostname -f 2>/dev/null || hostname`"
++#define VLC_COMPILE_HOST "OBS"
+ _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)
+ 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_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler])
+ dnl Win32 need s a numerical version_extra.
+ case $( echo ${VERSION_EXTRA}|wc -m ) in
|
|
[-]
[+]
|
Added |
vlc-matroska_110.patch
^
|
| @@ -0,0 +1,89 @@
+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"
|
