Drop old mjpegtools version.

Package-Manager: portage-2.1_pre9-r4

10 files changed, 0 insertions, 995 deletions

diff --git a/media-video/mjpegtools/files/altivec-fix-1.6.2.patch b/media-video/mjpegtools/files/altivec-fix-1.6.2.patch
deleted file mode 100644
index 0700f4d5e743..000000000000
--- a/media-video/mjpegtools/files/altivec-fix-1.6.2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.in.orig	2004-06-14 22:03:42.109367120 +0200
-+++ configure.in	2004-06-14 22:04:49.835071248 +0200
-@@ -502,15 +502,15 @@
-     ALTIVEC_CFLAGS=""
-     if $CC -o conftest conftest.c >/dev/null 2>&1; then
-       have_altivec=true
--    elif $CC -faltivec -o conftest conftest.c >/dev/null 2>&1; then
-+    elif $CC $CFLAGS -faltivec -o conftest conftest.c >/dev/null 2>&1; then
-       # Mac OS X style
-       have_altivec=true
-       ALTIVEC_CFLAGS="-faltivec"
--    elif $CC -fvec -o conftest conftest.c >/dev/null 2>&1; then
-+    elif $CC $CFLAGS -fvec -o conftest conftest.c >/dev/null 2>&1; then
-       # Motorola style
-       have_altivec=true
-       ALTIVEC_CFLAGS="-fvec"
--    elif $CC -DHAVE_ALTIVEC_H=1 -maltivec -mabi=altivec -o conftest conftest.c >/dev/null 2>&1; then
-+    elif $CC $CFLAGS -DHAVE_ALTIVEC_H=1 -maltivec -mabi=altivec -o conftest conftest.c >/dev/null 2>&1; then
-       # gcc 3.1 style
-       have_altivec=true
-       ALTIVEC_CFLAGS="-DHAVE_ALTIVEC_H=1 -maltivec -mabi=altivec"
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r4 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r4
deleted file mode 100644
index bf5968a0c2cb..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r4
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 9b80377667257536e0870cf7fffd506f mjpegtools-1.6.2-mmx-fPIC.patch.bz2 3065
-RMD160 b18bc3105964de0c3377fdd22fded4822ca6c8ed mjpegtools-1.6.2-mmx-fPIC.patch.bz2 3065
-SHA256 2d1cf95c5f75e02f181aabe1e59f1b211d66f0daf981d5f816fd25fa6c975310 mjpegtools-1.6.2-mmx-fPIC.patch.bz2 3065
-MD5 01c0120b0182de67f182ef99ad855daa mjpegtools-1.6.2.tar.gz 1256280
-RMD160 48d4e6fa037f18973bae7d22ac14412182361c23 mjpegtools-1.6.2.tar.gz 1256280
-SHA256 525afc26f07aacf06638ffe8612b2d5d84dab64e09df4d3691bc4909ef4850ae mjpegtools-1.6.2.tar.gz 1256280
-MD5 cd55f55ddd646eb79d4e4df99d4c777f mjpegtools-m4-1.tar.bz2 4547
-RMD160 b81b89bb6364023606a1d3ca9519e143fe053ab4 mjpegtools-m4-1.tar.bz2 4547
-SHA256 10de1e206ee9c84aae111e95f655ad9394be749bfed01d337f7ff9a983aab522 mjpegtools-m4-1.tar.bz2 4547
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.2-configure.patch b/media-video/mjpegtools/files/mjpegtools-1.6.2-configure.patch
deleted file mode 100644
index e7e1f57afe6a..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.6.2-configure.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- configure.in.orig	2004-02-03 23:57:29.000000000 +0100
-+++ configure.in	2004-12-02 03:27:39.649492528 +0100
-@@ -44,6 +44,10 @@
-   [  --with-dv-yv12,                   libDV PAL YV12 read-support])
- AC_ARG_ENABLE(zalpha,
-   [  --enable-zalpha,                  include MPEG Z/Alpha support in mplex (www.geofront.se/products_software_mza.php)])
-+AC_ARG_WITH(v4l,
-+  [ --without-v4l		       disable video4linux support])
-+AC_ARG_WITH(gtk,
-+  [--without-gtk		       disable gtk+ support])
- 
- AC_GNU_SOURCE
- 
-@@ -155,12 +159,16 @@
- os_type=`uname`
- have_video4linux=false
- if test x$os_type = x"Linux"; then
--  AC_CHECK_HEADER(linux/videodev.h,
--    have_video4linux=true
--    AC_DEFINE(HAVE_V4L,1,
--		      [Building for Linux - using the video4linux API]),
--    AC_MSG_ERROR([videodev.h not found - please install the linux kernel headers])
--    )
-+  if test x$with_v4l != xno; then
-+    AC_CHECK_HEADER(linux/videodev.h,
-+      have_video4linux=true
-+      AC_DEFINE(HAVE_V4L,1,
-+  		      [Building for Linux - using the video4linux API]),
-+      AC_MSG_ERROR([videodev.h not found - please install the linux kernel headers])
-+      )
-+  else
-+    AC_MSG_WARN([video4linux support disapled])
-+  fi
- else
-   AC_MSG_WARN([Did not find linux platform - video4linux functionality will be disabled])
-   AC_MSG_WARN([If you are on MacOS X, please note that only the classic libjpeg works !])
-@@ -294,6 +302,7 @@
- fi
- 
- have_dv=false
-+if test x$with_dv != xno ; then
- EXTRA_LIBS=" $LIBM_LIBS $GLIB_LIBS  $PTHREAD_LIBS"
- AC_CHECK_LIB(dv, dv_decoder_free,
-   [ DV_LIBS="-L${with_dv}/lib -ldv ${EXTRA_LIBS}"
-@@ -302,6 +311,7 @@
- 			  [libdv is present])
-     have_dv=true],, 
-     -L${with_dv}/lib -ldv ${EXTRA_LIBS})
-+fi
- 
- dnl *********************************************************************
- dnl Check for libDV YV12 read-support
-@@ -364,11 +374,13 @@
- dnl Check for Gtk+/glib (for glav)
- dnl ********************************************************************
- have_gtk=false
--ifdef([AM_PATH_GTK],
--      [ AM_PATH_GTK(1.2.0, [ have_gtk=true
--                           AC_DEFINE(HAVE_GTK,1,
--									 [Gtk library present]
--							)],,) ])
-+if test x$with_gtk != xno; then
-+ ifdef([AM_PATH_GTK],
-+       [ AM_PATH_GTK(1.2.0, [ have_gtk=true
-+                            AC_DEFINE(HAVE_GTK,1,
-+                                                                        [Gtk library present]
-+                                                       )],,) ])
-+fi
- 
- dnl ********************************************************************
- dnl Check for the SDL library (for software playback)
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.2-dv.patch b/media-video/mjpegtools/files/mjpegtools-1.6.2-dv.patch
deleted file mode 100644
index cf2725f0b58a..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.6.2-dv.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mjpegtools-1.6.2.orig/configure.in	2004-02-03 23:57:29.000000000 +0100
-+++ mjpegtools-1.6.2/configure.in	2005-03-13 12:46:28.000000000 +0100
-@@ -293,7 +293,9 @@
-   with_dv=/usr/local
- fi
- 
-+if test x$with_dv = xno ; then
- have_dv=false
-+else
- EXTRA_LIBS=" $LIBM_LIBS $GLIB_LIBS  $PTHREAD_LIBS"
- AC_CHECK_LIB(dv, dv_decoder_free,
-   [ DV_LIBS="-L${with_dv}/lib -ldv ${EXTRA_LIBS}"
-@@ -302,7 +304,7 @@
- 			  [libdv is present])
-     have_dv=true],, 
-     -L${with_dv}/lib -ldv ${EXTRA_LIBS})
--
-+fi
- dnl *********************************************************************
- dnl Check for libDV YV12 read-support
- have_dv_yv12=false
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.2-fPIC.patch b/media-video/mjpegtools/files/mjpegtools-1.6.2-fPIC.patch
deleted file mode 100644
index bac879b634b3..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.6.2-fPIC.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-===================================================================
-RCS file: /cvsroot/mjpeg/mjpeg_play/aenc/Makefile.am,v
-retrieving revision 1.17
-retrieving revision 1.18
-diff -u -r1.17 -r1.18
---- mjpeg/mjpeg_play/aenc/Makefile.am	2003/11/25 10:36:30	1.17
-+++ mjpeg/mjpeg_play/aenc/Makefile.am	2004/03/03 17:55:45	1.18
-@@ -27,4 +27,4 @@
- 	table_th.h \
- 	wav_io.h
- 
--mp2enc_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
-+mp2enc_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS)
-===================================================================
-RCS file: /cvsroot/mjpeg/mjpeg_play/lavtools/Makefile.am,v
-retrieving revision 1.90
-retrieving revision 1.92
-diff -u -r1.90 -r1.92
---- mjpeg/mjpeg_play/lavtools/Makefile.am	2004/01/01 19:59:55	1.90
-+++ mjpeg/mjpeg_play/lavtools/Makefile.am	2004/03/03 17:55:45	1.92
-@@ -8,6 +8,8 @@
-         -I /usr/X11R6/include -I$(top_srcdir)/utils \
- 	${GTK_CFLAGS} $(JPEG_CFLAGS)
- 
-+LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
-+
- # *********************************************************************
- # Support lib
- 
-@@ -133,113 +136,108 @@
- 	yuvcorrect.h
- 
- ypipe_SOURCES = ypipe.c
--ypipe_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+ypipe_LDADD = $(LIBMJPEGUTILS)
- 
- yuv2lav_SOURCES = yuv2lav.c
--yuv2lav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
--		 liblavfile.la liblavjpeg.la ${LIBM_LIBS}
-+yuv2lav_LDADD = $(LIBMJPEGUTILS) liblavfile.la liblavjpeg.la ${LIBM_LIBS}
- 
- transist_flt_SOURCES = transist.flt.c
--transist_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+transist_flt_LDADD = $(LIBMJPEGUTILS)
- 
- matteblend_flt_SOURCES = matteblend.flt.c
--matteblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+matteblend_flt_LDADD = $(LIBMJPEGUTILS)
- 
- multiblend_flt_SOURCES = multiblend.flt.c
--multiblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+multiblend_flt_LDADD = $(LIBMJPEGUTILS)
- 
- if HAVE_X
-   LAVPLAY_X_LIBS = $(X_LIBS) -lX11
- endif
- 
- lavplay_SOURCES = lavplay.c
--lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lavplay_LDADD = $(LIBMJPEGUTILS) \
- 	liblavplay.la liblavjpeg.la liblavfile.la \
- 	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} $(LAVPLAY_X_LIBS)
- 
- lavrec_SOURCES = lavrec.c
--lavrec_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lavrec_LDADD = $(LIBMJPEGUTILS) \
- 	liblavrec.la liblavfile.la liblavjpeg.la \
- 	@LIBGETOPT_LIB@ $(PTHREAD_LIBS)
- 
- testrec_SOURCES = testrec.c audiolib.c
--testrec_LDADD = $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.a
-+testrec_LDADD = $(PTHREAD_LIBS) $(LIBMJPEGUTILS)
- 
- lav2yuv_SOURCES = lav2yuv.c lav_common.c
--lav2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-+lav2yuv_LDADD = $(LIBMJPEGUTILS) \
- 		liblavfile.la liblavjpeg.la $(DV_LIBS)
- 
- jpeg2yuv_SOURCES = jpeg2yuv.c
--jpeg2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a liblavjpeg.la
-+jpeg2yuv_LDADD = $(LIBMJPEGUTILS) liblavjpeg.la
- 
- png2yuv_SOURCES = png2yuv.c colorspace.c subsample.c
--png2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a -lpng -lz -lm
-+png2yuv_LDADD = $(LIBMJPEGUTILS) -lpng -lz -lm
- 
- lavpipe_SOURCES = lavpipe.c pipelist.c
--lavpipe_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+lavpipe_LDADD = $(LIBMJPEGUTILS)
- 
- yuvmedianfilter_SOURCES = yuvmedianfilter.c
--yuvmedianfilter_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+yuvmedianfilter_LDADD = $(LIBMJPEGUTILS)
- 
- lav2wav_SOURCES = lav2wav.c
--lav2wav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
--	 liblavfile.la
-+lav2wav_LDADD = $(LIBMJPEGUTILS) liblavfile.la
- 
- lavtrans_SOURCES = lavtrans.c
--lavtrans_LDADD = $(top_builddir)/utils/libmjpegutils.a \
--	 liblavfile.la
-+lavtrans_LDADD = $(LIBMJPEGUTILS) liblavfile.la
- 
- lavaddwav_SOURCES = lavaddwav.c
--lavaddwav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
--	 liblavfile.la
-+lavaddwav_LDADD = $(LIBMJPEGUTILS) liblavfile.la
- 
- glav_SOURCES = glav.c glav_main.c
--glav_LDADD = $(top_builddir)/utils/libmjpegutils.a ${GTK_LIBS}
-+glav_LDADD = $(LIBMJPEGUTILS) ${GTK_LIBS}
- 
- lavvideo_SOURCES = lavvideo.c frequencies.c
- 
- yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c
--yuvscaler_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
-+yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
- 
- yuvcorrect_SOURCES = yuvcorrect.c yuvcorrect_functions.c
--yuvcorrect_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
-+yuvcorrect_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
- 
- yuvcorrect_tune_SOURCES = yuvcorrect_tune.c yuvcorrect_functions.c
--yuvcorrect_tune_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
-+yuvcorrect_tune_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
- 
- yuvplay_SOURCES = yuvplay.c
--yuvplay_LDADD = $(SDL_LIBS) $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.a
-+yuvplay_LDADD = $(SDL_LIBS) $(PTHREAD_LIBS) $(LIBMJPEGUTILS)
- 
- ppmtoy4m_SOURCES = ppmtoy4m.c colorspace.c subsample.c
--ppmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+ppmtoy4m_LDADD = $(LIBMJPEGUTILS)
- 
- pgmtoy4m_SOURCES = pgmtoy4m.c
--pgmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+pgmtoy4m_LDADD = $(LIBMJPEGUTILS)
- 
- y4mtoppm_SOURCES = y4mtoppm.c colorspace.c subsample.c
--y4mtoppm_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mtoppm_LDADD = $(LIBMJPEGUTILS)
- 
- y4mcolorbars_SOURCES = y4mcolorbars.c colorspace.c subsample.c
--y4mcolorbars_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mcolorbars_LDADD = $(LIBMJPEGUTILS)
- 
- lavinfo_SOURCES = lavinfo.c
--lavinfo_LDADD = $(top_builddir)/utils/libmjpegutils.a \
--	liblavfile.la
-+lavinfo_LDADD = $(LIBMJPEGUTILS) liblavfile.la
- 
- y4mshift_SOURCES = y4mshift.c
--y4mshift_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mshift_LDADD = $(LIBMJPEGUTILS)
- 
- y4mblack_SOURCES = y4mblack.c
--y4mblack_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mblack_LDADD = $(LIBMJPEGUTILS)
- 
- y4mtoyuv_SOURCES = y4mtoyuv.c
--y4mtoyuv_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+y4mtoyuv_LDADD = $(LIBMJPEGUTILS)
- 
- yuv4mpeg_SOURCES = yuv4mpeg.c
--yuv4mpeg_LDADD = $(top_builddir)/utils/libmjpegutils.a
-+yuv4mpeg_LDADD = $(LIBMJPEGUTILS)
- 
- yuvfps_SOURCES = yuvfps.c
--yuvfps_LDADD = ${top_builddir}/utils/libmjpegutils.a
-+yuvfps_LDADD = $(LIBMJPEGUTILS)
- 
- yuvinactive_SOURCES = yuvinactive.c
--yuvinactive_LDADD = ${top_builddir}/utils/libmjpegutils.a
-+yuvinactive_LDADD = $(LIBMJPEGUTILS)
-===================================================================
-RCS file: /cvsroot/mjpeg/mjpeg_play/mpeg2enc/Makefile.am,v
-retrieving revision 1.67
-retrieving revision 1.68
-diff -u -r1.67 -r1.68
---- mjpeg/mjpeg_play/mpeg2enc/Makefile.am	2003/12/20 17:33:38	1.67
-+++ mjpeg/mjpeg_play/mpeg2enc/Makefile.am	2004/03/03 17:55:46	1.68
-@@ -26,6 +26,8 @@
- 
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/utils
- 
-+LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
-+
- lib_LTLIBRARIES = libmpeg2encpp.la
- 
- if HAVE_ASM_MMX
-@@ -113,24 +115,24 @@
- 	-export-dynamic 
- 
- libmpeg2encpp_la_DEPENDENCIES = \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(LIBMJPEGUTILS) \
- 	$(top_builddir)/utils/libcpuaccel.la \
- 	$(top_builddir)/utils/libmotion.la \
- 	$(LIBSIMDASM_LIB)
- 
- libmpeg2encpp_la_LIBADD = \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(LIBMJPEGUTILS) \
- 	$(top_builddir)/utils/libcpuaccel.la \
- 	$(top_builddir)/utils/libmotion.la \
- 	$(LIBSIMDASM_LIB)
- 
- mpeg2enc_DEPENDENCIES = \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(LIBMJPEGUTILS) \
- 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la
- 
- mpeg2enc_LDADD = \
- 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(LIBMJPEGUTILS) \
- 	@PTHREAD_LIBS@ @LIBGETOPT_LIB@ $(LIBM_LIBS)
- 
- # VITAL: Override default compilation rules generated by automake...
-===================================================================
-RCS file: /cvsroot/mjpeg/mjpeg_play/mplex/Makefile.am,v
-retrieving revision 1.41
-retrieving revision 1.42
-diff -u -r1.41 -r1.42
---- mjpeg/mjpeg_play/mplex/Makefile.am	2003/12/20 17:33:38	1.41
-+++ mjpeg/mjpeg_play/mplex/Makefile.am	2004/03/03 17:55:46	1.42
-@@ -67,7 +67,7 @@
- 	-export-dynamic 
- 
- libmplex2_la_LIBADD = \
--	$(top_builddir)/utils/libmjpegutils.a
-+	$(top_builddir)/utils/libmjpegutils.la
- 
- libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
- 
-===================================================================
-RCS file: /cvsroot/mjpeg/mjpeg_play/yuvdenoise/Makefile.am,v
-retrieving revision 1.18
-retrieving revision 1.19
-diff -u -r1.18 -r1.19
---- mjpeg/mjpeg_play/yuvdenoise/Makefile.am	2003/12/20 17:33:39	1.18
-+++ mjpeg/mjpeg_play/yuvdenoise/Makefile.am	2004/03/03 17:55:46	1.19
-@@ -25,5 +25,5 @@
- 
- yuvdenoise_LDADD = \
- 	$(top_builddir)/utils/libcpuaccel.la \
--	$(top_builddir)/utils/libmjpegutils.a \
-+	$(top_builddir)/utils/libmjpegutils.la \
- 	@LIBM_LIBS@
-===================================================================
-RCS file: /cvsroot/mjpeg/mjpeg_play/yuvfilters/Makefile.am,v
-retrieving revision 1.20
-retrieving revision 1.21
-diff -u -r1.20 -r1.21
---- mjpeg/mjpeg_play/yuvfilters/Makefile.am	2003/12/21 14:37:44	1.20
-+++ mjpeg/mjpeg_play/yuvfilters/Makefile.am	2004/03/03 17:55:46	1.21
-@@ -7,7 +7,7 @@
- noinst_LTLIBRARIES = libyuvfilters.la
- 
- AM_CPPFLAGS = -I$(top_srcdir)/utils
--MJPEGLIB = $(top_builddir)/utils/libmjpegutils.a
-+MJPEGLIB = $(top_builddir)/utils/libmjpegutils.la
- 
- libyuvfilters_la_SOURCES = \
- 	addtask.c \
-===================================================================
-RCS file: /cvsroot/mjpeg/mjpeg_play/utils/Makefile.am,v
-retrieving revision 1.21
-retrieving revision 1.22
-diff -u -r1.21 -r1.22
---- mjpeg/mjpeg_play/utils/Makefile.am	2003/12/20 17:33:38	1.21
-+++ mjpeg/mjpeg_play/utils/Makefile.am	2004/03/03 17:55:46	1.22
-@@ -15,10 +15,14 @@
- 
- noinst_LTLIBRARIES = libmotion.la libcpuaccel.la
- 
--# FIXME: make this libtool (but static-only!) too
--lib_LIBRARIES = libmjpegutils.a
-+lib_LTLIBRARIES = libmjpegutils.la
- 
--libmjpegutils_a_SOURCES = \
-+libmjpegutils_la_LDFLAGS = \
-+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-+	-release $(LT_RELEASE) \
-+	-export-dynamic
-+
-+libmjpegutils_la_SOURCES = \
- 	mjpeg_logging.c \
- 	mpegconsts.c \
- 	mpegtimecode.c \
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.2-gcc34-altivec.patch b/media-video/mjpegtools/files/mjpegtools-1.6.2-gcc34-altivec.patch
deleted file mode 100644
index 9275a4162e5a..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.6.2-gcc34-altivec.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ruN mjpegtools-1.6.2.orig/utils/altivec/fdct_idct.c mjpegtools-1.6.2/utils/altivec/fdct_idct.c
---- mjpegtools-1.6.2.orig/utils/altivec/fdct_idct.c	2003-10-09 09:05:09.000000000 +0200
-+++ mjpegtools-1.6.2/utils/altivec/fdct_idct.c	2004-08-05 09:38:31.808037456 +0200
-@@ -177,14 +177,14 @@
- 
- /* Post-scaling matrix -- scaled by 1 */
- static const vector signed short PostScale[8] = {
--    (vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
--    (vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880),
--    (vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
--    (vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
--    (vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
--    (vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
--    (vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
--    (vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880)
-+    (const vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
-+    (const vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880),
-+    (const vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
-+    (const vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
-+    (const vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
-+    (const vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
-+    (const vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
-+    (const vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880)
- };
- 
- /***************************************************************
-@@ -219,7 +219,7 @@
-  * of lvx which is more efficient given the remainder of the instruction mix.
-  */
- static const vector signed short SpecialConstants =
--  (vector signed short)VCONST(23170, 13573, 6518, 21895, -23170, -21895, 0, 0);
-+  (const vector signed short)VCONST(23170, 13573, 6518, 21895, -23170, -21895, 0, 0);
- 
- #ifdef ORIGINAL_SOURCE
- void DCT(short *input, short *output) {
-@@ -364,14 +364,14 @@
- 
- /* Pre-Scaling matrix -- scaled by 1 */
- static const vector signed short PreScale[8] = {
--    (vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
--    (vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880),
--    (vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
--    (vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
--    (vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
--    (vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
--    (vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
--    (vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880)
-+    (const vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
-+    (const vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880),
-+    (const vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
-+    (const vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
-+    (const vector signed short)VCONST(4095, 5681, 5351, 4816, 4095, 4816, 5351, 5681),
-+    (const vector signed short)VCONST(4816, 6680, 6292, 5663, 4816, 5663, 6292, 6680),
-+    (const vector signed short)VCONST(5351, 7422, 6992, 6292, 5351, 6292, 6992, 7422),
-+    (const vector signed short)VCONST(5681, 7880, 7422, 6680, 5681, 6680, 7422, 7880)
- };
- 
- 
-
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.2-gcc34.patch b/media-video/mjpegtools/files/mjpegtools-1.6.2-gcc34.patch
deleted file mode 100644
index 995705fd0ce7..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.6.2-gcc34.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -udBbr mjpegtools-1.6.2/configure mjpegtools-1.6.2-r1-fix1/work/mjpegtools-1.6.2/configure
-+++ mjpegtools-1.6.2/configure	2004-02-04 01:58:37.000000000 +0300
---- mjpegtools-1.6.2/configure	2004-04-24 11:44:34.961978760 +0400
-@@ -25858,16 +25858,16 @@
-   fi
-   have_cmov=false
-   case $arch in
--  i786) ARCHFLAGS="-mcpu=i786 -march=$arch"
-+  i786) ARCHFLAGS="-march=$arch"
-   have_cmov=true
-   ;;
--  i686) ARCHFLAGS="-mcpu=i686 -march=$arch"
-+  i686) ARCHFLAGS="-march=$arch"
-   have_cmov=true
-   ;;
--  i586) ARCHFLAGS="-mcpu=i586 -march=$arch"
-+  i586) ARCHFLAGS="-march=$arch"
-   have_cmov=false
-   ;;
--  *) ARCHFLAGS="-mcpu=i686 -march=$arch"
-+  *) ARCHFLAGS="-march=$arch"
-   have_cmov=true
-   ;;
-   esac
-diff -udBbr mjpegtools-1.6.2/lavtools/lavpipe.c mjpegtools-1.6.2/lavtools/lavpipe.c
---- mjpegtools-1.6.2/lavtools/lavpipe.c	2002-09-23 23:46:43.000000000 +0400
-+++ mjpegtools-1.6.2/lavtools/lavpipe.c	2004-04-24 11:59:15.279150208 +0400
-@@ -582,6 +582,7 @@
-       mjpeg_info( "closing input %d (source %d)", i, current_index);
-       decommission_pipe_source(source);
-     KEEP_SOURCE:
-+      ;
-     }
-   }
- }
-diff -udBbr mjpegtools-1.6.2/mpeg2enc/picture.cc mjpegtools-1.6.2/mpeg2enc/picture.cc
---- mjpegtools-1.6.2/mpeg2enc/picture.cc	2003-10-25 21:36:32.000000000 +0400
-+++ mjpegtools-1.6.2/mpeg2enc/picture.cc	2004-04-24 12:09:37.018631440 +0400
-@@ -83,9 +83,9 @@
-     }
- 
- 
--	curref = new (uint8_t *)[5];
--	curorg = new (uint8_t *)[5];
--	pred   = new (uint8_t *)[5];
-+	curref = new uint8_t *[5];
-+	curorg = new uint8_t *[5];
-+	pred   = new uint8_t *[5];
- 
- 	for( i = 0 ; i<3; i++)
- 	{
\ No newline at end of file
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.2-libquicktime094.patch b/media-video/mjpegtools/files/mjpegtools-1.6.2-libquicktime094.patch
deleted file mode 100644
index 311894694fcc..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.6.2-libquicktime094.patch
+++ /dev/null
@@ -1,447 +0,0 @@
-diff -uprN lavtools.orig/lavaddwav.c lavtools/lavaddwav.c
---- lavtools.orig/lavaddwav.c	2005-04-16 14:36:52.000000000 +0200
-+++ lavtools/lavaddwav.c	2005-04-16 14:46:18.000000000 +0200
-@@ -155,7 +155,7 @@ int main(int argc, char **argv)
-    }
- 
-    lav_out = lav_open_output_file(argv[3],
--                                  lav_filetype(lav_fd),
-+                                  lav_fd->format,
-                                   lav_video_width (lav_fd),
-                                   lav_video_height(lav_fd),
-                                   lav_video_interlacing(lav_fd),
-diff -uprN lavtools.orig/lav_io.c lavtools/lav_io.c
---- lavtools.orig/lav_io.c	2005-04-16 14:36:52.000000000 +0200
-+++ lavtools/lav_io.c	2005-04-16 14:37:48.000000000 +0200
-@@ -36,7 +36,8 @@
- #endif
- 
- #ifdef HAVE_LIBQUICKTIME
--#include <quicktime.h>
-+#include <quicktime/quicktime.h>
-+#include <quicktime/lqt.h>
- #endif
- 
- extern int AVI_errno;
-@@ -275,8 +276,9 @@ lav_file_t *lav_open_output_file(char *f
-                     int asize, int achans, long arate)
- {
-    lav_file_t *lav_fd = (lav_file_t*) malloc(sizeof(lav_file_t));
-+   char *extension, *tempfile;
- 
--   if(lav_fd==0) { internal_error=ERROR_MALLOC; return 0; }
-+   if (lav_fd == 0) { internal_error=ERROR_MALLOC; return 0; }
- 
-    /* Set lav_fd */
- 
-@@ -284,35 +286,49 @@ lav_file_t *lav_open_output_file(char *f
-    lav_fd->qt_fd       = 0;
-    lav_fd->format      = format;
-    /* Sanity check: do not create a quicktime file that is named with .avi */
--   if(rindex(filename, '.') != NULL)
-+   extension = rindex(filename, '.');
-+   if (extension != NULL)
-    {
--      if((format == 'a' || format == 'A') && strcmp(rindex(filename, '.')+1, "avi")) {
--        internal_error = ERROR_FORMAT;
--        return 0;
--      }
--      if(format == 'q' && (strcmp(rindex(filename, '.')+1, "qt") 
--           && strcmp(rindex(filename, '.')+1, "mov") && strcmp(rindex(filename, '.')+1,"moov"))) {
--        internal_error = ERROR_FORMAT;
--        return 0;
--      }
--      if(format == 'j' && strcmp(rindex(filename, '.')+1, "jpg")
--           && strcmp(rindex(filename, '.')+1, "jpeg")) {
--        internal_error = ERROR_FORMAT;
--        return 0;
--      }
-+      extension++;
-+      switch(format)
-+        {
-+        case 'a':
-+        case 'A':
-+          if (strcmp(extension, "avi") && strcmp(extension, "AVI")) 
-+            {
-+               internal_error = ERROR_FORMAT;
-+               return 0;
-+            }
-+          break;
-+        case 'q':
-+          if (strcmp(extension,  "qt") && strcmp(extension,  "QT") &&
-+              strcmp(extension, "mov") && strcmp(extension, "MOV") && 
-+              strcmp(extension,"moov") && strcmp(extension,"MOOV")) 
-+            {
-+             internal_error = ERROR_FORMAT;
-+             return 0;
-+            }
-+          break;
-+        case 'j':
-+          if (strcmp(extension, "jpg") && strcmp(extension, "jpg") &&
-+              strcmp(extension,"jpeg") && strcmp(extension,"JPEG"))
-+            {
-+              internal_error = ERROR_FORMAT;
-+              return 0;
-+            }
-+          break;
-+        }
-    }
-    lav_fd->interlacing = interlaced ? lav_query_polarity(format) :
-                                       LAV_NOT_INTERLACED;
-    lav_fd->has_audio   = (asize>0 && achans>0);
-    lav_fd->bps         = (asize*achans+7)/8;
--   lav_fd->is_MJPG     = 1;
-    lav_fd->MJPG_chroma = CHROMAUNKNOWN;
- 
-    switch(format)
-    {
-       case 'a':
-       case 'A':
--
-          /* Open AVI output file */
- 
-          lav_fd->avi_fd = AVI_open_output_file(filename);
-@@ -321,21 +337,22 @@ lav_file_t *lav_open_output_file(char *f
-          if (asize) AVI_set_audio(lav_fd->avi_fd, achans, arate, asize, WAVE_FORMAT_PCM);
-          return lav_fd;
- 
--      case 'j': {
--
-+      case 'j':
-         /* Open JPEG output file */
--        char tempfile[256];
--
-+	tempfile = (char *)malloc(strlen(filename) + strlen(TMP_EXTENSION) + 1);
-+	if (tempfile == NULL)
-+	   {
-+	   internal_error=ERROR_MALLOC;
-+	   return(0);
-+	   }
-         strcpy(tempfile, filename);
-         strcat(tempfile, TMP_EXTENSION);
--
-         lav_fd->jpeg_filename = strdup(filename);
-         lav_fd->jpeg_fd = open(tempfile, O_CREAT | O_TRUNC | O_WRONLY, 0644);
--
-+	free(tempfile);
-         return lav_fd;
--      }
--      case 'q':
- 
-+      case 'q':
- #ifdef HAVE_LIBQUICKTIME
-          /* open quicktime output file */
- 
-@@ -364,26 +381,33 @@ lav_file_t *lav_open_output_file(char *f
- }
- 
- int lav_close(lav_file_t *lav_file)
--{
-+   {
-    int res;
-+   char *tempfile;
- 
-    video_format = lav_file->format; internal_error = 0; /* for error messages */
- 
--   switch(lav_file->format)
--   {
-+   switch (lav_file->format)
-+      {
-       case 'a':
-       case 'A':
-          res = AVI_close( lav_file->avi_fd );
-          break;
--      case 'j': {
--         char tempfile[256];
-+      case 'j':
-+	 tempfile = (char *)malloc(strlen(lav_file->jpeg_filename) + 
-+				   strlen(TMP_EXTENSION) + 1);
-+	 if (tempfile == NULL)
-+	    {
-+	    res = -1;
-+	    break;
-+	    }
-          strcpy(tempfile, lav_file->jpeg_filename);
-          strcat(tempfile, TMP_EXTENSION);
-          res = close(lav_file->jpeg_fd);
-          rename(tempfile, lav_file->jpeg_filename);
-+	 free(tempfile);
-          free(lav_file->jpeg_filename);
-          break;
--      }
- #ifdef HAVE_LIBQUICKTIME
-       case 'q':
-          res = quicktime_close( lav_file->qt_fd );
-@@ -391,12 +415,10 @@ int lav_close(lav_file_t *lav_file)
- #endif
-       default:
-          res = -1;
--   }
--
-+      }
-    free(lav_file);
--
-    return res;
--}
-+   }
- 
- int lav_write_frame(lav_file_t *lav_file, uint8_t *buff, long size, long count)
- {
-@@ -524,9 +546,14 @@ int lav_write_frame(lav_file_t *lav_file
- int lav_write_audio(lav_file_t *lav_file, uint8_t *buff, long samps)
- {
-    int res;
--#ifdef	HAVE_LIBQUICKTIME
--   int	n, nb;
--   uint8_t *hbuff;
-+#ifdef HAVE_LIBQUICKTIME
-+   int i, j;
-+   int16_t *qt_audio = (int16_t *)buff, **qt_audion;
-+   int channels = lav_audio_channels(lav_file);
-+
-+   qt_audion = malloc(channels * sizeof (int16_t **));
-+   for (i = 0; i < channels; i++)
-+	qt_audion[i] = (int16_t *)malloc(samps * lav_file->bps);
- #endif
- 
-    video_format = lav_file->format; internal_error = 0; /* for error messages */
-@@ -539,19 +566,17 @@ int lav_write_audio(lav_file_t *lav_file
-          break;
- #ifdef HAVE_LIBQUICKTIME
-       case 'q':
--         if(lav_audio_bits(lav_file)==16)
--         {
--            nb = samps*2*lav_audio_channels(lav_file);
--            hbuff = (uint8_t *) malloc(nb);
--            if(!hbuff) { internal_error=ERROR_MALLOC; return -1; }
--            for(n=0;n<nb;n+=2)
--            { hbuff[n] = buff[n+1]; hbuff[n+1] = buff[n]; }
--            res = quicktime_write_audio( lav_file->qt_fd, (char*)hbuff, samps, 0 );
--            free(hbuff);
--         }
--         else
--            res = quicktime_write_audio( lav_file->qt_fd, (char*)buff, samps, 0 );
--         break;
-+	/* Deinterleave the audio into the two channels. */
-+	for (i = 0; i < samps; i++)
-+	    {
-+	    for (j = 0; j < channels; j++)
-+		qt_audion[j][i] = qt_audio[(2*i) + j];
-+	    }
-+	res = lqt_encode_audio_track(lav_file->qt_fd, qt_audion, NULL,samps,0);
-+	free(qt_audion[0]);
-+	free(qt_audion[1]);
-+	free(qt_audion);
-+        break;
- #endif
-       default:
-          res = -1;
-@@ -560,8 +585,6 @@ int lav_write_audio(lav_file_t *lav_file
-    return res;
- }
- 
--
--
- long lav_video_frames(lav_file_t *lav_file)
- {
-    video_format = lav_file->format; internal_error = 0; /* for error messages */
-@@ -638,17 +661,11 @@ void lav_video_sampleaspect(lav_file_t *
-   return;
- }
- 
--int lav_video_is_MJPG(lav_file_t *lav_file)
--{
--   return lav_file->is_MJPG;
--}
--
- int lav_video_MJPG_chroma(lav_file_t *lav_file)
- {
- 	return lav_file->MJPG_chroma;
- }
- 
--
- const char *lav_video_compressor(lav_file_t *lav_file)
- {
-    video_format = lav_file->format; internal_error = 0; /* for error messages */
-@@ -797,7 +814,6 @@ int lav_read_frame(lav_file_t *lav_file,
-    return -1;
- }
- 
--
- int lav_set_audio_position(lav_file_t *lav_file, long sample)
- {
-    if(!lav_file->has_audio) return 0;
-@@ -809,7 +825,7 @@ int lav_set_audio_position(lav_file_t *l
-          return AVI_set_audio_position(lav_file->avi_fd,sample*lav_file->bps);
- #ifdef HAVE_LIBQUICKTIME
-       case 'q':
--         return quicktime_set_audio_position(lav_file->qt_fd,sample,0);
-+         quicktime_set_audio_position(lav_file->qt_fd,sample,0);
- #endif
-    }
-    return -1;
-@@ -818,13 +834,20 @@ int lav_set_audio_position(lav_file_t *l
- long lav_read_audio(lav_file_t *lav_file, uint8_t *audbuf, long samps)
- {
- #ifdef	HAVE_LIBQUICKTIME
--   long res, n, t;
-+   int64_t last_pos, start_pos;
-+   int res, i, j;
-+   int16_t *qt_audio = (int16_t *)audbuf, **qt_audion;
-+   int channels = lav_audio_channels(lav_file);
-+
-+   qt_audion = malloc(channels * sizeof (int16_t **));
-+   for (i = 0; i < channels; i++)
-+	qt_audion[i] = (int16_t *)malloc(samps * lav_file->bps);
- #endif
- 
-    if(!lav_file->has_audio)
-    {
-       internal_error = ERROR_NOAUDIO;
--      return -1;
-+      return(-1);
-    }
-    video_format = lav_file->format; internal_error = 0; /* for error messages */
-    switch(lav_file->format)
-@@ -834,28 +857,28 @@ long lav_read_audio(lav_file_t *lav_file
-          return AVI_read_audio(lav_file->avi_fd,audbuf,samps*lav_file->bps)/lav_file->bps;
- #ifdef HAVE_LIBQUICKTIME
-       case 'q':
--         res = quicktime_read_audio(lav_file->qt_fd,(char*)audbuf,samps,0)/lav_file->bps;
--         if(res<=0) return res;
--         if(lav_audio_bits(lav_file)==16)
--         {
--            for(n=0;n<res*2*lav_audio_channels(lav_file);n+=2)
--            {
--               t = audbuf[n];
--               audbuf[n] = audbuf[n+1];
--               audbuf[n+1] = t;
--            }
--         }
--         return res;
-+	start_pos = quicktime_audio_position(lav_file->qt_fd, 0);
-+	lqt_decode_audio_track(lav_file->qt_fd, qt_audion, NULL, samps, 0);
-+	last_pos = lqt_last_audio_position(lav_file->qt_fd, 0);
-+	res = last_pos - start_pos;
-+	if (res <= 0)
-+	   goto out;
-+	/* Interleave the channels of audio into the one buffer provided */
-+	for (i =0; i < res; i++)
-+	    {
-+	    for (j = 0; j < channels; j++)
-+		qt_audio[(2*i) + j] = qt_audion[j][i];
-+	    }
-+out:
-+	 free(qt_audion[0]);
-+	 free(qt_audion[1]);
-+	 free(qt_audion);
-+         return(res);
- #endif
-    }
-    return -1;
- }
- 
--int lav_filetype(lav_file_t *lav_file)
--{
--   return lav_file->format;
--}
--
- lav_file_t *lav_open_input_file(char *filename)
- {
-    int n;
-@@ -878,11 +901,10 @@ lav_file_t *lav_open_input_file(char *fi
-    lav_fd->qt_fd       = 0;
-    lav_fd->format      = 0;
-    lav_fd->interlacing = LAV_INTER_UNKNOWN;
--   lav_fd->sar_w       = 0; /* (0,0) == unknown */
--   lav_fd->sar_h       = 0; 
-+   lav_fd->sar_w       = 1; /* unknown - assume square pixels */
-+   lav_fd->sar_h       = 1; 
-    lav_fd->has_audio   = 0;
-    lav_fd->bps         = 0;
--   lav_fd->is_MJPG     = 0;
-    lav_fd->MJPG_chroma = CHROMAUNKNOWN;
- 
-    /* open video file, try AVI first */
-@@ -1010,8 +1032,6 @@ lav_file_t *lav_open_input_file(char *fi
-       return lav_fd;
-    }
- 
--   lav_fd->is_MJPG = 1;
--
-    /* Make some checks on the video source, we read the first frame for that */
- 
-    ierr  = 0;
-@@ -1200,8 +1220,6 @@ const char *lav_strerror(void)
-    }
- }
- 
--
--
- #ifdef HAVE_LIBDV
- static int check_DV2_input(lav_file_t *lav_fd)
- {
-@@ -1209,8 +1227,6 @@ static int check_DV2_input(lav_file_t *l
-    double len = 0;
-    unsigned char *frame = NULL;
- 
--   lav_fd->is_MJPG = 0;
--
-    /* Make some checks on the video source, we read the first frame for that */
- 
-    if ( lav_set_video_position(lav_fd,0) ) goto ERREXIT;
-@@ -1261,16 +1277,12 @@ ERREXIT:
- }
- #endif
- 
--
--
- static int check_YUV420_input(lav_file_t *lav_fd)
- {
-    int ierr = 0;
-    double len = 0;
-    unsigned char *frame = NULL;
- 
--   lav_fd->is_MJPG = 0;
--
-    /* Make some checks on the video source, we read the first frame for that */
- 
-    if ( lav_set_video_position(lav_fd,0) ) goto ERREXIT;
-@@ -1312,17 +1324,3 @@ int lav_fileno(lav_file_t *lav_file)
- 
-    return res;
- }
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-diff -uprN lavtools.orig/lav_io.h lavtools/lav_io.h
---- lavtools.orig/lav_io.h	2005-04-16 14:36:52.000000000 +0200
-+++ lavtools/lav_io.h	2005-04-16 14:44:58.000000000 +0200
-@@ -24,7 +24,7 @@
- typedef void avi_t;
- #endif
- 
--#include "yuv4mpeg.h"
-+#include <yuv4mpeg.h>
- 
- #define LAV_INTER_UNKNOWN       Y4M_UNKNOWN
- #define LAV_NOT_INTERLACED      Y4M_ILACE_NONE
-@@ -88,7 +88,6 @@ int  lav_set_video_position(lav_file_t *
- int  lav_read_frame(lav_file_t *lav_file, uint8_t *vidbuf);
- int  lav_set_audio_position(lav_file_t *lav_file, long sample);
- long lav_read_audio(lav_file_t *lav_file, uint8_t *audbuf, long samps);
--int  lav_filetype(lav_file_t *lav_file);
- lav_file_t *lav_open_input_file(char *filename);
- int  lav_get_field_size(uint8_t * jpegdata, long jpeglen);
- const char *lav_strerror(void);
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.2-nogtk.patch b/media-video/mjpegtools/files/mjpegtools-1.6.2-nogtk.patch
deleted file mode 100644
index 51a9a59f8515..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-1.6.2-nogtk.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.in	2004-02-03 23:57:29.000000000 +0100
-+++ configure.in.nogtk	2004-07-01 13:05:28.279752280 +0200
-@@ -364,11 +364,6 @@
- dnl Check for Gtk+/glib (for glav)
- dnl ********************************************************************
- have_gtk=false
--ifdef([AM_PATH_GTK],
--      [ AM_PATH_GTK(1.2.0, [ have_gtk=true
--                           AC_DEFINE(HAVE_GTK,1,
--									 [Gtk library present]
--							)],,) ])
- 
- dnl ********************************************************************
- dnl Check for the SDL library (for software playback)
diff --git a/media-video/mjpegtools/files/no-x11-lib-2.patch b/media-video/mjpegtools/files/no-x11-lib-2.patch
deleted file mode 100644
index cb506be98144..000000000000
--- a/media-video/mjpegtools/files/no-x11-lib-2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mjpegtools-1.6.1.91/lavtools/Makefile.in.old	2003-12-31 01:04:06.000000000 +0100
-+++ mjpegtools-1.6.1.91/lavtools/Makefile.in	2003-12-31 01:04:24.000000000 +0100
-@@ -334,7 +334,7 @@
- multiblend_flt_SOURCES = multiblend.flt.c
- multiblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a
- 
--@HAVE_X_TRUE@LAVPLAY_X_LIBS = $(X_LIBS) -lX11
-+@HAVE_X_TRUE@LAVPLAY_X_LIBS = $(X_LIBS)
- 
- lavplay_SOURCES = lavplay.c
- lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \