diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile index 0b51377857e..e119ed2b400 100644 --- a/graphics/fxtv/Makefile +++ b/graphics/fxtv/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2002/02/02 00:52:18 naddy Exp $ +# $OpenBSD: Makefile,v 1.25 2002/04/26 11:37:10 wcobb Exp $ COMMENT= "Display and capture for Brooktree-based cards" DISTNAME= fxtv-1.03 @@ -9,20 +9,19 @@ HOMEPAGE= http://people.freebsd.org/~rhh/fxtv/ EXTRACT_SUFX= .tgz MASTER_SITES= ${HOMEPAGE} \ - http://vedge.com.ar/mirror/fxtv/ \ - ftp://vedge.com.ar/pub/mirror/fxtv/ + http://mirror.csoft.org/fxtv/ LIB_DEPENDS= tiff.35::graphics/tiff \ jpeg.62::graphics/jpeg \ Xaw3d.6.1::x11/Xaw3d RUN_DEPENDS= ::audio/sox \ - ::audio/mpg123 \ + ::audio/mpg321 \ ::audio/mp3encode \ ::graphics/mpeg_encode \ ::graphics/mplex -MAINTAINER= Wilbern Cobb +MAINTAINER= Wilbern Cobb # BSD license PERMIT_PACKAGE_CDROM= Yes diff --git a/graphics/fxtv/patches/patch-Fxtv b/graphics/fxtv/patches/patch-Fxtv index 0886e64a4b9..190754f62b5 100644 --- a/graphics/fxtv/patches/patch-Fxtv +++ b/graphics/fxtv/patches/patch-Fxtv @@ -1,4 +1,4 @@ -$OpenBSD: patch-Fxtv,v 1.1 2002/02/02 00:52:18 naddy Exp $ +$OpenBSD: patch-Fxtv,v 1.2 2002/04/26 11:37:10 wcobb Exp $ --- Fxtv.orig Mon Feb 12 17:07:05 2001 +++ Fxtv Wed Aug 15 13:46:30 2001 @@ -13,7 +13,7 @@ Fxtv*defaultInput: tuner @@ -20,8 +20,8 @@ $OpenBSD: patch-Fxtv,v 1.1 2002/02/02 00:52:18 naddy Exp $ -Fxtv*playCmdMpeg3: mpg123 +Fxtv*recCmdMpeg2: %%LOCALBASE%%/bin/mp3encode -l 2 -p 1 +Fxtv*recCmdMpeg3: %%LOCALBASE%%/bin/mp3encode -l 3 -p 2 -+Fxtv*playCmdMpeg2: %%LOCALBASE%%/bin/mpg123 -+Fxtv*playCmdMpeg3: %%LOCALBASE%%/bin/mpg123 ++Fxtv*playCmdMpeg2: %%LOCALBASE%%/bin/mpg321 ++Fxtv*playCmdMpeg3: %%LOCALBASE%%/bin/mpg321 ! Custom MPEG video/system stream conversion script -!Fxtv*videoCnvtScript: /usr/X11R6/lib/X11/fxtv/fxtv_cnvt.sh diff --git a/graphics/fxtv/patches/patch-app_rsrc_h b/graphics/fxtv/patches/patch-app_rsrc_h index 9a609ef78c2..09c1beae879 100644 --- a/graphics/fxtv/patches/patch-app_rsrc_h +++ b/graphics/fxtv/patches/patch-app_rsrc_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-app_rsrc_h,v 1.1 2002/02/02 00:52:18 naddy Exp $ +$OpenBSD: patch-app_rsrc_h,v 1.2 2002/04/26 11:37:10 wcobb Exp $ --- app_rsrc.h.orig Mon Feb 12 17:17:53 2001 +++ app_rsrc.h Wed Aug 15 13:46:30 2001 @@ -399,20 +399,20 @@ static XtResource Resources[] = { @@ -14,11 +14,11 @@ $OpenBSD: patch-app_rsrc_h,v 1.1 2002/02/02 00:52:18 naddy Exp $ { RNplayCmdMpeg2, RCplayCmd, XtRString, sizeof(String), XtOffsetOf(AppResources, play_cmd_mpeg2 ), XtRImmediate, - "mpg123" }, -+ "%%LOCALBASE%%/bin/mpg123" }, ++ "%%LOCALBASE%%/bin/mpg321" }, { RNplayCmdMpeg3, RCplayCmd, XtRString, sizeof(String), XtOffsetOf(AppResources, play_cmd_mpeg3 ), XtRImmediate, - "mpg123" }, -+ "%%LOCALBASE%%/bin/mpg123" }, ++ "%%LOCALBASE%%/bin/mpg321" }, { RNvideoCnvtScript, RCvideoCnvtScript, XtRString, sizeof(String), XtOffsetOf(AppResources, video_cnvt_script ), XtRImmediate,