mjpegtools: added recipe for version 2.1.0

* tested x86
This commit is contained in:
Jerome Duval
2014-06-12 19:20:05 +00:00
parent f46c65c770
commit ecef7cd03c
2 changed files with 226 additions and 0 deletions

View File

@@ -0,0 +1,171 @@
SUMMARY="Audio and Video Tools for Motion JPEG and MPEG"
DESCRIPTION="
Programs for MJPEG recording and playback and simple cut-and-paste \
editting and MPEG compression of audio and video.
"
HOMEPAGE="http://mjpeg.sourceforge.net"
LICENSE="
GNU GPL v2
"
COPYRIGHT="
2000-2003 Fabrice Bellard
2003-2012 the FFmpeg developers
"
SRC_URI="http://sourceforge.net/projects/mjpeg/files/mjpegtools/$portVersion/mjpegtools-$portVersion.tar.gz"
CHECKSUM_SHA256="864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407"
REVISION="1"
ARCHITECTURES="?x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
PATCHES="mjpegtools-2.1.0.patchset"
PROVIDES="
mjpegtools$secondaryArchSuffix = $portVersion compat >= 2
lib:liblavfile_2.1$secondaryArchSuffix = 0.0.0 compat >= 0
lib:liblavjpeg_2.1$secondaryArchSuffix = 0.0.0 compat >= 0
lib:libmjpegutils_2.1$secondaryArchSuffix = 0.0.0 compat >= 0
lib:libmpeg2encpp_2.1$secondaryArchSuffix = 0.0.0 compat >= 0
lib:libmplex2_2.1$secondaryArchSuffix = 0.0.0 compat >= 0
"
if [ -z "$secondaryArchSuffix" ]; then
PROVIDES="$PROVIDES
cmd:anytovcd.sh = $portVersion compat >= 2
cmd:jpeg2yuv = $portVersion compat >= 2
cmd:lav2avi.sh = $portVersion compat >= 2
cmd:lav2mpeg = $portVersion compat >= 2
cmd:lav2wav = $portVersion compat >= 2
cmd:lav2yuv = $portVersion compat >= 2
cmd:lavaddwav = $portVersion compat >= 2
cmd:lavinfo = $portVersion compat >= 2
cmd:lavpipe = $portVersion compat >= 2
cmd:lavtc.sh = $portVersion compat >= 2
cmd:lavtrans = $portVersion compat >= 2
cmd:matteblend.flt = $portVersion compat >= 2
cmd:mjpeg_simd_helper = $portVersion compat >= 2
cmd:mp2enc = $portVersion compat >= 2
cmd:mpeg2enc = $portVersion compat >= 2
cmd:mpegtranscode = $portVersion compat >= 2
cmd:mplex = $portVersion compat >= 2
cmd:multiblend.flt = $portVersion compat >= 2
cmd:pgmtoy4m = $portVersion compat >= 2
cmd:png2yuv = $portVersion compat >= 2
cmd:pnmtoy4m = $portVersion compat >= 2
cmd:ppmtoy4m = $portVersion compat >= 2
cmd:transist.flt = $portVersion compat >= 2
cmd:y4mblack = $portVersion compat >= 2
cmd:y4mcolorbars = $portVersion compat >= 2
cmd:y4mdenoise = $portVersion compat >= 2
cmd:y4mhist = $portVersion compat >= 2
cmd:y4minterlace = $portVersion compat >= 2
cmd:y4mivtc = $portVersion compat >= 2
cmd:y4mscaler = $portVersion compat >= 2
cmd:y4mshift = $portVersion compat >= 2
cmd:y4mspatialfilter = $portVersion compat >= 2
cmd:y4mstabilizer = $portVersion compat >= 2
cmd:y4mtopnm = $portVersion compat >= 2
cmd:y4mtoppm = $portVersion compat >= 2
cmd:y4mtoyuv = $portVersion compat >= 2
cmd:y4munsharp = $portVersion compat >= 2
cmd:ypipe = $portVersion compat >= 2
cmd:yuv2lav = $portVersion compat >= 2
cmd:yuv4mpeg = $portVersion compat >= 2
cmd:yuvcorrect = $portVersion compat >= 2
cmd:yuvcorrect_tune = $portVersion compat >= 2
cmd:yuvdeinterlace = $portVersion compat >= 2
cmd:yuvdenoise = $portVersion compat >= 2
cmd:yuvfps = $portVersion compat >= 2
cmd:yuvinactive = $portVersion compat >= 2
cmd:yuvkineco = $portVersion compat >= 2
cmd:yuvmedianfilter = $portVersion compat >= 2
cmd:yuvscaler = $portVersion compat >= 2
cmd:yuvycsnoise = $portVersion compat >= 2
cmd:yuyvtoy4m = $portVersion compat >= 2
"
fi
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libjpeg$secondaryArchSuffix
lib:libpng15$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libjpeg$secondaryArchSuffix
devel:libpng15$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:awk
cmd:sed
cmd:pkg_config
cmd:nasm
cmd:libtoolize
cmd:autoconf
cmd:automake
cmd:aclocal
"
BUILD()
{
libtoolize -fci
aclocal
autoconf
automake
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
mv $libDir/libmjpegutils.a $libDir/libmjpegutils-2.1.a
mv $libDir/liblavfile.a $libDir/liblavfile-2.1.a
mv $libDir/liblavjpeg.a $libDir/liblavjpeg-2.1.a
mv $libDir/libmpeg2encpp.a $libDir/libmpeg2encpp-2.1.a
mv $libDir/libmplex2.a $libDir/libmplex2-2.1.a
mv $libDir/libmjpegutils.la $libDir/libmjpegutils-2.1.la
mv $libDir/liblavfile.la $libDir/liblavfile-2.1.la
mv $libDir/liblavjpeg.la $libDir/liblavjpeg-2.1.la
mv $libDir/libmpeg2encpp.la $libDir/libmpeg2encpp-2.1.la
mv $libDir/libmplex2.la $libDir/libmplex2-2.1.la
mv $libDir/libmjpegutils.so $libDir/libmjpegutils-2.1.so
mv $libDir/liblavfile.so $libDir/liblavfile-2.1.so
mv $libDir/liblavjpeg.so $libDir/liblavjpeg-2.1.so
mv $libDir/libmpeg2encpp.so $libDir/libmpeg2encpp-2.1.so
mv $libDir/libmplex2.so $libDir/libmplex2-2.1.so
prepareInstalledDevelLibs \
libmjpegutils-2.1 liblavfile-2.1 liblavjpeg-2.1 \
libmpeg2encpp-2.1 libmplex2-2.1
fixPkgconfig
# devel package
packageEntries devel \
$developDir
# Remove stuff we don't need in the secondary architecture base package.
if [ -n "$secondaryArchSuffix" ]; then
rm -rf $prefix/bin
rm -rf $documentationDir
fi
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
mjpegtools${secondaryArchSuffix}_devel = $portVersion compat >= 2
devel:liblavfile_2.1$secondaryArchSuffix = 0.0.0 compat >= 0
devel:liblavjpeg_2.1$secondaryArchSuffix = 0.0.0 compat >= 0
devel:libmjpegutils_2.1$secondaryArchSuffix = 0.0.0 compat >= 0
devel:libmpeg2encpp_2.1$secondaryArchSuffix = 0.0.0 compat >= 0
devel:libmplex2_2.1$secondaryArchSuffix = 0.0.0 compat >= 0
"
REQUIRES_devel="
mjpegtools$secondaryArchSuffix == $portVersion
"

View File

@@ -0,0 +1,55 @@
From f4fa8ee2c60a7f6ce3e091e39e887337b30710d3 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 11 Jun 2014 17:25:38 +0000
Subject: haiku patch
diff --git a/configure.ac b/configure.ac
index 8ad5562..c0994fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,6 +130,9 @@ case $host in
[ LIBM_LIBS="-lcpml"
have_cpml=true ],,)
;;
+ haiku*)
+ LIBM_LIBS=""
+ ;;
*)
AC_MSG_RESULT([no])
;;
diff --git a/lavtools/Makefile.am b/lavtools/Makefile.am
index 117dce7..e84a3c2 100644
--- a/lavtools/Makefile.am
+++ b/lavtools/Makefile.am
@@ -152,7 +152,7 @@ jpeg2yuv_LDADD = $(LIBMJPEGUTILS) liblavjpeg.la $(JPEG_LIBS)
png2yuv_SOURCES = png2yuv.c colorspace.c subsample.c
png2yuv_CPPFLAGS = $(AM_CPPFLAGS) $(LIBPNG_CFLAGS)
-png2yuv_LDADD = $(LIBMJPEGUTILS) $(LIBPNG_LIBS) -lz -lm
+png2yuv_LDADD = $(LIBMJPEGUTILS) $(LIBPNG_LIBS) -lz
lavpipe_SOURCES = lavpipe.c pipelist.c
lavpipe_LDADD = $(LIBMJPEGUTILS)
diff --git a/y4mdenoise/newdenoise.cc b/y4mdenoise/newdenoise.cc
index d84890b..3b0a4ec 100644
--- a/y4mdenoise/newdenoise.cc
+++ b/y4mdenoise/newdenoise.cc
@@ -1853,12 +1853,14 @@ BasicThread::Initialize (void)
mjpeg_error_exit1 ("pthread_attr_init() failed: %s",
strerror (nErr));
+#ifndef __HAIKU__
// Inherit scheduling parameters from the main thread.
nErr = pthread_attr_setinheritsched (&sThreadAttributes,
PTHREAD_INHERIT_SCHED);
if (nErr != 0)
mjpeg_error_exit1 ("pthread_attr_setinheritsched() failed: %s",
strerror (nErr));
+#endif
// Create the thread.
nErr = pthread_create (&m_oThreadInfo,
--
1.8.3.4