diff options
| author | jmmv <jmmv> | 2004-01-26 12:44:05 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2004-01-26 12:44:05 +0000 |
| commit | be4a1f4a1d85df1f5950dc9a2cd45a6a0f3bee8d (patch) | |
| tree | f18a6dfff28884fe389fbb004df4c76f7af39173 /multimedia/mjpegtools/patches | |
| parent | e16385525ea05def684499b36a6ef3c0f4495a17 (diff) | |
| download | pkgsrc-be4a1f4a1d85df1f5950dc9a2cd45a6a0f3bee8d.tar.gz | |
Move mjpegtools to the multimedia category (coming from graphics).
This is version 1.6.1.93.
Diffstat (limited to 'multimedia/mjpegtools/patches')
| -rw-r--r-- | multimedia/mjpegtools/patches/patch-aa | 12 | ||||
| -rw-r--r-- | multimedia/mjpegtools/patches/patch-ab | 13 | ||||
| -rw-r--r-- | multimedia/mjpegtools/patches/patch-ac | 24 |
3 files changed, 49 insertions, 0 deletions
diff --git a/multimedia/mjpegtools/patches/patch-aa b/multimedia/mjpegtools/patches/patch-aa new file mode 100644 index 00000000000..0083dbf1bcf --- /dev/null +++ b/multimedia/mjpegtools/patches/patch-aa @@ -0,0 +1,12 @@ +$NetBSD: patch-aa,v 1.1.1.1 2004/01/26 12:44:06 jmmv Exp $ + +--- mplex/Makefile.in.orig 2004-01-16 12:22:11.000000000 +0100 ++++ mplex/Makefile.in +@@ -276,6 +276,7 @@ mplex_SOURCES = main.cpp + + mplex_LDADD = \ + $(top_builddir)/mplex/libmplex2.la \ ++ $(top_builddir)/utils/libmjpegutils.a \ + @LIBGETOPT_LIB@ $(LIBM_LIBS) + + subdir = mplex diff --git a/multimedia/mjpegtools/patches/patch-ab b/multimedia/mjpegtools/patches/patch-ab new file mode 100644 index 00000000000..e0beafd19fb --- /dev/null +++ b/multimedia/mjpegtools/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 12:44:06 jmmv Exp $ + +--- lavtools/Makefile.in.orig 2004-01-16 12:22:10.000000000 +0100 ++++ lavtools/Makefile.in +@@ -340,7 +340,7 @@ multiblend_flt_LDADD = $(top_builddir)/u + lavplay_SOURCES = lavplay.c + lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \ + liblavplay.la liblavjpeg.la liblavfile.la \ +- @LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} $(LAVPLAY_X_LIBS) ++ @LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} $(LAVPLAY_X_LIBS) $(LIBOSSAUDIO) + + + lavrec_SOURCES = lavrec.c diff --git a/multimedia/mjpegtools/patches/patch-ac b/multimedia/mjpegtools/patches/patch-ac new file mode 100644 index 00000000000..34cdb7110b6 --- /dev/null +++ b/multimedia/mjpegtools/patches/patch-ac @@ -0,0 +1,24 @@ +$NetBSD: patch-ac,v 1.1.1.1 2004/01/26 12:44:06 jmmv Exp $ + +--- lavtools/audiolib.c.orig Mon Dec 8 13:28:32 2003 ++++ lavtools/audiolib.c Sun Jan 25 15:47:33 2004 +@@ -665,7 +665,9 @@ + const char *audio_dev_name; + + #ifndef FORK_NOT_THREAD ++#if !defined(__NetBSD__) || __NetBSD_Version__ >= 106130000 /* 1.6M */ + struct sched_param schedparam; ++#endif + sigset_t blocked_signals; + + /* Set the capture thread in a reasonable state - cancellation enabled +@@ -862,7 +864,8 @@ + memset(buf+nbset*info.fragsize,0,info.fragsize); + } + +-#ifndef FORK_NOT_THREAD ++#if !defined(FORK_NOT_THREAD) && \ ++ (!defined(__NetBSD__) || __NetBSD_Version__ >= 106130000) /* 1.6M */ + /* Now we're ready to go move to Real-time scheduling... */ + schedparam.sched_priority = 1; + |