pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia ffmpeg is now 0.4.9pre1



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c63a62f11f76
branches:  trunk
changeset: 508193:c63a62f11f76
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Feb 16 10:27:25 2006 +0000

description:
ffmpeg is now 0.4.9pre1

diffstat:

 multimedia/Makefile                          |    3 +-
 multimedia/ffmpeg-devel/DESCR                |   10 -
 multimedia/ffmpeg-devel/Makefile             |   54 ----
 multimedia/ffmpeg-devel/PLIST                |   24 -
 multimedia/ffmpeg-devel/buildlink3.mk        |   19 -
 multimedia/ffmpeg-devel/distinfo             |   11 -
 multimedia/ffmpeg-devel/files/bktr.diff      |   22 -
 multimedia/ffmpeg-devel/files/ffmpeg.1.diff  |   61 ----
 multimedia/ffmpeg-devel/files/grab_bsdbktr.c |  340 ---------------------------
 multimedia/ffmpeg-devel/options.mk           |   96 -------
 multimedia/ffmpeg-devel/patches/patch-aa     |   17 -
 multimedia/ffmpeg-devel/patches/patch-ab     |   22 -
 multimedia/ffmpeg-devel/patches/patch-ac     |  113 --------
 multimedia/ffmpeg-devel/patches/patch-ad     |   57 ----
 multimedia/ffmpeg-devel/patches/patch-ae     |   41 ---
 multimedia/ffmpeg-devel/patches/patch-ag     |  194 ---------------
 16 files changed, 1 insertions(+), 1083 deletions(-)

diffs (truncated from 1158 to 300 lines):

diff -r 5d343480d531 -r c63a62f11f76 multimedia/Makefile
--- a/multimedia/Makefile       Thu Feb 16 10:26:30 2006 +0000
+++ b/multimedia/Makefile       Thu Feb 16 10:27:25 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2006/02/12 14:17:02 joerg Exp $
+# $NetBSD: Makefile,v 1.87 2006/02/16 10:27:25 abs Exp $
 #
 
 COMMENT=       Multimedia utilities
@@ -14,7 +14,6 @@
 SUBDIR+=       dvdrip
 SUBDIR+=       dvdstyler
 SUBDIR+=       ffmpeg
-SUBDIR+=       ffmpeg-devel
 SUBDIR+=       flashplayer
 SUBDIR+=       fxtv
 SUBDIR+=       gmencoder
diff -r 5d343480d531 -r c63a62f11f76 multimedia/ffmpeg-devel/DESCR
--- a/multimedia/ffmpeg-devel/DESCR     Thu Feb 16 10:26:30 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-FFmpeg is the first complete and free Internet Live Audio and Video
-Broadcasting solution. FFMpeg aims at being the command line tool to
-handle audio and video. It is a "three-in-one" solution.
-
-FFmpeg includes a soft VCR capable of encoding in many different
-formats simultaneously, a streaming server for Netcasting multimedia
-and is available under the GNU General Public License.
-
-FFmpeg generates streaming files, in many popular formats
-simultaneously, faster than any other solution.
diff -r 5d343480d531 -r c63a62f11f76 multimedia/ffmpeg-devel/Makefile
--- a/multimedia/ffmpeg-devel/Makefile  Thu Feb 16 10:26:30 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:15 joerg Exp $
-
-DISTNAME=      ffmpeg-0.4.9-pre1
-PKGNAME=       ffmpeg-devel-0.4.9pre1
-PKGREVISION=   1
-CATEGORIES=    multimedia
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ffmpeg/}
-
-MAINTAINER=    zul%NetBSD-fr.org@localhost
-HOMEPAGE=      http://ffmpeg.sourceforge.net/
-COMMENT=       MPEG decoding, encoding and streaming software
-
-HAS_CONFIGURE= YES
-USE_TOOLS+=    gmake
-USE_LIBTOOL=   YES
-
-CONFLICTS+=    ffmpeg-[0-9]*
-
-REPLACE_PERL=  doc/texi2pod.pl
-
-CONF_FILES=    ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
-               ${PKG_SYSCONFDIR}/ffserver.conf
-
-MAKE_ENV+=     EXTRA_LIBS=${LIBGETOPT:Q} \
-               FFSERVER_CONF=${PKG_SYSCONFDIR}/ffserver.conf \
-               LOCALBASE=${LOCALBASE:Q}
-
-CONFIGURE_ARGS=                --cc=${CC:Q} --prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=       --enable-pp --disable-vhook --disable-debug
-CONFIGURE_ARGS+=       --enable-gpl
-CONFIGURE_ARGS+=       --enable-ffplay
-
-.include "options.mk"
-
-post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ffmpeg \
-               ${PREFIX}/share/doc/ffmpeg \
-               ${PREFIX}/include/ffmpeg/libpostproc
-       ${INSTALL_DATA} ${WRKSRC}/libavcodec/apiexample.c \
-               ${PREFIX}/share/doc/ffmpeg
-       ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \
-               ${PREFIX}/share/doc/ffmpeg
-       ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/ffmpeg
-       ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
-               ${PREFIX}/share/examples/ffmpeg
-       # ffplay not installed
-       if [ -f ${PREFIX}/man/man1/ffplay.1 ]; then \
-       ${RM} ${PREFIX}/man/man1/ffplay.1 ; \
-       fi
-       ${INSTALL_DATA} ${WRKSRC}/libavcodec/libpostproc/postprocess.h \
-               ${PREFIX}/include/ffmpeg/libpostproc
-
-.include "../../devel/libgetopt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 5d343480d531 -r c63a62f11f76 multimedia/ffmpeg-devel/PLIST
--- a/multimedia/ffmpeg-devel/PLIST     Thu Feb 16 10:26:30 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/24 04:00:37 xtraeme Exp $
-bin/ffmpeg
-bin/ffserver
-include/ffmpeg/avcodec.h
-include/ffmpeg/avformat.h
-include/ffmpeg/avio.h
-include/ffmpeg/common.h
-include/ffmpeg/libpostproc/postprocess.h
-include/ffmpeg/rational.h
-include/ffmpeg/rtp.h
-include/ffmpeg/rtsp.h
-include/ffmpeg/rtspcodes.h
-lib/libavcodec.la
-lib/libavformat.la
-share/doc/ffmpeg/README
-share/doc/ffmpeg/TODO
-share/doc/ffmpeg/apiexample.c
-share/doc/ffmpeg/ffmpeg_powerpc_performance_evaluation_howto.txt
-share/doc/ffmpeg/optimization.txt
-share/examples/ffmpeg/ffserver.conf
-@dirrm share/examples/ffmpeg
-@dirrm share/doc/ffmpeg
-@dirrm include/ffmpeg/libpostproc
-@dirrm include/ffmpeg
diff -r 5d343480d531 -r c63a62f11f76 multimedia/ffmpeg-devel/buildlink3.mk
--- a/multimedia/ffmpeg-devel/buildlink3.mk     Thu Feb 16 10:26:30 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:15 joerg Exp $
-
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
-FFMPEG_DEVEL_BUILDLINK3_MK:=   ${FFMPEG_DEVEL_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    ffmpeg-devel
-.endif
-
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nffmpeg-devel}
-BUILDLINK_PACKAGES+=   ffmpeg-devel
-
-.if !empty(FFMPEG_DEVEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ffmpeg-devel+=       ffmpeg-devel>=0.4.9pre1
-BUILDLINK_RECOMMENDED.ffmpeg-devel?=   ffmpeg-devel>=0.4.9pre1nb1
-BUILDLINK_PKGSRCDIR.ffmpeg-devel?=     ../../multimedia/ffmpeg-devel
-.endif # FFMPEG_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 5d343480d531 -r c63a62f11f76 multimedia/ffmpeg-devel/distinfo
--- a/multimedia/ffmpeg-devel/distinfo  Thu Feb 16 10:26:30 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/02/02 08:18:04 joerg Exp $
-
-SHA1 (ffmpeg-0.4.9-pre1.tar.gz) = aad00445137520bec19e56bcb042e75a10c53bb3
-RMD160 (ffmpeg-0.4.9-pre1.tar.gz) = fd682846f97ada32951af7844e185c42783189a4
-Size (ffmpeg-0.4.9-pre1.tar.gz) = 1611332 bytes
-SHA1 (patch-aa) = acc31f2c428411f912750e05703f5cad506c12bc
-SHA1 (patch-ab) = f596db3c555ab772eae2da5b8144c23fb4f2eaa0
-SHA1 (patch-ac) = 2e7aa9021ddfe46cda35a9399e59f63848610d83
-SHA1 (patch-ad) = 95eea8ef74a270a0c60243eff740aa3346efaaaf
-SHA1 (patch-ae) = 7223978301c95de96d19610afb332f10764c4de0
-SHA1 (patch-ag) = 69656d16d44d3321bdf9b790e6263db1529d2c99
diff -r 5d343480d531 -r c63a62f11f76 multimedia/ffmpeg-devel/files/bktr.diff
--- a/multimedia/ffmpeg-devel/files/bktr.diff   Thu Feb 16 10:26:30 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- libavformat/Makefile.orig  2004-08-14 14:51:47.000000000 +0200
-+++ libavformat/Makefile       2004-08-14 14:52:43.000000000 +0200
-@@ -32,7 +32,7 @@
- OBJS+= framehook.o 
- 
- ifeq ($(CONFIG_VIDEO4LINUX),yes)
--OBJS+= grab.o
-+OBJS+= grab_bsdbktr.o
- endif
- 
- ifeq ($(CONFIG_DV1394),yes)
---- configure.org       2004-07-31 17:12:40.000000000 +0200
-+++ configure   2004-07-31 17:12:54.000000000 +0200
-@@ -231,6 +231,8 @@
- *) ;;
- esac
-
-+v4l="yes"
-+
- # From mplayer configure. We need TARGET_OS available
- # to the Makefile, so it can distinguish between flavors
- # of AltiVec on PowerPC
diff -r 5d343480d531 -r c63a62f11f76 multimedia/ffmpeg-devel/files/ffmpeg.1.diff
--- a/multimedia/ffmpeg-devel/files/ffmpeg.1.diff       Thu Feb 16 10:26:30 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
---- doc/ffmpeg.1.orig  2004-08-29 12:38:34.000000000 +0200
-+++ doc/ffmpeg.1       2004-08-29 13:03:08.000000000 +0200
-@@ -505,21 +505,49 @@
- tell that the raw codec data must be copied as is.
- .Sh "Audio/Video grab options"
- .IX Subsection "Audio/Video grab options"
--.IP "\fB\-vd device\fR" 4
--.IX Item "-vd device"
--set video grab device (e.g. \fI/dev/video0\fR)
--.IP "\fB\-vc channel\fR" 4
--.IX Item "-vc channel"
--set video grab channel (\s-1DV1394\s0 only)
- .IP "\fB\-tvstd standard\fR" 4
- .IX Item "-tvstd standard"
- set television standard (\s-1NTSC\s0, \s-1PAL\s0 (\s-1SECAM\s0))
--.IP "\fB\-dv1394\fR" 4
--.IX Item "-dv1394"
--set \s-1DV1394\s0 grab
- .IP "\fB\-ad device\fR" 4
- .IX Item "-ad device"
- set audio device (e.g. \fI/dev/dsp\fR)
-+.PP
-+This build of ffmpeg includes NetBSD-specific patches that change the
-+video-grabbing semantics. Recording from bktr(4) can be controlled via the
-+following environment variables:
-+.PP
-+.RS
-+.B BKTR_DEV
-+(0\-4): which of the devices on the bktr should provide the signal (tuner,
-+video-in,...)
-+.PP
-+.B BKTR_FORMAT
-+(1\-6): TV format, 1 PAL 2 NTSC 3 SECAM 4 PALN 5 PALM 6 NTSCJ
-+.PP
-+.B BKTR_FREQUENCY
-+(float): frequency to which the tuner should be set.
-+.PP
-+.B BKTR_CHANNEL
-+(int): channel to which the tuner should be set, overrides BKTR_FREQUENCY
-+.RE
-+.PP
-+If you set the channel or frequency with a different program such as xawtv
-+or fxtv you might not get audio; try to use the environment variables in
-+that case. Do not forget to set the following mixerctl variables to useful
-+values:
-+.PP
-+.RS
-+record.source=line
-+.PP
-+record.volume=255,255
-+.PP
-+inputs.line=255,255
-+.RE
-+.PP
-+One possible command line would then be:
-+.PP
-+ffmpeg -y -intra -tvstd pal -vcodec mpeg2video -s 768x576 -b 9600 -ab 128 -ad
-+/dev/audio -ac 2 -ar 44100 /tmp/file.mpg
- .Sh "Advanced options"
- .IX Subsection "Advanced options"
- .IP "\fB\-map file:stream\fR" 4
diff -r 5d343480d531 -r c63a62f11f76 multimedia/ffmpeg-devel/files/grab_bsdbktr.c
--- a/multimedia/ffmpeg-devel/files/grab_bsdbktr.c      Thu Feb 16 10:26:30 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,340 +0,0 @@
-/*
- * FreeBSD video grab interface
- * Copyright (c) 2002 Steve O'Hara-Smith
- * based on
- *           Linux video grab interface
- *           Copyright (c) 2000,2001 Gerard Lantau.
- * and
- *           simple_grab.c Copyright (c) 1999 Roger Hardiman
- *
- * GPL virus inherited:
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#include "avformat.h"
-#if defined __DragonFly__
-#include <dev/video/meteor/ioctl_meteor.h>
-#include <dev/video/bktr/ioctl_bt848.h>
-#else
-#if defined __FreeBSD__
-#if __FreeBSD__ >= 502100
-#include <dev/bktr/ioctl_meteor.h>
-#include <dev/bktr/ioctl_bt848.h>
-#else
-#include <machine/ioctl_meteor.h>
-#include <machine/ioctl_bt848.h>
-#endif
-#else
-#include <dev/ic/bt8xx.h>
-#endif
-#endif
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/time.h>
-#include <signal.h>
-
-typedef struct {



Home | Main Index | Thread Index | Old Index