diff options
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch | 26 | ||||
-rw-r--r-- | media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg.patch | 38 |
2 files changed, 0 insertions, 64 deletions
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch deleted file mode 100644 index 3b0ad4792a54..000000000000 --- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ur mpeg_encode.orig/jpeg.c mpeg_encode/jpeg.c ---- mpeg_encode.orig/jpeg.c 2009-08-24 21:33:18.000000000 +0300 -+++ mpeg_encode/jpeg.c 2009-08-24 22:23:08.000000000 +0300 -@@ -80,13 +80,9 @@ - /* make it happier.... */ - #undef DCTSIZE2 - #include "jpeglib.h" --#include "jpegint.h" -- - - #define HEADER_SIZE 607 /*JFIF header size used on output images*/ - -- -- - /*=======================================================================* - * * - * JMovie2JPEG * -@@ -517,7 +513,7 @@ - #ifdef JPEG4 - buffer_height = 8; /* could be 2, 4,8 rows high */ - #else -- buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; -+ buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size; - #endif - - for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components; diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg.patch deleted file mode 100644 index 7be3905577c3..000000000000 --- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg.patch +++ /dev/null @@ -1,38 +0,0 @@ -Use the system jpeg rather than the bundled one - ---- mpeg_encode/Makefile -+++ mpeg_encode/Makefile -@@ -36,9 +36,9 @@ - ############## - # JPEG STUFF # - ############## --JPEG_LIB = jpeg/libjpeg.a --JPEG_DIR = -Ijpeg --JPEG_LIB_DIR = -Ljpeg -+JPEG_LIB = -ljpeg -+JPEG_DIR = -+JPEG_LIB_DIR = - MP_JPEG_OBJS = jpeg.o - MP_JPEG_SRCS = jpeg.c - -@@ -57,7 +57,7 @@ - ################# - # INCLUDE FILES # - ################# --INCLUDEDIR = -Iheaders -I/usr/include $(JPEG_DIR) -+INCLUDEDIR = -Iheaders - - ############################################################################ - # LIBRARIES # specify library directories; need jpg lib and maybe pbm # ---- mpeg_encode/jpeg.c -+++ mpeg_encode/jpeg.c -@@ -79,7 +79,8 @@ - - /* make it happier.... */ - #undef DCTSIZE2 --#include "jpeg/jpeglib.h" -+#include "jpeglib.h" -+#include "jpegint.h" - - - #define HEADER_SIZE 607 /*JFIF header size used on output images*/ |