multimedia/mjpegtools: Patched to build with glibc 2.10.
This commit is contained in:
parent
49e6340cd8
commit
f10a7e233e
|
@ -0,0 +1,11 @@
|
|||
--- mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp.orig 2009-05-27 01:31:46.000000000 -0700
|
||||
+++ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp 2009-05-27 01:33:09.000000000 -0700
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
bool LPCMStream::Probe(IBitStream &bs )
|
||||
{
|
||||
- char *last_dot = strrchr( bs.StreamName(), '.' );
|
||||
+ const char *last_dot = strrchr( bs.StreamName(), '.' );
|
||||
return
|
||||
last_dot != NULL
|
||||
&& strcmp( last_dot+1, "lpcm") == 0;
|
|
@ -0,0 +1,24 @@
|
|||
Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
|
||||
|
||||
Patch by: Salah Coronya
|
||||
|
||||
http://bugs.gentoo.org/show_bug.cgi?id=293919
|
||||
|
||||
--- lavtools/jpegutils.c
|
||||
+++ lavtools/jpegutils.c
|
||||
@@ -502,6 +502,7 @@
|
||||
|
||||
jpeg_read_header (&dinfo, TRUE);
|
||||
dinfo.raw_data_out = TRUE;
|
||||
+ dinfo.do_fancy_upsampling = FALSE;
|
||||
dinfo.out_color_space = JCS_YCbCr;
|
||||
dinfo.dct_method = JDCT_IFAST;
|
||||
guarantee_huff_tables(&dinfo);
|
||||
@@ -599,6 +600,7 @@
|
||||
if (field > 0) {
|
||||
jpeg_read_header (&dinfo, TRUE);
|
||||
dinfo.raw_data_out = TRUE;
|
||||
+ dinfo.do_fancy_upsampling = FALSE;
|
||||
dinfo.out_color_space = JCS_YCbCr;
|
||||
dinfo.dct_method = JDCT_IFAST;
|
||||
jpeg_start_decompress (&dinfo);
|
|
@ -57,6 +57,8 @@ chmod -R a-s,u+w,go+r-w .
|
|||
|
||||
# Fix for x86_64
|
||||
sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
|
||||
patch -p1 < $CWD/mjpegtools-1.9.0-glibc-2.10.patch
|
||||
patch -p0 < $CWD/mjpegtools-1.9.0-jpeg-7.patch
|
||||
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
|
@ -74,12 +76,8 @@ CXXFLAGS="$SLKCFLAGS" \
|
|||
make
|
||||
make install DESTDIR=$PKG
|
||||
|
||||
( cd $PKG
|
||||
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
|
||||
xargs strip --strip-unneeded 2> /dev/null || true
|
||||
find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
|
||||
xargs strip --strip-unneeded 2> /dev/null
|
||||
)
|
||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
|
||||
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
|
||||
|
||||
( cd $PKG/usr/man
|
||||
find . -type f -exec gzip -9 {} \;
|
||||
|
|
Loading…
Reference in New Issue