From 66a64d2715a870e8b8d718580ef55aa76c09699b Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Sat, 17 Sep 2005 21:29:26 +0000 Subject: Remove avi-xmms. --- media-plugins/avi-xmms/ChangeLog | 70 --- media-plugins/avi-xmms/Manifest | 17 - media-plugins/avi-xmms/avi-xmms-1.2.3-r1.ebuild | 37 -- media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild | 29 -- .../files/avi-xmms-1.2.3-gcc3-gentoo.patch | 514 --------------------- media-plugins/avi-xmms/files/digest-avi-xmms-1.2.3 | 1 - .../avi-xmms/files/digest-avi-xmms-1.2.3-r1 | 1 - media-plugins/avi-xmms/metadata.xml | 5 - 8 files changed, 674 deletions(-) delete mode 100644 media-plugins/avi-xmms/ChangeLog delete mode 100644 media-plugins/avi-xmms/Manifest delete mode 100644 media-plugins/avi-xmms/avi-xmms-1.2.3-r1.ebuild delete mode 100644 media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild delete mode 100644 media-plugins/avi-xmms/files/avi-xmms-1.2.3-gcc3-gentoo.patch delete mode 100644 media-plugins/avi-xmms/files/digest-avi-xmms-1.2.3 delete mode 100644 media-plugins/avi-xmms/files/digest-avi-xmms-1.2.3-r1 delete mode 100644 media-plugins/avi-xmms/metadata.xml (limited to 'media-plugins') diff --git a/media-plugins/avi-xmms/ChangeLog b/media-plugins/avi-xmms/ChangeLog deleted file mode 100644 index b31aee988b6c..000000000000 --- a/media-plugins/avi-xmms/ChangeLog +++ /dev/null @@ -1,70 +0,0 @@ -# ChangeLog for media-plugins/avi-xmms -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/avi-xmms/ChangeLog,v 1.11 2005/09/16 23:00:26 ciaranm Exp $ - - 16 Sep 2005; Ciaran McCreesh ChangeLog: - Converted to UTF-8, fixed encoding screwups - - 04 Sep 2005; Diego Pettenò avi-xmms-1.2.3.ebuild, - avi-xmms-1.2.3-r1.ebuild: - Don't install COPYING file. Use epatch instead of patch. - - 10 Jul 2005; Sven Wegener avi-xmms-1.2.3.ebuild, - avi-xmms-1.2.3-r1.ebuild: - QA: Removed 'emake || make || die' and variants. Either a package is - parallel build safe or it is not. There's nothing like trying and falling - back. - - 06 Jul 2004; Jeremy Huddleston - avi-xmms-1.2.3-r1.ebuild: - -* added with note. - - 22 Apr 2004; Jeremy Huddleston - avi-xmms-1.2.3-r1.ebuild, avi-xmms-1.2.3.ebuild: - Removed explicit S=. - - 20 Apr 2004; Jeremy Huddleston - avi-xmms-1.2.3-r1.ebuild, avi-xmms-1.2.3.ebuild: - Added IUSE. - -*avi-xmms-1.2.3-r1 (30 Nov 2002) - - 03 Feb 2003; Nick Hadaway avi-xmms-1.2.3-r1.ebuild : - Masked the package as it causes xmms to crash. - - 30 Nov 2002; Matthew Kennedy ChangeLog, - avi-xmms-1.2.3-r1.ebuild, files/digest-avi-xmms-1.2.3-r1, - files/avi-xmms-1.2.3-gcc3-gentoo.patch : - - Various GCC3 fixes. Resolves bug 7433. - -*avi-xmms-1.2.3 (23 Aug 2002) - - 30 Aug 2002; Seemant Kulleen *: - - Relocated to media-plugins - - 23 Aug 2002; Seemant Kulleen avi-xmms-1.2.3.ebuild - files/digest-avi-xmms-1.2.3 : - - Courtesy of Olle Hällnäs , a new version of avi-xmms has - come out, which has avifile statically compiled, so that the system's - avifile version is independent of this. - -*avi-xmms-1.2.2-r3 (28 Mar 2002) - - 28 Mar 2002; Seemant Kulleen avi-xmms-1.2.2-r3.ebuild : - - This ebuild is now just a virtual package for avi4xmms. Eventually, avi-xmms - will be removed completely (unless 4Front Technologies releases a version - that is compatible with avifile-0.6). - -*avi-xmms-1.2.2-r2 (1 Feb 2002) - - 1 Feb 2002; G.Bevin ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/media-plugins/avi-xmms/Manifest b/media-plugins/avi-xmms/Manifest deleted file mode 100644 index 341df6f0cbb0..000000000000 --- a/media-plugins/avi-xmms/Manifest +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 00560a17b701222dcb9ac926faca6ec5 avi-xmms-1.2.3-r1.ebuild 884 -MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 -MD5 63f54aa11e6b087fd61823221e8ce4ba ChangeLog 2672 -MD5 45d9826cd0bff3508cfef1f1b30cb0a6 avi-xmms-1.2.3.ebuild 723 -MD5 1353d8be29f9685e51f62d3b06ad4fe2 files/digest-avi-xmms-1.2.3 66 -MD5 12ef286167d623ec80c2adbe84ced3c8 files/avi-xmms-1.2.3-gcc3-gentoo.patch 18455 -MD5 1353d8be29f9685e51f62d3b06ad4fe2 files/digest-avi-xmms-1.2.3-r1 66 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFDK07ILLFUmVNQ7rkRAvkgAJ9HHq6cDCr3FvA9aBmwOWcUBnAYYwCePjmD -JZ+fAfvFFaa+MVs072ublpI= -=IelY ------END PGP SIGNATURE----- diff --git a/media-plugins/avi-xmms/avi-xmms-1.2.3-r1.ebuild b/media-plugins/avi-xmms/avi-xmms-1.2.3-r1.ebuild deleted file mode 100644 index 38bedaac1efe..000000000000 --- a/media-plugins/avi-xmms/avi-xmms-1.2.3-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/avi-xmms/avi-xmms-1.2.3-r1.ebuild,v 1.10 2005/09/04 10:05:56 flameeyes Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="A xmms plugin for AVI/DivX movies" -SRC_URI="http://www.xmms.org/files/plugins/avi-xmms/${P}.tar.gz" -HOMEPAGE="http://www.xmms.org/plugins_input.html" - -IUSE="" -SLOT="0" -LICENSE="GPL-2" -# Contains x86 assembly -KEYWORDS="-x86 -*" - -DEPEND=">=media-sound/xmms-1.2.7-r13 - media-libs/libsdl" - -src_unpack() { - unpack ${A} - cd ${S} - # various C++ language fixes - epatch ${FILESDIR}/avi-xmms-1.2.3-gcc3-gentoo.patch -} - -src_compile() { - filter-flags -fno-exceptions - - econf || die - emake -j1 || die -} - -src_install () { - make libdir=/usr/lib/xmms/Input DESTDIR=${D} install || die - dodoc AUTHORS ChangeLog README TODO -} diff --git a/media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild b/media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild deleted file mode 100644 index 650092652df0..000000000000 --- a/media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild,v 1.10 2005/09/04 10:05:56 flameeyes Exp $ - -inherit flag-o-matic - -DESCRIPTION="A xmms plugin for AVI/DivX movies" -SRC_URI="http://www.xmms.org/files/plugins/avi-xmms/${P}.tar.gz" -HOMEPAGE="http://www.xmms.org/plugins_input.html" - -IUSE="" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86" - -DEPEND=">=media-sound/xmms-1.2.7-r13 - media-libs/libsdl" - -src_compile() { - filter-flags -fno-exceptions - - econf || die - emake -j1 || die -} - -src_install () { - make libdir=/usr/lib/xmms/Input DESTDIR=${D} install || die - dodoc AUTHORS ChangeLog README TODO -} diff --git a/media-plugins/avi-xmms/files/avi-xmms-1.2.3-gcc3-gentoo.patch b/media-plugins/avi-xmms/files/avi-xmms-1.2.3-gcc3-gentoo.patch deleted file mode 100644 index 3d22c1beca55..000000000000 --- a/media-plugins/avi-xmms/files/avi-xmms-1.2.3-gcc3-gentoo.patch +++ /dev/null @@ -1,514 +0,0 @@ -diff -ur avi-xmms-1.2.3/include/com.h avi-xmms-1.2.3~/include/com.h ---- avi-xmms-1.2.3/include/com.h 2000-12-08 14:05:32.000000000 -0600 -+++ avi-xmms-1.2.3~/include/com.h 2002-11-30 02:41:01.000000000 -0600 -@@ -24,7 +24,7 @@ - int RegisterComClass(GUID* clsid, GETCLASSOBJECT gcs); - - #ifndef STDCALL --#define STDCALL __attribute__((__stdcall__)) -+#define STDCALL - #endif - - struct IUnknown; -@@ -60,4 +60,4 @@ - }; - #endif - --#endif -\ No newline at end of file -+#endif -diff -ur avi-xmms-1.2.3/include/infotypes.h avi-xmms-1.2.3~/include/infotypes.h ---- avi-xmms-1.2.3/include/infotypes.h 2000-12-18 02:46:08.000000000 -0600 -+++ avi-xmms-1.2.3~/include/infotypes.h 2002-11-30 02:44:24.000000000 -0600 -@@ -40,13 +40,13 @@ - std::string dll; - enum Kind {Win32, Source, Plugin, DShow_Dec}; - Kind kind; -- vector decoder_info; -- vector encoder_info; -+ std::vector decoder_info; -+ std::vector encoder_info; - GUID* guid; - CodecInfo(){} - CodecInfo(int* array, const char* info, const char* path, const char* a, -- Kind _kind, GUID* id=0, const vector& ei=vector(), -- const vector& di=vector()) -+ Kind _kind, GUID* id=0, const std::vector& ei=std::vector(), -+ const std::vector& di=std::vector()) - :kind(_kind), dll(path), text(info), about(a), fourcc(array[0]), decoder_info(di), encoder_info(ei), guid(id) - { - if(!*array) // uncompressed codec -@@ -71,4 +71,4 @@ - BITMAPINFOHEADER header; - }; - --#endif -\ No newline at end of file -+#endif -diff -ur avi-xmms-1.2.3/lib/avifile/AVIReadHandler.cpp avi-xmms-1.2.3~/lib/avifile/AVIReadHandler.cpp ---- avi-xmms-1.2.3/lib/avifile/AVIReadHandler.cpp 2000-11-26 23:08:44.000000000 -0600 -+++ avi-xmms-1.2.3~/lib/avifile/AVIReadHandler.cpp 2002-11-30 04:10:23.000000000 -0600 -@@ -255,7 +255,7 @@ - - - class AVIReadStream : public IvAVIReadStream, public ListNode2 { -- friend AVIReadHandler; -+ friend class AVIReadHandler; - - public: - AVIReadStream(AVIReadHandler *, AVIStreamNode *, int); -@@ -987,7 +987,7 @@ - int hdrSize; - switch(fccType) { - case ckidAVIMAINHDR: -- hdrSize=min(dwLength, sizeof(m_header)); -+ hdrSize= (dwLength < sizeof(m_header)) ? dwLength : sizeof(m_header); - _readFile2(&m_header, hdrSize); - // printf("Found main header, size %d\n", hdrSize); - dwLength-=hdrSize; -@@ -1109,7 +1109,7 @@ - __int64 cpos=_posFile(); - while(cpos/(i64FileSize/10)>progress) - { -- cerr<<"."; -+ std::cerr<<"."; - progress++; - } - -@@ -1154,7 +1154,7 @@ - // pd.advance((long)((_posFile() - i64ChunkMoviPos)/1024)); - // pd.check(); - } -- cerr<NextKeyFrame((frame<0)?(int)m_sample:frame); - } --Unsigned AviReadStream::GetPrevKeyFrame(int frame=-1) const -+Unsigned AviReadStream::GetPrevKeyFrame(int frame) const - { - if(m_pIStream==0)return 0; - if(frame==0)return 0; -diff -ur avi-xmms-1.2.3/lib/avifile/AviSegWrite.cpp avi-xmms-1.2.3~/lib/avifile/AviSegWrite.cpp ---- avi-xmms-1.2.3/lib/avifile/AviSegWrite.cpp 2000-10-03 01:44:42.000000000 -0500 -+++ avi-xmms-1.2.3~/lib/avifile/AviSegWrite.cpp 2002-11-30 04:19:12.000000000 -0600 -@@ -1,5 +1,5 @@ - #include "AviSegWrite.h" --IAviSegWriteFile* CreateSegmentedFile(const char* name, unsigned long flimit=0x7F000000, int flags=0, int mask=00777) -+IAviSegWriteFile* CreateSegmentedFile(const char* name, unsigned long flimit, int flags, int mask) - { - return new AviSegWriteFile(name, flimit, flags, mask); - } -@@ -65,7 +65,7 @@ - return str.vstream; - } - IAviAudioWriteStream* AviSegWriteFile::AddAudioStream(int fourcc, -- WAVEFORMATEX* fmt, int bitrate, int flags=0) -+ WAVEFORMATEX* fmt, int bitrate, int flags) - { - if(!fmt)return 0; - streaminfo str; -@@ -85,7 +85,7 @@ - IAviWriteStream* AviSegWriteFile::AddStream(enum AviStream::StreamType type, - const char* format, Unsigned format_size, - int handler, int frame_rate, -- int samplesize=0, int quality=0, int flags=0) -+ int samplesize, int quality, int flags) - - //IAviWriteStream* AviSegWriteFile::AddStream(enum AviStream::StreamType type) - { -@@ -120,7 +120,7 @@ - { - if(_format)delete _format; - } --AviSegWriteFile::AviSegWriteFile(const char* name, unsigned long flimit=0x7F000000, int flags=0, int mask=00777) -+AviSegWriteFile::AviSegWriteFile(const char* name, unsigned long flimit, int flags, int mask) - :_name(name), m_lFlimit(flimit), _flags(flags), _mask(mask), _size(0LL) - { - rf=new AviWriteFile(name, flags, mask); -@@ -134,7 +134,7 @@ - delete it->format; - } - --HRESULT AviSegWriteStream::AddChunk(const char* chunk, Unsigned size, Unsigned flags=0) -+HRESULT AviSegWriteStream::AddChunk(const char* chunk, Unsigned size, Unsigned flags) - { - HRESULT result=m_pStream->AddChunk(chunk, size, flags); - if(m_pFile->rf->FileSize()>m_pFile->m_lFlimit) -diff -ur avi-xmms-1.2.3/lib/avifile/AviWrite.cpp avi-xmms-1.2.3~/lib/avifile/AviWrite.cpp ---- avi-xmms-1.2.3/lib/avifile/AviWrite.cpp 2000-12-01 05:13:53.000000000 -0600 -+++ avi-xmms-1.2.3~/lib/avifile/AviWrite.cpp 2002-11-30 04:16:00.000000000 -0600 -@@ -45,7 +45,7 @@ - IAviWriteStream* AviWriteFile::AddStream(AviStream::StreamType type, - const char* format, Unsigned format_size, - int handler, int frame_rate, -- int samplesize=0, int quality=0, int flags=0) -+ int samplesize, int quality, int flags) - { - int ckid; - ckid=MAKEAVICKID((type==AviWriteStream::Video)?cktypeDIBcompressed:cktypeWAVEbytes, m_streams.size()); -@@ -73,7 +73,7 @@ - return result; - } - IAviAudioWriteStream* AviWriteFile::AddAudioStream(int fourcc, -- WAVEFORMATEX* fmt, int bitrate, int flags=0) -+ WAVEFORMATEX* fmt, int bitrate, int flags) - { - int ckid; - ckid=MAKEAVICKID(cktypeWAVEbytes, m_streams.size()); -@@ -134,7 +134,7 @@ - m_status=0; - return; - } --void AviWriteFile::AddChunk(offset_t offset, Unsigned size, Unsigned id, Unsigned flags=0) -+void AviWriteFile::AddChunk(offset_t offset, Unsigned size, Unsigned id, Unsigned flags) - { - // m_index=(AVIINDEXENTRY*)realloc(m_index, (m_indsize+1)*sizeof(AVIINDEXENTRY)); - AVIINDEXENTRY entry; -@@ -164,7 +164,7 @@ - enum AviStream::StreamType type, - const char* format, Unsigned format_size, - int handler, int frame_rate, -- int samplesize=0, int quality=0, int flags=0) -+ int samplesize, int quality, int flags) - - :m_file(file), m_ckid(ckid) - { -@@ -207,7 +207,7 @@ - } - AviWriteStream::AviWriteStream(AviWriteFile* file, int ckid, - enum AviStream::StreamType type, -- int handler, int frame_rate, int flags=0) -+ int handler, int frame_rate, int flags) - :m_file(file), m_ckid(ckid), m_format(0) - { - m_fd=file->m_fd; -@@ -243,7 +243,7 @@ - } - - --HRESULT AviWriteStream::AddChunk(const char* chunk, Unsigned size, Unsigned flags=0) -+HRESULT AviWriteStream::AddChunk(const char* chunk, Unsigned size, Unsigned flags) - { - if((chunk==0) && (size!=0)) - { -@@ -280,7 +280,7 @@ - IAviVideoWriteStream::~IAviVideoWriteStream(){} - IAviWriteFile::~IAviWriteFile(){} - --IAviWriteFile* CreateIAviWriteFile(const char* name, int flags, int mask=00777) -+IAviWriteFile* CreateIAviWriteFile(const char* name, int flags, int mask) - { - return new AviWriteFile(name, flags, mask); - } -diff -ur avi-xmms-1.2.3/lib/avifile/List.h avi-xmms-1.2.3~/lib/avifile/List.h ---- avi-xmms-1.2.3/lib/avifile/List.h 2000-11-26 11:43:55.000000000 -0600 -+++ avi-xmms-1.2.3~/lib/avifile/List.h 2002-11-30 04:07:10.000000000 -0600 -@@ -78,7 +78,7 @@ - - template - class ListNode2 : public ListNode { --friend List2; -+friend class List2; - public: - ListNode2() {} - ListNode2(void *pv) : ListNode(pv) {} -diff -ur avi-xmms-1.2.3/lib/aviplay/aviutil.cpp avi-xmms-1.2.3~/lib/aviplay/aviutil.cpp ---- avi-xmms-1.2.3/lib/aviplay/aviutil.cpp 2000-11-29 07:16:09.000000000 -0600 -+++ avi-xmms-1.2.3~/lib/aviplay/aviutil.cpp 2002-11-30 04:43:25.000000000 -0600 -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -14,6 +15,7 @@ - unsigned int (*localcount)(); - long long (*longcount)(); - -+ - static void do_cpuid(unsigned int *regs) - { - unsigned int ax; -@@ -139,7 +141,7 @@ - continue; - - } -- cout<<"Available CPU flags: "<::iterator it; - vector::iterator iv; -@@ -327,7 +327,7 @@ - } - return 0; - } --int VideoDecoder::SetDestFmt(int bits=24, int csp=0) -+int VideoDecoder::SetDestFmt(int bits, int csp) - { - if(m_iState==0) - return -1; -diff -ur avi-xmms-1.2.3/lib/videocodec/codeckeeper.cpp avi-xmms-1.2.3~/lib/videocodec/codeckeeper.cpp ---- avi-xmms-1.2.3/lib/videocodec/codeckeeper.cpp 2001-02-03 23:37:51.000000000 -0600 -+++ avi-xmms-1.2.3~/lib/videocodec/codeckeeper.cpp 2002-11-30 04:05:42.000000000 -0600 -@@ -253,20 +253,19 @@ - } - } - --const CodecInfo* CodecInfo::match(int codec, const CodecInfo* start=0) -+const CodecInfo* CodecInfo::match(int codec, const CodecInfo* start) - { -- vector::const_iterator it; -- if(start==0) -- it=video_codecs.begin(); -- else -- it=start; -- vector::const_iterator iv; -+ std::vector::const_iterator it = video_codecs.begin(); -+ if (start) -+ it = std::vector::const_iterator(start); -+ -+ std::vector::const_iterator iv; - for(; it!=video_codecs.end(); it++) - { -- if(start && (it==start))continue; -+ if(start && (&(*it)==start))continue; - for(iv=it->fourcc_array.begin(); iv!=it->fourcc_array.end(); iv++) - if(codec==(*iv)) -- return (const CodecInfo*)it; -+ return &(*it); - } - return 0; - } -diff -ur avi-xmms-1.2.3/lib/videocodec/image.cpp avi-xmms-1.2.3~/lib/videocodec/image.cpp ---- avi-xmms-1.2.3/lib/videocodec/image.cpp 2001-01-27 11:46:37.000000000 -0600 -+++ avi-xmms-1.2.3~/lib/videocodec/image.cpp 2002-11-30 02:50:26.000000000 -0600 -@@ -27,7 +27,7 @@ - _width=abs(_info->biWidth); - _height=abs(_info->biHeight); - } --CImage::CImage(const BitmapInfo* header, unsigned char* data=0, bool copy=true) -+CImage::CImage(const BitmapInfo* header, unsigned char* data, bool copy) - :_info(new BitmapInfo(header)),_refcount(1) - { - fill_members(); -@@ -57,7 +57,7 @@ - register_image(); - } - --CImage::CImage(const CImage* im, int depth=-1) -+CImage::CImage(const CImage* im, int depth) - :_info(new BitmapInfo(im->get_fmt())), _refcount(1) - { - if(depth!=-1) -@@ -208,7 +208,7 @@ - { - return (int(b)<<16)+(int(g)<<8)+int(r); - } --void CImage::ToYUV(int destfmt=0) -+void CImage::ToYUV(int destfmt) - { - struct yuv* src; - src=(struct yuv*)_data+_width*_height-1; -@@ -431,7 +431,7 @@ - return; - } - } -- cerr<<"Unsupported"< - - -sound - -- cgit v1.2.3-65-gdbad