From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Feb 26 09:30:24 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A05AB16A4D6 for ; Thu, 26 Feb 2004 09:30:24 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AED7143D48 for ; Thu, 26 Feb 2004 09:30:20 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i1QHUKbv066720 for ; Thu, 26 Feb 2004 09:30:20 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i1QHUKpO066712; Thu, 26 Feb 2004 09:30:20 -0800 (PST) (envelope-from gnats) Resent-Date: Thu, 26 Feb 2004 09:30:20 -0800 (PST) Resent-Message-Id: <200402261730.i1QHUKpO066712@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, Hendrik Scholz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 92D2F16A4CE; Thu, 26 Feb 2004 09:27:49 -0800 (PST) Received: from mail.atl.us.wormulon.net (unknown [63.223.8.130]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1900543D39; Thu, 26 Feb 2004 09:27:49 -0800 (PST) (envelope-from hscholz@slurmcan.wormulon.net) Received: from localhost (unknown [63.223.8.130]) by mail.atl.us.wormulon.net (Postfix) with ESMTP id 6B5CB5D9AC; Thu, 26 Feb 2004 12:28:31 -0500 (EST) Received: from mail.atl.us.wormulon.net ([63.223.8.130]) by localhost (plant.wormulon.net [63.223.8.130]) (amavisd-new, port 10024) with ESMTP id 59048-01; Thu, 26 Feb 2004 12:28:30 -0500 (EST) Received: from slurmcan.wormulon.net (unknown [63.223.7.6]) by mail.atl.us.wormulon.net (Postfix) with ESMTP id 7D7EB5D95D; Thu, 26 Feb 2004 12:28:30 -0500 (EST) Received: by slurmcan.wormulon.net (Postfix, from userid 1001) id D1F4A39819; Thu, 26 Feb 2004 12:27:54 -0500 (EST) Message-Id: <20040226172754.D1F4A39819@slurmcan.wormulon.net> Date: Thu, 26 Feb 2004 12:27:54 -0500 (EST) From: Hendrik Scholz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: ahze@ahze.net cc: krion@FreeBSD.org Subject: ports/63402: maintainer-update: multimedia/transcode X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Hendrik Scholz List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Feb 2004 17:30:24 -0000 >Number: 63402 >Category: ports >Synopsis: maintainer-update: multimedia/transcode >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Feb 26 09:30:20 PST 2004 >Closed-Date: >Last-Modified: >Originator: Hendrik Scholz >Release: FreeBSD 5.2.1-RC amd64 >Organization: >Environment: System: FreeBSD slurmcan.wormulon.net 5.2.1-RC FreeBSD 5.2.1-RC #0: Sat Jan 31 12:38:34 GMT 2004 root@ngoc.NUXI.com:/usr/obj/usr/src/sys/GENERIC amd64 >Description: This patch merges pr 62848 (from me) and pr 63344 (from Michael Johnson). Please to not apply pr 63344 alone as the plist is broken. Additionally remove files/patch-libtool Changes: - update to 0.6.12 - add WITH_LIBTHEORA knob (by Michael Johnson) - don't turn this into a i386-only port if NASM is installed users now have to enforce WITH_NASM - pkg-plist update Krion: I could not reproduce the 4.9-REL compile error you've send me on my -stable systems. PLEASE CLOSE PR 62848 AND PR 63344! >How-To-Repeat: >Fix: --- transcode-0.6.12-1.diff begins here --- Index: Makefile =================================================================== RCS file: /home/FreeBSD-CVS/ports/multimedia/transcode/Makefile,v retrieving revision 1.36 diff -u -r1.36 Makefile --- Makefile 25 Feb 2004 10:43:16 -0000 1.36 +++ Makefile 26 Feb 2004 17:22:02 -0000 @@ -6,8 +6,7 @@ # PORTNAME= transcode -PORTVERSION= 0.6.10 -PORTREVISION= 1 +PORTVERSION= 0.6.12 CATEGORIES= multimedia MASTER_SITES= http://www.zebra.fh-weingarten.de/~transcode/pre/ @@ -26,7 +25,7 @@ CPPFLAGS= -I${X11BASE}/include -I${LOCALBASE}/include CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" -CONFIGURE_ARGS= --program-transform-name="" +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes @@ -37,18 +36,14 @@ .include -.if ${ARCH} != "i386" -BROKEN= "Does not compile on !i386" +.if exists(${LOCALBASE}/lib/libtheora.so) +WITH_LIBTHEORA= yes .endif .if exists(${LOCALBASE}/lib/libMagick.so) WITH_IMAGEMAGICK= yes .endif -.if exists(${LOCALBASE}/bin/nasm) -WITH_NASM= yes -.endif - .if exists(${LOCALBASE}/lib/libaviplay.so) WITH_AVIFILE= yes .endif @@ -110,6 +105,12 @@ WITH_DIVX5= yes .endif +.if defined(WITH_LIBTHEORA) +LIB_DEPENDS+= theora.0:${PORTSDIR}/graphics/libtheora +.else +CONFIGURE_ARGS+= --with-theora=no +.endif + .if defined(WITH_IMAGEMAGICK) LIB_DEPENDS+= Magick.6:${PORTSDIR}/graphics/ImageMagick PLIST_SUB+= WITH_IMAGEMAGICK="" @@ -245,6 +246,10 @@ .if !defined(WITH_OPTIMIZED_CFLAGS) @${ECHO_MSG} @${ECHO_MSG} "You can enable extra optimizations by defining WITH_OPTIMIZED_CFLAGS." +.endif +.if !defined(WITH_LIBTHEORA) + @${ECHO_MSG} + @${ECHO_MSG} "You can enable Libtheora by defining WITH_LIBTHEORA." .endif .if !defined(WITH_IMAGEMAGICK) @${ECHO_MSG} Index: distinfo =================================================================== RCS file: /home/FreeBSD-CVS/ports/multimedia/transcode/distinfo,v retrieving revision 1.10 diff -u -r1.10 distinfo --- distinfo 15 Oct 2003 22:49:33 -0000 1.10 +++ distinfo 26 Feb 2004 17:22:02 -0000 @@ -1 +1,2 @@ -MD5 (transcode-0.6.10.tar.gz) = eaa65eb3f6cc548cab5d1d26aba79aa5 +MD5 (transcode-0.6.12.tar.gz) = 550214ed9f85224423ca8c7308ed96ce +SIZE (transcode-0.6.12.tar.gz) = 3454807 Index: pkg-plist =================================================================== RCS file: /home/FreeBSD-CVS/ports/multimedia/transcode/pkg-plist,v retrieving revision 1.16 diff -u -r1.16 pkg-plist --- pkg-plist 15 Oct 2003 22:49:33 -0000 1.16 +++ pkg-plist 26 Feb 2004 17:22:02 -0000 @@ -14,6 +14,7 @@ bin/tcmp3cut bin/tcmplex bin/tcprobe +bin/tcrequant bin/tcscan bin/tcxmlcheck bin/tcxpm2rgb @@ -31,13 +32,13 @@ lib/transcode/export_ffmpeg.so lib/transcode/export_jpg.so lib/transcode/export_lame.so -lib/transcode/export_sampeg.so %%WITH_LIBDV%%lib/transcode/export_dv.so %%WITH_LIBDV%%lib/transcode/export_dvraw.so %%WITH_LZO%%lib/transcode/export_lzo.so %%WITH_FAME%%lib/transcode/export_fame.so %%WITH_IMAGEMAGICK%%lib/transcode/export_im.so lib/transcode/export_mjpeg.so +lib/transcode/export_mp1e.so %%WITH_NASM%%lib/transcode/export_mpeg.so %%WITH_MJPEG%%lib/transcode/export_mpeg2enc.so %%WITH_MJPEG%%lib/transcode/export_mp2enc.so @@ -61,12 +62,14 @@ lib/transcode/filter_astat.so lib/transcode/filter_clone.so %%WITH_IMAGEMAGICK%%lib/transcode/filter_compare.so +lib/transcode/filter_control.so lib/transcode/filter_cpaudio.so lib/transcode/filter_cshift.so lib/transcode/filter_cut.so lib/transcode/filter_decimate.so +lib/transcode/filter_denoise3d.so +lib/transcode/filter_detectclipping.so lib/transcode/filter_detectsilence.so -lib/transcode/filter_dilyuvmmx.so lib/transcode/filter_divxkey.so lib/transcode/filter_doublefps.so lib/transcode/filter_dnr.so @@ -87,6 +90,7 @@ lib/transcode/filter_normalize.so lib/transcode/filter_null.so %%WITH_SDL%%lib/transcode/filter_preview.so +lib/transcode/filter_pp.so lib/transcode/filter_pv.so lib/transcode/filter_resample.so lib/transcode/filter_skip.so @@ -99,8 +103,10 @@ lib/transcode/filter_tc_audio.so lib/transcode/filter_tc_video.so lib/transcode/filter_test.so +lib/transcode/filter_text.so lib/transcode/filter_testframe.so lib/transcode/filter_unsharp.so +lib/transcode/filter_whitebalance.so lib/transcode/filter_xsharpen.so lib/transcode/filter_yuvdenoise.so lib/transcode/filter_yuy2toyv12.so @@ -117,6 +123,7 @@ %%WITH_IMAGEMAGICK%%lib/transcode/import_im.so %%WITH_IMAGEMAGICK%%lib/transcode/import_imlist.so lib/transcode/import_ffmpeg.so +lib/transcode/import_fraps.so lib/transcode/import_lav.so %%WITH_LZO%%lib/transcode/import_lzo.so lib/transcode/import_mpeg2.so @@ -129,6 +136,7 @@ lib/transcode/import_ogg.so lib/transcode/import_raw.so lib/transcode/import_rawlist.so +lib/transcode/import_sh.so lib/transcode/import_vdrac3.so lib/transcode/import_vnc.so lib/transcode/import_vob.so @@ -141,6 +149,7 @@ lib/transcode/xvid2.cfg lib/transcode/xvid3.cfg lib/transcode/xvid4.cfg +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README.Inverse.Telecine.txt %%PORTDOCS%%%%DOCSDIR%%/README.cluster %%PORTDOCS%%%%DOCSDIR%%/README.filter.modfps @@ -223,6 +232,7 @@ %%PORTDOCS%%%%DOCSDIR%%/import-API.txt %%PORTDOCS%%%%DOCSDIR%%/import-xml.txt %%PORTDOCS%%%%DOCSDIR%%/import_nvrec.txt +%%PORTDOCS%%%%DOCSDIR%%/import_v4l2.txt %%PORTDOCS%%%%DOCSDIR%%/pvm.cfg %%PORTDOCS%%%%DOCSDIR%%/template.cfg.txt %%PORTDOCS%%@dirrm %%DOCSDIR%%/html --- transcode-0.6.12-1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: