On Fri, Jul 24, 2009 at 06:01:32PM -0400, Brad wrote: > Here is an update to Transcode 1.1.3. This also has the lzo FLAVOR > again unlike the previous 1.1.2 update now that there is the lzo2 > library in the ports tree. Here is a more up to date diff which integrates a patch for a bug with getopt handling found by Stuart.
Index: Makefile =================================================================== RCS file: /cvs/ports/multimedia/transcode/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- Makefile 10 Aug 2009 06:33:02 -0000 1.25 +++ Makefile 14 Aug 2009 03:20:30 -0000 @@ -1,126 +1,124 @@ # $OpenBSD: Makefile,v 1.25 2009/08/10 06:33:02 kili Exp $ -SHARED_ONLY= Yes +SHARED_ONLY= Yes -COMMENT= video stream processing tools +COMMENT= video stream processing tools -DISTNAME= transcode-1.0.5 -PKGNAME= ${DISTNAME}p5 -CATEGORIES= multimedia +DISTNAME= transcode-1.1.3 +CATEGORIES= multimedia +MASTER_SITES= ${MASTER_SITE_BERLIOS:=tcforge/} +EXTRACT_SUFX= .tar.bz2 -HOMEPAGE= http://www.transcoding.org/ +HOMEPAGE= http://www.transcoding.org/ # GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +WANTLIB= ICE SM X11 Xau Xaw Xdmcp Xext Xpm Xrandr Xrender Xt \ + Xv bz2 c faad freetype m oil-0.3 pthread-stubs pthread \ + schroedinger-1.0 sndio usbhid xcb z -WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xpm Xrandr Xrender Xt -WANTLIB += Xv c faac faad freetype m pthread sndio usbhid x264 -WANTLIB += z oil-0.3 schroedinger-1.0 pthread-stubs xcb - -MASTER_SITES= http://fromani.exit1.org/ -EXTRACT_SUFX= .tar.bz2 - -FLAVORS= lzo mjpegtools quicktime altivec +FLAVORS= lzo mjpegtools quicktime altivec FLAVOR?= .if ${MACHINE_ARCH} == "i386" -PKG_ARGS+= -Di386=1 +PKG_ARGS+= -Di386=1 .else -PKG_ARGS+= -Di386=0 +PKG_ARGS+= -Di386=0 .endif + .if ${MACHINE_ARCH} == "sparc64" -PATCH_LIST= patch-* gcc-* +PATCH_LIST= patch-* gcc-* .endif -LIB_DEPENDS= SDL.>=2::devel/sdl \ - a52::audio/liba52 \ - avcodec.>=13.1,avutil.>=6:ffmpeg->=20080620p10:graphics/ffmpeg \ - dv.>=4::multimedia/libdv \ - dvdread.>=3::devel/libdvdread \ - iconv.>=4::converters/libiconv \ - jpeg.>=62::graphics/jpeg \ - mp3lame::audio/lame \ - mpeg2,mpeg2convert::graphics/libmpeg2 \ - ogg.>=5::audio/libogg \ - postproc.>=6::graphics/ffmpeg \ - theora.>=1::multimedia/libtheora \ - vorbis.>=3,vorbisenc.>=2,vorbisfile.>=4::audio/libvorbis \ - xml2.>=8::textproc/libxml - -RUN_DEPENDS= ::graphics/ffmpeg \ - ::audio/sox \ - ::audio/vorbis-tools \ - ::audio/toolame \ - ::multimedia/xvidcore \ - ::x11/mplayer - -SEPARATE_BUILD= concurrent - -USE_X11= Yes -USE_LIBTOOL= Yes -LIBTOOL_FLAGS+= --tag=disable-static -CONFIGURE_STYLE= gnu -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - LIBAVCODEC_EXTRA_LIBS="-pthread" - +MODULES= converters/libiconv +LIB_DEPENDS= SDL.>=2::devel/sdl \ + a52::audio/liba52 \ + avcodec.>=13.1,avformat.>=12,avutil.>=6,postproc.>=6:ffmpeg->=20080620p10:graphics/ffmpeg \ + dv.>=4::multimedia/libdv \ + dvdread.>=3::devel/libdvdread \ + jpeg.>=62::graphics/jpeg \ + mp3lame::audio/lame \ + faac::audio/faac \ + mpeg2,mpeg2convert::graphics/libmpeg2 \ + ogg.>=5::audio/libogg \ + theora.>=1::multimedia/libtheora \ + vorbis.>=3,vorbisenc.>=2,vorbisfile.>=4::audio/libvorbis \ + xml2.>=8::textproc/libxml \ + xvidcore::multimedia/xvidcore \ + x264::multimedia/x264 +RUN_DEPENDS= ::graphics/ffmpeg \ + ::audio/sox \ + ::audio/vorbis-tools \ + ::audio/toolame \ + ::x11/mplayer + +SEPARATE_BUILD= concurrent + +USE_X11= Yes +USE_LIBTOOL= Yes +LIBTOOL_FLAGS+= --tag=disable-static +CONFIGURE_STYLE= autoconf +AUTOCONF_VERSION= 2.61 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools - -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-netstream \ - --enable-statbuffer \ - --enable-a52 \ - --enable-a52-default-decoder \ - --enable-bktr \ - --enable-freetype2 \ - --enable-lame \ - --enable-libdv \ - --enable-libdvdread \ - --enable-libiconv \ - --enable-libjpeg \ - --enable-libpostproc \ - --enable-libxml2 \ - --enable-ogg \ - --enable-sdl \ - --enable-sunau \ - --enable-theora \ - --enable-vorbis \ - --with-libpostproc-includes="${LOCALBASE}/include/libpostproc" +CONFIGURE_ARGS+=--enable-a52 \ + --enable-a52-default-decoder \ + --enable-bktr \ + --enable-faac \ + --enable-freetype2 \ + --enable-lame \ + --enable-libdv \ + --enable-libdvdread \ + --enable-libiconv \ + --enable-libjpeg \ + --enable-libpostproc \ + --enable-libxml2 \ + --enable-netstream \ + --enable-ogg \ + --enable-sdl \ + --enable-statbuffer \ + --enable-sunau \ + --enable-theora \ + --enable-vorbis \ + --enable-xvid \ + --enable-x264 +CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ + LIBAVCODEC_EXTRA_LIBS="-pthread" .if ${FLAVOR:L:Mlzo} CONFIGURE_ARGS+= --enable-lzo -LIB_DEPENDS+= lzo.>=1::archivers/lzo +LIB_DEPENDS+= lzo2::archivers/lzo2 PKG_ARGS+= -Dlzo=1 .else PKG_ARGS+= -Dlzo=0 .endif .if ${FLAVOR:L:Mmjpegtools} -CONFIGURE_ARGS+= --enable-mjpegtools -LIB_DEPENDS+= mjpegutils.>=3::multimedia/mjpegtools -RUN_DEPENDS+= ::multimedia/mjpegtools -PKG_ARGS+= -Dmjpegtools=1 +CONFIGURE_ARGS+=--enable-mjpegtools +LIB_DEPENDS+= mjpegutils.>=3::multimedia/mjpegtools +RUN_DEPENDS+= ::multimedia/mjpegtools +PKG_ARGS+= -Dmjpegtools=1 .else -PKG_ARGS+= -Dmjpegtools=0 +PKG_ARGS+= -Dmjpegtools=0 .endif .if ${FLAVOR:L:Mquicktime} -CONFIGURE_ARGS+= --enable-libquicktime -LIB_DEPENDS+= quicktime::multimedia/libquicktime -WANTLIB+= GL intl -PKG_ARGS+= -Dquicktime=1 +CONFIGURE_ARGS+=--enable-libquicktime +LIB_DEPENDS+= quicktime::multimedia/libquicktime +MODULES+= devel/gettext +PKG_ARGS+= -Dquicktime=1 .else -PKG_ARGS+= -Dquicktime=0 +PKG_ARGS+= -Dquicktime=0 .endif .if ${FLAVOR:L:Maltivec} -ONLY_FOR_ARCHS= powerpc -CONFIGURE_ARGS+= --enable-altivec +ONLY_FOR_ARCHS= powerpc +CONFIGURE_ARGS+=--enable-altivec .else -CONFIGURE_ARGS+= --disable-altivec +CONFIGURE_ARGS+=--disable-altivec .endif .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/multimedia/transcode/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 26 Jan 2008 02:17:50 -0000 1.5 +++ distinfo 21 Jul 2009 01:52:42 -0000 @@ -1,5 +1,5 @@ -MD5 (transcode-1.0.5.tar.bz2) = EkpgVdME+i2Fd9c4DivLDA== -RMD160 (transcode-1.0.5.tar.bz2) = fzNfo/PfTxeLgjFL/mYao0915pM= -SHA1 (transcode-1.0.5.tar.bz2) = lvh0ao1Uw+148LXrMv98cjE+jms= -SHA256 (transcode-1.0.5.tar.bz2) = JUXVE5wODWkLbwnhgAXP0x1j/jtuefSDKSGao8aEccU= -SIZE (transcode-1.0.5.tar.bz2) = 1989934 +MD5 (transcode-1.1.3.tar.bz2) = nm1z9v7f8yDQ8l/qpPRkoQ== +RMD160 (transcode-1.1.3.tar.bz2) = z5hXB+SxU7asjTzoBeEZ1pU4I+Q= +SHA1 (transcode-1.1.3.tar.bz2) = etz6Mz1ycuwKaQMecL7Iz/LsqGk= +SHA256 (transcode-1.1.3.tar.bz2) = K1qUzUrGs/CknJFtH9VaHGT8XHybE9MqsUH6WYJVRfc= +SIZE (transcode-1.1.3.tar.bz2) = 2116702 Index: patches/gcc-filter_yuvdenoise_Makefile_in =================================================================== RCS file: /cvs/ports/multimedia/transcode/patches/gcc-filter_yuvdenoise_Makefile_in,v retrieving revision 1.3 diff -u -p -r1.3 gcc-filter_yuvdenoise_Makefile_in --- patches/gcc-filter_yuvdenoise_Makefile_in 13 Nov 2005 21:11:13 -0000 1.3 +++ patches/gcc-filter_yuvdenoise_Makefile_in 8 Jun 2009 03:54:52 -0000 @@ -1,8 +1,8 @@ $OpenBSD: gcc-filter_yuvdenoise_Makefile_in,v 1.3 2005/11/13 21:11:13 jakemsr Exp $ ---- filter/yuvdenoise/Makefile.in.orig Sun Oct 2 19:50:54 2005 -+++ filter/yuvdenoise/Makefile.in Sun Oct 9 14:47:20 2005 -@@ -533,6 +533,20 @@ distclean-compile: - @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +--- filter/yuvdenoise/Makefile.in.orig Sat Mar 28 05:13:17 2009 ++++ filter/yuvdenoise/Makefile.in Sun Jun 7 23:54:37 2009 +@@ -428,6 +428,20 @@ distclean-compile: + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +deinterlace.lo: Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Makefile_in 8 Jun 2009 03:40:33 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- Makefile.in.orig Thu May 14 01:40:50 2009 ++++ Makefile.in Thu May 14 01:41:53 2009 +@@ -321,7 +321,6 @@ SUBDIRS = \ + multiplex \ + $(PVM3) \ + src \ +- testsuite \ + tools \ + docs + Index: patches/patch-avilib_Makefile_in =================================================================== RCS file: patches/patch-avilib_Makefile_in diff -N patches/patch-avilib_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-avilib_Makefile_in 8 Jun 2009 03:40:33 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- avilib/Makefile.in.orig Thu May 7 22:53:21 2009 ++++ avilib/Makefile.in Thu May 7 22:53:50 2009 +@@ -294,6 +294,7 @@ x_libraries = @x_libraries@ + xvid_config = @xvid_config@ + AM_CPPFLAGS = \ + $(PTHREAD_CFLAGS) \ ++ -I$(top_srcdir) \ + $(XIO_CFLAGS) + + noinst_LTLIBRARIES = libavi.la libwav.la Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 9 Jul 2008 02:13:01 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,164 +0,0 @@ -$OpenBSD: patch-configure,v 1.7 2008/07/09 02:13:01 jakemsr Exp $ ---- configure.orig Sat Jan 5 06:38:47 2008 -+++ configure Sat Jun 21 21:12:47 2008 -@@ -1761,7 +1761,7 @@ Optional Packages: - prefix where libavcodec is installed (/usr) - --with-libavcodec-includes=DIR - directory where libavcodec headers -- (ffmpeg/avcodec.h) are installed (/usr/include) -+ (libavcodec/avcodec.h) are installed (/usr/include) - --with-libavcodec-libs=DIR - directory where libavcodec libararies - (libavcodec.so) are installed (/usr/lib) -@@ -10222,6 +10222,7 @@ fi - echo "${ECHO_T}$have_asm_altivec" >&6; } - if test x"$have_asm_altivec" = x"yes" ; then - -+CFLAGS="$CFLAGS -maltivec" - cat >>confdefs.h <<\_ACEOF - #define HAVE_PPC_ALTIVEC 1 - _ACEOF -@@ -27132,12 +27133,12 @@ echo "${ECHO_T}default" >&6; } - LIBAVCODEC_EXTRA_CFLAGS="$LIBAVCODEC_EXTRA_CFLAGS $xi" - LIBAVCODEC_EXTRA_CFLAGS="`echo $LIBAVCODEC_EXTRA_CFLAGS | sed -e 's/ */ /g'`" - -- if test x"ffmpeg/avcodec.h" != x"none" ; then -+ if test x"libavcodec/avcodec.h" != x"none" ; then - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $libavcodec_ii" - if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then -- { echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5 --echo $ECHO_N "checking for ffmpeg/avcodec.h... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for libavcodec/avcodec.h" >&5 -+echo $ECHO_N "checking for libavcodec/avcodec.h... $ECHO_C" >&6; } - if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi -@@ -27145,8 +27146,8 @@ fi - echo "${ECHO_T}$ac_cv_header_ffmpeg_avcodec_h" >&6; } - else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking ffmpeg/avcodec.h usability" >&5 --echo $ECHO_N "checking ffmpeg/avcodec.h usability... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: checking libavcodec/avcodec.h usability" >&5 -+echo $ECHO_N "checking libavcodec/avcodec.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27154,7 +27155,7 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - _ACEOF - rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" -@@ -27186,15 +27187,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ - echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ echo "$as_me:$LINENO: checking ffmpeg/avcodec.h presence" >&5 --echo $ECHO_N "checking ffmpeg/avcodec.h presence... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: checking libavcodec/avcodec.h presence" >&5 -+echo $ECHO_N "checking libavcodec/avcodec.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - _ACEOF - if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in -@@ -27227,30 +27228,30 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: ffmpeg/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: ffmpeg/avcodec.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: libavcodec/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: libavcodec/avcodec.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: ffmpeg/avcodec.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: ffmpeg/avcodec.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: ffmpeg/avcodec.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: ffmpeg/avcodec.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: ffmpeg/avcodec.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: ffmpeg/avcodec.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: libavcodec/avcodec.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: libavcodec/avcodec.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: libavcodec/avcodec.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: libavcodec/avcodec.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: libavcodec/avcodec.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: libavcodec/avcodec.h: in the future, the compiler will take precedence" >&2;} - - ;; - esac --{ echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5 --echo $ECHO_N "checking for ffmpeg/avcodec.h... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: checking for libavcodec/avcodec.h" >&5 -+echo $ECHO_N "checking for libavcodec/avcodec.h... $ECHO_C" >&6; } - if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -27275,8 +27276,8 @@ else - fi - - cat >> $tc_pkg_err_file <<EOF --ERROR: $prob: cannot compile ffmpeg/avcodec.h --ffmpeg/avcodec.h can be found in the following packages: -+ERROR: $prob: cannot compile libavcodec/avcodec.h -+libavcodec/avcodec.h can be found in the following packages: - FFMpeg http://www.ffmpeg.org/ - - EOF -@@ -27450,7 +27451,7 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - #include <stdio.h> --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - int - main() - { -@@ -27511,8 +27512,8 @@ else - fi - - cat >> $tc_pkg_err_file <<EOF --ERROR: $prob: cannot compile ffmpeg/avcodec.h --ffmpeg/avcodec.h can be found in the following packages: -+ERROR: $prob: cannot compile libavcodec/avcodec.h -+libavcodec/avcodec.h can be found in the following packages: - libavcodec http://www.ffmpeg.org - - EOF -@@ -27537,7 +27538,7 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - - int - main () Index: patches/patch-configure_in =================================================================== RCS file: patches/patch-configure_in diff -N patches/patch-configure_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-configure_in 21 Jul 2009 01:56:48 -0000 @@ -0,0 +1,22 @@ +$OpenBSD$ +--- configure.in.orig Sat Mar 28 04:39:07 2009 ++++ configure.in Sat Jul 18 06:34:53 2009 +@@ -887,7 +887,8 @@ TC_PKG_HAVE(lame, LAME) + dnl + dnl xvid + dnl +-TC_PKG_CHECK(xvid, no, xvid, no, xvid.h, xvidcore, xvid_global, xvid, ++XVID_EXTRA_LIBS="$XVID_EXTRA_LIBS -pthread" ++TC_PKG_CHECK(xvid, no, XVID, no, xvid.h, xvidcore, xvid_global, xvid, + [http://www.xvid.org/]) + if test x"$have_xvid" = x"yes" ; then + AC_MSG_CHECKING([xvid version >= 1.0]) +@@ -906,7 +907,7 @@ int main() { + [cannot compile and run a test program])],, + [AC_MSG_RESULT([cross compiling; assumed OK...])]) + if test x"$xvid_version_ok" = x"yes"; then +- XVID_LIBS="-lxvidcore" ++ XVID_LIBS="-lxvidcore $XVID_EXTRA_LIBS" + else + have_xvid="no" + TC_PKG_ERROR(xvid, xvid.h, yes, xvid, [http://www.xvid.org/], Index: patches/patch-export_aud_aux_c =================================================================== RCS file: patches/patch-export_aud_aux_c diff -N patches/patch-export_aud_aux_c --- patches/patch-export_aud_aux_c 9 Jul 2008 02:13:01 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-export_aud_aux_c,v 1.3 2008/07/09 02:13:01 jakemsr Exp $ ---- export/aud_aux.c.orig Sat Jun 21 21:14:44 2008 -+++ export/aud_aux.c Sat Jun 21 21:14:59 2008 -@@ -31,7 +31,7 @@ - #include <inttypes.h> - #include <assert.h> - --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - - #include "aud_aux.h" - #include "ac3.h" Index: patches/patch-export_export_ffmpeg_c =================================================================== RCS file: /cvs/ports/multimedia/transcode/patches/patch-export_export_ffmpeg_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-export_export_ffmpeg_c --- patches/patch-export_export_ffmpeg_c 9 Jul 2008 02:13:01 -0000 1.3 +++ patches/patch-export_export_ffmpeg_c 8 Jun 2009 03:40:33 -0000 @@ -1,16 +1,7 @@ $OpenBSD: patch-export_export_ffmpeg_c,v 1.3 2008/07/09 02:13:01 jakemsr Exp $ ---- export/export_ffmpeg.c.orig Sat Nov 17 01:35:31 2007 -+++ export/export_ffmpeg.c Sat Jun 21 21:15:39 2008 -@@ -36,7 +36,7 @@ - #include "vid_aux.h" - // FIXME - #undef EMULATE_FAST_INT --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - - #if !defined(INFINITY) && defined(HUGE_VAL) - #define INFINITY HUGE_VAL -@@ -87,7 +87,7 @@ static struct ffmpeg_codec ffmpeg_codecs[] = { +--- export/export_ffmpeg.c.orig Sat Nov 29 10:43:14 2008 ++++ export/export_ffmpeg.c Thu May 7 21:10:13 2009 +@@ -81,7 +81,7 @@ static struct ffmpeg_codec ffmpeg_codecs[] = { {"mpeg2video", "mpg2", "MPEG2 compliant video", 1}, {"h263", "h263", "H263", 0}, {"h263p", "h263", "H263 plus", 1}, Index: patches/patch-export_ffmpeg_cfg_h =================================================================== RCS file: patches/patch-export_ffmpeg_cfg_h diff -N patches/patch-export_ffmpeg_cfg_h --- patches/patch-export_ffmpeg_cfg_h 9 Jul 2008 02:13:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-export_ffmpeg_cfg_h,v 1.1 2008/07/09 02:13:01 jakemsr Exp $ ---- export/ffmpeg_cfg.h.orig Sat Jun 21 21:19:50 2008 -+++ export/ffmpeg_cfg.h Sat Jun 21 21:20:02 2008 -@@ -2,7 +2,7 @@ - #define __FFMPEG_CFG_H - - #include "libioaux/configs.h" --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - - //char *lavc_param_vcodec = "mpeg4"; - //extern int lavc_param_vbitrate; Index: patches/patch-filter_filter_resample_c =================================================================== RCS file: patches/patch-filter_filter_resample_c diff -N patches/patch-filter_filter_resample_c --- patches/patch-filter_filter_resample_c 9 Jul 2008 02:13:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-filter_filter_resample_c,v 1.1 2008/07/09 02:13:01 jakemsr Exp $ ---- filter/filter_resample.c.orig Sat Jun 21 21:29:55 2008 -+++ filter/filter_resample.c Sat Jun 21 21:30:12 2008 -@@ -30,7 +30,7 @@ - #include "filter.h" - #include "optstr.h" - --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - - static char * resample_buffer = NULL; - static int bytes_per_sample; Index: patches/patch-import_decode_lavc_c =================================================================== RCS file: patches/patch-import_decode_lavc_c diff -N patches/patch-import_decode_lavc_c --- patches/patch-import_decode_lavc_c 9 Jul 2008 02:13:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-import_decode_lavc_c,v 1.1 2008/07/09 02:13:01 jakemsr Exp $ ---- import/decode_lavc.c.orig Sat Jun 21 21:17:30 2008 -+++ import/decode_lavc.c Sat Jun 21 21:17:48 2008 -@@ -31,7 +31,7 @@ - #ifdef EMULATE_FAST_INT - #undef EMULATE_FAST_INT - #endif --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - #include "yuv2rgb.h" - - #define READ_BUFFER_SIZE (10*1024*1024) Index: patches/patch-import_import_ffmpeg_c =================================================================== RCS file: patches/patch-import_import_ffmpeg_c diff -N patches/patch-import_import_ffmpeg_c --- patches/patch-import_import_ffmpeg_c 9 Jul 2008 02:13:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-import_import_ffmpeg_c,v 1.1 2008/07/09 02:13:01 jakemsr Exp $ ---- import/import_ffmpeg.c.orig Sat Jun 21 21:16:13 2008 -+++ import/import_ffmpeg.c Sat Jun 21 21:16:29 2008 -@@ -38,7 +38,7 @@ static int capability_flag = TC_CAP_YUV | TC_CAP_RGB | - - // FIXME - #undef EMULATE_FAST_INT --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - - #include "libvo/yuv2rgb.h" - #include "avilib/avilib.h" Index: patches/patch-libxio_libxio_c =================================================================== RCS file: patches/patch-libxio_libxio_c diff -N patches/patch-libxio_libxio_c --- patches/patch-libxio_libxio_c 26 Jan 2008 02:17:50 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-libxio_libxio_c,v 1.4 2008/01/26 02:17:50 jakemsr Exp $ ---- libxio/libxio.c.orig Sun Sep 16 04:11:51 2007 -+++ libxio/libxio.c Sat Jan 19 20:23:08 2008 -@@ -42,7 +42,7 @@ char *strndup(const char *s, size_t n); - #include <unistd.h> - #include <fcntl.h> - #include <sys/stat.h> --#include <sys/errno.h> -+#include <errno.h> - #include <stdarg.h> - - Index: patches/patch-src_cmdline_def_h =================================================================== RCS file: patches/patch-src_cmdline_def_h diff -N patches/patch-src_cmdline_def_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_cmdline_def_h 15 Aug 2009 22:07:28 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- src/cmdline_def.h.orig Sat Aug 15 18:06:17 2009 ++++ src/cmdline_def.h Sat Aug 15 18:07:18 2009 +@@ -117,6 +117,7 @@ + # define TC_OPTION(name,shortopt,argname,helptext,code) \ + { #name, (argname) ? required_argument : no_argument, NULL, OPT_##name }, + # define TC_HEADER(name) /* nothing */ ++# define _TCO_FINI {0,0,0,0} + #endif + + #ifdef TC_OPTIONS_TO_SHORTOPTS Index: pkg/PFRAG.i386 =================================================================== RCS file: /cvs/ports/multimedia/transcode/pkg/PFRAG.i386,v retrieving revision 1.3 diff -u -p -r1.3 PFRAG.i386 --- pkg/PFRAG.i386 26 Jan 2008 02:17:50 -0000 1.3 +++ pkg/PFRAG.i386 8 Jun 2009 03:40:33 -0000 @@ -1,7 +1,3 @@ @comment $OpenBSD: PFRAG.i386,v 1.3 2008/01/26 02:17:50 jakemsr Exp $ -...@comment lib/transcode/filter_dilyuvmmx.la -lib/transcode/filter_dilyuvmmx.so @comment lib/transcode/filter_tomsmocomp.la lib/transcode/filter_tomsmocomp.so -...@comment lib/transcode/import_nuv.la -lib/transcode/import_nuv.so Index: pkg/PFRAG.mjpegtools =================================================================== RCS file: /cvs/ports/multimedia/transcode/pkg/PFRAG.mjpegtools,v retrieving revision 1.3 diff -u -p -r1.3 PFRAG.mjpegtools --- pkg/PFRAG.mjpegtools 26 Jan 2008 02:17:50 -0000 1.3 +++ pkg/PFRAG.mjpegtools 8 Jun 2009 03:40:33 -0000 @@ -5,3 +5,5 @@ lib/transcode/export_mp2enc.so lib/transcode/export_mpeg2enc.so @comment lib/transcode/export_yuv4mpeg.la lib/transcode/export_yuv4mpeg.so +...@comment lib/transcode/import_yuv4mpeg.la +lib/transcode/import_yuv4mpeg.so Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/multimedia/transcode/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 9 Jul 2008 02:13:01 -0000 1.4 +++ pkg/PLIST 24 Jul 2009 20:20:26 -0000 @@ -15,29 +15,18 @@ @bin bin/tcmodinfo @bin bin/tcmp3cut @bin bin/tcprobe -...@bin bin/tcrequant @bin bin/tcscan @bin bin/tcxmlcheck @bin bin/tcxpm2rgb +...@bin bin/tcyait @bin bin/transcode lib/transcode/ @comment lib/transcode/a52_decore.la lib/transcode/a52_decore.so -...@comment lib/transcode/af6_decore.la -...@comment lib/transcode/af6_decore.so @comment lib/transcode/export_ac3.la lib/transcode/export_ac3.so -...@comment lib/transcode/export_af6.conf -...@comment lib/transcode/export_debugppm.la -lib/transcode/export_debugppm.so -...@comment lib/transcode/export_divx4.la -...@comment lib/transcode/export_divx4.so -...@comment lib/transcode/export_divx4raw.la -...@comment lib/transcode/export_divx4raw.so @comment lib/transcode/export_divx5.la @comment lib/transcode/export_divx5.so -...@comment lib/transcode/export_divx5raw.la -...@comment lib/transcode/export_divx5raw.so @comment lib/transcode/export_dv.la lib/transcode/export_dv.so @comment lib/transcode/export_dvraw.la @@ -48,14 +37,8 @@ lib/transcode/export_ffmpeg.so lib/transcode/export_jpg.so @comment lib/transcode/export_lame.la lib/transcode/export_lame.so -...@comment lib/transcode/export_mjpeg.la -lib/transcode/export_mjpeg.so -...@comment lib/transcode/export_mp1e.la -lib/transcode/export_mp1e.so @comment lib/transcode/export_mp2.la lib/transcode/export_mp2.so -...@comment lib/transcode/export_net.la -lib/transcode/export_net.so @comment lib/transcode/export_null.la lib/transcode/export_null.so @comment lib/transcode/export_ogg.la @@ -68,15 +51,13 @@ lib/transcode/export_ppm.so lib/transcode/export_pvn.so @comment lib/transcode/export_raw.la lib/transcode/export_raw.so +...@comment lib/transcode/export_tcaud.la +lib/transcode/export_tcaud.so @comment lib/transcode/export_toolame.la lib/transcode/export_toolame.so @comment lib/transcode/export_wav.la lib/transcode/export_wav.so lib/transcode/export_xvid.so -...@comment lib/transcode/export_xvid2.la -...@comment lib/transcode/export_xvid2.so -...@comment lib/transcode/export_xvid3.la -...@comment lib/transcode/export_xvid3.so @comment lib/transcode/export_xvid4.la lib/transcode/export_xvid4.so @comment lib/transcode/filter_29to23.la @@ -91,16 +72,10 @@ lib/transcode/filter_aclip.so lib/transcode/filter_ascii.so @comment lib/transcode/filter_astat.la lib/transcode/filter_astat.so -...@comment lib/transcode/filter_clone.la -lib/transcode/filter_clone.so @comment lib/transcode/filter_control.la lib/transcode/filter_control.so @comment lib/transcode/filter_cpaudio.la lib/transcode/filter_cpaudio.so -...@comment lib/transcode/filter_cshift.la -lib/transcode/filter_cshift.so -...@comment lib/transcode/filter_cut.la -lib/transcode/filter_cut.so @comment lib/transcode/filter_decimate.la lib/transcode/filter_decimate.so @comment lib/transcode/filter_denoise3d.la @@ -144,8 +119,6 @@ lib/transcode/filter_mask.so lib/transcode/filter_modfps.so @comment lib/transcode/filter_msharpen.la lib/transcode/filter_msharpen.so -...@comment lib/transcode/filter_nored.la -lib/transcode/filter_nored.so @comment lib/transcode/filter_normalize.la lib/transcode/filter_normalize.so @comment lib/transcode/filter_null.la @@ -158,6 +131,8 @@ lib/transcode/filter_preview.so lib/transcode/filter_pv.so @comment lib/transcode/filter_resample.la lib/transcode/filter_resample.so +...@comment lib/transcode/filter_sdlview.la +lib/transcode/filter_sdlview.so @comment lib/transcode/filter_skip.la lib/transcode/filter_skip.so @comment lib/transcode/filter_slowmo.la @@ -170,32 +145,28 @@ lib/transcode/filter_smartdeinter.so lib/transcode/filter_smartyuv.so @comment lib/transcode/filter_smooth.la lib/transcode/filter_smooth.so +...@comment lib/transcode/filter_stabilize.la +lib/transcode/filter_stabilize.so @comment lib/transcode/filter_subtitler.la lib/transcode/filter_subtitler.so -...@comment lib/transcode/filter_tc_audio.la -lib/transcode/filter_tc_audio.so -...@comment lib/transcode/filter_tc_video.la -lib/transcode/filter_tc_video.so -...@comment lib/transcode/filter_test.la -lib/transcode/filter_test.so @comment lib/transcode/filter_testframe.la lib/transcode/filter_testframe.so @comment lib/transcode/filter_text.la lib/transcode/filter_text.so +...@comment lib/transcode/filter_transform.la +lib/transcode/filter_transform.so @comment lib/transcode/filter_unsharp.la lib/transcode/filter_unsharp.so -...@comment lib/transcode/filter_videocore.la -lib/transcode/filter_videocore.so @comment lib/transcode/filter_whitebalance.la lib/transcode/filter_whitebalance.so @comment lib/transcode/filter_xsharpen.la lib/transcode/filter_xsharpen.so +...@comment lib/transcode/filter_yait.la +lib/transcode/filter_yait.so @comment lib/transcode/filter_yuvdenoise.la lib/transcode/filter_yuvdenoise.so @comment lib/transcode/filter_yuvmedian.la lib/transcode/filter_yuvmedian.so -...@comment lib/transcode/filter_yuy2toyv12.la -lib/transcode/filter_yuy2toyv12.so @comment lib/transcode/import_ac3.la lib/transcode/import_ac3.so @comment lib/transcode/import_avi.la @@ -204,61 +175,43 @@ lib/transcode/import_avi.so lib/transcode/import_bktr.so @comment lib/transcode/import_bsdav.la lib/transcode/import_bsdav.so -...@comment lib/transcode/import_divx.la -lib/transcode/import_divx.so @comment lib/transcode/import_dv.la lib/transcode/import_dv.so @comment lib/transcode/import_dvd.la lib/transcode/import_dvd.so -...@comment lib/transcode/import_ffbin.la -lib/transcode/import_ffbin.so @comment lib/transcode/import_ffmpeg.la lib/transcode/import_ffmpeg.so -...@comment lib/transcode/import_fraps.la -lib/transcode/import_fraps.so -...@comment lib/transcode/import_lav.la -lib/transcode/import_lav.so +...@comment lib/transcode/import_framegen.la +lib/transcode/import_framegen.so @comment lib/transcode/import_mp3.la lib/transcode/import_mp3.so @comment lib/transcode/import_mpeg2.la lib/transcode/import_mpeg2.so @comment lib/transcode/import_mplayer.la lib/transcode/import_mplayer.so -...@comment lib/transcode/import_net.la -lib/transcode/import_net.so @comment lib/transcode/import_null.la lib/transcode/import_null.so -...@comment lib/transcode/import_nvrec.la -lib/transcode/import_nvrec.so @comment lib/transcode/import_ogg.la lib/transcode/import_ogg.so @comment lib/transcode/import_pvn.la lib/transcode/import_pvn.so @comment lib/transcode/import_raw.la lib/transcode/import_raw.so -...@comment lib/transcode/import_rawlist.la -lib/transcode/import_rawlist.so -...@comment lib/transcode/import_sh.la -lib/transcode/import_sh.so @comment lib/transcode/import_sunau.la lib/transcode/import_sunau.so -...@comment lib/transcode/import_vdrac3.la -lib/transcode/import_vdrac3.so +...@comment lib/transcode/import_vag.la +lib/transcode/import_vag.so @comment lib/transcode/import_vnc.la lib/transcode/import_vnc.so @comment lib/transcode/import_vob.la lib/transcode/import_vob.so +...@comment lib/transcode/import_x11.la +lib/transcode/import_x11.so @comment lib/transcode/import_xml.la lib/transcode/import_xml.so @comment lib/transcode/import_xvid.la lib/transcode/import_xvid.so -...@comment lib/transcode/import_yuv.la -lib/transcode/import_yuv.so -...@comment lib/transcode/import_yuv4mpeg.la -lib/transcode/import_yuv4mpeg.so lib/transcode/parse_csv.awk -...@comment lib/transcode/xvid2.cfg -...@comment lib/transcode/xvid3.cfg lib/transcode/xvid4.cfg @man man/man1/avifix.1 @man man/man1/aviindex.1 @@ -268,17 +221,21 @@ lib/transcode/xvid4.cfg @man man/man1/tccat.1 @man man/man1/tcdecode.1 @man man/man1/tcdemux.1 +...@man man/man1/tcexport.1 @man man/man1/tcextract.1 +...@man man/man1/tcmodchain.1 @man man/man1/tcmodinfo.1 @man man/man1/tcprobe.1 @man man/man1/tcpvmexportd.1 @man man/man1/tcscan.1 @man man/man1/tcxmlcheck.1 @man man/man1/transcode.1 +...@man man/man1/transcode_export.1 +...@man man/man1/transcode_filter.1 +...@man man/man1/transcode_import.1 share/doc/transcode/ -share/doc/transcode/ChangeLog +...@comment share/doc/transcode/ChangeLog share/doc/transcode/DV-to-DVD-HOWTO.txt -share/doc/transcode/OPTIMIZERS share/doc/transcode/README.Inverse.Telecine.txt share/doc/transcode/README.cluster share/doc/transcode/README.dv @@ -287,16 +244,11 @@ share/doc/transcode/README.rip share/doc/transcode/README.sync share/doc/transcode/README.vcd share/doc/transcode/README.xvid-credits -share/doc/transcode/architecture.txt -share/doc/transcode/avi_comments.txt -share/doc/transcode/clone.txt -share/doc/transcode/export-API.txt +share/doc/transcode/RELNOTES-0.6.13 +share/doc/transcode/RELNOTES-1.1.0 share/doc/transcode/export_ffmpeg.txt share/doc/transcode/export_mp2.txt -share/doc/transcode/export_mpeg.txt -share/doc/transcode/export_pvm.txt share/doc/transcode/faq -share/doc/transcode/filter-API.txt share/doc/transcode/filter-socket.txt share/doc/transcode/filter_dnr.txt share/doc/transcode/filter_logo.txt @@ -349,13 +301,33 @@ share/doc/transcode/html/sub3-00000.png share/doc/transcode/html/subtitles.html share/doc/transcode/html/table.php share/doc/transcode/html/tc.png -share/doc/transcode/ibp_support.txt -share/doc/transcode/import-API.txt share/doc/transcode/import-xml.txt @comment share/doc/transcode/import_nvrec.txt @comment share/doc/transcode/import_v4l2.txt +share/doc/transcode/import_x11.txt share/doc/transcode/import_yuv.txt -share/doc/transcode/pvm.cfg -share/doc/transcode/release-notes/ -share/doc/transcode/release-notes/README-0.6.13 +share/doc/transcode/pvm3/ +share/doc/transcode/pvm3/export_pvm.txt +share/doc/transcode/pvm3/pvm_10x.cfg +share/doc/transcode/pvm3/pvm_11x.cfg +share/doc/transcode/pvm3/pvm_config.txt +share/doc/transcode/tech/ +share/doc/transcode/tech/OPTIMIZERS +share/doc/transcode/tech/architecture.txt +share/doc/transcode/tech/avi_comments.txt +share/doc/transcode/tech/clone.txt +share/doc/transcode/tech/export-API.txt +share/doc/transcode/tech/filter-API.txt +share/doc/transcode/tech/filter_template.c +share/doc/transcode/tech/html/ +share/doc/transcode/tech/html/index.html +share/doc/transcode/tech/html/tc_basic.css +share/doc/transcode/tech/html/tc_frame_buffer.html +share/doc/transcode/tech/html/tc_input_rotation.html +share/doc/transcode/tech/html/tc_libraries.html +share/doc/transcode/tech/html/tc_logo.png +share/doc/transcode/tech/ibp_support.txt +share/doc/transcode/tech/import-API.txt +share/doc/transcode/tech/libraries.txt +share/doc/transcode/tech/module-system-API.txt share/doc/transcode/template.cfg.txt -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.