cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 20050413; from Jacob Meuser <jakemsr@jakemsr.com>.

Browse Source 
Lots of bug fixes.
This commit is contained in:
naddy 2005-04-20 16:46:54 +00:00
parent 605e90b7e9
commit 59b3fd48bd
12 changed files with 99 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
graphics/ffmpeg/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.16 2005/03/10 03:35:15 jolan Exp $
# $OpenBSD: Makefile,v 1.17 2005/04/20 16:46:54 naddy Exp $
COMMENT= "audio/video converter and streamer with bktr(4) support"
DISTNAME= FFMpeg-20050130
PKGNAME= ${DISTNAME:L}p0
DISTNAME= FFMpeg-20050413
PKGNAME= ${DISTNAME:L}
CATEGORIES= graphics x11
MASTER_SITES= http://www.jakemsr.com/
@ -25,7 +25,7 @@ BUILD_DEPENDS= ::textproc/texi2html
LIB_DEPENDS= SDL.2.0::devel/sdl \
a52.0.0::audio/liba52 \
mp3lame.0.1::audio/lame \
vorbis.3.0,vorbisenc.2.0::audio/libvorbis
vorbis.4.0,vorbisenc.2.0::audio/libvorbis
NO_REGRESS= Yes # Possible to adapt with some work
USE_GMAKE= Yes
@ -36,8 +36,11 @@ USE_X11= Yes
CFLAGS+=-fomit-frame-pointer
.endif
# version numbers for the shared libraries
SV= 6.0
CONFIGURE_STYLE=simple
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" SV="${SV}"
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--cc=${CC} \
--make=${MAKE_PROGRAM} \
@ -47,6 +50,7 @@ CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--enable-a52 \
--enable-pp \
--enable-mp3lame \
--enable-libogg \
--enable-vorbis \
--enable-gpl \
--enable-pthreads \
@ -59,9 +63,6 @@ MAKE_ENV+= LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
CONFIGURE_ARGS+=--enable-shared-pp
.endif
# version numbers for the shared libraries
SV= 5.0
post-extract:
@cp ${FILESDIR}/grab_bsdbktr.c ${WRKSRC}/libavformat/

8
graphics/ffmpeg/distinfo
View File

@ -1,4 +1,4 @@
MD5 (FFMpeg-20050130.tar.bz2) = 07e6fb2a05a597472c7821d2384d937f
RMD160 (FFMpeg-20050130.tar.bz2) = 8022ac61cf7047f63cf6d9df8ab24c07b42729cc
SHA1 (FFMpeg-20050130.tar.bz2) = e35822d7c83560c44790e71832fa280a92c57333
SIZE (FFMpeg-20050130.tar.bz2) = 1492188
MD5 (FFMpeg-20050413.tar.bz2) = fbad8626724753343758518994ea72f9
RMD160 (FFMpeg-20050413.tar.bz2) = 3618e592ebe5c5f4bc33e4dd2bbf428984ac8b7f
SHA1 (FFMpeg-20050413.tar.bz2) = 10b1c70453faa092fefc0f4417cfc6ce69e3a813
SIZE (FFMpeg-20050413.tar.bz2) = 1525035

52
graphics/ffmpeg/files/grab_bsdbktr.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: grab_bsdbktr.c,v 1.4 2004/10/13 01:38:21 jolan Exp $
/* $OpenBSD: grab_bsdbktr.c,v 1.5 2005/04/20 16:46:54 naddy Exp $
*
* FreeBSD video grab interface
* Copyright (c) 2002 Steve O'Hara-Smith
@ -34,7 +34,7 @@
#include <signal.h>
typedef struct {
int fd;
int video_fd;
int tuner_fd;
int frame_format; /* see VIDEO_PALETTE_xxx */
int width, height;
@ -68,6 +68,7 @@ static int bktr_dev[] = { METEOR_DEV0, METEOR_DEV1, METEOR_DEV2,
unsigned char *video_buf;
static int nsignals = 0;
static void catchsignal(int signal)
{
nsignals++;
@ -75,8 +76,7 @@ static void catchsignal(int signal)
}
static int bktr_init (const char *video_device, int width, int height,
int format, int video_fd, int tuner_fd,
int idev, double frequency)
int format, int *video_fd, int *tuner_fd, int idev, double frequency)
{
struct meteor_geomet geo;
int h_max;
@ -117,13 +117,13 @@ static int bktr_init (const char *video_device, int width, int height,
act.sa_handler = catchsignal;
sigaction(SIGUSR1,&act,&old);
tuner_fd = open ("/dev/tuner0", O_RDONLY);
if (tuner_fd < 0) {
*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) {
*video_fd = open (video_device, O_RDONLY);
if (*video_fd < 0) {
perror (video_device);
return -1;
}
@ -147,36 +147,41 @@ static int bktr_init (const char *video_device, int width, int height,
geo.oformat |= METEOR_GEO_EVEN_ONLY;
}
if (ioctl(video_fd, METEORSETGEO, &geo) < 0) {
if (ioctl(*video_fd, METEORSETGEO, &geo) < 0) {
perror ("METEORSETGEO");
return -1;
}
if (ioctl(video_fd, BT848SFMT, &c) < 0) {
if (ioctl(*video_fd, BT848SFMT, &c) < 0) {
perror ("BT848SFMT");
return -1;
}
c = bktr_dev[idev];
if (ioctl(video_fd, METEORSINPUT, &c) < 0) {
if (ioctl(*video_fd, METEORSINPUT, &c) < 0) {
perror ("METEORSINPUT");
return -1;
}
video_buf = (unsigned char *) mmap((caddr_t)0, width*height*2,
PROT_READ, MAP_SHARED, video_fd, (off_t) 0);
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)
if (ioctl(*tuner_fd, TVTUNER_SETFREQ, &ioctl_frequency)<0)
perror("TVTUNER_SETFREQ");
}
c = AUDIO_UNMUTE;
if (ioctl(*tuner_fd, BT848_SAUDIO, &c) < 0)
perror("TVTUNER_SAUDIO");
c = METEOR_CAP_CONTINOUS;
ioctl(video_fd, METEORCAPTUR, &c);
ioctl(*video_fd, METEORCAPTUR, &c);
c = SIGUSR1;
ioctl (video_fd, METEORSSIGNAL, &c);
ioctl (*video_fd, METEORSSIGNAL, &c);
return 0;
}
@ -283,7 +288,7 @@ static int grab_read_header (AVFormatContext *s1, AVFormatParameters *ap)
}
if (bktr_init (video_device, width, height, format,
s->fd, s->tuner_fd, -1, 0.0) < 0)
&(s->video_fd), &(s->tuner_fd), -1, 0.0) < 0)
return -EIO;
return 0;
}
@ -291,13 +296,18 @@ static int grab_read_header (AVFormatContext *s1, AVFormatParameters *ap)
static int grab_read_close (AVFormatContext *s1)
{
VideoData *s = s1->priv_data;
int c;
int c = METEOR_CAP_STOP_CONT;
ioctl(s->fd, METEORCAPTUR, &c);
close(s->fd);
c = METEOR_CAP_STOP_CONT;
ioctl(s->video_fd, METEORCAPTUR, &c);
close(s->video_fd);
c = AUDIO_MUTE;
ioctl(s->tuner_fd, BT848_SAUDIO, &c);
close(s->tuner_fd);
munmap((caddr_t)video_buf, sizeof(video_buf));
// av_free(s);
munmap((caddr_t)video_buf, sizeof(video_buf));
return 0;
}

22
graphics/ffmpeg/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.4 2005/02/09 23:41:42 naddy Exp $
--- Makefile.orig Fri Jan 21 14:16:04 2005
+++ Makefile Sun Jan 30 18:49:14 2005
$OpenBSD: patch-Makefile,v 1.5 2005/04/20 16:46:54 naddy Exp $
--- Makefile.orig Thu Mar 17 18:13:13 2005
+++ Makefile Wed Apr 13 00:17:45 2005
@@ -7,7 +7,7 @@ include config.mak
VPATH=$(SRC_PATH)
@ -10,24 +10,18 @@ $OpenBSD: patch-Makefile,v 1.4 2005/02/09 23:41:42 naddy Exp $
ifeq ($(TARGET_GPROF),yes)
CFLAGS+=-p
@@ -38,13 +38,18 @@ ifeq ($(BUILD_SHARED),yes)
@@ -38,9 +38,14 @@ ifeq ($(BUILD_SHARED),yes)
DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
else
DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
+endif
+
+ifeq ($(CONFIG_AC3),yes)
+EXTRALIBS+=-la52
+endif
+
ifeq ($(CONFIG_MP3LAME),yes)
EXTRALIBS+=-lmp3lame
endif
-endif
ifeq ($(CONFIG_VORBIS),yes)
-EXTRALIBS+=-lvorbis -lvorbisenc -logg
+EXTRALIBS+=-lvorbisenc -lvorbis -logg
+
+ifeq ($(CONFIG_AC3),yes)
+EXTRALIBS+=-la52
endif
ifeq ($(CONFIG_FAAD),yes)
ifeq ($(CONFIG_LIBOGG),yes)

16
graphics/ffmpeg/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.11 2005/04/11 14:58:00 naddy Exp $
--- configure.orig Fri Jan 21 14:16:04 2005
+++ configure Tue Apr 5 11:30:14 2005
@@ -107,8 +107,8 @@ case "$cpu" in
$OpenBSD: patch-configure,v 1.12 2005/04/20 16:46:54 naddy Exp $
--- configure.orig Sat Apr 9 08:32:58 2005
+++ configure Wed Apr 13 00:18:10 2005
@@ -111,8 +111,8 @@ case "$cpu" in
i386|i486|i586|i686|i86pc|BePC)
cpu="x86"
;;
@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v 1.11 2005/04/11 14:58:00 naddy Exp $
-z "`echo $CFLAGS | grep -- -m32`" ]; then
cpu="x86_64"
else
@@ -248,6 +248,12 @@ make="gmake"
@@ -266,6 +266,12 @@ make="gmake"
CFLAGS="-pthread"
LDFLAGS="$LDFLAGS -export-dynamic -pthread"
;;
@ -20,12 +20,12 @@ $OpenBSD: patch-configure,v 1.11 2005/04/11 14:58:00 naddy Exp $
+strip="echo"
+extralibs="$extralibs -lossaudio -pthread"
+source_path="`echo $0 | sed -e 's#/configure##'`"
+SLIBSUF=.so.5.0
+SLIBSUF=".so.$SV"
+;;
BSD/OS)
v4l="no"
audio_oss="yes"
@@ -785,10 +791,10 @@ EOF
@@ -832,10 +838,10 @@ EOF
$cc -o $TMPE $TMPC 2> /dev/null || _memalign=no
fi
@ -40,7 +40,7 @@ $OpenBSD: patch-configure,v 1.11 2005/04/11 14:58:00 naddy Exp $
cat > $TMPC << EOF
#include <time.h>
@@ -1219,9 +1225,6 @@ if test "$pthreads" = "yes" ; then
@@ -1274,9 +1280,6 @@ if test "$pthreads" = "yes" ; then
echo "HAVE_PTHREADS=yes" >> config.mak
echo "#define HAVE_PTHREADS 1" >> $TMPH
echo "#define HAVE_THREADS 1" >> $TMPH

12
graphics/ffmpeg/patches/patch-libavcodec_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libavcodec_Makefile,v 1.9 2005/02/09 23:41:43 naddy Exp $
--- libavcodec/Makefile.orig Sat Jan 22 09:52:00 2005
+++ libavcodec/Makefile Tue Feb 8 17:03:22 2005
@@ -76,11 +76,11 @@ ifeq ($(CONFIG_AC3),yes)
$OpenBSD: patch-libavcodec_Makefile,v 1.10 2005/04/20 16:46:54 naddy Exp $
--- libavcodec/Makefile.orig Sat Apr 2 21:02:08 2005
+++ libavcodec/Makefile Tue Apr 12 23:05:59 2005
@@ -73,11 +73,11 @@ ifeq ($(CONFIG_AC3),yes)
OBJS+= a52dec.o
# using builtin liba52 or runtime linked liba52.so.0
@ -17,7 +17,7 @@ $OpenBSD: patch-libavcodec_Makefile,v 1.9 2005/02/09 23:41:43 naddy Exp $
# currently using libdts for dts decoding
ifeq ($(CONFIG_DTS),yes)
@@ -199,6 +199,7 @@ OBJS := $(OBJS) $(ASM_OBJS)
@@ -208,6 +208,7 @@ OBJS := $(OBJS) $(ASM_OBJS)
LIB= $(LIBPREF)avcodec$(LIBSUF)
ifeq ($(BUILD_SHARED),yes)
SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
@ -25,7 +25,7 @@ $OpenBSD: patch-libavcodec_Makefile,v 1.9 2005/02/09 23:41:43 naddy Exp $
endif
TESTS= imgresample-test dct-test motion-test fft-test
@@ -222,7 +223,7 @@ ifeq ($(CONFIG_WIN32),yes)
@@ -231,7 +232,7 @@ ifeq ($(CONFIG_WIN32),yes)
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
-lib /machine:i386 /def:$(@:.dll=.def)
else

8
graphics/ffmpeg/patches/patch-libavcodec_libpostproc_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libavcodec_libpostproc_Makefile,v 1.1 2005/02/09 23:41:43 naddy Exp $
--- libavcodec/libpostproc/Makefile.orig Tue Feb 8 17:10:14 2005
+++ libavcodec/libpostproc/Makefile Tue Feb 8 17:11:03 2005
@@ -38,8 +38,7 @@ postprocess_pic.o: postprocess.c
$OpenBSD: patch-libavcodec_libpostproc_Makefile,v 1.2 2005/04/20 16:46:54 naddy Exp $
--- libavcodec/libpostproc/Makefile.orig Wed Mar 23 06:10:22 2005
+++ libavcodec/libpostproc/Makefile Tue Apr 12 23:05:59 2005
@@ -40,8 +40,7 @@ postprocess_pic.o: postprocess.c
$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
$(SPPLIB): $(SPPOBJS)

8
graphics/ffmpeg/patches/patch-libavcodec_mpeg12_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libavcodec_mpeg12_c,v 1.2 2005/02/09 23:41:43 naddy Exp $
--- libavcodec/mpeg12.c.orig Mon Dec 13 22:56:26 2004
+++ libavcodec/mpeg12.c Sun Jan 16 21:01:36 2005
@@ -2997,7 +2997,7 @@ static int mpeg_decode_frame(AVCodecCont
$OpenBSD: patch-libavcodec_mpeg12_c,v 1.3 2005/04/20 16:46:54 naddy Exp $
--- libavcodec/mpeg12.c.orig Mon Apr 4 04:25:44 2005
+++ libavcodec/mpeg12.c Tue Apr 12 23:06:00 2005
@@ -3008,7 +3008,7 @@ static int mpeg_decode_frame(AVCodecCont
input_size = buf_end - buf_ptr;
if(avctx->debug & FF_DEBUG_STARTCODE){

25
graphics/ffmpeg/patches/patch-libavformat_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libavformat_Makefile,v 1.8 2005/02/09 23:41:43 naddy Exp $
--- libavformat/Makefile.orig Tue Jan 11 00:16:04 2005
+++ libavformat/Makefile Tue Feb 8 17:03:23 2005
@@ -42,7 +42,7 @@ OBJS+= avio.o aviobuf.o file.o
$OpenBSD: patch-libavformat_Makefile,v 1.9 2005/04/20 16:46:54 naddy Exp $
--- libavformat/Makefile.orig Sat Apr 9 08:32:58 2005
+++ libavformat/Makefile Tue Apr 12 23:10:36 2005
@@ -37,7 +37,7 @@ OBJS+= avio.o aviobuf.o file.o
OBJS+= framehook.o
ifeq ($(CONFIG_VIDEO4LINUX),yes)
@ -10,20 +10,21 @@ $OpenBSD: patch-libavformat_Makefile,v 1.8 2005/02/09 23:41:43 naddy Exp $
endif
ifeq ($(CONFIG_DV1394),yes)
@@ -83,6 +83,7 @@ endif
@@ -76,7 +76,7 @@ endif
LIB= $(LIBPREF)avformat$(LIBSUF)
ifeq ($(BUILD_SHARED),yes)
SLIB= $(SLIBPREF)avformat$(SLIBSUF)
-
+CFLAGS += ${PIC} -DPIC
endif
EXTRALIBS+=-lavcodec -L../libavcodec
@@ -104,7 +105,7 @@ ifeq ($(CONFIG_WIN32),yes)
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
AVCLIBS+=-lavcodec -L../libavcodec
ifeq ($(CONFIG_MP3LAME),yes)
AVCLIBS+=-lmp3lame
@@ -97,7 +97,7 @@ ifeq ($(CONFIG_WIN32),yes)
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
-lib /machine:i386 /def:$(@:.dll=.def)
else
- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)
+ $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(LDFLAGS)
- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
+ $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(LDFLAGS)
endif
depend: $(SRCS)

41
graphics/ffmpeg/patches/patch-libavformat_audio_c
View File

@ -1,29 +1,19 @@
$OpenBSD: patch-libavformat_audio_c,v 1.2 2004/10/13 01:38:21 jolan Exp $
$OpenBSD: patch-libavformat_audio_c,v 1.3 2005/04/20 16:46:54 naddy Exp $
--- libavformat/audio.c.orig Fri Jun 18 20:59:34 2004
+++ libavformat/audio.c Wed Oct 6 22:27:57 2004
@@ -21,7 +21,12 @@
+++ libavformat/audio.c Thu Apr 14 23:01:52 2005
@@ -21,7 +21,11 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#if defined(__OpenBSD__)
+#include <soundcard.h>
+#include <sys/audioio.h>
+#else
#include <sys/soundcard.h>
+#endif
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
@@ -43,13 +48,16 @@ typedef struct {
static int audio_open(AudioData *s, int is_output, const char *audio_device)
{
+#ifdef __OpenBSD__
+ audio_info_t audio_if;
+#endif
int audio_fd;
int tmp, err;
char *flip = getenv("AUDIO_FLIP_LEFT");
@@ -49,7 +53,7 @@ static int audio_open(AudioData *s, int
/* open linux audio device */
if (!audio_device)
@ -32,26 +22,3 @@ $OpenBSD: patch-libavformat_audio_c,v 1.2 2004/10/13 01:38:21 jolan Exp $
if (is_output)
audio_fd = open(audio_device, O_WRONLY);
@@ -133,6 +141,22 @@ static int audio_open(AudioData *s, int
}
s->sample_rate = tmp; /* store real sample rate */
s->fd = audio_fd;
+
+#ifdef __OpenBSD__
+ AUDIO_INITINFO(&audio_if);
+ if (is_output) {
+ audio_if.play.pause = 0;
+ audio_if.record.pause = 1;
+ } else {
+ audio_if.play.pause = 1;
+ audio_if.record.pause = 0;
+ }
+ err = ioctl(audio_fd, AUDIO_SETINFO, &audio_if);
+ if (err < 0) {
+ perror("AUDIO_SETINFO");
+ goto fail;
+ }
+#endif
return 0;
fail:

8
graphics/ffmpeg/patches/patch-vhook_ppm_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-vhook_ppm_c,v 1.2 2005/02/09 23:41:43 naddy Exp $
--- vhook/ppm.c.orig Wed Jan 12 20:48:23 2005
+++ vhook/ppm.c Sun Jan 16 21:01:36 2005
@@ -74,7 +74,7 @@ rwpipe *rwpipe_open( int argc, char *arg
$OpenBSD: patch-vhook_ppm_c,v 1.3 2005/04/20 16:46:54 naddy Exp $
--- vhook/ppm.c.orig Thu Feb 24 14:07:10 2005
+++ vhook/ppm.c Tue Apr 12 23:06:00 2005
@@ -75,7 +75,7 @@ rwpipe *rwpipe_open( int argc, char *arg
close( output[ 0 ] );
close( output[ 1 ] );

8
graphics/ffmpeg/pkg/PFRAG.shared
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.10 2005/02/09 23:41:43 naddy Exp $
@lib lib/libavcodec.so.5.0
@lib lib/libavformat.so.5.0
@lib lib/libpostproc.so.5.0
@comment $OpenBSD: PFRAG.shared,v 1.11 2005/04/20 16:46:54 naddy Exp $
@lib lib/libavcodec.so.6.0
@lib lib/libavformat.so.6.0
@lib lib/libpostproc.so.6.0