diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-04-19 00:05:24 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-04-19 00:05:24 +0000 |
commit | d36e8435c9a933ecba64b9fe3d08bf52807e2dc3 (patch) | |
tree | a72e51c55c6ad81d49f3eea62b6212ea7477fdd3 /media-video | |
parent | Version bump #73845 by Daniel Webert and add /etc/whois.conf support #89417 b... (diff) | |
download | historical-d36e8435c9a933ecba64b9fe3d08bf52807e2dc3.tar.gz historical-d36e8435c9a933ecba64b9fe3d08bf52807e2dc3.tar.bz2 historical-d36e8435c9a933ecba64b9fe3d08bf52807e2dc3.zip |
Forgot to remove orphaned patches. Now files/ is also clean.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/vlc/Manifest | 4 | ||||
-rw-r--r-- | media-video/vlc/files/buildorder.patch | 12 | ||||
-rw-r--r-- | media-video/vlc/files/live-gcc3-3.patch | 30 | ||||
-rw-r--r-- | media-video/vlc/files/mozplugin.patch | 177 | ||||
-rw-r--r-- | media-video/vlc/files/vlc-0.7.2-live.patch | 47 |
5 files changed, 0 insertions, 270 deletions
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 73ca50d08bf7..60a342643102 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -6,16 +6,12 @@ MD5 922c5025744b20389f1308adfee401e7 vlc-0.6.2-r1.ebuild 6503 MD5 6bc089e06f042607bd4bb5cabe7dc72e vlc-0.6.2.ebuild 5551 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 MD5 09c124e45049f615519ded3278a97376 files/0.6.2-mozilla-fix.patch 1261 -MD5 80aeaf3595979e8e16dd382c50dfd275 files/buildorder.patch 590 MD5 d766f772e3e3be4f8d6cbf4d54bf2700 files/digest-vlc-0.6.2 63 MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2 63 MD5 77f4e9cceacd8059c3e1c8322a14c30a files/digest-vlc-0.8.1 63 MD5 77f4e9cceacd8059c3e1c8322a14c30a files/digest-vlc-0.8.1-r1 63 MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744 -MD5 20de936c17c2ab1c4767bcbce0d2e972 files/live-gcc3-3.patch 828 -MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995 MD5 0ee383795d543048e4d47eb58f6d36bb files/mpeg2dec-20030612-configure.in-fpic.patch 1065 -MD5 310366968813598e8b0cae64b5dbd19a files/vlc-0.7.2-live.patch 1287 MD5 40bcf94b78e4cb16470b8dd2673adb06 files/vlc-0.8.1-time.patch 403 MD5 0cb865191c6e2dfa7fd777e911044327 files/vlc.desktop 214 MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2-r1 202 diff --git a/media-video/vlc/files/buildorder.patch b/media-video/vlc/files/buildorder.patch deleted file mode 100644 index f61dccd75230..000000000000 --- a/media-video/vlc/files/buildorder.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN vlc-0.6.1/Makefile.am vlc-0.6.1-modified/Makefile.am ---- vlc-0.6.1/Makefile.am 2003-07-28 17:26:11.000000000 -0500 -+++ vlc-0.6.1-modified/Makefile.am 2003-07-31 23:37:00.000000000 -0500 -@@ -7,7 +7,7 @@ - # SUBDIRS stores the directories where a "make" is required when building - # something. DIST_SUBDIRS stores the directories where nothing is built but - # which have makefiles with distribution information. --SUBDIRS = intl modules po mozilla share m4 . -+SUBDIRS = intl modules po . mozilla share m4 - DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools - - EXTRA_DIST = \ diff --git a/media-video/vlc/files/live-gcc3-3.patch b/media-video/vlc/files/live-gcc3-3.patch deleted file mode 100644 index 29d387032cfe..000000000000 --- a/media-video/vlc/files/live-gcc3-3.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- live.old/groupsock/Groupsock.cpp 2004-01-31 23:57:01.000000000 +0100 -+++ live/groupsock/Groupsock.cpp 2004-01-31 23:59:36.000000000 +0100 -@@ -26,7 +26,11 @@ - #if defined(__WIN32__) || defined(_WIN32) - #include <strstrea.h> - #else --#include <strstream.h> -+# if !defined(__GNUC__) || (__GNUC__ < 3) -+# include <strstream.h> -+# else -+# include <sstream> -+# endif - #endif - #include <stdio.h> - ---- live.old/groupsock/NetInterface.cpp 2004-01-31 23:57:20.000000000 +0100 -+++ live/groupsock/NetInterface.cpp 2004-02-01 00:00:16.000000000 +0100 -@@ -24,7 +24,11 @@ - #if defined(__WIN32__) || defined(_WIN32) - #include <strstrea.h> - #else --#include <strstream.h> -+# if !defined(__GNUC__) || (__GNUC__ < 3) -+# include <strstream.h> -+# else -+# include <sstream> -+# endif - #endif - - ////////// NetInterface ////////// diff --git a/media-video/vlc/files/mozplugin.patch b/media-video/vlc/files/mozplugin.patch deleted file mode 100644 index ce6be2d920bb..000000000000 --- a/media-video/vlc/files/mozplugin.patch +++ /dev/null @@ -1,177 +0,0 @@ -diff -urN vlc-0.6.0/mozilla/npvlc_rc.rc vlc-0.6.0-mozfix/mozilla/npvlc_rc.rc ---- vlc-0.6.0/mozilla/npvlc_rc.rc 1969-12-31 18:00:00.000000000 -0600 -+++ vlc-0.6.0-mozfix/mozilla/npvlc_rc.rc 2003-07-16 16:32:54.000000000 -0500 -@@ -0,0 +1,44 @@ -+ -+///////////////////////////////////////////////////////////////////////////// -+// -+// VLC Plugin description. -+// -+ -+//VS_VERSION_INFO VERSIONINFO -+1 VERSIONINFO -+ FILEVERSION 1,0,0,1 -+ PRODUCTVERSION 1,0,0,1 -+ FILEFLAGSMASK 0x3fL -+#ifdef _DEBUG -+ FILEFLAGS 0x1L -+#else -+ FILEFLAGS 0x0L -+#endif -+ FILEOS 0x4L -+ FILETYPE 0x2L -+ FILESUBTYPE 0x0L -+ -+BEGIN -+ BLOCK "StringFileInfo" -+ BEGIN -+ BLOCK "040904e4" -+ BEGIN -+ VALUE "ProductName", "VLC Multimedia Plugin\0" -+ VALUE "ProductVersion", "1, 0, 0, 1\0" -+ VALUE "OriginalFilename", "npvlc.dll\0" -+ VALUE "FileVersion", "1, 0, 0, 1\0" -+ VALUE "FileDescription", "VLC multimedia plugin<br><br>VideoLAN WWW: <a href=""http://www.videolan.org/"">http://www.videolan.org/</a>\0" -+ VALUE "InternalName", "npvlc\0" -+ VALUE "CompanyName", "VideoLAN\0" -+ VALUE "LegalCopyright", "Copyright VideoLAN \251 1996-2003\0" -+ VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mpeg4|audio/mpeg4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-msvideo|video/quicktime|application/x-ogg|application/x-vlc-plugin\0" -+ VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,vob|mpg,mpeg,vob|mp4,mpg4|mp4,mpg4|mp4,mpg4|mp4,mpg4|avi|mov,qt|ogg|\0" -+ VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 video|MPEG-4 audio|MPEG-4 video|MPEG-4 video|AVI video|QuickTime video|Ogg stream|VLC plugin\0" -+ END -+ END -+ BLOCK "VarFileInfo" -+ BEGIN -+ VALUE "Translation", 0x409, 1252 -+ END -+END -+ -diff -urN vlc-0.6.0/mozilla/support/npmac.cpp vlc-0.6.0-mozfix/mozilla/support/npmac.cpp ---- vlc-0.6.0/mozilla/support/npmac.cpp 2003-04-09 11:18:36.000000000 -0500 -+++ vlc-0.6.0-mozfix/mozilla/support/npmac.cpp 2003-07-16 16:33:20.000000000 -0500 -@@ -66,6 +66,7 @@ - #include <A4Stuff.h> - #endif - -+#include "nscore.h" - #include "jri.h" - #include "npapi.h" - -diff -urN vlc-0.6.0/mozilla/support/npunix.c vlc-0.6.0-mozfix/mozilla/support/npunix.c ---- vlc-0.6.0/mozilla/support/npunix.c 2003-04-09 11:18:36.000000000 -0500 -+++ vlc-0.6.0-mozfix/mozilla/support/npunix.c 2003-07-16 16:33:20.000000000 -0500 -@@ -32,12 +32,16 @@ - *---------------------------------------------------------------------- - * PLUGIN DEVELOPERS: - * YOU WILL NOT NEED TO EDIT THIS FILE. -+ * TO NETSCAPE DEVELOPERS: -+ * OF COURSE I WILL NEED TO EDIT THIS FILE, YOU BORKED IT ALL AROUND YOU -+ * IGNORANT FOOLS -- sam - *---------------------------------------------------------------------- - */ - - #define XP_UNIX 1 - - #include <stdio.h> -+#include "nscore.h" - #include "npapi.h" - #include "npupp.h" - -@@ -367,7 +371,7 @@ - * that the navigator needs. - */ - NPError --NP_GetValue(NPP future, NPPVariable variable, void *value) -+NP_GetValue(void *future, NPPVariable variable, void *value) - { - return NPP_GetValue(future, variable, value); - } -diff -urN vlc-0.6.0/mozilla/vlc.r vlc-0.6.0-mozfix/mozilla/vlc.r ---- vlc-0.6.0/mozilla/vlc.r 1969-12-31 18:00:00.000000000 -0600 -+++ vlc-0.6.0-mozfix/mozilla/vlc.r 2003-07-16 16:32:54.000000000 -0500 -@@ -0,0 +1,33 @@ -+/***************************************************************************** -+ * VLC Plugin description for OS X -+ *****************************************************************************/ -+ -+/* Definitions of system resource types */ -+#include <Types.r> -+ -+/* The first string in the array is a plugin description, -+ * the second is the plugin name */ -+resource 'STR#' (126) -+{ -+ { -+ "A VLC test plugin... hope it goes somewhere", -+ "VLC plugin" -+ }; -+}; -+ -+/* A description for each MIME type in resource 128 */ -+resource 'STR#' (127) -+{ -+ { -+ "Invoke scriptable sample plugin" -+ }; -+}; -+ -+/* A series of pairs of strings... first MIME type, then file extension(s) */ -+resource 'STR#' (128,"MIME Type") -+{ -+ { -+ "application/vlc-plugin", "" -+ }; -+}; -+ -diff -urN vlc-0.6.0/mozilla/vlcpeer.cpp vlc-0.6.0-mozfix/mozilla/vlcpeer.cpp ---- vlc-0.6.0/mozilla/vlcpeer.cpp 2002-10-11 17:32:56.000000000 -0500 -+++ vlc-0.6.0-mozfix/mozilla/vlcpeer.cpp 2003-07-16 16:32:54.000000000 -0500 -@@ -26,12 +26,13 @@ - *****************************************************************************/ - #include <vlc/vlc.h> - --#include "npapi.h" -+#include <nsISupports.h> -+#include <nsMemory.h> -+#include <npapi.h> -+ - #include "vlcpeer.h" - #include "vlcplugin.h" - --#include "nsMemory.h" -- - NS_IMPL_ISUPPORTS2( VlcPeer, VlcIntf, nsIClassInfo ) - - /***************************************************************************** -diff -urN vlc-0.6.0/mozilla/vlcplugin.cpp vlc-0.6.0-mozfix/mozilla/vlcplugin.cpp ---- vlc-0.6.0/mozilla/vlcplugin.cpp 2003-02-18 07:13:12.000000000 -0600 -+++ vlc-0.6.0-mozfix/mozilla/vlcplugin.cpp 2003-07-16 16:32:54.000000000 -0500 -@@ -26,6 +26,8 @@ - *****************************************************************************/ - #include <vlc/vlc.h> - -+#include <nsISupports.h> -+#include <nsMemory.h> - #include <npapi.h> - - #include "vlcpeer.h" -diff -urN vlc-0.6.0/mozilla/vlcshell.cpp vlc-0.6.0-mozfix/mozilla/vlcshell.cpp ---- vlc-0.6.0/mozilla/vlcshell.cpp 2003-04-09 12:27:51.000000000 -0500 -+++ vlc-0.6.0-mozfix/mozilla/vlcshell.cpp 2003-07-16 16:32:54.000000000 -0500 -@@ -29,6 +29,7 @@ - *****************************************************************************/ - #include <stdio.h> - #include <string.h> -+#include <stdlib.h> - - /* vlc stuff */ - #ifdef USE_LIBVLC -@@ -36,6 +37,8 @@ - #endif - - /* Mozilla stuff */ -+#include <nsISupports.h> -+#include <nsMemory.h> - #include <npapi.h> - - #ifdef XP_WIN diff --git a/media-video/vlc/files/vlc-0.7.2-live.patch b/media-video/vlc/files/vlc-0.7.2-live.patch deleted file mode 100644 index fe23bc6d4ccb..000000000000 --- a/media-video/vlc/files/vlc-0.7.2-live.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- modules/demux/livedotcom.cpp.old 2004-08-08 22:44:54.171817176 +0900 -+++ modules/demux/livedotcom.cpp 2004-08-08 22:47:48.793270680 +0900 -@@ -132,7 +132,7 @@ - } - if( ( rtsp = RTSPClient::createNew(*env, 1/*verbose*/, "VLC Media Player" ) ) == NULL ) - { -- delete env; -+ env->reclaim(); - delete scheduler; - msg_Err( p_input, "RTSPClient::createNew failed" ); - return VLC_EGENERIC; -@@ -149,7 +149,7 @@ - msg_Err( p_input, "describeURL failed (%s)", env->getResultMsg() ); - - free( psz_url ); -- delete env; -+ env->reclaim(); - delete scheduler; - free( p_sys ); - return VLC_EGENERIC; -@@ -160,7 +160,7 @@ - - //fprintf( stderr, "sdp=%s\n", p_sys->p_sdp ); - -- delete env; -+ env->reclaim(); - delete scheduler; - - var_Create( p_input, "rtsp-tcp", VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); -@@ -670,7 +670,7 @@ - } - if( p_sys->env ) - { -- delete p_sys->env; -+ p_sys->env->reclaim(); - } - if( p_sys->scheduler ) - { -@@ -724,7 +724,7 @@ - - if( p_sys->env ) - { -- delete p_sys->env; -+ p_sys->env->reclaim(); - } - if( p_sys->scheduler ) - { |