Drop old mjpegtools version.

Package-Manager: portage-2.1_pre9-r4

12 files changed, 7 insertions, 1162 deletions

diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 6d5b14cc56a9..73ad555d8340 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,38 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX altivec-fix-1.6.2.patch 1011 RMD160 575a42610ba933f6d8cede2983bf206f08081f09 SHA1 e94b62f7c04ee3c1d63e99d78f5beeba5346b0c0 SHA256 b82e3666c6b73a9f14f1b280ec85e1ad66a57a786395dc16f66b8d58c979d4dc size 1011
-MD5 3150d43b1c44c02265b8481e271093c8 files/altivec-fix-1.6.2.patch 1011
-RMD160 575a42610ba933f6d8cede2983bf206f08081f09 files/altivec-fix-1.6.2.patch 1011
-SHA256 b82e3666c6b73a9f14f1b280ec85e1ad66a57a786395dc16f66b8d58c979d4dc files/altivec-fix-1.6.2.patch 1011
-AUX mjpegtools-1.6.2-configure.patch 2592 RMD160 08061eaba5922dff4ce6ee0f96954fbdde6e4142 SHA1 4e5aeddae9de8fcdc295560cf084716f1e7d177d SHA256 2c110a7deeefb20d9fc0c5d65e4b32d775b6a9e5c71ba0e43b720cb3ca1a38c5 size 2592
-MD5 1b2c526400f0a0f1e0c150c6ff42e8c6 files/mjpegtools-1.6.2-configure.patch 2592
-RMD160 08061eaba5922dff4ce6ee0f96954fbdde6e4142 files/mjpegtools-1.6.2-configure.patch 2592
-SHA256 2c110a7deeefb20d9fc0c5d65e4b32d775b6a9e5c71ba0e43b720cb3ca1a38c5 files/mjpegtools-1.6.2-configure.patch 2592
-AUX mjpegtools-1.6.2-dv.patch 634 RMD160 8b354ac309878a4786d53db8a49143c3aab72beb SHA1 c39216a3f7f934b6f2dc45fa4ed61b3c5ba2f1dd SHA256 bf78c1e6e2a658b106794ac72e9dcd048d8eb72032b9e16ff412483043238d85 size 634
-MD5 39b5dadaf6e522165490f099d98b954c files/mjpegtools-1.6.2-dv.patch 634
-RMD160 8b354ac309878a4786d53db8a49143c3aab72beb files/mjpegtools-1.6.2-dv.patch 634
-SHA256 bf78c1e6e2a658b106794ac72e9dcd048d8eb72032b9e16ff412483043238d85 files/mjpegtools-1.6.2-dv.patch 634
-AUX mjpegtools-1.6.2-fPIC.patch 9945 RMD160 b6762daab6481b153cfb6aa8bcf76b72705e8b5d SHA1 e0021f156cbbf03e8c186f9ae77a352eee00906d SHA256 fc38a5587dc1e2a9bd53a06751282f254d5e4d629999ea4646bf43215fe46437 size 9945
-MD5 a4cae44ea5989aed95d7b8d84aaf0af4 files/mjpegtools-1.6.2-fPIC.patch 9945
-RMD160 b6762daab6481b153cfb6aa8bcf76b72705e8b5d files/mjpegtools-1.6.2-fPIC.patch 9945
-SHA256 fc38a5587dc1e2a9bd53a06751282f254d5e4d629999ea4646bf43215fe46437 files/mjpegtools-1.6.2-fPIC.patch 9945
-AUX mjpegtools-1.6.2-gcc34-altivec.patch 3693 RMD160 432c9aad0a17116fea79a26d1a5dce367a5c1da1 SHA1 835c15fcda34cf5631ca1fb2570f6ae8cadbf0a0 SHA256 08dced76f188cda73d7ade4ef59f6b8dc9094e44af5b0b56a48e91a82f00e41f size 3693
-MD5 f16b681aebfa408a1ff5b6030c50fad8 files/mjpegtools-1.6.2-gcc34-altivec.patch 3693
-RMD160 432c9aad0a17116fea79a26d1a5dce367a5c1da1 files/mjpegtools-1.6.2-gcc34-altivec.patch 3693
-SHA256 08dced76f188cda73d7ade4ef59f6b8dc9094e44af5b0b56a48e91a82f00e41f files/mjpegtools-1.6.2-gcc34-altivec.patch 3693
-AUX mjpegtools-1.6.2-gcc34.patch 1601 RMD160 c62889a359c6e7622275e5151e1aa248186fba91 SHA1 1789e406d6f051d2d7397f95c8d4c0f192cbdef2 SHA256 ef8f0fe8e6bc02391c138a005dd6804b5f2a2abd883a8bbfd867ba1357aee527 size 1601
-MD5 d67f97f3bd586946968fca9b8d31be85 files/mjpegtools-1.6.2-gcc34.patch 1601
-RMD160 c62889a359c6e7622275e5151e1aa248186fba91 files/mjpegtools-1.6.2-gcc34.patch 1601
-SHA256 ef8f0fe8e6bc02391c138a005dd6804b5f2a2abd883a8bbfd867ba1357aee527 files/mjpegtools-1.6.2-gcc34.patch 1601
-AUX mjpegtools-1.6.2-libquicktime094.patch 12934 RMD160 b13e4c0732fad8634eaee4c0948a2b03388691e5 SHA1 159dd8156d7055079e8560745fb0686f9bef4f06 SHA256 4da8dd9945dc391b2a2149a931b1260853db5c5d21f52819be61e4f45f3aa512 size 12934
-MD5 ff67ff91c5a8ae610b882510d8d9f43c files/mjpegtools-1.6.2-libquicktime094.patch 12934
-RMD160 b13e4c0732fad8634eaee4c0948a2b03388691e5 files/mjpegtools-1.6.2-libquicktime094.patch 12934
-SHA256 4da8dd9945dc391b2a2149a931b1260853db5c5d21f52819be61e4f45f3aa512 files/mjpegtools-1.6.2-libquicktime094.patch 12934
-AUX mjpegtools-1.6.2-nogtk.patch 556 RMD160 9c17dee165f6cc11ffafa0be10ac884922d47469 SHA1 a7a71a795f660831a91a5cd427fe2b0b5aba33f0 SHA256 15e58bee9cff6730ffa41ea4196d5bfa1de5ccb10b36dabb02954ef7876ed849 size 556
-MD5 abdfec9a9d07b842509b709ba17d69ab files/mjpegtools-1.6.2-nogtk.patch 556
-RMD160 9c17dee165f6cc11ffafa0be10ac884922d47469 files/mjpegtools-1.6.2-nogtk.patch 556
-SHA256 15e58bee9cff6730ffa41ea4196d5bfa1de5ccb10b36dabb02954ef7876ed849 files/mjpegtools-1.6.2-nogtk.patch 556
 AUX mjpegtools-1.8.0-gcc41.patch 420 RMD160 e48e6d716f21e450cc26e7039c703005ed9a0bd9 SHA1 b1bd9604fa0eb6c8b54ee9d0836b0c61b233ffff SHA256 5e748deceb1af3179025ab42d274cc2941fe85bb0b7b512b49263a9ff6754446 size 420
 MD5 803eccd889c60a442ee23ba65951fadc files/mjpegtools-1.8.0-gcc41.patch 420
 RMD160 e48e6d716f21e450cc26e7039c703005ed9a0bd9 files/mjpegtools-1.8.0-gcc41.patch 420
@@ -41,40 +9,26 @@ AUX mjpegtools-1.8.0-parallelmake.patch 2163 RMD160 1bf0d3c30601b2b6d421c8dad316
 MD5 78e3f74445e8ab3c4e3f171cfb21a17f files/mjpegtools-1.8.0-parallelmake.patch 2163
 RMD160 1bf0d3c30601b2b6d421c8dad3167a42304cce39 files/mjpegtools-1.8.0-parallelmake.patch 2163
 SHA256 d2456d4a75c7c2b205fc9c71431aaae427dd5667c71dd3bee2fa4869cb438b03 files/mjpegtools-1.8.0-parallelmake.patch 2163
-AUX no-x11-lib-2.patch 469 RMD160 167a532e48521d20c83a0171d36be68c046fa9fc SHA1 db42046aa78431b3c33f1e1c668ba8590eaca78a SHA256 1a6658a4e78f8a5a0df25717e4370a1d8b7f0a6305e2fa19f080ffa24060c268 size 469
-MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
-RMD160 167a532e48521d20c83a0171d36be68c046fa9fc files/no-x11-lib-2.patch 469
-SHA256 1a6658a4e78f8a5a0df25717e4370a1d8b7f0a6305e2fa19f080ffa24060c268 files/no-x11-lib-2.patch 469
-DIST mjpegtools-1.6.2-mmx-fPIC.patch.bz2 3065 RMD160 b18bc3105964de0c3377fdd22fded4822ca6c8ed SHA256 2d1cf95c5f75e02f181aabe1e59f1b211d66f0daf981d5f816fd25fa6c975310 size 3065
-DIST mjpegtools-1.6.2.tar.gz 1256280 RMD160 48d4e6fa037f18973bae7d22ac14412182361c23 SHA256 525afc26f07aacf06638ffe8612b2d5d84dab64e09df4d3691bc4909ef4850ae size 1256280
 DIST mjpegtools-1.8.0.tar.gz 1475998 RMD160 4d97a6a721f29223975605e2a5e645b4d7d129b5 SHA256 d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a size 1475998
-DIST mjpegtools-m4-1.tar.bz2 4547 RMD160 b81b89bb6364023606a1d3ca9519e143fe053ab4 SHA256 10de1e206ee9c84aae111e95f655ad9394be749bfed01d337f7ff9a983aab522 size 4547
-EBUILD mjpegtools-1.6.2-r4.ebuild 3198 RMD160 fa7388f51894c2ee8074ecea31ca3b87406ef0af SHA1 d7131c6870e4f1024f5e16b0471e34ef1ec63a37 SHA256 109a519ee3ff3dc7e71e89247f95564c177903591c266052520246f7f19324d6 size 3198
-MD5 36540d6497ac92e2bacc1512b1aeafaf mjpegtools-1.6.2-r4.ebuild 3198
-RMD160 fa7388f51894c2ee8074ecea31ca3b87406ef0af mjpegtools-1.6.2-r4.ebuild 3198
-SHA256 109a519ee3ff3dc7e71e89247f95564c177903591c266052520246f7f19324d6 mjpegtools-1.6.2-r4.ebuild 3198
 EBUILD mjpegtools-1.8.0-r1.ebuild 2776 RMD160 146b0d23814292fce996ef7f1c154f9fe19a7e1a SHA1 01aa09f6ca4f86d3ade54db31b0a3817cffa7749 SHA256 0561d936dbe8522ecbae61908d39e55d873ff6abc125b75cbd4baf7e58f999fc size 2776
 MD5 854c6bd6919cb717efd807adb00abf9c mjpegtools-1.8.0-r1.ebuild 2776
 RMD160 146b0d23814292fce996ef7f1c154f9fe19a7e1a mjpegtools-1.8.0-r1.ebuild 2776
 SHA256 0561d936dbe8522ecbae61908d39e55d873ff6abc125b75cbd4baf7e58f999fc mjpegtools-1.8.0-r1.ebuild 2776
-MISC ChangeLog 19307 RMD160 3837f36f02a4aea509fc5dfd20b4a4ec3eee4086 SHA1 e6fc9bb8dbb3fe8d30a67a10841d5f3b3544d05b SHA256 11a858f4ba4c93cb251b47b9397b265bff6b2fd6a73c323a84efa8460d336c4f size 19307
-MD5 7c26f83f6add5f000f13178f04cf6cc1 ChangeLog 19307
-RMD160 3837f36f02a4aea509fc5dfd20b4a4ec3eee4086 ChangeLog 19307
-SHA256 11a858f4ba4c93cb251b47b9397b265bff6b2fd6a73c323a84efa8460d336c4f ChangeLog 19307
+MISC ChangeLog 19772 RMD160 c6e1efd6e972583e7d9e869090f74fb96a71c606 SHA1 59a9bd26f44da614f9379604fd9854e71c4c623d SHA256 0ba1a02d156e46be6a0e2d5b72c663a6ae583a40dab50c692eff2b38f91fa39d size 19772
+MD5 475c5ffcf209727e057961b2a5e8da5b ChangeLog 19772
+RMD160 c6e1efd6e972583e7d9e869090f74fb96a71c606 ChangeLog 19772
+SHA256 0ba1a02d156e46be6a0e2d5b72c663a6ae583a40dab50c692eff2b38f91fa39d ChangeLog 19772
 MISC metadata.xml 311 RMD160 5d2d2fac1a97018f75e5ff1e8e7c90fb02511cb9 SHA1 228093feb5989936d0480ac2bc543df959b06dfa SHA256 82201360db287eaebbba80aafcad5384e656d9a652f076a75eb2298b42093955 size 311
 MD5 fe49014257499366bdc6903a9aa33fe5 metadata.xml 311
 RMD160 5d2d2fac1a97018f75e5ff1e8e7c90fb02511cb9 metadata.xml 311
 SHA256 82201360db287eaebbba80aafcad5384e656d9a652f076a75eb2298b42093955 metadata.xml 311
-MD5 fe05e4864f343a5e19e093e5ba3bb53f files/digest-mjpegtools-1.6.2-r4 777
-RMD160 0c535cf49b75b55e95a81a7be876fbf37933a064 files/digest-mjpegtools-1.6.2-r4 777
-SHA256 31391ccc93bdb728c27fd3de8a03ecc27f1bc7d4e1f894a909f2fe0d92efff66 files/digest-mjpegtools-1.6.2-r4 777
 MD5 2188754e2cd2108901028f4e9c83d696 files/digest-mjpegtools-1.8.0-r1 253
 RMD160 5743c9441f2552b35045c0b5d3b9797079f8d30d files/digest-mjpegtools-1.8.0-r1 253
 SHA256 21770c4dd885e9231db381f9693c0650f32cd48f0a5c4438e62338c3b75d3c97 files/digest-mjpegtools-1.8.0-r1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFETJJ+AiZjviIA2XgRAqVsAJ9LXl1B4r28skQ2SOVSRGO2LrqiYACg4hfn
-9w6ZAiinKndb5rfh6QQgjPk=
-=MaoT
+iD8DBQFETJMPAiZjviIA2XgRAtLhAJ9jZOZ51/VtEJW9wLfs2gt/xIGOBACfQFI6
+jkb8aPKEeY0mfH5psViikq8=
+=dcxD
 -----END PGP SIGNATURE-----
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 \
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r4.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r4.ebuild
deleted file mode 100644
index 92c00f571410..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.6.2-r4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r4.ebuild,v 1.11 2006/02/04 16:30:11 flameeyes Exp $
-
-inherit flag-o-matic toolchain-funcs eutils autotools
-
-M4V="1"
-
-DESCRIPTION="Tools for MJPEG video"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz
-	mirror://gentoo/${PN}-m4-${M4V}.tar.bz2
-	http://dev.gentoo.org/~luckyduck/patches/${P}-mmx-fPIC.patch.bz2"
-
-LICENSE="as-is"
-SLOT="1"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="gtk dv quicktime sdl X yv12 3dnow mmx sse v4l dga"
-
-RDEPEND="media-libs/jpeg
-	x86? ( media-libs/libmovtar
-		mmx? ( >=media-libs/jpeg-mmx-0.1.6 )
-	)
-	gtk? ( =x11-libs/gtk+-1.2*
-		=dev-libs/glib-1.2* )
-	dv? ( >=media-libs/libdv-0.99 )
-	quicktime? ( virtual/quicktime )
-	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
-	X? ( virtual/x11 )"
-
-DEPEND="${RDEPEND}
-	x86? ( mmx? ( dev-lang/nasm )
-		3dnow? ( dev-lang/nasm )
-		sse? ( dev-lang/nasm )
-		)
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${P}-configure.patch
-	epatch ${FILESDIR}/${P}-fPIC.patch
-	epatch ${FILESDIR}/${P}-gcc34.patch
-	epatch ${FILESDIR}/${P}-libquicktime094.patch
-	epatch ${WORKDIR}/${P}-mmx-fPIC.patch
-
-	if use ppc; then
-		# Fix an error in the detection of the altivec-support
-		# in the compiler
-		epatch "${FILESDIR}/altivec-fix-${PV}.patch"
-		sed -i -e 's:-O3::' configure.in
-		#Worst workaround ever...
-		sed -i -e "s/const vector signed short/vector signed short/g" \
-			${S}/utils/altivec/fdct_idct.c
-	fi
-
-	AT_M4DIR="${WORKDIR}/m4" eautoreconf
-
-	use X || epatch "${FILESDIR}/no-x11-lib-2.patch"
-}
-
-src_compile() {
-	local myconf
-
-	if use yv12 && use dv; then
-		myconf="${myconf} --with-dv-yv12"
-	elif use yv12; then
-		ewarn "yv12 support is possible when 'dv' is in your USE flags."
-	fi
-
-	# This could be changed to allow building on g/fbsd in the future.
-	if use x86; then
-		if use mmx || use 3dnow || use sse; then
-			myconf="${myconf} --enable-simd-accel"
-		fi
-		if use mmx; then
-			myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
-		fi
-
-		if [[ ${CHOST/i686/} != ${CHOST} ]] || [[ ${CHOST/x86_64/} != ${CHOST} ]]; then
-			myconf="${myconf} --enable-cmov-extension"
-		fi
-
-		[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-	fi
-
-	econf \
-		$(use_with X x) \
-		$(use_enable dga xfree-ext) \
-		$(use_with quicktime) \
-		$(use_with v4l) \
-		$(use_with gtk) \
-		$(use_with sdl) \
-		$(use_with dv dv /usr) \
-		--enable-largefile \
-		${myconf} || die "configure failed"
-
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -j1 || die "emake failed"
-	cd docs
-	local infofile
-	for infofile in mjpeg*info*; do
-		echo "INFO-DIR-SECTION Miscellaneous" >> ${infofile}
-		echo "START-INFO-DIR-ENTRY" >> ${infofile}
-		echo "* mjpeg-howto: (mjpeg-howto).                  How to use the mjpeg-tools" >> ${infofile}
-		echo "END-INFO-DIR-ENTRY" >> ${infofile}
-	done
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc mjpeg_howto.txt README PLANS NEWS README.AltiVec README.avilib \
-		README.DV README.glav README.lavpipe README.transist TODO \
-		HINTS BUGS ChangeLog AUTHORS CHANGES
-}