diff --git a/media-video/mjpegtools/mjpegtools-2.1.0.recipe b/media-video/mjpegtools/mjpegtools-2.2.0.recipe similarity index 66% rename from media-video/mjpegtools/mjpegtools-2.1.0.recipe rename to media-video/mjpegtools/mjpegtools-2.2.0.recipe index b24b5f9c8..7703bd020 100644 --- a/media-video/mjpegtools/mjpegtools-2.1.0.recipe +++ b/media-video/mjpegtools/mjpegtools-2.2.0.recipe @@ -11,23 +11,22 @@ COPYRIGHT=" 2000-2003 Fabrice Bellard 2003-2012 the FFmpeg developers " -SOURCE_URI="http://sourceforge.net/projects/mjpeg/files/mjpegtools/$portVersion/mjpegtools-$portVersion.tar.gz" -CHECKSUM_SHA256="864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407" -REVISION="3" +SOURCE_URI="https://downloads.sourceforge.net/sourceforge/mjpeg/mjpegtools-$portVersion.tar.bz2" +CHECKSUM_SHA256="a84349839471052db1ef691134aacf905b314dfce8762d47e10edcc9ab5f97d8" +REVISION="1" +PATCHES="mjpegtools-$portVersion.patchset" + 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 + lib:liblavfile_2.2$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:liblavjpeg_2.2$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libmjpegutils_2.2$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libmpeg2encpp_2.2$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libmplex2_2.2$secondaryArchSuffix = 0.0.0 compat >= 0 " - if [ -z "$secondaryArchSuffix" ]; then PROVIDES="$PROVIDES cmd:anytovcd.sh = $portVersion compat >= 2 @@ -90,32 +89,42 @@ REQUIRES=" lib:libpng16$secondaryArchSuffix lib:libz$secondaryArchSuffix " + +PROVIDES_devel=" + mjpegtools${secondaryArchSuffix}_devel = $portVersion compat >= 2 + devel:liblavfile_2.2$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:liblavjpeg_2.2$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libmjpegutils_2.2$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libmpeg2encpp_2.2$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libmplex2_2.2$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + mjpegtools$secondaryArchSuffix == $portVersion + " + BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel devel:libjpeg$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:awk - cmd:sed - cmd:pkg_config$secondaryArchSuffix - cmd:nasm - cmd:libtoolize + cmd:aclocal cmd:autoconf cmd:automake - cmd:aclocal + cmd:awk + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:nasm + cmd:pkg_config$secondaryArchSuffix + cmd:sed " BUILD() { - libtoolize -fci - aclocal - autoconf - automake + autoreconf -fi runConfigure ./configure --disable-dependency-tracking make $jobArgs } @@ -124,25 +133,16 @@ 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 + rm -f $libDir/lib*.la $libDir/lib*.a + mv $libDir/libmjpegutils.so $libDir/libmjpegutils-2.2.so + mv $libDir/liblavfile.so $libDir/liblavfile-2.2.so + mv $libDir/liblavjpeg.so $libDir/liblavjpeg-2.2.so + mv $libDir/libmpeg2encpp.so $libDir/libmpeg2encpp-2.2.so + mv $libDir/libmplex2.so $libDir/libmplex2-2.2.so prepareInstalledDevelLibs \ - libmjpegutils-2.1 liblavfile-2.1 liblavjpeg-2.1 \ - libmpeg2encpp-2.1 libmplex2-2.1 + libmjpegutils-2.2 liblavfile-2.2 liblavjpeg-2.2 \ + libmpeg2encpp-2.2 libmplex2-2.2 fixPkgconfig # devel package @@ -155,17 +155,3 @@ INSTALL() 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 - " diff --git a/media-video/mjpegtools/patches/mjpegtools-2.1.0.patchset b/media-video/mjpegtools/patches/mjpegtools-2.1.0.patchset deleted file mode 100644 index 276601339..000000000 --- a/media-video/mjpegtools/patches/mjpegtools-2.1.0.patchset +++ /dev/null @@ -1,75 +0,0 @@ -From 6bb33f02e730526ca22abe041a5f81c87bd137ce Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Wed, 11 Jun 2014 17:25:38 +0000 -Subject: haiku patch - - -diff --git a/configure.ac b/configure.ac -index 8ad5562..8c9c428 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]) - ;; -@@ -355,7 +358,7 @@ case $host_cpu in - AC_DEFINE(HAVE_X86CPU,1, [Compiling for x86-64 architecture CPU]) - have_x86cpu=true - have_x86_64cpu=true -- PROGRAM_NOPIC="-fno-PIC" -+ PROGRAM_NOPIC="" - ;; - powerpc | powerpc64) - AC_MSG_RESULT(PowerPC) -diff --git a/lavtools/Makefile.am b/lavtools/Makefile.am -index 117dce7..417d7d2 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, -diff --git a/yuvscaler/Makefile.am b/yuvscaler/Makefile.am -index 1fe4d75..d855a93 100644 ---- a/yuvscaler/Makefile.am -+++ b/yuvscaler/Makefile.am -@@ -18,6 +18,5 @@ noinst_HEADERS = \ - - EXTRA_DIST = yuvscaler_implementation.txt - --yuvscaler_CFLAGS=@PROGRAM_NOPIC@ - yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c - yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS) --- -1.8.3.4 - diff --git a/media-video/mjpegtools/patches/mjpegtools-2.2.0.patchset b/media-video/mjpegtools/patches/mjpegtools-2.2.0.patchset new file mode 100644 index 000000000..6a8739a46 --- /dev/null +++ b/media-video/mjpegtools/patches/mjpegtools-2.2.0.patchset @@ -0,0 +1,28 @@ +From db8e63b23ff1f51808e36d5db835a24b026a885c Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 11 Jun 2014 17:25:38 +0000 +Subject: haiku patch + + +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, +-- +2.30.0 +