diff options
Diffstat (limited to 'multimedia/ffmpeg-devel/files')
10 files changed, 0 insertions, 526 deletions
diff --git a/multimedia/ffmpeg-devel/files/extra-bktr-patch-libavformat::Makefile b/multimedia/ffmpeg-devel/files/extra-bktr-patch-libavformat::Makefile deleted file mode 100644 index 25f7c23de3a0..000000000000 --- a/multimedia/ffmpeg-devel/files/extra-bktr-patch-libavformat::Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- libavformat/Makefile.orig Wed Jan 1 21:00:22 2003 -+++ libavformat/Makefile Wed Jan 1 21:01:27 2003 -@@ -21,7 +21,7 @@ - endif - - ifeq ($(CONFIG_VIDEO4LINUX),yes) --OBJS+= grab.o -+OBJS+= grab_bsdbktr.o - endif - - ifeq ($(CONFIG_AUDIO_OSS),yes) diff --git a/multimedia/ffmpeg-devel/files/ffserver.sh b/multimedia/ffmpeg-devel/files/ffserver.sh deleted file mode 100644 index 0ec0f5b65cf6..000000000000 --- a/multimedia/ffmpeg-devel/files/ffserver.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/multimedia/ffmpeg-devel/files/Attic/ffserver.sh,v 1.1 2004-12-05 18:12:41 lioux Exp $ -# - -# PROVIDE: ffserver -# REQUIRE: NETWORKING -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable ffserver: -# -#ffserver_enable="YES" -# -ffserver_enable="NO" - -. %%RC_SUBR%% - -name=ffserver -rcvar=`set_rcvar` - -command=%%PREFIX%%/bin/${name} -required_files=%%PREFIX%%/etc/ffserver.conf - -load_rc_config ${name} -run_rc_command "$1" diff --git a/multimedia/ffmpeg-devel/files/grab_bsdbktr.c b/multimedia/ffmpeg-devel/files/grab_bsdbktr.c deleted file mode 100644 index 853cf55221f4..000000000000 --- a/multimedia/ffmpeg-devel/files/grab_bsdbktr.c +++ /dev/null @@ -1,320 +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 __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 -#include <unistd.h> -#include <fcntl.h> -#include <sys/ioctl.h> -#include <sys/mman.h> -#include <sys/time.h> -#include <signal.h> - -typedef struct { - int fd; - int tuner_fd; - int frame_format; /* see VIDEO_PALETTE_xxx */ - int width, height; - int frame_rate; - int frame_rate_base; - int64_t per_frame; -} VideoData; - -const char *video_device = "/dev/bktr0"; - -#define PAL 1 -#define PALBDGHI 1 -#define NTSC 2 -#define NTSCM 2 -#define SECAM 3 -#define PALN 4 -#define PALM 5 -#define NTSCJ 6 - -/* PAL is 768 x 576. NTSC is 640 x 480 */ -#define PAL_HEIGHT 576 -#define SECAM_HEIGHT 576 -#define NTSC_HEIGHT 480 - -#ifndef VIDEO_FORMAT -#define VIDEO_FORMAT NTSC -#endif - -static int bktr_dev[] = { METEOR_DEV0, METEOR_DEV1, METEOR_DEV2, - METEOR_DEV3, METEOR_DEV_SVIDEO }; - -static u_int8_t *video_buf; -static int nsignals = 0; -static void catchsignal(int signal) -{ - nsignals++; - return; -} - -static int bktr_init (const char *video_device, int width, int height, - int format, u_int8_t **video_buf, int *video_fd, int *tuner_fd, - int idev, double frequency) -{ - struct meteor_geomet geo; - int h_max; - long ioctl_frequency; - char *arg; - int c; - struct sigaction act,old; - - if (idev < 0 || idev > 4) - { - arg = getenv ("BKTR_DEV"); - if (arg) - idev = atoi (arg); - if (idev < 0 || idev > 4) - idev = 0; - } - - if (format < 1 || format > 6) - { - arg = getenv ("BKTR_FORMAT"); - if (arg) - format = atoi (arg); - if (format < 1 || format > 6) - format = VIDEO_FORMAT; - } - - if (frequency <= 0) - { - arg = getenv ("BKTR_FREQUENCY"); - if (arg) - frequency = atof (arg); - if (frequency <= 0) - frequency = 0.0; - } - - memset(&act,0,sizeof(act)); - sigemptyset(&act.sa_mask); - act.sa_handler = catchsignal; - sigaction(SIGUSR1,&act,&old); - - *tuner_fd = open ("/dev/tuner0", O_RDONLY); - if (*tuner_fd < 0) { - perror("Warning: Tuner not opened continuing"); - } - - *video_fd = open (video_device, O_RDONLY); - if (*video_fd < 0) { - perror (video_device); - return -1; - } - - geo.rows = height; - geo.columns = width; - geo.frames = 1; -// geo.oformat = METEOR_GEO_YUV_422 | METEOR_GEO_YUV_12; - geo.oformat = METEOR_GEO_YUV_PACKED; - - switch (format) { - case PAL: h_max = PAL_HEIGHT; c = BT848_IFORM_F_PALBDGHI; break; - case PALN: h_max = PAL_HEIGHT; c = BT848_IFORM_F_PALN; break; - case PALM: h_max = PAL_HEIGHT; c = BT848_IFORM_F_PALM; break; - case SECAM: h_max = SECAM_HEIGHT; c = BT848_IFORM_F_SECAM; break; - case NTSC: h_max = NTSC_HEIGHT; c = BT848_IFORM_F_NTSCM; break; - case NTSCJ: h_max = NTSC_HEIGHT; c = BT848_IFORM_F_NTSCJ; break; - default: h_max = PAL_HEIGHT; c = BT848_IFORM_F_PALBDGHI; break; - } - if (height <= h_max/2) { - geo.oformat |= METEOR_GEO_EVEN_ONLY; - } - - if (ioctl(*video_fd, METEORSETGEO, &geo) < 0) { - perror ("METEORSETGEO"); - return -1; - } - - if (ioctl(*video_fd, BT848SFMT, &c) < 0) { - perror ("BT848SFMT"); - return -1; - } - - c = bktr_dev[idev]; - if (ioctl(*video_fd, METEORSINPUT, &c) < 0) { - perror ("METEORSINPUT"); - return -1; - } - *video_buf = (u_int8_t *) mmap((caddr_t)0, width*height*2, - PROT_READ, MAP_SHARED, *video_fd, (off_t) 0); - if (*video_buf == MAP_FAILED) { - perror ("mmap"); - return -1; - } - if (frequency != 0.0) { - ioctl_frequency = (unsigned long)(frequency*16); - if (ioctl(*tuner_fd, TVTUNER_SETFREQ, &ioctl_frequency)<0) - perror("TVTUNER_SETFREQ"); - } - c = METEOR_CAP_CONTINOUS; - ioctl(*video_fd, METEORCAPTUR, &c); - c = SIGUSR1; - ioctl (*video_fd, METEORSSIGNAL, &c); - return 0; -} - -static void bktr_getframe(u_int64_t per_frame) -{ - u_int64_t curtime; - static u_int64_t last_frame_time = 0; - - curtime = av_gettime(); - if (!last_frame_time - || ((last_frame_time + per_frame) > curtime)) { - if (!usleep (last_frame_time + per_frame + per_frame/8 - curtime)) { - if (!nsignals) - printf ("\nSLEPT NO signals - %d microseconds late\n", - (int) (av_gettime() - last_frame_time - per_frame)); - } - } - nsignals = 0; - - last_frame_time = curtime; -} - -void bf_memcpy (char *dest, char *src, int size) -{ - while (size -= 2) - { - dest[0] = src[1]; - dest[1] = src[0]; - dest += 2; - src += 2; - } -} - -/* note: we support only one picture read at a time */ -static int grab_read_packet(AVFormatContext *s1, AVPacket *pkt) -{ - VideoData *s = s1->priv_data; - int size, halfsize; - - size = s->width * s->height; - halfsize = size << 1; - -// if (av_new_packet(pkt, size + halfsize) < 0) - if (av_new_packet(pkt, size + size) < 0) - return -EIO; - - bktr_getframe (s->per_frame); - pkt->pts = av_gettime() & ((1LL << 48) - 1); - bf_memcpy (pkt->data, video_buf, size + size); -// bf_memcpy (pkt->data, video_buf, size + halfsize); - -// return size + halfsize; - return size + size; -} - -static int grab_read_header (AVFormatContext *s1, AVFormatParameters *ap) -{ - VideoData *s = s1->priv_data; - AVStream *st; - int width, height; - int frame_rate; - int frame_rate_base; - int format = -1; - - if (!ap || ap->width <= 0 || ap->height <= 0 || ap->frame_rate <= 0) - return -1; - - width = ap->width; - height = ap->height; - frame_rate = ap->frame_rate; - frame_rate_base = ap->frame_rate_base; - - st = av_new_stream(s1, 0); - if (!st) - return -ENOMEM; - - s->width = width; - s->height = height; - s->frame_rate = frame_rate; - s->frame_rate_base = frame_rate_base; - s->per_frame = ((int64_t)1000000 * s->frame_rate_base) / s->frame_rate; - - st->codec.codec_type = CODEC_TYPE_VIDEO; -// st->codec.pix_fmt = PIX_FMT_YUV420P; - st->codec.pix_fmt = PIX_FMT_YUV422; - st->codec.codec_id = CODEC_ID_RAWVIDEO; - st->codec.width = width; - st->codec.height = height; - st->codec.frame_rate = frame_rate; - st->codec.frame_rate_base = frame_rate_base; - - av_set_pts_info(s1, 48, 1, 1000000); /* 48 bits pts in use */ - - if (ap->standard) { - if (!strcasecmp(ap->standard, "pal")) - format = PAL; - if (!strcasecmp(ap->standard, "secam")) - format = SECAM; - if (!strcasecmp(ap->standard, "ntsc")) - format = NTSC; - } - - if (bktr_init (video_device, width, height, format, &video_buf, - &(s->fd), &(s->tuner_fd), -1, 0.0) < 0) - return -EIO; - return 0; -} - -static int grab_read_close (AVFormatContext *s1) -{ - VideoData *s = s1->priv_data; - - int c = METEOR_CAP_STOP_CONT; - ioctl(s->fd, METEORCAPTUR, &c); - close(s->fd); - close(s->tuner_fd); - av_free(s); - return 0; -} - -AVInputFormat video_grab_device_format = { - "video4linux", - "video grab", - sizeof(VideoData), - NULL, - grab_read_header, - grab_read_packet, - grab_read_close, - flags: AVFMT_NOFILE, -}; - -int video_grab_init(void) -{ - av_register_input_format(&video_grab_device_format); - return 0; -} diff --git a/multimedia/ffmpeg-devel/files/patch-Makefile b/multimedia/ffmpeg-devel/files/patch-Makefile deleted file mode 100644 index a04053123a5f..000000000000 --- a/multimedia/ffmpeg-devel/files/patch-Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile.orig Sat Jul 17 11:05:15 2004 -+++ Makefile Sat Jul 17 11:04:42 2004 -@@ -81,8 +81,9 @@ - all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC) - - lib: -- $(MAKE) -C libavcodec all -- $(MAKE) -C libavformat all -+ $(MAKE) LDFLAGS="$(LDFLAGS)" -C libavcodec all -+ $(MAKE) LDFLAGS="$(LDFLAGS)" -C libavformat all -+ - - ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs - $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure deleted file mode 100644 index 8aa0caaa7940..000000000000 --- a/multimedia/ffmpeg-devel/files/patch-configure +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.orig Mon Jul 5 15:05:54 2004 -+++ configure Sun Dec 5 15:49:57 2004 -@@ -88,7 +88,7 @@ - mandir="" - bindir="" - cross_prefix="" --cc="gcc" -+cc="$CC" - ar="ar" - ranlib="ranlib" - make="make" -@@ -187,7 +187,7 @@ - BeOS) - prefix="/boot/home/config" - # helps building libavcodec --CFLAGS="-DPIC -fomit-frame-pointer" -+CFLAGS="$CFLAGS -DPIC -fomit-frame-pointer" - # 3 gcc releases known for BeOS, each with ugly bugs - gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`" - case "$gcc_version" in -@@ -857,7 +857,7 @@ - EOF - - imlib2=no --if $cc -o $TMPE $TMPC -lImlib2 -lm > /dev/null 2>&1 ; then -+if $cc $CFLAGS $LDFLAGS -o $TMPE $TMPC -lImlib2 -lm > /dev/null 2>&1 ; then - imlib2=yes - fi - diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile deleted file mode 100644 index 4ed42ea46e9d..000000000000 --- a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile +++ /dev/null @@ -1,22 +0,0 @@ ---- libavcodec/Makefile.orig Sat Jul 17 11:07:57 2004 -+++ libavcodec/Makefile Sat Jul 17 11:09:21 2004 -@@ -197,7 +197,7 @@ - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) - -lib /machine:i386 /def:$(@:.dll=.def) - else -- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS) -+ $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) - endif - - dsputil.o: dsputil.c dsputil.h -@@ -269,8 +269,8 @@ - install -s -m 755 $(SLIB) "$(prefix)" - else - install -d $(prefix)/lib -- install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so -- ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so -+ install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.1 -+ cd $(prefix)/lib && ln -s libavcodec.so.1 libavcodec.so - ldconfig || true - endif - else diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::alpha::simple_idct_alpha.c b/multimedia/ffmpeg-devel/files/patch-libavcodec::alpha::simple_idct_alpha.c deleted file mode 100644 index 9595454fd081..000000000000 --- a/multimedia/ffmpeg-devel/files/patch-libavcodec::alpha::simple_idct_alpha.c +++ /dev/null @@ -1,19 +0,0 @@ ---- libavcodec/alpha/simple_idct_alpha.c.bak Fri Dec 27 12:35:23 2002 -+++ libavcodec/alpha/simple_idct_alpha.c Tue May 13 21:21:42 2003 -@@ -24,8 +24,16 @@ - * and Falk Hueffner <falk@debian.org> - */ - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #include "asm.h" - #include "../dsputil.h" -+ -+#if defined(__FreeBSD__) && __FreeBSD_version < 500000 -+typedef __int32_t int_fast32_t; -+#endif - - extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels, - int line_size); diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::bswap.h b/multimedia/ffmpeg-devel/files/patch-libavcodec::bswap.h deleted file mode 100644 index 8bef16c36abc..000000000000 --- a/multimedia/ffmpeg-devel/files/patch-libavcodec::bswap.h +++ /dev/null @@ -1,53 +0,0 @@ ---- libavcodec/bswap.h.orig Sun Dec 5 16:03:35 2004 -+++ libavcodec/bswap.h Sun Dec 5 16:06:48 2004 -@@ -10,6 +10,14 @@ - #include <byteswap.h> - #else - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 470000 -+#include <sys/endian.h> -+#endif -+ - #ifdef ARCH_X86 - static inline unsigned short ByteSwap16(unsigned short x) - { -@@ -18,7 +26,11 @@ - "0" (x)); - return x; - } -+#if defined(__FreeBSD__) && __FreeBSD_version >= 470000 -+#define bswap_16(x) (be16toh(x)) -+#else - #define bswap_16(x) ByteSwap16(x) -+#endif - - static inline unsigned int ByteSwap32(unsigned int x) - { -@@ -34,7 +46,11 @@ - "0" (x)); - return x; - } -+#if defined(__FreeBSD__) && __FreeBSD_version >= 470000 -+#define bswap_32(x) (be32toh(x)) -+#else - #define bswap_32(x) ByteSwap32(x) -+#endif - - static inline unsigned long long int ByteSwap64(unsigned long long int x) - { -@@ -45,7 +61,11 @@ - "0"(bswap_32((unsigned long)x)),"1"(bswap_32((unsigned long)(x>>32)))); - return __x.__ll; - } -+#if defined(__FreeBSD__) && __FreeBSD_version >= 510000 -+#define bswap_64(x) (be64toh(x)) -+#else - #define bswap_64(x) ByteSwap64(x) -+#endif - - #elif defined(ARCH_SH4) - diff --git a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile b/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile deleted file mode 100644 index 36a7674c28e5..000000000000 --- a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- libavformat/Makefile.orig Thu Sep 11 22:55:10 2003 -+++ libavformat/Makefile Thu Sep 11 23:12:50 2003 -@@ -88,8 +88,8 @@ - install: all - ifeq ($(BUILD_SHARED),yes) - install -d $(prefix)/lib -- install -s -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so -- ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so -+ install -s -m 755 $(SLIB) $(prefix)/lib/libavformat.so.1 -+ ln -sf libavformat.so.1 $(prefix)/lib/libavformat.so - ldconfig || true - mkdir -p $(prefix)/include/ffmpeg - install -m 644 $(VPATH)/avformat.h $(prefix)/include/ffmpeg/avformat.h diff --git a/multimedia/ffmpeg-devel/files/patch-vhook::Makefile b/multimedia/ffmpeg-devel/files/patch-vhook::Makefile deleted file mode 100644 index cea89f3f74e5..000000000000 --- a/multimedia/ffmpeg-devel/files/patch-vhook::Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- vhook/Makefile.orig Fri Dec 5 20:07:04 2003 -+++ vhook/Makefile Fri Dec 5 20:07:55 2003 -@@ -29,13 +29,13 @@ - install -s -m 755 $(HOOKS) $(INSTDIR) - - imlib2.so: imlib2.o -- $(CC) -g -o $@ $(SHFLAGS) $< -lImlib2 -+ $(CC) -o $@ $(LDFLAGS) $(SHFLAGS) $< -lImlib2 - - drawtext.so: drawtext.o -- $(CC) -g -o $@ $(SHFLAGS) $< `freetype-config --libs` -+ $(CC) -o $@ $(LDFLAGS) $(SHFLAGS) $< `freetype-config --libs` - - %.so: %.o -- $(CC) -g -o $@ $(SHFLAGS) $< -+ $(CC) -o $@ $(LDFLAGS) $(SHFLAGS) $< - - clean: - rm -f *.o *.d .depend *.so *~ |