update: multimedia/mjpegtools

[Jacob Meuser]

attached is a diff to update multimedia/mjpegtools to version 1.8.0

source changes:
  changes in YUV4MPEG2 API to offer support for multiple colorspaces  
    (particularly useful for DV video), so that multiple planar YUV
    formats (also monochrome or alpha) are supported.  
  most filtering tools have been adapted to support multiple YUV
    formats,   so that you will not lose quality/precision in
    conversion steps.  
  many new or dramatically improved filters including (but not
    limited to):  
    *) yuvdenoise (denoising filter)  
    *) yuvdeinterlace (intelligent deinterlacing program)  
    *) y4munsharp (unsharp mask image sharpening program)  
  improvements in the IDCT/DCT routines in the MPEG-1/-2 encoder  
    (much more exact now and not subject to overflow/truncation on the  
    IA32 arch).  
  MANY new utilties for importing/exporting data:  
    *) New and improved PGM/PNM conversion programs for dealing  
       with PPM data.  
    *) Utilities to convert raw (headerless) YUV data to and from  
       YUV4MPEG2 format. Useful when interfacing with other program  
       suites.  
    *) Program (yuyvtoy4m) to convert 4:2:2 data from digital cameras  
       into YUV4MPEG2 format for use with mjpegtools.  
    *) y4mstabilizer for stabilizing images with unsteady camera work  
  Improvements and fixes in 'mplex' for handling PCM audio (LPCM  
    audio actually works now)
  DPME (Dual Prime Motion Estimation) in the encoder (mpeg2enc)  
    is fully functional (it was present but buggy/artifacted in the
    earlier  releases)  
  rate control in the encoder improved considerably.  
  much better Quicktime file handling (via libquicktime) especially  
    the audio tracks.  
  besides the always-excellent x86 support, we now have full support
    for  AMD64 (including MMX/SSE/etc. optimizations) and for PPC.

port changes:
  USE_LIBTOOL=Yes
  CONFIGURE_STYLE=autoconf no-autoheader automake
  run automake in pre-configure because the libpng support in the
    distribution sources is incomplete/incorrect
  several patches integrated upstream
  remove NO_REGRESS=Yes
  use my @openbsd.org email address
  libmjpegutils is now a shared library, so don't need the hack
    to create libmjpegutils_pic.a
  better wording in DESCR

note, this update will break multimedia/transcode,-mjpegtools, the
only port that depends on mjpegtools, because libmjpegutils is now a
shared library.  patch for that below.

tested by me on i386 and amd64.

OK?

--
<[hidden email]>

Index: multimedia/transcode/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/transcode/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- multimedia/transcode/Makefile 13 Nov 2005 21:11:13 -0000 1.5
+++ multimedia/transcode/Makefile 17 Dec 2005 22:01:01 -0000
@@ -3,6 +3,7 @@
 COMMENT= "video stream processing tools"
 
 DISTNAME= transcode-1.0.2
+PKGNAME= ${DISTNAME}p0
 CATEGORIES= multimedia
 
 HOMEPAGE= http://www.transcoding.org/
@@ -101,7 +102,7 @@
 
 .if ${FLAVOR:L:Mmjpegtools}
 CONFIGURE_ARGS+= --enable-mjpegtools
-BUILD_DEPENDS+= ::multimedia/mjpegtools
+LIB_DEPENDS+= mjpegutils.3::multimedia/mjpegtools
 RUN_DEPENDS+= ::multimedia/mjpegtools
 PKG_ARGS+= -Dmjpegtools=1
 .else
Index: multimedia/transcode/patches/patch-configure
===================================================================
RCS file: multimedia/transcode/patches/patch-configure
diff -N multimedia/transcode/patches/patch-configure
--- multimedia/transcode/patches/patch-configure 13 Nov 2005 21:11:13 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2005/11/13 21:11:13 jakemsr Exp $
---- configure.orig Sun Oct  2 19:50:44 2005
-+++ configure Sun Oct  9 14:46:27 2005
-@@ -40618,7 +40618,7 @@ if test "${ac_cv_lib_mjpegutils_y4m_si_g
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmjpegutils $MJPEGTOOLS_EXTRA_LIBS $LIBS"
-+LIBS="-lmjpegutils_pic $MJPEGTOOLS_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -40677,7 +40677,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_mjpegutils_y4m_si_get_height" >&5
- echo "${ECHO_T}$ac_cv_lib_mjpegutils_y4m_si_get_height" >&6
- if test $ac_cv_lib_mjpegutils_y4m_si_get_height = yes; then
--  MJPEGTOOLS_LIBS="$mjpegtools_ll -lmjpegutils $MJPEGTOOLS_EXTRA_LIBS"
-+  MJPEGTOOLS_LIBS="$mjpegtools_ll -lmjpegutils_pic $MJPEGTOOLS_EXTRA_LIBS"
- else
-
- tc_pkg_err="yes"

[Rik Burt]

Jacob Meuser wrote:
> attached is a diff to update multimedia/mjpegtools to version 1.8.0
>

Builds and installs fine on i386.  Had to remove the patch_configure
patch in multimedia/transcode to build transcode with the mjpegtools
flavor.  The patch makes transcode look for a libmjpegutil_pic library
which doesn't exist in version 1.8.0

[Pedro Marcolino]

Hi Jacob,

Works fine( transcode included ) on amd64.

Best Regards,
Pedro Marcolino


On Sat, 17 Dec 2005 14:01:26 -0800
Jacob Meuser <[hidden email]> wrote:

> attached is a diff to update multimedia/mjpegtools to version 1.8.0
>
> source changes:
>   changes in YUV4MPEG2 API to offer support for multiple colorspaces  
>     (particularly useful for DV video), so that multiple planar YUV
>     formats (also monochrome or alpha) are supported.  
>   most filtering tools have been adapted to support multiple YUV
>     formats,   so that you will not lose quality/precision in
>     conversion steps.  
>   many new or dramatically improved filters including (but not
>     limited to):  
>     *) yuvdenoise (denoising filter)  
>     *) yuvdeinterlace (intelligent deinterlacing program)  
>     *) y4munsharp (unsharp mask image sharpening program)  
>   improvements in the IDCT/DCT routines in the MPEG-1/-2 encoder  
>     (much more exact now and not subject to overflow/truncation on the  
>     IA32 arch).  
>   MANY new utilties for importing/exporting data:  
>     *) New and improved PGM/PNM conversion programs for dealing  
>        with PPM data.  
>     *) Utilities to convert raw (headerless) YUV data to and from  
>        YUV4MPEG2 format. Useful when interfacing with other program  
>        suites.  
>     *) Program (yuyvtoy4m) to convert 4:2:2 data from digital cameras  
>        into YUV4MPEG2 format for use with mjpegtools.  
>     *) y4mstabilizer for stabilizing images with unsteady camera work  
>   Improvements and fixes in 'mplex' for handling PCM audio (LPCM  
>     audio actually works now)
>   DPME (Dual Prime Motion Estimation) in the encoder (mpeg2enc)  
>     is fully functional (it was present but buggy/artifacted in the
>     earlier  releases)  
>   rate control in the encoder improved considerably.  
>   much better Quicktime file handling (via libquicktime) especially  
>     the audio tracks.  
>   besides the always-excellent x86 support, we now have full support
>     for  AMD64 (including MMX/SSE/etc. optimizations) and for PPC.
>
> port changes:
>   USE_LIBTOOL=Yes
>   CONFIGURE_STYLE=autoconf no-autoheader automake
>   run automake in pre-configure because the libpng support in the
>     distribution sources is incomplete/incorrect
>   several patches integrated upstream
>   remove NO_REGRESS=Yes
>   use my @openbsd.org email address
>   libmjpegutils is now a shared library, so don't need the hack
>     to create libmjpegutils_pic.a
>   better wording in DESCR
>
> note, this update will break multimedia/transcode,-mjpegtools, the
> only port that depends on mjpegtools, because libmjpegutils is now a
> shared library.  patch for that below.
>
> tested by me on i386 and amd64.
>
> OK?
>
> --

[Jacob Meuser]

On Thu, Dec 29, 2005 at 03:06:42PM +0000, Pedro Marcolino wrote:
> Hi Jacob,
>
> Works fine( transcode included ) on amd64.
>
> Best Regards,
> Pedro Marcolino

thanks for testing, Pedro!

--
<[hidden email]>

[Jacob Meuser]

On Sat, Dec 17, 2005 at 02:01:26PM -0800, Jacob Meuser wrote:
> attached is a diff to update multimedia/mjpegtools to version 1.8.0

here is a new one, taking into account recent changes,

--
<[hidden email]>

[Jacob Meuser]

On Sun, Jan 22, 2006 at 11:52:04PM -0800, Jacob Meuser wrote:
> On Sat, Dec 17, 2005 at 02:01:26PM -0800, Jacob Meuser wrote:
> > attached is a diff to update multimedia/mjpegtools to version 1.8.0
>
> here is a new one, taking into account recent changes,

with the patch this time ...

--
<[hidden email]>