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 ...
--
<[EMAIL PROTECTED]>
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mjpegtools/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 15 Jan 2006 20:34:06 -0000 1.4
+++ Makefile 23 Jan 2006 07:43:21 -0000
@@ -1,81 +1,81 @@
-# $OpenBSD: Makefile,v 1.4 2006/01/15 20:34:06 jakemsr Exp $
+# $OpenBSD$
COMMENT= "tools to edit/modify/encode video streams"
-DISTNAME= mjpegtools-1.6.2
-PKGNAME= ${DISTNAME}p2
+DISTNAME= mjpegtools-1.8.0
CATEGORIES= multimedia
-SHARED_LIBS= lavfile 2.2 \
- lavfile-1.6 2.2 \
- lavjpeg 2.2 \
- lavjpeg-1.6 2.2 \
- lavplay 2.2 \
- lavplay-1.6 2.2 \
- mpeg2enc 2.2 \
- mpeg2enc-1.6 2.2 \
- mpeg2encpp 3.0 \
- mpeg2encpp-1.6 3.0 \
- mplex2 3.0 \
- mplex2-1.6 3.0
+SHARED_LIBS= lavfile 3.0 \
+ lavfile-1.8 3.0 \
+ lavjpeg 3.0 \
+ lavjpeg-1.8 3.0 \
+ lavplay 3.0 \
+ lavplay-1.8 3.0 \
+ mjpegutils 3.0 \
+ mjpegutils-1.8 3.0 \
+ mpeg2encpp 4.0 \
+ mpeg2encpp-1.8 4.0 \
+ mplex2 4.0 \
+ mplex2-1.8 4.0
HOMEPAGE= http://mjpeg.sourceforge.net/
-MAINTAINER= Jacob Meuser <[EMAIL PROTECTED]>
+MAINTAINER= Jacob Meuser <[EMAIL PROTECTED]>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 stdc++ pthread glib m usbhid c gmodule Xi Xext z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mjpeg/}
-MODULES= devel/gettext
+WANTLIB= X11 Xext Xft Xrender c fontconfig \
+ freetype m pthread stdc++ usbhid z
+
+MODULES+= devel/gettext
+
BUILD_DEPENDS= ::devel/pkgconfig
+
LIB_DEPENDS= SDL.2:sdl-*-!no_x11:devel/sdl \
dv.4::multimedia/libdv \
- gdk.1.2,gtk.1.2::x11/gtk+ \
jpeg.62::graphics/jpeg \
- png.4::graphics/png
-
-SEPARATE_BUILD= concurrent
+ png.4::graphics/png \
+ atk-1.0.800.0::devel/atk \
+
glib-2.0.600.0,gmodule-2.0.600.0,gobject-2.0.600.0::devel/glib2 \
+
gdk-x11-2.0.400.0,gdk_pixbuf-2.0.400.0,gtk-x11-2.0.400.0::x11/gtk+2 \
+
pango-1.0.1001.0,pangoft2-1.0.1001.0,pangox-1.0.1001.0,pangoxft-1.0.1001.0::devel/pango
USE_LIBTOOL= Yes
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --with-x --enable-xfree-ext \
- --with-dv=${LOCALBASE} --with-dv-yv12 \
- --disable-zalpha
-
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
- -I${LOCALBASE}/include/libpng" \
- LDFLAGS="-L${LOCALBASE}/lib"
+AUTOMAKE_VERSION= 1.9
+AUTOCONF_VERSION= 2.59
+
+SEPARATE_BUILD= concurrent
+CONFIGURE_STYLE= autoconf no-autoheader automake
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
+ --with-x --with-libpng --with-libdv
+
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
FLAVORS= quicktime optimized
FLAVOR?=
.if ${FLAVOR:L:Moptimized}
CONFIGURE_ARGS+= --enable-simd-accel
-. if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS+= ::devel/nasm
-CONFIGURE_ARGS+= --enable-cmov-extension
-. endif
.else
-CONFIGURE_ARGS+= --disable-cmov-extension \
- --disable-simd-accel
+CONFIGURE_ARGS+= --disable-simd-accel
.endif
.if ${FLAVOR:L:Mquicktime}
-LIB_DEPENDS+= quicktime.0::multimedia/libquicktime
-CONFIGURE_ARGS+= --with-quicktime
+LIB_DEPENDS+= quicktime.2::multimedia/libquicktime
+CONFIGURE_ARGS+= --with-libquicktime
.else
-CONFIGURE_ARGS+= --without-quicktime
+CONFIGURE_ARGS+= --without-libquicktime
.endif
-post-install:
- ${INSTALL_DATA} ${WRKBUILD}/utils/libmjpegutils_pic.a ${PREFIX}/lib
-
-NO_REGRESS= Yes
+pre-configure:
+ cd ${WRKSRC} && env AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+ AUTOCONF_VERSION=${AUTOCONF_VERSION} automake
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/mjpegtools/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 5 Jan 2005 17:05:07 -0000 1.2
+++ distinfo 23 Jan 2006 07:43:21 -0000
@@ -1,4 +1,4 @@
-MD5 (mjpegtools-1.6.2.tar.gz) = 01c0120b0182de67f182ef99ad855daa
-RMD160 (mjpegtools-1.6.2.tar.gz) = 48d4e6fa037f18973bae7d22ac14412182361c23
-SHA1 (mjpegtools-1.6.2.tar.gz) = c69ce6cd8a37c133c92d677f21650ae541c86575
-SIZE (mjpegtools-1.6.2.tar.gz) = 1256280
+MD5 (mjpegtools-1.8.0.tar.gz) = 6fd98362310480bdaf7171e9659f165f
+RMD160 (mjpegtools-1.8.0.tar.gz) = 4d97a6a721f29223975605e2a5e645b4d7d129b5
+SHA1 (mjpegtools-1.8.0.tar.gz) = e11d68298a64b52f98724dbf3fd14f168e140290
+SIZE (mjpegtools-1.8.0.tar.gz) = 1475998
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 10 Jan 2006 02:23:37 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,83 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2006/01/10 02:23:37 jakemsr Exp $
---- configure.orig Tue Feb 3 14:58:37 2004
-+++ configure Sun Jan 8 15:18:30 2006
-@@ -22483,10 +22483,10 @@ fi
-
- # FreeBSD and OpenBSD have neither -lpthread nor integrated pthreads in libc.
- # Instead -pthread is used to the compiler/linker to get pthreads working
right.
--if test x$OS_ARCH = xFreeBSD -o x$OS_ARCH = xOpenBSD; then
-- CFLAGS="$CFLAGS -pthread"
-- CXXFLAGS="$CXXFLAGS -pthread"
--fi
-+#if test x$OS_ARCH = xFreeBSD -o x$OS_ARCH = xOpenBSD; then
-+# CFLAGS="$CFLAGS -pthread"
-+# CXXFLAGS="$CXXFLAGS -pthread"
-+#fi
-
-
- case "$HOSTTYPE" in
-@@ -22965,13 +22965,13 @@ rm -f conftest.$ac_objext conftest$ac_ex
-
-
- have_pthread=false
--echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
-+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread $LIBS"
-+LIBS="-pthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -23020,7 +23020,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
- if test $ac_cv_lib_pthread_pthread_create = yes; then
-- PTHREAD_LIBS="-lpthread"
-+ PTHREAD_LIBS="-pthread"
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBPTHREAD 1
-@@ -23570,6 +23570,7 @@ if test x$with_dv = x ; then
- fi
-
- have_dv=false
-+if test x"$with_dv" != x"no"; then
- EXTRA_LIBS=" $LIBM_LIBS $GLIB_LIBS $PTHREAD_LIBS"
- echo "$as_me:$LINENO: checking for dv_decoder_free in -ldv" >&5
- echo $ECHO_N "checking for dv_decoder_free in -ldv... $ECHO_C" >&6
-@@ -23635,8 +23636,8 @@ _ACEOF
-
- have_dv=true
- fi
-+fi # with_dv != no
-
--
- have_dv_yv12=false
- if test x$with_dv_yv12 = xyes -a $have_dv = true; then
-
-@@ -25852,7 +25853,7 @@ echo "$as_me:$LINENO: checking x86 sub-a
- echo $ECHO_N "checking x86 sub-architecture settings... $ECHO_C" >&6
-
- if test "$enable_cmov_extension" != "no" ; then
-- arch=`uname -m`
-+ arch=i`sysctl hw.model | sed -e 's,.*\(.86\)-class.*,\1,' | grep
'^[456]86$' || echo 386`
- else
- arch=i586
- fi
-@@ -26013,9 +26014,10 @@ else
- fi
-
-
--
-+if test "$enable_simd_accel" != "false" -a "$enable_simd_accel" != "no" ; then
- CFLAGS="$ARCHFLAGS $CFLAGS"
- CXXFLAGS="$ARCHFLAGS $CXXFLAGS"
-+fi
- if test "x${GCC}" != "xyes" ; then
- enable_compile_warnings=no
- fi
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac 23 Jan 2006 07:43:21 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- configure.ac.orig Sun Sep 18 18:58:48 2005
++++ configure.ac Thu Dec 22 02:14:18 2005
+@@ -446,7 +446,8 @@ dnl done with the helper script cpuinfo.
+ dnl correctly is complex and lengthy (about as long as the entire configure.ac
+ dnl file).
+
+-if test x$have_x86cpu = xtrue -o x$have_ppccpu = xtrue; then
++# if test x$have_x86cpu = xtrue -o x$have_ppccpu = xtrue; then
++if false ; then
+ if test x$host_alias != x; then
+ dnl This is to allow cross compiling
+ AC_MSG_CHECKING(sub-architecture settings)
Index: patches/patch-lavtools_Makefile_am
===================================================================
RCS file: patches/patch-lavtools_Makefile_am
diff -N patches/patch-lavtools_Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lavtools_Makefile_am 23 Jan 2006 07:43:21 -0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- lavtools/Makefile.am.orig Thu Jun 16 10:09:37 2005
++++ lavtools/Makefile.am Sat Dec 24 02:41:33 2005
+@@ -41,12 +41,13 @@ LAV_ALL_LIB_OPTS = \
+
+ liblavfile_la_SOURCES = editlist.c lav_io.c avilib.c
+ liblavfile_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(JPEG_CFLAGS)
$(LIBQUICKTIME_CFLAGS)
+-liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) \
+- $(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS)
++liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
++liblavfile_la_LIBADD = $(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS)
+
+ liblavjpeg_la_SOURCES = jpegutils.c
+ liblavjpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(JPEG_CFLAGS)
+-liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) $(JPEG_LIBS)
++liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
++liblavjpeg_la_LIBADD = $(JPEG_LIBS)
+
+ liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c
+ liblavrec_la_CPPFLAGS = $(AM_CPPFLAGS) # so automake doesn't complain about
audiolib & frequencies
+@@ -165,7 +166,8 @@ jpeg2yuv_CPPFLAGS = $(AM_CPPFLAGS) $(JPE
+ jpeg2yuv_LDADD = $(LIBMJPEGUTILS) liblavjpeg.la $(JPEG_LIBS)
+
+ png2yuv_SOURCES = png2yuv.c colorspace.c subsample.c
+-png2yuv_LDADD = $(LIBMJPEGUTILS) -lpng -lz -lm
++png2yuv_CPPFLAGS = $(AM_CPPFLAGS) $(LIBPNG_CFLAGS)
++png2yuv_LDADD = $(LIBMJPEGUTILS) $(LIBPNG_LIBS)
+
+ lavpipe_SOURCES = lavpipe.c pipelist.c
+ lavpipe_LDADD = $(LIBMJPEGUTILS)
Index: patches/patch-lavtools_Makefile_in
===================================================================
RCS file: patches/patch-lavtools_Makefile_in
diff -N patches/patch-lavtools_Makefile_in
--- patches/patch-lavtools_Makefile_in 10 Jan 2006 02:23:37 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-$OpenBSD: patch-lavtools_Makefile_in,v 1.2 2006/01/10 02:23:37 jakemsr Exp $
---- lavtools/Makefile.in.orig Tue Feb 3 14:58:30 2004
-+++ lavtools/Makefile.in Sun Jan 8 16:35:12 2006
-@@ -241,12 +241,12 @@ LAV_ALL_LIB_OPTS = \
-
-
- liblavfile_la_SOURCES = editlist.c lav_io.c avilib.c
--liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) \
-+liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) $(LDFLAGS) \
- $(QUICKTIME_LIBS) $(JPEG_LIBS) $(DV_LIBS)
-
-
- liblavjpeg_la_SOURCES = jpegutils.c
--liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) $(JPEG_LIBS)
-+liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) $(LDFLAGS) $(JPEG_LIBS)
-
- liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c
- liblavrec_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
-@@ -323,7 +323,7 @@ ypipe_LDADD = $(top_builddir)/utils/libm
-
- yuv2lav_SOURCES = yuv2lav.c
- yuv2lav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-- liblavfile.la liblavjpeg.la ${LIBM_LIBS}
-+ liblavfile.la $(PTHREAD_LIBS) liblavjpeg.la ${LIBM_LIBS}
-
-
- transist_flt_SOURCES = transist.flt.c
-@@ -371,17 +371,17 @@ yuvmedianfilter_LDADD = $(top_builddir)/
-
- lav2wav_SOURCES = lav2wav.c
- lav2wav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-- liblavfile.la
-+ liblavfile.la $(PTHREAD_LIBS)
-
-
- lavtrans_SOURCES = lavtrans.c
- lavtrans_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-- liblavfile.la
-+ liblavfile.la $(PTHREAD_LIBS)
-
-
- lavaddwav_SOURCES = lavaddwav.c
- lavaddwav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-- liblavfile.la
-+ liblavfile.la $(PTHREAD_LIBS)
-
-
- glav_SOURCES = glav.c glav_main.c
-@@ -415,7 +415,7 @@ y4mcolorbars_LDADD = $(top_builddir)/uti
-
- lavinfo_SOURCES = lavinfo.c
- lavinfo_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-- liblavfile.la
-+ liblavfile.la $(PTHREAD_LIBS)
-
-
- y4mshift_SOURCES = y4mshift.c
-@@ -1507,7 +1507,7 @@ am_png2yuv_OBJECTS = png2yuv.$(OBJEXT) c
- subsample.$(OBJEXT)
- png2yuv_OBJECTS = $(am_png2yuv_OBJECTS)
- png2yuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
--png2yuv_LDFLAGS =
-+png2yuv_LDFLAGS = $(LDFLAGS)
- am_ppmtoy4m_OBJECTS = ppmtoy4m.$(OBJEXT) colorspace.$(OBJEXT) \
- subsample.$(OBJEXT)
- ppmtoy4m_OBJECTS = $(am_ppmtoy4m_OBJECTS)
-@@ -1629,7 +1629,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+ $(AM_LDFLAGS) -o $@
- DIST_SOURCES = $(liblavfile_la_SOURCES) $(liblavjpeg_la_SOURCES) \
- $(liblavplay_la_SOURCES) $(liblavrec_la_SOURCES) \
- $(glav_SOURCES) $(jpeg2yuv_SOURCES) $(lav2wav_SOURCES) \
Index: patches/patch-mpeg2enc_Makefile_in
===================================================================
RCS file: patches/patch-mpeg2enc_Makefile_in
diff -N patches/patch-mpeg2enc_Makefile_in
--- patches/patch-mpeg2enc_Makefile_in 10 Jan 2006 02:23:37 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-mpeg2enc_Makefile_in,v 1.2 2006/01/10 02:23:37 jakemsr Exp $
---- mpeg2enc/Makefile.in.orig Tue Feb 3 14:58:31 2004
-+++ mpeg2enc/Makefile.in Sun Jan 8 16:42:20 2006
-@@ -634,7 +634,7 @@ distclean-compile:
- $(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else
$(CYGPATH_W) '$(srcdir)/$<'; fi`
-
- .s.lo:
-- $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ $(LTCCASCOMPILE) -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -847,9 +847,6 @@ uninstall-am: uninstall-binPROGRAMS unin
- uninstall-info-am uninstall-libLTLIBRARIES \
- uninstall-libmpeg2encpp_includeHEADERS
-
--
--%.lo: %.s
-- $(LTCCASCOMPILE) -o $@ $<
-
- #%.o: %.x86c ; $(CC) $(CFLAGS) -mmmx -o $@ $<
-
Index: patches/patch-mplex_Makefile_in
===================================================================
RCS file: patches/patch-mplex_Makefile_in
diff -N patches/patch-mplex_Makefile_in
--- patches/patch-mplex_Makefile_in 9 Jul 2004 11:58:39 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-mplex_Makefile_in,v 1.1.1.1 2004/07/09 11:58:39 sturm Exp $
---- mplex/Makefile.in.orig 2004-02-03 14:58:31.000000000 -0800
-+++ mplex/Makefile.in 2004-06-19 16:56:54.000000000 -0700
-@@ -56,13 +56,13 @@ CC = @CC@
- CCAS = @CCAS@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = -fPIC -DPIC @CFLAGS@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
--CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = -fPIC -DPIC @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-@@ -267,7 +267,7 @@ libmplex2_la_LDFLAGS = \
-
-
- libmplex2_la_LIBADD = \
-- $(top_builddir)/utils/libmjpegutils.a
-+ -L$(top_builddir)/utils -lmjpegutils
-
-
- libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
Index: patches/patch-scripts_lav2avi_sh
===================================================================
RCS file: patches/patch-scripts_lav2avi_sh
diff -N patches/patch-scripts_lav2avi_sh
--- patches/patch-scripts_lav2avi_sh 9 Jul 2004 11:58:39 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-scripts_lav2avi_sh,v 1.1.1.1 2004/07/09 11:58:39 sturm Exp $
---- scripts/lav2avi.sh.orig 2004-06-13 20:27:58.000000000 -0700
-+++ scripts/lav2avi.sh 2004-06-13 20:28:26.000000000 -0700
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
-
################################################################################
- ## CONFIGURATION START
#########################################################
Index: patches/patch-scripts_lav2mpeg
===================================================================
RCS file: patches/patch-scripts_lav2mpeg
diff -N patches/patch-scripts_lav2mpeg
--- patches/patch-scripts_lav2mpeg 9 Jul 2004 11:58:39 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,63 +0,0 @@
-$OpenBSD: patch-scripts_lav2mpeg,v 1.1.1.1 2004/07/09 11:58:39 sturm Exp $
---- scripts/lav2mpeg.orig 2004-06-13 20:30:20.000000000 -0700
-+++ scripts/lav2mpeg 2004-06-13 20:34:30.000000000 -0700
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # A convenient front-end for the various mpeg encoding tools.
- # Allows "1 command" production of a video stream...
-@@ -69,7 +69,7 @@ NICE="nice -n $NICEVAL"
-
-
- # functions
--function logIt () {
-+function logIt {
- if [ $LOGDATE -ne 0 ]; then
- NOW=$(date $LOGDATESTR)
- NOW="$NOW - "
-@@ -84,7 +84,7 @@ function logIt () {
- fi
- }
-
--function cleanExit() {
-+function cleanExit {
- # delete raw files if sawraw is 0 or exiting with non-zero
- if [ $saveraw -eq 0 -a "$1" = "0" ]; then
- rm -f $audio $video
-@@ -92,7 +92,7 @@ function cleanExit() {
- exit $1
- }
-
--function getTimeDiff() {
-+function getTimeDiff {
- if [ $# -lt 2 ]; then
- return
- fi
-@@ -105,7 +105,7 @@ function getTimeDiff() {
- printf "%i:%02d:%02d\n" "$hours" "$minutes" "$sec"
- }
-
--function doStep() {
-+function doStep {
- if [ "$LOGCOMMANDS" == "0" ]; then
- echo "COMMAND=${step[$count]}"
- fi
-@@ -115,7 +115,7 @@ function doStep() {
- }
-
-
--function usage ()
-+function usage
- {
- name=`basename $0`
- cat << END
-@@ -161,7 +161,7 @@ END
- exit 1
- }
-
--function printDebugInfo () {
-+function printDebugInfo {
- logIt "going from ${video_width}x${video_height} ($video_norm) to
${output_width}x${output_height} in $mode with quality=$quality,
bitrate=$bitrate and encodequal=${encode_quality}"
- logIt "outfile=$outfile audio=$audio video=$video"
- logIt "lav2yuv_flags=$lav2yuv_flags"
Index: patches/patch-scripts_mpegtranscode
===================================================================
RCS file: patches/patch-scripts_mpegtranscode
diff -N patches/patch-scripts_mpegtranscode
--- patches/patch-scripts_mpegtranscode 9 Jul 2004 11:58:39 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-$OpenBSD: patch-scripts_mpegtranscode,v 1.1.1.1 2004/07/09 11:58:39 sturm Exp $
---- scripts/mpegtranscode.orig 2004-06-13 20:40:04.000000000 -0700
-+++ scripts/mpegtranscode 2004-06-13 20:44:37.000000000 -0700
-@@ -1,6 +1,6 @@
--#!/bin/bash
-+#!/bin/sh
-
--function usage ()
-+function usage
- {
- echo "Usage: transcode -S|-V [-T] [-s mins] [-b bitrate] [-F framerate] [-o
dstfile] srcfile ..."
- echo "o - output file root name"
-@@ -18,7 +18,7 @@ exit 0
- #MP2ENC="nice -n 29 wav2mp2 -v -o"
- MPEG2ENC=mpeg2enc
- MPLEX=mplex
--if [ $[$# < 3 ] = 1 ]
-+if [ $# -lt 3 ]
- then
- usage
- fi
-@@ -71,8 +71,8 @@ then
- echo "Must specify -V or -S!"
- useage
- fi
--shift $[$OPTIND-1]
--sleep $[$sleep*60]
-+shift `expr $OPTIND - 1`
-+sleep `expr $sleep * 60`
-
- cat $* | mpeg2dec -s -o $decode | \
- ${MPEG2ENC} ${MPEGOPTS} $bitrate $framerate -o $outfile.m1v
Index: patches/patch-utils_Makefile_in
===================================================================
RCS file: patches/patch-utils_Makefile_in
diff -N patches/patch-utils_Makefile_in
--- patches/patch-utils_Makefile_in 9 Jul 2004 11:58:39 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-utils_Makefile_in,v 1.1.1.1 2004/07/09 11:58:39 sturm Exp $
---- utils/Makefile.in.orig 2004-06-19 16:31:43.000000000 -0700
-+++ utils/Makefile.in 2004-06-19 16:37:16.000000000 -0700
-@@ -56,13 +56,13 @@ CC = @CC@
- CCAS = @CCAS@
- CCASFLAGS = @CCASFLAGS@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = -fPIC -DPIC @CFLAGS@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
--CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = -fPIC -DPIC @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-@@ -363,6 +363,7 @@ libmjpegutils.a: $(libmjpegutils_a_OBJEC
- -rm -f libmjpegutils.a
- $(libmjpegutils_a_AR) libmjpegutils.a $(libmjpegutils_a_OBJECTS)
$(libmjpegutils_a_LIBADD)
- $(RANLIB) libmjpegutils.a
-+ cp libmjpegutils.a libmjpegutils_pic.a
-
- clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
Index: patches/patch-utils_mmxsse_Makefile_in
===================================================================
RCS file: patches/patch-utils_mmxsse_Makefile_in
diff -N patches/patch-utils_mmxsse_Makefile_in
--- patches/patch-utils_mmxsse_Makefile_in 9 Jul 2004 11:58:39 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-utils_mmxsse_Makefile_in,v 1.1.1.1 2004/07/09 11:58:39 sturm
Exp $
---- utils/mmxsse/Makefile.in.orig 2004-06-19 17:16:50.000000000 -0700
-+++ utils/mmxsse/Makefile.in 2004-06-19 17:19:24.000000000 -0700
-@@ -340,7 +340,7 @@ distclean-compile:
- $(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else
$(CYGPATH_W) '$(srcdir)/$<'; fi`
-
- .s.lo:
-- $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ $(LTCCASCOMPILE) -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -528,8 +528,6 @@ uninstall-am: uninstall-info-am
- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
-
-
--%.lo: %.s
-- $(LTCCASCOMPILE) -o $@ $<
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/multimedia/mjpegtools/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 DESCR
--- pkg/DESCR 9 Jul 2004 11:58:39 -0000 1.1.1.1
+++ pkg/DESCR 23 Jan 2006 07:43:21 -0000
@@ -1,16 +1,12 @@
-The mjpegtools are a set of programs that can do recording, playback,
-editing and eventual MPEG compression of audio and video under Linux.
+The MJPEG-tools are a basic set of utilities for editing, playing
+back, filtering and encoding video under UNIX-like operating systems.
-Although primarily intended for use with capture / playback boards
-based on the Zoran ZR36067 MJPEG codec chip, the mjpegtools can easily
-be used to process and compress MJPEG video streams captured using
-xawtv using simple frame-buffer devices.
+There are two FLAVORS for this port:
-There are two FLAVORs for this port:
+ quicktime
+ builds the package with support for reading and writing quicktime
+ ".mov" files
- optimized - This FLAVOR turns on processor specific compiler
- optimizations. Without this FLAVOR, these optimizations are
- turned off.
-
- quicktime - This FLAVOR allows the mjpegtools to read and write
- Quicktime files.
+ optimized
+ builds the package with SSE instructions. packages built with
+ this FLAVOR might not run on systems that are not SSE capable.
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/multimedia/mjpegtools/pkg/PFRAG.shared,v
retrieving revision 1.3
diff -u -r1.3 PFRAG.shared
--- pkg/PFRAG.shared 10 Jan 2006 02:23:37 -0000 1.3
+++ pkg/PFRAG.shared 23 Jan 2006 07:43:21 -0000
@@ -1,11 +1,13 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared,v 1.3 2006/01/10 02:23:37 jakemsr Exp $
[EMAIL PROTECTED] lib/liblavfile-1.6.so.${LIBlavfile-1.6_VERSION}
[EMAIL PROTECTED] $OpenBSD$
[EMAIL PROTECTED] lib/liblavfile-1.8.so.${LIBlavfile-1.8_VERSION}
@lib lib/liblavfile.so.${LIBlavfile_VERSION}
[EMAIL PROTECTED] lib/liblavjpeg-1.6.so.${LIBlavjpeg-1.6_VERSION}
[EMAIL PROTECTED] lib/liblavjpeg-1.8.so.${LIBlavjpeg-1.8_VERSION}
@lib lib/liblavjpeg.so.${LIBlavjpeg_VERSION}
[EMAIL PROTECTED] lib/liblavplay-1.6.so.${LIBlavplay-1.6_VERSION}
[EMAIL PROTECTED] lib/liblavplay-1.8.so.${LIBlavplay-1.8_VERSION}
@lib lib/liblavplay.so.${LIBlavplay_VERSION}
[EMAIL PROTECTED] lib/libmpeg2encpp-1.6.so.${LIBmpeg2encpp-1.6_VERSION}
[EMAIL PROTECTED] lib/libmjpegutils-1.8.so.${LIBmjpegutils-1.8_VERSION}
[EMAIL PROTECTED] lib/libmjpegutils.so.${LIBmjpegutils_VERSION}
[EMAIL PROTECTED] lib/libmpeg2encpp-1.8.so.${LIBmpeg2encpp-1.8_VERSION}
@lib lib/libmpeg2encpp.so.${LIBmpeg2encpp_VERSION}
[EMAIL PROTECTED] lib/libmplex2-1.6.so.${LIBmplex2-1.6_VERSION}
[EMAIL PROTECTED] lib/libmplex2-1.8.so.${LIBmplex2-1.8_VERSION}
@lib lib/libmplex2.so.${LIBmplex2_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/mjpegtools/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 18 Sep 2004 12:57:32 -0000 1.3
+++ pkg/PLIST 23 Jan 2006 07:43:21 -0000
@@ -1,5 +1,5 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.3 2004/09/18 12:57:32 espie Exp $
[EMAIL PROTECTED] mplex-*
[EMAIL PROTECTED] $OpenBSD$
+bin/anytovcd.sh
bin/glav
bin/jpeg2yuv
bin/lav2avi.sh
@@ -12,7 +12,7 @@
bin/lavplay
bin/lavtrans
bin/matteblend.flt
-bin/mjpegtools-config
+bin/mjpeg_simd_helper
bin/mp2enc
bin/mpeg2enc
bin/mpegtranscode
@@ -20,18 +20,27 @@
bin/multiblend.flt
bin/pgmtoy4m
bin/png2yuv
+bin/pnmtoy4m
bin/ppmtoy4m
bin/transist.flt
bin/y4mblack
bin/y4mcolorbars
+bin/y4mdenoise
+bin/y4mhist
+bin/y4minterlace
bin/y4mshift
+bin/y4mspatialfilter
+bin/y4mstabilizer
+bin/y4mtopnm
bin/y4mtoppm
bin/y4mtoyuv
+bin/y4munsharp
bin/ypipe
bin/yuv2lav
bin/yuv4mpeg
bin/yuvcorrect
bin/yuvcorrect_tune
+bin/yuvdeinterlace
bin/yuvdenoise
bin/yuvfps
bin/yuvinactive
@@ -40,6 +49,7 @@
bin/yuvplay
bin/yuvscaler
bin/yuvycsnoise
+bin/yuyvtoy4m
include/mjpegtools/
include/mjpegtools/audiolib.h
include/mjpegtools/avilib.h
@@ -55,6 +65,7 @@
include/mjpegtools/mpeg2enc/
include/mjpegtools/mpeg2enc/elemstrmwriter.hh
include/mjpegtools/mpeg2enc/encoderparams.hh
+include/mjpegtools/mpeg2enc/encodertypes.h
include/mjpegtools/mpeg2enc/macroblock.hh
include/mjpegtools/mpeg2enc/mpeg2coder.hh
include/mjpegtools/mpeg2enc/mpeg2encoder.hh
@@ -67,6 +78,7 @@
include/mjpegtools/mpeg2enc/quantize_ref.h
include/mjpegtools/mpeg2enc/ratectl.hh
include/mjpegtools/mpeg2enc/seqencoder.hh
+include/mjpegtools/mpeg2enc/streamstate.h
include/mjpegtools/mpeg2enc/synchrolib.h
include/mjpegtools/mpeg2enc/syntaxconsts.h
include/mjpegtools/mpegconsts.h
@@ -74,8 +86,9 @@
include/mjpegtools/mplex/
include/mjpegtools/mplex/audiostrm.hpp
include/mjpegtools/mplex/aunit.hpp
+include/mjpegtools/mplex/aunitbuffer.hpp
include/mjpegtools/mplex/bits.hpp
-include/mjpegtools/mplex/buffer.hpp
+include/mjpegtools/mplex/decodebufmodel.hpp
include/mjpegtools/mplex/inputstrm.hpp
include/mjpegtools/mplex/interact.hpp
include/mjpegtools/mplex/mplexconsts.hpp
@@ -85,10 +98,9 @@
include/mjpegtools/mplex/stillsstream.hpp
include/mjpegtools/mplex/stream_params.hpp
include/mjpegtools/mplex/systems.hpp
-include/mjpegtools/mplex/vector.hpp
include/mjpegtools/mplex/videostrm.hpp
include/mjpegtools/yuv4mpeg.h
[EMAIL PROTECTED] info/mjpeg-howto.info
+info/mjpeg-howto.info
lib/liblavfile.a
lib/liblavfile.la
lib/liblavjpeg.a
@@ -96,7 +108,7 @@
lib/liblavplay.a
lib/liblavplay.la
lib/libmjpegutils.a
-lib/libmjpegutils_pic.a
+lib/libmjpegutils.la
lib/libmpeg2encpp.a
lib/libmpeg2encpp.la
lib/libmplex2.a
@@ -109,16 +121,21 @@
@man man/man1/lav2yuv.1
@man man/man1/lavpipe.1
@man man/man1/lavplay.1
[EMAIL PROTECTED] @man man/man1/lavrec.1
[EMAIL PROTECTED] man/man1/lavrec.1
@man man/man1/lavtrans.1
@man man/man1/mjpegtools.1
@man man/man1/mp2enc.1
@man man/man1/mpeg2enc.1
@man man/man1/mplex.1
@man man/man1/pgmtoy4m.1
[EMAIL PROTECTED] man/man1/png2yuv.1
[EMAIL PROTECTED] man/man1/pnmtoy4m.1
@man man/man1/ppmtoy4m.1
@man man/man1/y4mcolorbars.1
[EMAIL PROTECTED] man/man1/y4mdenoise.1
[EMAIL PROTECTED] man/man1/y4mtopnm.1
@man man/man1/y4mtoppm.1
[EMAIL PROTECTED] man/man1/y4munsharp.1
@man man/man1/yuv2lav.1
@man man/man1/yuvdenoise.1
@man man/man1/yuvfps.1
