| 1 |
ssuominen 13/08/02 06:14:19 |
| 2 |
|
| 3 |
Added: mpeg-tools-1.5b-jpeg.patch |
| 4 |
Log: |
| 5 |
Use if and else to support both libjpeg.so.62 and libjpeg.so.8 and libjpeg.so.9 wrt #479462 by Juergen Rose |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: mpeg-tools-1.5b-jpeg.patch |
| 16 |
=================================================================== |
| 17 |
--- jpeg.c |
| 18 |
+++ jpeg.c |
| 19 |
@@ -77,13 +77,10 @@ |
| 20 |
|
| 21 |
/* make it happier.... */ |
| 22 |
#undef DCTSIZE2 |
| 23 |
-#include "jpeg/jpeglib.h" |
| 24 |
- |
| 25 |
+#include "jpeglib.h" |
| 26 |
|
| 27 |
#define HEADER_SIZE 607 /*JFIF header size used on output images*/ |
| 28 |
|
| 29 |
- |
| 30 |
- |
| 31 |
/*=======================================================================* |
| 32 |
* * |
| 33 |
* JMovie2JPEG * |
| 34 |
@@ -514,8 +511,12 @@ |
| 35 |
#ifdef JPEG4 |
| 36 |
buffer_height = 8; /* could be 2, 4,8 rows high */ |
| 37 |
#else |
| 38 |
- buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; |
| 39 |
-#endif |
| 40 |
+ #if JPEG_LIB_VERSION >= 80 |
| 41 |
+ buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size; |
| 42 |
+ #else |
| 43 |
+ buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; |
| 44 |
+ #endif |
| 45 |
+#endif /* JPEG4 */ |
| 46 |
|
| 47 |
for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components; |
| 48 |
cp++,compptr++) { |
| 49 |
--- Makefile |
| 50 |
+++ Makefile |
| 51 |
@@ -36,9 +36,9 @@ |
| 52 |
############## |
| 53 |
# JPEG STUFF # |
| 54 |
############## |
| 55 |
-JPEG_LIB = jpeg/libjpeg.a |
| 56 |
-JPEG_DIR = -Ijpeg |
| 57 |
-JPEG_LIB_DIR = -Ljpeg |
| 58 |
+JPEG_LIB = -ljpeg |
| 59 |
+JPEG_DIR = |
| 60 |
+JPEG_LIB_DIR = |
| 61 |
MP_JPEG_OBJS = jpeg.o |
| 62 |
MP_JPEG_SRCS = jpeg.c |
| 63 |
|
| 64 |
@@ -57,7 +57,7 @@ |
| 65 |
################# |
| 66 |
# INCLUDE FILES # |
| 67 |
################# |
| 68 |
-INCLUDEDIR = -Iheaders -I/usr/include $(JPEG_DIR) |
| 69 |
+INCLUDEDIR = -Iheaders |
| 70 |
|
| 71 |
############################################################################ |
| 72 |
# LIBRARIES # specify library directories; need jpg lib and maybe pbm # |
Archives