From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 24 05:40: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 139D91065676 for ; Fri, 24 Apr 2009 05:40: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 DC3F08FC1E for ; Fri, 24 Apr 2009 05:40: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 n3O5e4d1001333 for ; Fri, 24 Apr 2009 05:40:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n3O5e4Fp001332; Fri, 24 Apr 2009 05:40:04 GMT (envelope-from gnats) Resent-Date: Fri, 24 Apr 2009 05:40:04 GMT Resent-Message-Id: <200904240540.n3O5e4Fp001332@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, "Dima Panov" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7AA51106564A for ; Fri, 24 Apr 2009 05:30:17 +0000 (UTC) (envelope-from fluffy@fluffy.khv.ru) Received: from ns.ael.RU (ns.ael.ru [85.142.68.226]) by mx1.freebsd.org (Postfix) with ESMTP id 642068FC0A for ; Fri, 24 Apr 2009 05:30:15 +0000 (UTC) (envelope-from fluffy@fluffy.khv.ru) Received: from Fluffy.Khv.RU ([192.168.101.222]) by ns.ael.RU (8.14.3/8.14.3/Fluffy/5.2) with ESMTP id n3O5UBOi006864 for ; Fri, 24 Apr 2009 16:30:11 +1100 (VLAST) (envelope-from fluffy@fluffy.khv.ru) Received: from Fluffy.Khv.RU (localhost [127.0.0.1]) by Fluffy.Khv.RU (8.14.3/8.14.3/Fluffy/5.4.1) with ESMTP id n3O5TuqV036653 for ; Fri, 24 Apr 2009 16:29:57 +1100 (VLAST) (envelope-from fluffy@fluffy.khv.ru) Message-Id: <1240550997.15219@Fluffy.Khv.RU> Date: Fri, 24 Apr 2009 16:29:57 +1100 From: "Dima Panov" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/133959: multimedia/transcode: update 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, 24 Apr 2009 05:40:05 -0000 >Number: 133959 >Category: ports >Synopsis: multimedia/transcode: update >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 Apr 24 05:40:04 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Dima Panov >Release: FreeBSD 8.0-800081-CURRENT i386 >Organization: Fluffy.Khv.RU >Environment: System: FreeBSD 8.0-800081-CURRENT #0: Mon Apr 20 17:30:24 VLAST 2009 root@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot >Description: multimedia/transcode: update to 1.1.0 release, review dependency list >How-To-Repeat: >Fix: --- transcode.diff begins here --- diff -urN --exclude=CVS multimedia/transcode.orig/Makefile multimedia/transcode/Makefile --- multimedia/transcode.orig/Makefile 2009-04-24 16:03:07.000000000 +1100 +++ multimedia/transcode/Makefile 2009-04-24 16:05:24.000000000 +1100 @@ -6,8 +6,7 @@ # PORTNAME= transcode -PORTVERSION= 1.0.6 -PORTREVISION= 3 +PORTVERSION= 1.1.0 CATEGORIES= multimedia MASTER_SITES= http://transcode.kabewm.com/ \ http://fromani.exit1.org/ @@ -133,14 +132,23 @@ CONFIGURE_ARGS+= --enable-libquicktime=no .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_X264) || exists(${LOCALBASE}/lib/libx264.so)) && !defined(WITHOUT_X264) +LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264 +CONFIGURE_ARGS+= --enable-x264 \ + --with-x264-prefix=${LOCALBASE} +.else +CONFIGURE_ARGS+= --enable-x264=no +.endif + +.if defined(WITH_FAAC) || (exists(${LOCALBASE}/lib/libfaac.so) && !defined(WITHOUT_FAAC)) +LIB_DEPENDS+= faac:${PORTSDIR}/audio/faac +CONFIGURE_ARGS+= --with-faac-prefix=${LOCALBASE} --enable-faac .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 +CONFIGURE_ARGS+= --with-xvid-prefix=${LOCALBASE} --enable-xvid .endif .if defined(WITH_LIBA52_DEFAULT) || (exists(${LOCALBASE}/lib/liba52.so) && !defined(WITHOUT_LIBA52)) @@ -245,9 +253,13 @@ @${ECHO_MSG} @${ECHO_MSG} "You can enable quicktime-dependent modules by defining WITH_QUICKTIME." .endif -.if !defined(WITH_FAME) +.if !defined(WITH_FAAC) + @${ECHO_MSG} + @${ECHO_MSG} "You can enable faac support by defining WITH_FAAC." +.endif +.if !defined(WITH_X264) @${ECHO_MSG} - @${ECHO_MSG} "You can enable libfame-support by defining WITH_FAME." + @${ECHO_MSG} "You can enable x264 support by defining WITH_X264." .endif .if !defined(WITH_XVID) @${ECHO_MSG} diff -urN --exclude=CVS multimedia/transcode.orig/distinfo multimedia/transcode/distinfo --- multimedia/transcode.orig/distinfo 2009-04-24 16:03:07.000000000 +1100 +++ multimedia/transcode/distinfo 2009-04-24 13:30:55.000000000 +1100 @@ -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 -urN --exclude=CVS multimedia/transcode.orig/files/patch-filter:filter_modfps.c multimedia/transcode/files/patch-filter:filter_modfps.c --- multimedia/transcode.orig/files/patch-filter:filter_modfps.c 2009-04-24 16:03:01.000000000 +1100 +++ multimedia/transcode/files/patch-filter:filter_modfps.c 2009-04-24 13:34:20.000000000 +1100 @@ -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 -urN --exclude=CVS multimedia/transcode.orig/files/patch-filter_Makefile.in multimedia/transcode/files/patch-filter_Makefile.in --- multimedia/transcode.orig/files/patch-filter_Makefile.in 2009-04-24 16:03:01.000000000 +1100 +++ multimedia/transcode/files/patch-filter_Makefile.in 2009-04-24 13:34:17.000000000 +1100 @@ -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 -urN --exclude=CVS multimedia/transcode.orig/files/patch-import:decode_dv.c multimedia/transcode/files/patch-import:decode_dv.c --- multimedia/transcode.orig/files/patch-import:decode_dv.c 2009-04-24 16:03:01.000000000 +1100 +++ multimedia/transcode/files/patch-import:decode_dv.c 2009-04-24 13:34:13.000000000 +1100 @@ -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 -urN --exclude=CVS multimedia/transcode.orig/files/patch-import_Makefile.in multimedia/transcode/files/patch-import_Makefile.in --- multimedia/transcode.orig/files/patch-import_Makefile.in 2009-04-24 16:03:01.000000000 +1100 +++ multimedia/transcode/files/patch-import_Makefile.in 2009-04-24 13:44:33.000000000 +1100 @@ -1,11 +0,0 @@ ---- 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 \ diff -urN --exclude=CVS multimedia/transcode.orig/files/patch-import_ioaux.c multimedia/transcode/files/patch-import_ioaux.c --- multimedia/transcode.orig/files/patch-import_ioaux.c 2009-04-24 16:03:01.000000000 +1100 +++ multimedia/transcode/files/patch-import_ioaux.c 2009-04-24 13:40:44.000000000 +1100 @@ -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 -urN --exclude=CVS multimedia/transcode.orig/files/patch-libtc_tc_functions.c multimedia/transcode/files/patch-libtc_tc_functions.c --- multimedia/transcode.orig/files/patch-libtc_tc_functions.c 1970-01-01 10:00:00.000000000 +1000 +++ multimedia/transcode/files/patch-libtc_tc_functions.c 2009-04-24 13:41:21.000000000 +1100 @@ -0,0 +1,43 @@ +--- libtc/tc_functions.c.orig Mon Jul 4 11:09:33 2005 ++++ libtc/tc_functions.c Wed Jan 3 02:44:37 2007 +@@ -535,6 +535,25 @@ + /* *BSD DVD device? v4l? bktr? sunau? */ + if(S_ISCHR(fbuf.st_mode)) { + switch (major(fbuf.st_rdev)) { ++# 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 ++ + #ifdef OS_BSD + # ifdef __OpenBSD__ + case 15: /* rcd */ +@@ -544,14 +563,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 -urN --exclude=CVS multimedia/transcode.orig/files/patch-libvo_yuv2rgv.c multimedia/transcode/files/patch-libvo_yuv2rgv.c --- multimedia/transcode.orig/files/patch-libvo_yuv2rgv.c 2009-04-24 16:03:01.000000000 +1100 +++ multimedia/transcode/files/patch-libvo_yuv2rgv.c 2009-04-24 13:35:51.000000000 +1100 @@ -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.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: