summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2007-09-29 10:58:10 +0000
committerSamuli Suominen <drac@gentoo.org>2007-09-29 10:58:10 +0000
commit94385730b31abe88b61f494fe44540b26b7b91a6 (patch)
treec4f9cfbe4f656289e78eb49b59b4256db6eaa388 /media-plugins
parentMarked stable on amd64 as per bug 191993. (diff)
downloadgentoo-2-94385730b31abe88b61f494fe44540b26b7b91a6.tar.gz
gentoo-2-94385730b31abe88b61f494fe44540b26b7b91a6.tar.bz2
gentoo-2-94385730b31abe88b61f494fe44540b26b7b91a6.zip
Removing GStreamer 0.8.
(Portage version: 2.1.3.11)
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.8.7-r13
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/ffmpeg_dos.patch88
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/gst-ffmpeg-gcc4.patch114
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.4-eoshangfix.patch26
-rw-r--r--media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.5-gmake.patch10
-rw-r--r--media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.7-r1.ebuild75
6 files changed, 0 insertions, 316 deletions
diff --git a/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.8.7-r1 b/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.8.7-r1
deleted file mode 100644
index 9807a29d1973..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/digest-gst-plugins-ffmpeg-0.8.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6435ef3954ee05de79829e262f86187a gst-ffmpeg-0.8.7.tar.bz2 2110685
-RMD160 919163d3fb8cdcf401e0acfe951b24cbdfc81f1f gst-ffmpeg-0.8.7.tar.bz2 2110685
-SHA256 42c5c1ce64ac1ca382e1d95cc48d5e1d6aa48391f22d99c3dc0dc4cd5ab1a414 gst-ffmpeg-0.8.7.tar.bz2 2110685
diff --git a/media-plugins/gst-plugins-ffmpeg/files/ffmpeg_dos.patch b/media-plugins/gst-plugins-ffmpeg/files/ffmpeg_dos.patch
deleted file mode 100644
index 3425c1f5be83..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/ffmpeg_dos.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Index: libavcodec/utils.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/utils.c,v
-retrieving revision 1.161
-retrieving revision 1.162
-diff -u -r1.161 -r1.162
---- gst-libs/ext/ffmpeg/libavcodec/utils.c 2 Nov 2005 09:18:32 -0000 1.161
-+++ gst-libs/ext/ffmpeg/libavcodec/utils.c 2 Dec 2005 00:12:37 -0000 1.162
-@@ -292,27 +292,10 @@
- buf->last_pic_num= *picture_number;
- }else{
- int h_chroma_shift, v_chroma_shift;
-- int pixel_size;
--
-+ int pixel_size, size[3];
-+ AVPicture picture;
-+
- avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift);
--
-- switch(s->pix_fmt){
-- case PIX_FMT_RGB555:
-- case PIX_FMT_RGB565:
-- case PIX_FMT_YUV422:
-- case PIX_FMT_UYVY422:
-- pixel_size=2;
-- break;
-- case PIX_FMT_RGB24:
-- case PIX_FMT_BGR24:
-- pixel_size=3;
-- break;
-- case PIX_FMT_RGBA32:
-- pixel_size=4;
-- break;
-- default:
-- pixel_size=1;
-- }
-
- avcodec_align_dimensions(s, &w, &h);
-
-@@ -320,21 +303,39 @@
- w+= EDGE_WIDTH*2;
- h+= EDGE_WIDTH*2;
- }
--
-+ avpicture_fill(&picture, NULL, s->pix_fmt, w, h);
-+ pixel_size= picture.linesize[0]*8 / w;
-+//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d\n", (int)picture.data[1], w, h, s->pix_fmt);
-+ assert(pixel_size>=1);
-+ //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it
-+ if(pixel_size == 3*8)
-+ w= ALIGN(w, STRIDE_ALIGN<<h_chroma_shift);
-+ else
-+ w= ALIGN(pixel_size*w, STRIDE_ALIGN<<(h_chroma_shift+3)) / pixel_size;
-+ size[1] = avpicture_fill(&picture, NULL, s->pix_fmt, w, h);
-+ size[0] = picture.linesize[0] * h;
-+ size[1] -= size[0];
-+ if(picture.data[2])
-+ size[1]= size[2]= size[1]/2;
-+ else
-+ size[2]= 0;
-+
- buf->last_pic_num= -256*256*256*64;
-+ memset(buf->base, 0, sizeof(buf->base));
-+ memset(buf->data, 0, sizeof(buf->data));
-
-- for(i=0; i<3; i++){
-+ for(i=0; i<3 && size[i]; i++){
- const int h_shift= i==0 ? 0 : h_chroma_shift;
- const int v_shift= i==0 ? 0 : v_chroma_shift;
-
-- //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it
-- buf->linesize[i]= ALIGN(pixel_size*w>>h_shift, STRIDE_ALIGN<<(h_chroma_shift-h_shift));
-+ buf->linesize[i]= picture.linesize[i];
-
-- buf->base[i]= av_malloc((buf->linesize[i]*h>>v_shift)+16); //FIXME 16
-+ buf->base[i]= av_malloc(size[i]+16); //FIXME 16
- if(buf->base[i]==NULL) return -1;
-- memset(buf->base[i], 128, buf->linesize[i]*h>>v_shift);
--
-- if(s->flags&CODEC_FLAG_EMU_EDGE)
-+ memset(buf->base[i], 128, size[i]);
-+
-+ // no edge if EDEG EMU or not planar YUV, we check for PAL8 redundantly to protect against a exploitable bug regression ...
-+ if((s->flags&CODEC_FLAG_EMU_EDGE) || (s->pix_fmt == PIX_FMT_PAL8) || !size[2])
- buf->data[i] = buf->base[i];
- else
- buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), STRIDE_ALIGN);
-
diff --git a/media-plugins/gst-plugins-ffmpeg/files/gst-ffmpeg-gcc4.patch b/media-plugins/gst-plugins-ffmpeg/files/gst-ffmpeg-gcc4.patch
deleted file mode 100644
index 0828c261745f..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/gst-ffmpeg-gcc4.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -Naur gst-ffmpeg-0.8.4/gst-libs/ext/ffmpeg/libavcodec/avcodec.h gst-ffmpeg-0.8.4-gcc4/gst-libs/ext/ffmpeg/libavcodec/avcodec.h
---- gst-ffmpeg-0.8.4/gst-libs/ext/ffmpeg/libavcodec/avcodec.h 2004-12-16 18:47:15.000000000 +0100
-+++ gst-ffmpeg-0.8.4-gcc4/gst-libs/ext/ffmpeg/libavcodec/avcodec.h 2005-05-15 00:59:20.508942904 +0200
-@@ -1757,6 +1757,13 @@
- #define FF_OPT_MAX_DEPTH 10
- } AVOption;
-
-+#ifdef HAVE_MMX
-+extern const struct AVOption avoptions_common[3 + 5];
-+#else
-+extern const struct AVOption avoptions_common[3];
-+#endif
-+extern const struct AVOption avoptions_workaround_bug[11];
-+
- /**
- * Parse option(s) and sets fields in passed structure
- * @param strct structure where the parsed results will be written
-diff -Naur gst-ffmpeg-0.8.4/gst-libs/ext/ffmpeg/libavcodec/common.h gst-ffmpeg-0.8.4-gcc4/gst-libs/ext/ffmpeg/libavcodec/common.h
---- gst-ffmpeg-0.8.4/gst-libs/ext/ffmpeg/libavcodec/common.h 2004-12-16 18:47:16.000000000 +0100
-+++ gst-ffmpeg-0.8.4-gcc4/gst-libs/ext/ffmpeg/libavcodec/common.h 2005-05-15 00:59:20.510942600 +0200
-@@ -62,14 +62,6 @@
- #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
- #define AVOPTION_END() AVOPTION_SUB(NULL)
-
--struct AVOption;
--#ifdef HAVE_MMX
--extern const struct AVOption avoptions_common[3 + 5];
--#else
--extern const struct AVOption avoptions_common[3];
--#endif
--extern const struct AVOption avoptions_workaround_bug[11];
--
- #endif /* HAVE_AV_CONFIG_H */
-
- /* Suppress restrict if it was not defined in config.h. */
-diff -Naur gst-ffmpeg-0.8.4/gst-libs/ext/ffmpeg/libavcodec/i386/dsputil_mmx.c gst-ffmpeg-0.8.4-gcc4/gst-libs/ext/ffmpeg/libavcodec/i386/dsputil_mmx.c
---- gst-ffmpeg-0.8.4/gst-libs/ext/ffmpeg/libavcodec/i386/dsputil_mmx.c 2004-12-16 18:48:06.000000000 +0100
-+++ gst-ffmpeg-0.8.4-gcc4/gst-libs/ext/ffmpeg/libavcodec/i386/dsputil_mmx.c 2005-05-15 00:59:29.139630840 +0200
-@@ -672,26 +672,22 @@
- "punpcklwd %%mm0, %%mm1 \n\t"
- "punpckhwd %%mm4, %%mm3 \n\t"
- "punpckhwd %%mm0, %%mm6 \n\t"
-- "movd %%mm5, %0 \n\t"
-+ "movd %%mm5, (%0) \n\t"
- "punpckhdq %%mm5, %%mm5 \n\t"
-- "movd %%mm5, %1 \n\t"
-- "movd %%mm3, %2 \n\t"
-+ "movd %%mm5, (%0,%2) \n\t"
-+ "movd %%mm3, (%0,%2,2) \n\t"
- "punpckhdq %%mm3, %%mm3 \n\t"
-- "movd %%mm3, %3 \n\t"
-- "movd %%mm1, %4 \n\t"
-+ "movd %%mm3, (%0,%3) \n\t"
-+ "movd %%mm1, (%1) \n\t"
- "punpckhdq %%mm1, %%mm1 \n\t"
-- "movd %%mm1, %5 \n\t"
-- "movd %%mm6, %6 \n\t"
-+ "movd %%mm1, (%1,%2) \n\t"
-+ "movd %%mm6, (%1,%2,2) \n\t"
- "punpckhdq %%mm6, %%mm6 \n\t"
-- "movd %%mm6, %7 \n\t"
-- : "=m" (*(uint32_t*)(src + 0*stride)),
-- "=m" (*(uint32_t*)(src + 1*stride)),
-- "=m" (*(uint32_t*)(src + 2*stride)),
-- "=m" (*(uint32_t*)(src + 3*stride)),
-- "=m" (*(uint32_t*)(src + 4*stride)),
-- "=m" (*(uint32_t*)(src + 5*stride)),
-- "=m" (*(uint32_t*)(src + 6*stride)),
-- "=m" (*(uint32_t*)(src + 7*stride))
-+ "movd %%mm6, (%1,%3) \n\t"
-+ :: "r" (src),
-+ "r" (src + 4*stride),
-+ "r" ((long) stride ),
-+ "r" ((long)(3*stride))
- );
- }
-
-diff -Naur gst-ffmpeg-0.8.4/gst-libs/ext/ffmpeg/libavcodec/libpostproc/postprocess_template.c gst-ffmpeg-0.8.4-gcc4/gst-libs/ext/ffmpeg/libavcodec/libpostproc/postprocess_template.c
---- gst-ffmpeg-0.8.4/gst-libs/ext/ffmpeg/libavcodec/libpostproc/postprocess_template.c 2004-12-16 18:48:16.000000000 +0100
-+++ gst-ffmpeg-0.8.4-gcc4/gst-libs/ext/ffmpeg/libavcodec/libpostproc/postprocess_template.c 2005-05-15 00:59:20.506943208 +0200
-@@ -611,6 +611,7 @@
- static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext *c)
- {
- #if defined (HAVE_MMX2) || defined (HAVE_3DNOW)
-+ PPContext *ptr_c_pQPb = c->pQPb;
- /*
- uint8_t tmp[16];
- const int l1= stride;
-@@ -832,7 +833,7 @@
- "movq %%mm2, (%0, %1, 4) \n\t"
-
- :
-- : "r" (src), "r" ((long)stride), "m" (c->pQPb)
-+ : "r" (src), "r" ((long)stride), "m" (ptr_c_pQPb)
- : "%"REG_a, "%"REG_c
- );
-
-@@ -2758,6 +2759,7 @@
- if(dc_mask & eq_mask){
- long offset= -8*step;
- int64_t *temp_sums= sums;
-+ int64_t dc_eq_mask = dc_mask & eq_mask;
-
- asm volatile(
- "movq %2, %%mm0 \n\t" // QP,..., QP
-@@ -2930,7 +2932,7 @@
- " js 1b \n\t"
-
- : "+r"(offset), "+r"(temp_sums)
-- : "r" ((long)step), "r"(src - offset), "m"(dc_mask & eq_mask)
-+ : "r" ((long)step), "r"(src - offset), "m"(dc_eq_mask)
- );
- }else
- src+= step; // src points to begin of the 8x8 Block
diff --git a/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.4-eoshangfix.patch b/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.4-eoshangfix.patch
deleted file mode 100644
index a14fffe571ab..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.4-eoshangfix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-===================================================================
-RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdec.c,v
-rcsdiff: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdec.c,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.94
-retrieving revision 1.95
-diff -u -r1.94 -r1.95
---- gstffmpegdec.c 2005/04/02 10:01:20 1.94
-+++ gstffmpegdec.c 2005/04/14 10:50:15 1.95
-@@ -778,14 +778,15 @@
-
- switch (GST_EVENT_TYPE (event)) {
- case GST_EVENT_EOS: {
-- gint have_data, len;
-+ gint have_data, len, try = 0;
-
-+ /* max. 10 times, for safety (see e.g. #300200) */
- do {
- len = gst_ffmpegdec_frame (ffmpegdec, NULL, 0, &have_data,
- &ffmpegdec->next_ts);
- if (len < 0 || have_data == 0)
- break;
-- } while (1);
-+ } while (try++ < 10);
- goto forward;
- }
- case GST_EVENT_FLUSH:
diff --git a/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.5-gmake.patch b/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.5-gmake.patch
deleted file mode 100644
index 949acbc6fcbc..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/files/gst-plugins-ffmpeg-0.8.5-gmake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: gst-ffmpeg-0.8.5/gst-libs/ext/Makefile.am
-===================================================================
---- gst-ffmpeg-0.8.5.orig/gst-libs/ext/Makefile.am
-+++ gst-ffmpeg-0.8.5/gst-libs/ext/Makefile.am
-@@ -12,4 +12,4 @@ SUBDIRS =
- DIST_SUBDIRS = ffmpeg
-
- all-local:
-- cd ffmpeg && make
-+ cd ffmpeg && $(MAKE)
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.7-r1.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.7-r1.ebuild
deleted file mode 100644
index b2e9b42901d0..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.7-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.8.7-r1.ebuild,v 1.11 2006/09/04 06:42:34 vapier Exp $
-
-inherit flag-o-matic eutils
-
-MY_PN=${PN/-plugins/}
-MY_P=${MY_PN}-${PV}
-
-# Create a major/minor combo for SLOT
-PVP=(${PV//[-\._]/ })
-SLOT=${PVP[0]}.${PVP[1]}
-
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
-SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="|| ( =media-libs/gstreamer-0.8.10 =media-libs/gstreamer-0.8.11
- =media-libs/gstreamer-0.8.12 )
- =media-libs/gst-plugins-0.8*"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-src_compile() {
-
- # Restrictions taken from the mplayer ebuild
- # See bug #64262 for more info
- # let's play the filtration game!
- filter-flags -fPIE -fPIC -fstack-protector -fforce-addr -momit-leaf-frame-pointer -msse2 -msse3 -falign-functions -fweb
- # ugly optimizations cause MPlayer to cry on x86 systems!
- if use x86 ; then
- replace-flags -O0 -O2
- replace-flags -O3 -O2
- fi
-
- epatch ${FILESDIR}/ffmpeg_dos.patch
- econf || die
- emake || die
-
-}
-
-src_install() {
-
- make DESTDIR=${D} install || die
-
- dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-
-}
-
-# ripped from the gst-plugins eclass
-update_registry() {
-
- einfo "Updating gstreamer plugins registry for gstreamer ${SLOT}..."
- gst-register-${SLOT}
-
-}
-
-pkg_postinst() {
-
- update_registry
-
-}
-
-pkg_postrm() {
-
- update_registry
-
-}