diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-26 20:21:01 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-26 20:21:01 +0000 |
| commit | 43e411a8d2ba3c4d5ebaa5af704cd19fc268f105 (patch) | |
| tree | a88f4eec310349d3d4f896c1bfb23bd50e152920 /media-video/mjpegtools/files | |
| parent | Stable on alpha. (diff) | |
| download | historical-43e411a8d2ba3c4d5ebaa5af704cd19fc268f105.tar.gz historical-43e411a8d2ba3c4d5ebaa5af704cd19fc268f105.tar.bz2 historical-43e411a8d2ba3c4d5ebaa5af704cd19fc268f105.zip | |
Removilg older versions. Fixing avifile dependency to accept newer versions as it does compile with them.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'media-video/mjpegtools/files')
9 files changed, 0 insertions, 156 deletions
diff --git a/media-video/mjpegtools/files/1.6.0-r7-ppc.patch b/media-video/mjpegtools/files/1.6.0-r7-ppc.patch deleted file mode 100644 index 3eeaec04552c..000000000000 --- a/media-video/mjpegtools/files/1.6.0-r7-ppc.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur mjpegtools-1.6.0.orig/yuvdenoise/main.c mjpegtools-1.6.0/yuvdenoise/main.c ---- mjpegtools-1.6.0.orig/yuvdenoise/main.c 2002-05-06 10:13:00.000000000 +0200 -+++ mjpegtools-1.6.0/yuvdenoise/main.c 2003-02-10 16:39:25.000000000 +0100 -@@ -294,8 +294,7 @@ - void - process_commandline(int argc, char *argv[]) - { -- char c; -- int i1,i2,i3,i4; -+ int c,i1,i2,i3,i4; - - while ((c = getopt (argc, argv, "h?t:b:r:l:S:L:C:p:Ff")) != -1) - { - diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r7 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r7 deleted file mode 100644 index e262f9879cee..000000000000 --- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r7 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 cb34077cc3460494bc3759e3655e5263 mjpegtools-1.6.0.tar.gz 928991 -MD5 963b168854e8f74590c71aaaaedf5177 quicktime4linux-1.4-patched.tar.gz 560533 diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r2 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r2 deleted file mode 100644 index 5f401da864e9..000000000000 --- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 a903c49ee5902710b8e44bd6c0f4b38e mjpegtools-1.6.1.90.tar.gz 1168921 diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r1 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r1 deleted file mode 100644 index f61243bfc284..000000000000 --- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 01c0120b0182de67f182ef99ad855daa mjpegtools-1.6.2.tar.gz 1256280 diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.0-gcc3.patch b/media-video/mjpegtools/files/mjpegtools-1.6.0-gcc3.patch deleted file mode 100644 index 3b614554e87a..000000000000 --- a/media-video/mjpegtools/files/mjpegtools-1.6.0-gcc3.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -uNr mjpegtools-1.6.0/mplex/multplex.cc mjpegtools-1.6.0-gcc33/mplex/multplex.cc ---- mjpegtools-1.6.0/mplex/multplex.cc 2002-04-29 12:30:56.000000000 -0400 -+++ mjpegtools-1.6.0-gcc33/mplex/multplex.cc 2003-07-25 01:51:57.228994776 -0400 -@@ -2,6 +2,7 @@ - #include <config.h> - #include <math.h> - #include <stdlib.h> -+#include <assert.h> - #include <unistd.h> - - #include <mjpeg_types.h> -diff -uNr mjpegtools-1.6.0/mplex/stillsstream.cc mjpegtools-1.6.0-gcc33/mplex/stillsstream.cc ---- mjpegtools-1.6.0/mplex/stillsstream.cc 2002-04-19 11:14:17.000000000 -0400 -+++ mjpegtools-1.6.0-gcc33/mplex/stillsstream.cc 2003-07-25 01:52:12.769632240 -0400 -@@ -22,6 +22,7 @@ - - - #include <format_codes.h> -+#include <assert.h> - - #include "stillsstream.hh" - #include "interact.hh" -diff -uNr mjpegtools-1.6.0/mplex/systems.cc mjpegtools-1.6.0-gcc33/mplex/systems.cc ---- mjpegtools-1.6.0/mplex/systems.cc 2003-07-25 01:51:14.205535336 -0400 -+++ mjpegtools-1.6.0-gcc33/mplex/systems.cc 2003-07-25 01:51:44.020002848 -0400 -@@ -1,6 +1,7 @@ - #include <config.h> - #include <stdio.h> - #include <stdlib.h> -+#include <assert.h> - #include <string.h> - #include <sys/param.h> - #include <sys/stat.h> -Files mjpegtools-1.6.0/yuvdenoise/.motion.c.swp and mjpegtools-1.6.0-gcc33/yuvdenoise/.motion.c.swp differ -diff -uNr mjpegtools-1.6.0/yuvdenoise/motion.c mjpegtools-1.6.0-gcc33/yuvdenoise/motion.c ---- mjpegtools-1.6.0/yuvdenoise/motion.c 2002-05-06 04:13:37.000000000 -0400 -+++ mjpegtools-1.6.0-gcc33/yuvdenoise/motion.c 2003-07-25 01:52:38.339744992 -0400 -@@ -251,6 +251,9 @@ - " movl %1 , %%eax; /* load frameadress into eax */\n" - " movl %2 , %%ebx; /* load frameadress into ebx */\n" - " movl %3 , %%ecx; /* load width into ecx */\n" -+ " shrl $1 , %%ecx; /* shift width to scale it in the asm. */\n" -+ " /* why? we need an lvalue as input... gcc33... */\n" -+ " /* (carrbc1@wfu.edu) */\n" - " /* */\n" - ".rept 4 ; /* Loop for 4 lines */\n" - " movd (%%eax), %%mm1; /* 4 Pixels from filtered frame to mm1 */\n" -@@ -270,7 +273,7 @@ - " /* */\n" - " movq %%mm0 , %0 ; /* make mm0 available to gcc ... */\n" - :"=m" (a) -- :"m" (frm), "m" (ref), "m" (denoiser.frame.w/2) -+ :"m" (frm), "m" (ref), "m" (denoiser.frame.w) - :"%eax", "%ebx", "%ecx" - ); - #endif -@@ -295,7 +298,10 @@ - " movl %1 , %%eax; /* load frameadress into eax */\n" - " movl %2 , %%ebx; /* load frameadress into ebx */\n" - " movl %3 , %%ecx; /* load width into ecx */\n" -- " ; /* */\n" -+ " shrl $1 , %%ecx; /* shift width to scale it in the asm. */\n" -+ " /* why? we need an lvalue as input... gcc33... */\n" -+ " /* (carrbc1@wfu.edu) */\n" -+ " /* */\n" - " .rept 4 ; /* */\n" - " movd (%%eax), %%mm1; /* 4 Pixels from filtered frame to mm1 */\n" - " movd (%%ebx), %%mm2; /* 4 Pixels from filtered frame to mm2 */\n" -@@ -307,7 +313,7 @@ - " /* */\n" - " movq %%mm0 , %0 ; /* make mm0 available to gcc ... */\n" - :"=m" (a) -- :"m" (frm), "m" (ref), "m" (denoiser.frame.w/2) -+ :"m" (frm), "m" (ref), "m" (denoiser.frame.w) - :"%eax", "%ebx", "%ecx" - ); - #endif -@@ -349,6 +355,7 @@ - static uint32_t a; - #ifdef HAVE_ASM_MMX - static uint32_t bit_mask[2] = {0x7f7f7f7f,0x7f7f7f7f}; -+ static uint32_t* bit_mask_addr = bit_mask; - - __asm__ __volatile__ - ( -@@ -380,7 +387,7 @@ - " /* */" - " movq %%mm0 , %0 ; /* make mm0 available to gcc ... */" - :"=m" (a) -- :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (bit_mask) -+ :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (bit_mask_addr) - :"%eax", "%ebx", "%ecx", "%edx" - ); - #endif diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.1.91-fPIC.patch b/media-video/mjpegtools/files/mjpegtools-1.6.1.91-fPIC.patch deleted file mode 100644 index cf8b91f0801d..000000000000 --- a/media-video/mjpegtools/files/mjpegtools-1.6.1.91-fPIC.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- utils/Makefile.in 2004-01-02 20:41:53.687970979 +0000 -+++ utils/Makefile.in 2004-01-02 20:42:03.468500179 +0000 -@@ -289,7 +289,7 @@ - @AMDEP_TRUE@ ./$(DEPDIR)/mpegtimecode.Po ./$(DEPDIR)/yuv4mpeg.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/yuv4mpeg_ratio.Po - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIC - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.1.92-fPIC.patch b/media-video/mjpegtools/files/mjpegtools-1.6.1.92-fPIC.patch deleted file mode 100644 index cf8b91f0801d..000000000000 --- a/media-video/mjpegtools/files/mjpegtools-1.6.1.92-fPIC.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- utils/Makefile.in 2004-01-02 20:41:53.687970979 +0000 -+++ utils/Makefile.in 2004-01-02 20:42:03.468500179 +0000 -@@ -289,7 +289,7 @@ - @AMDEP_TRUE@ ./$(DEPDIR)/mpegtimecode.Po ./$(DEPDIR)/yuv4mpeg.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/yuv4mpeg_ratio.Po - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIC - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.1.93-fPIC.patch b/media-video/mjpegtools/files/mjpegtools-1.6.1.93-fPIC.patch deleted file mode 100644 index cf8b91f0801d..000000000000 --- a/media-video/mjpegtools/files/mjpegtools-1.6.1.93-fPIC.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- utils/Makefile.in 2004-01-02 20:41:53.687970979 +0000 -+++ utils/Makefile.in 2004-01-02 20:42:03.468500179 +0000 -@@ -289,7 +289,7 @@ - @AMDEP_TRUE@ ./$(DEPDIR)/mpegtimecode.Po ./$(DEPDIR)/yuv4mpeg.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/yuv4mpeg_ratio.Po - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIC - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) diff --git a/media-video/mjpegtools/files/no-x11-lib.patch b/media-video/mjpegtools/files/no-x11-lib.patch deleted file mode 100644 index 27089e0e2217..000000000000 --- a/media-video/mjpegtools/files/no-x11-lib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mjpegtools-1.6.1.90/lavtools/Makefile.in.old 2003-08-23 14:21:53.000000000 +0000 -+++ mjpegtools-1.6.1.90/lavtools/Makefile.in 2003-09-19 09:03:15.000000000 +0000 -@@ -235,7 +235,7 @@ - lavplay_SOURCES = lavplay.c ${lav_headers} - lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \ - liblavplay.la liblavjpeg.la liblavfile.la \ -- @LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} ${X_LIBS} -lX11 -+ @LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} ${X_LIBS} - - - lavrec_SOURCES = lavrec.c $(lav_headers) |