From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Feb 6 15:10:05 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 722341065690 for ; Fri, 6 Feb 2009 15:10:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8FD998FC26 for ; Fri, 6 Feb 2009 15:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n16FA4E0015103 for ; Fri, 6 Feb 2009 15:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n16FA43Q015102; Fri, 6 Feb 2009 15:10:04 GMT (envelope-from gnats) Resent-Date: Fri, 6 Feb 2009 15:10:04 GMT Resent-Message-Id: <200902061510.n16FA43Q015102@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Naram Qashat Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E64CB10656D0 for ; Fri, 6 Feb 2009 15:05:06 +0000 (UTC) (envelope-from cyberbotx@kirby.cyberbotx.com) Received: from QMTA02.emeryville.ca.mail.comcast.net (qmta02.emeryville.ca.mail.comcast.net [76.96.30.24]) by mx1.freebsd.org (Postfix) with ESMTP id CBEF08FC26 for ; Fri, 6 Feb 2009 15:05:06 +0000 (UTC) (envelope-from cyberbotx@kirby.cyberbotx.com) Received: from OMTA05.emeryville.ca.mail.comcast.net ([76.96.30.43]) by QMTA02.emeryville.ca.mail.comcast.net with comcast id Cc4x1b0080vp7WLA2f57Ni; Fri, 06 Feb 2009 15:05:07 +0000 Received: from kirby.cyberbotx.com ([68.43.195.82]) by OMTA05.emeryville.ca.mail.comcast.net with comcast id Cf531b00W1n8LeU8Rf54pd; Fri, 06 Feb 2009 15:05:06 +0000 Received: from kirby.cyberbotx.com (localhost [127.0.0.1]) by kirby.cyberbotx.com (Postfix) with ESMTP id D155611502; Fri, 6 Feb 2009 10:05:00 -0500 (EST) Received: (from root@localhost) by kirby.cyberbotx.com (8.14.2/8.14.2/Submit) id n16F50ug047590; Fri, 6 Feb 2009 10:05:00 -0500 (EST) (envelope-from cyberbotx) Message-Id: <200902061505.n16F50ug047590@kirby.cyberbotx.com> Date: Fri, 6 Feb 2009 10:05:00 -0500 (EST) From: Naram Qashat To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: multimedia@FreeBSD.org Subject: ports/131447: [PATCH] multimedia/transcode: update to 1.1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2009 15:10:07 -0000 >Number: 131447 >Category: ports >Synopsis: [PATCH] multimedia/transcode: update to 1.1.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Feb 06 15:10:04 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Naram Qashat >Release: FreeBSD 7.1-STABLE i386 >Organization: >Environment: System: FreeBSD kirby.cyberbotx.com 7.1-STABLE FreeBSD 7.1-STABLE #0: Tue Jan 27 17:30:46 EST 2009 >Description: - Update to 1.1.0 Added file(s): - files/patch-import-import_bktr.c - files/patch-libtc-tc_functions.c Removed file(s): - files/patch-filter:filter_modfps.c - files/patch-filter_Makefile.in - files/patch-import:decode_dv.c - files/patch-import_ioaux.c - files/patch-libvo_yuv2rgv.c This update also encompases the fixes from PRs ports/118168, ports/126019, ports/126020. The problem in ports/127672 doesn't occur, and this superceeds ports/130146. ports/101450 is marked as suspended, but the fix detailed in the PR has been included for over a year, and should probably be closed. Note: I would be willing to also take over maintainership of this port, I did not change myself to the maintainer because I wanted to see if it would be ok for me to be maintainer beforehand. Port maintainer (multimedia@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- transcode-1.1.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/multimedia/transcode/Makefile /kirby/shared/ports/transcode/Makefile --- /usr/ports/multimedia/transcode/Makefile 2008-09-02 05:33:16.000000000 -0400 +++ /kirby/shared/ports/transcode/Makefile 2009-02-06 09:58:34.000000000 -0500 @@ -6,20 +6,17 @@ # PORTNAME= transcode -PORTVERSION= 1.0.6 -PORTREVISION= 1 +PORTVERSION= 1.1.0 CATEGORIES= multimedia -MASTER_SITES= http://transcode.kabewm.com/ \ +MASTER_SITES= ${MASTER_SITE_BERLIOS} \ http://fromani.exit1.org/ +MASTER_SITE_SUBDIR= tcforge MAINTAINER= multimedia@FreeBSD.org COMMENT= A text-console utility for video stream processing -LIB_DEPENDS= dvdread.5:${PORTSDIR}/multimedia/libdvdread \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ - mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \ +LIB_DEPENDS= mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg -BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv USE_BZIP2= yes FAKEDIR= ${WRKDIR}/fake @@ -27,249 +24,204 @@ USE_GMAKE= yes USE_LDCONFIG= yes WANT_SDL= yes -USE_GNOME= gnometarget +WANT_GNOME= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-isystem /usr/include -isystem ${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ SDL_CONFIG="${SDL_CONFIG}" -CONFIGURE_ARGS+= --with-libavcodec-includes=${LOCALBASE}/include/ffmpeg \ - --with-libavcodec-libs=${LOCALBASE}/lib \ - --with-libdvdread-prefix=${LOCALBASE} \ - --with-libiconv-prefix=${LOCALBASE} \ - --enable-oss \ - --enable-gtk=no +CONFIGURE_ARGS+= --with-libmpeg2-prefix=${LOCALBASE} \ + --with-libavcodec-prefix=${LOCALBASE} \ + --enable-oss MAN1= avifix.1 aviindex.1 avimerge.1 avisplit.1 avisync.1 tccat.1 tcdemux.1 \ tcprobe.1 tcscan.1 transcode.1 tcextract.1 tcdecode.1 tcmodinfo.1 \ - tcpvmexportd.1 tcxmlcheck.1 + tcpvmexportd.1 tcxmlcheck.1 transcode_export.1 transcode_filter.1 \ + transcode_import.1 tcexport.1 tcmodchain.1 + +OPTIONS= OPTIMIZED_CFLAGS "Build with optimizations" off \ + X11 "Build with X11 support" off \ + BKTR "Enable bktr support" off \ + POSTPROC "Enable libpostproc support" off \ + FREETYPE "Enable FreeType2 support" off \ + LAME "Enable lame support" on \ + XVID "Enable Xvid support" off \ + X264 "Enable x264 support" off \ + OGG "Enable ogg support" off \ + VORBIS "Enable vorbis support" off \ + THEORA "Enable theora support" off \ + DVDREAD "Enable libdvdread support" on \ + LIBDV "Enable libdv support" off \ + QUICKTIME "Enable libquicktime support" off \ + LZO "Enable LZO support" off \ + LIBA52 "Enable a52 support (as default decoder)" off \ + FAAC "Enable faac support" off \ + XML "Enable libxml2 support" off \ + MJPEG "Enable mjpegtools support" off \ + SDL "Enable SDL support" off \ + IMAGEMAGICK "Enable ImageMagick support" off \ + JPEG "Enable libjpeg support" on \ + ICONV "Enable libiconv support" on .include -.if ${OSVERSION} < 700000 +.if ${OSVERSION} < 700000 CONFIGURE_ENV+= LIBAVCODEC_EXTRA_LIBS="-pthread" .endif -.if (defined(WITH_FREETYPE) || exists(${LOCALBASE}/lib/libfreetype.so)) && !defined(WITHOUT_FREETYPE) -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 -CONFIGURE_ARGS+= --with-ft-prefix=${LOCALBASE} --enable-freetype2 +.if !defined(WITHOUT_X11) +USE_XORG= xv xaw xpm +CONFIGURE_ARGS+= --with-x .else -CONFIGURE_ARGS+= --disable-fttest --enable-freetype=no +CONFIGURE_ARGS+= --without-x .endif -.if (defined(WITH_OGG) || exists(${LOCALBASE}/lib/libogg.so)) && !defined(WITHOUT_OGG) -LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg -CONFIGURE_ARGS+= --with-ogg-prefix=${LOCALBASE} --enable-ogg +.if defined(WITH_BKTR) +CONFIGURE_ARGS+= --enable-bktr +.endif + +.if !defined(WITHOUT_POSTPROC) +CONFIGURE_ARGS+= --with-libpostproc-prefix=${LOCALBASE} --enable-libpostproc .else -CONFIGURE_ARGS+= --enable-ogg=no +CONFIGURE_ARGS+= --disable-libpostproc .endif -.if defined(WITH_BKTR) -CONFIGURE_ARGS+= --enable-bktr +.if defined(WITH_FREETYPE) +LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 +CONFIGURE_ARGS+= --with-freetype2-prefix=${LOCALBASE} --enable-freetype2 +.else +CONFIGURE_ARGS+= --disable-freetype2 .endif -.if (defined(WITH_VORBIS) || exists(${LOCALBASE}/lib/libvorbis.so)) && !defined(WITHOUT_VORBIS) -LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis -CONFIGURE_ARGS+= --with-vorbis-prefix=${LOCALBASE} --enable-vorbis +.if !defined(WITHOUT_LAME) +LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame +CONFIGURE_ARGS+= --with-lame-prefix=${LOCALBASE} --enable-lame .else -CONFIGURE_ARGS+= --enable-vorbis=no +CONFIGURE_ARGS+= --disable-lame .endif -.if (defined(WITH_THEORA) || exists(${LOCALBASE}/lib/libtheora.so)) && !defined(WITHOUT_THEORA) -LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora -CONFIGURE_ARGS+= --with-theora-prefix=${LOCALBASE} --enable-theora +.if defined(WITH_XVID) +LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid +RUN_DEPENDS+= xvid4conf:${PORTSDIR}/multimedia/xvid4conf +CONFIGURE_ARGS+= --with-xvid-prefix=${LOCALBASE} --enable-xvid .else -CONFIGURE_ARGS+= --enable-theora=no +CONFIGURE_ARGS+= --disable-xvid .endif -.if (defined(WITH_IMAGEMAGICK) || exists(${LOCALBASE}/lib/libMagickWand.so)) && !defined(WITHOUT_IMAGEMAGICK) -LIB_DEPENDS+= MagickWand.1:${PORTSDIR}/graphics/ImageMagick -CONFIGURE_ARGS+= --enable-imagemagick --with-imagemagick-prefix=${LOCALBASE} +.if defined(WITH_X264) +LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264 +CONFIGURE_ARGS+= --with-x264-prefix=${LOCALBASE} --enable-x264 .else -CONFIGURE_ARGS+= --enable-imagemagick=no +CONFIGURE_ARGS+= --disable-x264 .endif -.if (defined(WITH_MJPEG) || exists(${LOCALBASE}/lib/liblavjpeg.so)) && !defined(WITHOUT_MJPEG) -LIB_DEPENDS+= lavjpeg-1.9.1:${PORTSDIR}/multimedia/mjpegtools -CONFIGURE_ARGS+= --enable-mjpegtools +.if defined(WITH_OGG) +LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg +CONFIGURE_ARGS+= --with-ogg-prefix=${LOCALBASE} --enable-ogg .else -CONFIGURE_ARGS+= --enable-mjpegtools=no +CONFIGURE_ARGS+= --disable-ogg .endif -.if (defined(WITH_AVIFILE) || exists(${LOCALBASE}/lib/libaviplay.so)) && !defined(WITHOUT_AVIFILE) && ${OSVERSION} < 700000 -LIB_DEPENDS+= aviplay:${PORTSDIR}/multimedia/avifile -CONFIGURE_ARGS+= --with-avifile-prefix=${LOCALBASE} --enable-avifile +.if defined(WITH_VORBIS) +LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis +CONFIGURE_ARGS+= --with-vorbis-prefix=${LOCALBASE} --enable-vorbis .else -CONFIGURE_ARGS+= --enable-avifile=no +CONFIGURE_ARGS+= --disable-vorbis .endif -.if defined(WITH_SDL) || ${HAVE_SDL:Msdl}!="" -USE_SDL+= sdl -WITH_LIBDV= yes -CONFIGURE_ARGS+= --enable-sdl --with-sdl-prefix=${LOCALBASE} +.if defined(WITH_THEORA) +LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora +CONFIGURE_ARGS+= --with-theora-prefix=${LOCALBASE} --enable-theora .else -CONFIGURE_ARGS+= --enable-sdl=no +CONFIGURE_ARGS+= --disable-theora .endif -.if !defined(WITHOUT_XML) || ${HAVE_GNOME:Mlibxml2}!="" -USE_GNOME+= libxml2 -CONFIGURE_ARGS+= --enable-libxml2 --with-libxml2-prefix=${LOCALBASE} +.if !defined(WITHOUT_DVDREAD) +LIB_DEPENDS+= dvdread.5:${PORTSDIR}/multimedia/libdvdread +CONFIGURE_ARGS+= --with-libdvdread-prefix=${LOCALBASE} --enable-libdvdread .else -CONFIGURE_ARGS+= --enable-libxml2=no +CONFIGURE_ARGS+= --disable-libdvdread .endif -.if (defined(WITH_LIBDV) || exists(${LOCALBASE}/lib/libdv.so)) && !defined(WITHOUT_LIBDV) +.if defined(WITH_LIBDV) LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv -CONFIGURE_ARGS+= --with-pal-yuv=YV12 --enable-libdv +CONFIGURE_ARGS+= --with-pal-yuv=YV12 --with-libdv-prefix=${LOCALBASE} --enable-libdv .else -CONFIGURE_ARGS+= --enable-libdv=no +CONFIGURE_ARGS+= --disable-libdv .endif -.if (defined(WITH_QUICKTIME) || exists(${LOCALBASE}/lib/libquicktime.so)) && !defined(WITHOUT_QUICKTIME) +.if defined(WITH_QUICKTIME) LIB_DEPENDS+= quicktime.0:${PORTSDIR}/multimedia/libquicktime -CONFIGURE_ARGS+= --enable-libquicktime \ - --with-libquicktime-prefix=${LOCALBASE} \ - --with-libquicktime-includes=${LOCALBASE}/include/lqt +CONFIGURE_ARGS+= --with-libquicktime-prefix=${LOCALBASE} --enable-libquicktime .else -CONFIGURE_ARGS+= --enable-libquicktime=no +CONFIGURE_ARGS+= --disable-libquicktime .endif -.if defined(WITH_FAME) # Disable.. meh # || (exists(${LOCALBASE}/lib/libfame.so) && !defined(WITHOUT_FAME)) -LIB_DEPENDS+= fame-0.9:${PORTSDIR}/multimedia/libfame -CONFIGURE_ARGS+= --with-libfame-prefix=${LOCALBASE} --enable-libfame +.if defined(WITH_LZO) +LIB_DEPENDS+= lzo2.2:${PORTSDIR}/archivers/lzo2 +CONFIGURE_ARGS+= --enable-lzo --with-lzo-prefix=${LOCALBASE} \ + --with-lzo-includes=${LOCALBASE} +.else +CONFIGURE_ARGS+= --disable-lzo .endif -.if defined(WITH_XVID) || (exists(${LOCALBASE}/lib/libxvidcore.so) && !defined(WITHOUT_XVID)) -LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid -RUN_DEPENDS+= xvid4conf:${PORTSDIR}/multimedia/xvid4conf +.if defined(WITH_LIBA52) +LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52 +CONFIGURE_ARGS+= --with-a52-prefix=${LOCALBASE} --enable-a52 +.else +CONFIGURE_ARGS+= --disable-a52 .endif -.if defined(WITH_LIBA52_DEFAULT) || (exists(${LOCALBASE}/lib/liba52.so) && !defined(WITHOUT_LIBA52)) -WITH_LIBA52= yes -CONFIGURE_ARGS+= --enable-a52-default-decoder +.if defined(WITH_FAAC) +LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac +CONFIGURE_ARGS+= --with-faac-prefix=${LOCALBASE} --enable-faac +.else +CONFIGURE_ARGS+= --disable-faac .endif -.if defined(WITH_LIBA52) -LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52 -CONFIGURE_ARGS+= --enable-a52 +.if !defined(WITHOUT_XML) && (defined(WITH_XML) || ${HAVE_GNOME:Mlibxml2}!="") +USE_GNOME+= libxml2 +CONFIGURE_ARGS+= --with-libxml2-prefix=${LOCALBASE} --enable-libxml2 .else -CONFIGURE_ARGS+= --with-a52=no +CONFIGURE_ARGS+= --disable-libxml2 .endif -.if defined(WITH_LAME) || (exists(${LOCALBASE}/lib/libmp3lame.so) && !defined(WITHOUT_LAME)) -LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame -CONFIGURE_ARGS+= --with-lame-prefix=${LOCALBASE} +.if defined(WITH_MJPEG) +LIB_DEPENDS+= lavjpeg-1.9.1:${PORTSDIR}/multimedia/mjpegtools +CONFIGURE_ARGS+= --with-mjpegtools-prefix=${LOCALBASE} --enable-mjpegtools .else -CONFIGURE_ARGS+= --disable-lame +CONFIGURE_ARGS+= --disable-mjpegtools .endif -.if defined(WITH_LZO) || (exists(${LOCALBASE}/lib/liblzo2.so) && !defined(WITHOUT_LZO)) -LIB_DEPENDS+= lzo2:${PORTSDIR}/archivers/lzo2 -CONFIGURE_ARGS+= --enable-lzo --with-lzo-prefix=${LOCALBASE} \ - --with-lzo-includes=${LOCALBASE} +.if !defined(WITHOUT_SDL) && (defined(WITH_SDL) || ${HAVE_SDL:Msdl}!="") +USE_SDL+= sdl +CONFIGURE_ARGS+= --with-sdl-prefix=${LOCALBASE} --enable-sdl .else -CONFIGURE_ARGS+= --enable-lzo=no +CONFIGURE_ARGS+= --disable-sdl .endif -.if (defined(WITH_DIVX5) && ${ARCH}=="i386") || (exists(${LINUXBASE}/usr/lib/libdivxdecore.so) && !defined(WITHOUT_DIVX5)) -BUILD_DEPENDS+= ${LINUXBASE}/usr/lib/libdivxdecore.so:${PORTSDIR}/multimedia/linux-divx4linux -CFLAGS+= -I${LINUXBASE}/usr/include/divx +.if defined(WITH_IMAGEMAGICK) +LIB_DEPENDS+= MagickWand.1:${PORTSDIR}/graphics/ImageMagick +CONFIGURE_ARGS+= --with-imagemagick-prefix=${LOCALBASE} --enable-imagemagick .else +CONFIGURE_ARGS+= --disable-imagemagick .endif -pre-everything:: -.if !defined(WITH_OPTIMIZED_CFLAGS) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable extra optimizations by defining WITH_OPTIMIZED_CFLAGS." +.if !defined(WITHOUT_JPEG) +LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +CONFIGURE_ARGS+= --with-libjpeg-prefix=${LOCALBASE} --enable-libjpeg +.else +CONFIGURE_ARGS+= --disable-libjpeg .endif -.if !defined(WITH_FREETYPE) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable text/subtitler modules by defining WITH_FREETYPE." -.endif -.if !defined(WITH_OGG) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable libogg support by defining WITH_OGG." -.endif -.if !defined(WITH_VORBIS) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable libvorbis support by defining WITH_VORBIS." -.endif -.if !defined(WITH_THEORA) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable libtheora support by defining WITH_THEORA." -.endif -.if !defined(WITH_MJPEG) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable MJPEG portions by defining WITH_JPEGMMX." -.endif -.if !defined(WITH_IMAGEMAGICK) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable ImageMagick-dependent modules by defining WITH_IMAGEMAGICK." -.endif -.if !defined(WITH_SDL) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable realtime-previewing by defining WITH_SDL." - @${ECHO_MSG} "This implies WITH_LIBDV." -.endif -.if !defined(WITH_XML) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable libxml2-dependent modules by defining WITH_XML." -.endif -.if !defined(WITH_LAME) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable lame-dependent modules by defining WITH_LAME." - @${ECHO_MSG} "You will probably want to enable this, if you plan to" - @${ECHO_MSG} "rip DVDs or dub videos." -.endif -.if !defined(WITH_LIBDV) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable libdv-support by defining WITH_LIBDV." - @${ECHO_MSG} "You will probably want to enable this, if you plan to" - @${ECHO_MSG} "transcode DV data from a digital videocamera." -.endif -.if !defined(WITH_LIBA52) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable liba52-support by defining WITH_LIBA52." - @${ECHO_MSG} "You will probably want to enable this, if you plan to" - @${ECHO_MSG} "rip DVDs." -.endif -.if !defined(WITH_LIBA52_DEFAULT) - @${ECHO_MSG} - @${ECHO_MSG} "You can use liba52 as default audio encoder by defining WITH_LIBA52_DEFAULT." - @${ECHO_MSG} "This implies WITH_LIBA52." -.endif -.if !defined(WITH_AVIFILE) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable avifile-dependent modules by defining WITH_AVIFILE." -.endif #WITH_AVIFILE -.if !defined(WITH_QUICKTIME) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable quicktime-dependent modules by defining WITH_QUICKTIME." -.endif -.if !defined(WITH_FAME) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable libfame-support by defining WITH_FAME." -.endif -.if !defined(WITH_XVID) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable xvid support by defining WITH_XVID." - @${ECHO_MSG} "You will probably want to enable this, if you plan to" - @${ECHO_MSG} "rip DVDs." -.endif -.if !defined(WITH_LZO) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable liblzo support by defining WITH_LZO." -.endif -.if !defined(WITH_DIVX5) && ${ARCH}=="i386" - @${ECHO_MSG} - @${ECHO_MSG} "You can enable experimental DivX 5 support by defining WITH_DIVX5." -.endif -.if !defined(WITH_BKTR) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable support for bktr(4) devices by defining WITH_BKTR." + +.if !defined(WITHOUT_ICONV) +USE_ICONV= yes +CONFIGURE_ARGS+= --with-iconv-prefix=${LOCALBASE} --enable-iconv +.else +CONFIGURE_ARGS+= --disable-iconv .endif post-patch: -.if defined(WITH_LZO) || (exists(${LOCALBASE}/lib/liblzo2.so) && !defined(WITHOUT_LZO)) +.if defined(WITH_LZO) && !defined(WITHOUT_LZO) @${REINPLACE_CMD} -e 's|%%NUV%%|nuv|' ${WRKSRC}/import/Makefile.in .else @${REINPLACE_CMD} -e 's|%%NUV%%||' ${WRKSRC}/import/Makefile.in diff -ruN --exclude=CVS /usr/ports/multimedia/transcode/distinfo /kirby/shared/ports/transcode/distinfo --- /usr/ports/multimedia/transcode/distinfo 2008-07-27 12:29:59.000000000 -0400 +++ /kirby/shared/ports/transcode/distinfo 2009-01-30 10:12:09.000000000 -0500 @@ -1,3 +1,3 @@ -MD5 (transcode-1.0.6.tar.bz2) = 7c3a341b0e4540e34ef50c66b0ab751d -SHA256 (transcode-1.0.6.tar.bz2) = cb6f2a33e5fd00f2ba1dcdb13c65fa60553a4a501161fe7e05bd05511bc92eb1 -SIZE (transcode-1.0.6.tar.bz2) = 1937157 +MD5 (transcode-1.1.0.tar.bz2) = 5ca205e32b546402a48ea8004a7b3232 +SHA256 (transcode-1.1.0.tar.bz2) = 78c0e96462a0d73779f73049af366e56c6b05859f0ea07ba4b3e1f16d8807a27 +SIZE (transcode-1.1.0.tar.bz2) = 2066731 diff -ruN --exclude=CVS /usr/ports/multimedia/transcode/files/patch-filter:filter_modfps.c /kirby/shared/ports/transcode/files/patch-filter:filter_modfps.c --- /usr/ports/multimedia/transcode/files/patch-filter:filter_modfps.c 2005-05-11 11:04:48.000000000 -0400 +++ /kirby/shared/ports/transcode/files/patch-filter:filter_modfps.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,17 +0,0 @@ ---- filter/filter_modfps.c.orig Sun May 8 16:55:54 2005 -+++ filter/filter_modfps.c Sun May 8 16:57:01 2005 -@@ -62,7 +62,14 @@ - //#define DEBUG 1 - - // FIXME -+#if !defined(HAV_LRINTF) -+static inline long int lrint(double x) -+{ -+ return (long)(rint(x)); -+} -+#else - extern long int lrint(double x); -+#endif - - static int show_results=0; - diff -ruN --exclude=CVS /usr/ports/multimedia/transcode/files/patch-filter_Makefile.in /kirby/shared/ports/transcode/files/patch-filter_Makefile.in --- /usr/ports/multimedia/transcode/files/patch-filter_Makefile.in 2005-05-11 11:04:48.000000000 -0400 +++ /kirby/shared/ports/transcode/files/patch-filter_Makefile.in 1969-12-31 19:00:00.000000000 -0500 @@ -1,11 +0,0 @@ ---- filter/Makefile.in.orig Sun May 8 16:54:37 2005 -+++ filter/Makefile.in Sun May 8 16:55:06 2005 -@@ -356,7 +356,7 @@ - uninstall-recursive - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = pp divxkey extsub yuvdenoise tomsmocomp preview \ -+DIST_SUBDIRS = divxkey extsub yuvdenoise tomsmocomp preview \ - subtitler - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A52_CFLAGS = @A52_CFLAGS@ diff -ruN --exclude=CVS /usr/ports/multimedia/transcode/files/patch-import-import_bktr.c /kirby/shared/ports/transcode/files/patch-import-import_bktr.c --- /usr/ports/multimedia/transcode/files/patch-import-import_bktr.c 1969-12-31 19:00:00.000000000 -0500 +++ /kirby/shared/ports/transcode/files/patch-import-import_bktr.c 2009-02-01 14:51:42.000000000 -0500 @@ -0,0 +1,11 @@ +--- import/import_bktr.c.orig 2008-04-14 16:20:46.000000000 -0400 ++++ import/import_bktr.c 2009-02-01 14:50:36.000000000 -0500 +@@ -595,7 +595,7 @@ + + /* bktr_buffer_size was set to width * height * 4 (32 bits) */ + /* so width * height = bktr_buffer_size / 4 */ +- tcv_convert(bktr_buffer, dest, bktr_buffer_size/4, 1, ++ tcv_convert(bktr_tcvhandle, bktr_buffer, dest, bktr_buffer_size/4, 1, + IMG_ARGB32, IMG_RGB24); + } + diff -ruN --exclude=CVS /usr/ports/multimedia/transcode/files/patch-import:decode_dv.c /kirby/shared/ports/transcode/files/patch-import:decode_dv.c --- /usr/ports/multimedia/transcode/files/patch-import:decode_dv.c 2004-08-09 08:17:15.000000000 -0400 +++ /kirby/shared/ports/transcode/files/patch-import:decode_dv.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,13 +0,0 @@ ---- import/decode_dv.c.orig Sun Aug 8 22:03:19 2004 -+++ import/decode_dv.c Sun Aug 8 22:03:43 2004 -@@ -37,8 +37,8 @@ - #include "transcode.h" - #include "ioaux.h" - --#define DV_PAL_SIZE frame_size_625_50 --#define DV_NTSC_SIZE frame_size_525_60 -+#define DV_PAL_SIZE (12 * 150 * 80) -+#define DV_NTSC_SIZE (10 * 150 * 80) - #define DV_HEADER_SIZE header_size - - static int verbose=TC_QUIET; diff -ruN --exclude=CVS /usr/ports/multimedia/transcode/files/patch-import_Makefile.in /kirby/shared/ports/transcode/files/patch-import_Makefile.in --- /usr/ports/multimedia/transcode/files/patch-import_Makefile.in 2008-08-15 18:42:37.000000000 -0400 +++ /kirby/shared/ports/transcode/files/patch-import_Makefile.in 2009-01-30 10:17:18.000000000 -0500 @@ -1,11 +1,11 @@ ---- import/Makefile.in.orig 2008-08-15 00:00:00.000000000 -0400 -+++ import/Makefile.in 2008-08-15 00:01:38.000000000 -0400 -@@ -798,7 +798,7 @@ - @NET_STREAM_TRUE@NET_MOD = import_net.la - BSDAV_MOD = import_bsdav.la - pkgdir = $(MOD_PATH) --SUBDIRS = nuv v4l -+SUBDIRS = v4l %%NUV%% - pkg_LTLIBRARIES = \ - import_avi.la \ - import_mpeg2.la \ +--- import/Makefile.in.orig 2009-01-17 03:30:40.000000000 -0500 ++++ import/Makefile.in 2009-01-30 10:16:53.000000000 -0500 +@@ -457,7 +457,7 @@ + distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = nuv v4l ++DIST_SUBDIRS = v4l %%NUV%% + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + A52_CFLAGS = @A52_CFLAGS@ + A52_LIBS = @A52_LIBS@ diff -ruN --exclude=CVS /usr/ports/multimedia/transcode/files/patch-import_ioaux.c /kirby/shared/ports/transcode/files/patch-import_ioaux.c --- /usr/ports/multimedia/transcode/files/patch-import_ioaux.c 2007-01-03 06:27:48.000000000 -0500 +++ /kirby/shared/ports/transcode/files/patch-import_ioaux.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,43 +0,0 @@ ---- import/ioaux.c.orig Mon Jul 4 11:09:33 2005 -+++ import/ioaux.c Wed Jan 3 02:44:37 2007 -@@ -261,6 +261,25 @@ - /* char device could be several things, depending on system */ - /* *BSD DVD device? v4l? bktr? sunau? */ - if(S_ISCHR(fbuf.st_mode)) { -+# ifdef __FreeBSD__ -+ char rpath[PATH_MAX], *prpath; -+ -+ prpath = realpath(name, &rpath); -+ if (prpath == NULL) { -+ warn("realpath(%s)", name); -+ return TC_PROBE_PATH_ABSPATH; -+ } -+ -+ if (strstr(rpath, "bktr") != NULL || strstr(rpath, "tuner") || \ -+ strstr(rpath, "vbi")) -+ return(TC_PROBE_PATH_BKTR); -+ else if (strstr(rpath, "dsp") || strstr(rpath, "audio") || \ -+ strstr(rpath, "music")) -+ return(TC_PROBE_PATH_OSS); -+ else -+ return(TC_PROBE_PATH_ABSPATH); -+# endif -+ - switch (major(fbuf.st_rdev)) { - #ifdef SYS_BSD - # ifdef __OpenBSD__ -@@ -270,14 +289,6 @@ - return(TC_PROBE_PATH_SUNAU); - case 49: /* bktr */ - return(TC_PROBE_PATH_BKTR); --# endif --# ifdef __FreeBSD__ -- case 4: /* acd */ -- return(TC_PROBE_PATH_ABSPATH); -- case 229: /* bktr */ -- return(TC_PROBE_PATH_BKTR); -- case 0: /* OSS */ -- return(TC_PROBE_PATH_OSS); - # endif - default: /* libdvdread uses "raw" disk devices here */ - return(TC_PROBE_PATH_ABSPATH); diff -ruN --exclude=CVS /usr/ports/multimedia/transcode/files/patch-libtc-tc_functions.c /kirby/shared/ports/transcode/files/patch-libtc-tc_functions.c --- /usr/ports/multimedia/transcode/files/patch-libtc-tc_functions.c 1969-12-31 19:00:00.000000000 -0500 +++ /kirby/shared/ports/transcode/files/patch-libtc-tc_functions.c 2009-02-01 22:14:46.000000000 -0500 @@ -0,0 +1,33 @@ +--- libtc/tc_functions.c.orig 2008-08-09 17:24:38.000000000 -0400 ++++ libtc/tc_functions.c 2009-02-01 22:13:42.000000000 -0500 +@@ -534,6 +534,15 @@ + /* char device could be several things, depending on system */ + /* *BSD DVD device? v4l? bktr? sunau? */ + if(S_ISCHR(fbuf.st_mode)) { ++#ifdef __FreeBSD__ ++ if (strstr(name, "bktr") || strstr(name, "tuner") || strstr(name, "wbi")) ++ return TC_PROBE_PATH_BKTR; ++ else if (strstr(name, "dsp") || strstr(name, "audio") || strstr(name, "music")) ++ return TC_PROBE_PATH_OSS; ++ else ++ return TC_PROBE_PATH_ABSPATH; ++#endif ++ + switch (major(fbuf.st_rdev)) { + #ifdef OS_BSD + # ifdef __OpenBSD__ +@@ -544,14 +553,6 @@ + case 49: /* bktr */ + return TC_PROBE_PATH_BKTR; + # endif +-# ifdef __FreeBSD__ +- case 4: /* acd */ +- return TC_PROBE_PATH_ABSPATH; +- case 229: /* bktr */ +- return TC_PROBE_PATH_BKTR; +- case 0: /* OSS */ +- return TC_PROBE_PATH_OSS; +-# endif + default: /* libdvdread uses "raw" disk devices here */ + return TC_PROBE_PATH_ABSPATH; + #else diff -ruN --exclude=CVS /usr/ports/multimedia/transcode/files/patch-libvo_yuv2rgv.c /kirby/shared/ports/transcode/files/patch-libvo_yuv2rgv.c --- /usr/ports/multimedia/transcode/files/patch-libvo_yuv2rgv.c 2005-05-11 11:04:48.000000000 -0400 +++ /kirby/shared/ports/transcode/files/patch-libvo_yuv2rgv.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,11 +0,0 @@ ---- libvo/yuv2rgb.c.orig Sun May 8 16:57:56 2005 -+++ libvo/yuv2rgb.c Sun May 8 16:58:18 2005 -@@ -72,7 +72,7 @@ - { - yuv2rgb = NULL; - #ifdef HAVE_MMX --# if defined(ARCH_X86) || defined(ARCH_X86_64) -+# if defined(ARCH_X86) - if ((yuv2rgb == NULL) && (vo_mm_accel & MM_ACCEL_X86_MMXEXT)) { - yuv2rgb = yuv2rgb_init_mmxext (bpp, mode); - if (yuv2rgb != NULL) --- transcode-1.1.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: