head	1.6;
access;
symbols
	pkgsrc-2013Q2:1.6.0.52
	pkgsrc-2013Q2-base:1.6
	pkgsrc-2012Q4:1.6.0.50
	pkgsrc-2012Q4-base:1.6
	pkgsrc-2011Q4:1.6.0.48
	pkgsrc-2011Q4-base:1.6
	pkgsrc-2011Q2:1.6.0.46
	pkgsrc-2011Q2-base:1.6
	pkgsrc-2009Q4:1.6.0.44
	pkgsrc-2009Q4-base:1.6
	pkgsrc-2008Q4:1.6.0.42
	pkgsrc-2008Q4-base:1.6
	pkgsrc-2008Q3:1.6.0.40
	pkgsrc-2008Q3-base:1.6
	cube-native-xorg:1.6.0.38
	cube-native-xorg-base:1.6
	pkgsrc-2008Q2:1.6.0.36
	pkgsrc-2008Q2-base:1.6
	pkgsrc-2008Q1:1.6.0.34
	pkgsrc-2008Q1-base:1.6
	pkgsrc-2007Q4:1.6.0.32
	pkgsrc-2007Q4-base:1.6
	pkgsrc-2007Q3:1.6.0.30
	pkgsrc-2007Q3-base:1.6
	pkgsrc-2007Q2:1.6.0.28
	pkgsrc-2007Q2-base:1.6
	pkgsrc-2007Q1:1.6.0.26
	pkgsrc-2007Q1-base:1.6
	pkgsrc-2006Q4:1.6.0.24
	pkgsrc-2006Q4-base:1.6
	pkgsrc-2006Q3:1.6.0.22
	pkgsrc-2006Q3-base:1.6
	pkgsrc-2006Q2:1.6.0.20
	pkgsrc-2006Q2-base:1.6
	pkgsrc-2006Q1:1.6.0.18
	pkgsrc-2006Q1-base:1.6
	pkgsrc-2005Q4:1.6.0.16
	pkgsrc-2005Q4-base:1.6
	pkgsrc-2005Q3:1.6.0.14
	pkgsrc-2005Q3-base:1.6
	pkgsrc-2005Q2:1.6.0.12
	pkgsrc-2005Q2-base:1.6
	pkgsrc-2005Q1:1.6.0.10
	pkgsrc-2005Q1-base:1.6
	pkgsrc-2004Q4:1.6.0.8
	pkgsrc-2004Q4-base:1.6
	pkgsrc-2004Q3:1.6.0.6
	pkgsrc-2004Q3-base:1.6
	pkgsrc-2004Q2:1.6.0.4
	pkgsrc-2004Q2-base:1.6
	pkgsrc-2004Q1:1.6.0.2
	pkgsrc-2004Q1-base:1.6
	pkgsrc-2003Q4:1.3.0.2
	pkgsrc-2003Q4-base:1.3;
locks; strict;
comment	@# @;


1.6
date	2004.01.26.12.45.50;	author jmmv;	state dead;
branches;
next	1.5;

1.5
date	2004.01.24.10.54.08;	author jmmv;	state Exp;
branches;
next	1.4;

1.4
date	2003.12.16.07.26.49;	author recht;	state Exp;
branches;
next	1.3;

1.3
date	2003.08.31.22.31.38;	author mycroft;	state Exp;
branches;
next	1.2;

1.2
date	2003.08.31.21.58.24;	author mycroft;	state dead;
branches;
next	1.1;

1.1
date	2003.08.02.05.22.59;	author mrg;	state Exp;
branches;
next	;


desc
@@


1.6
log
@mjpegtools moved to the multimedia category.
@
text
@$NetBSD: patch-ab,v 1.5 2004/01/24 10:54:08 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
@


1.5
log
@Update to mjpegtools-1.6.1.93.  I haven't been able to find a list of changes,
what I've found from diffing since 1.6.1.90 are mostly bug fixes.

While here, disable GTK support, so that we don't get a dependancy on GTK 1
when installing GNOME2.  This only removes the 'glav' program anyway, which
may be later added in an independant package if needed.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.4 2003/12/16 07:26:49 recht Exp $
@


1.4
log
@Fix build on NetBSD and remove unused patch.
Provided by Soren Jacobsen in PR 23771
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.3 2003/08/31 22:31:38 mycroft Exp $
d3 4
a6 13
--- lavtools/Makefile.in.orig	2003-08-23 07:21:53.000000000 -0700
+++ lavtools/Makefile.in	2003-12-15 18:00:39.000000000 -0800
@@@@ -220,7 +220,7 @@@@
 
 yuv2lav_SOURCES = yuv2lav.c $(lav_headers)
 yuv2lav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
-		 liblavfile.la liblavjpeg.la
+		 liblavfile.la liblavjpeg.la -lm
 
 
 transist_flt_SOURCES = transist.flt.c ${lav_headers}
@@@@ -235,7 +235,8 @@@@
 lavplay_SOURCES = lavplay.c ${lav_headers}
d9 2
a10 3
-	@@LIBGETOPT_LIB@@ ${PTHREAD_LIBS} ${SDL_LIBS} ${X_LIBS} -lX11
+	@@LIBGETOPT_LIB@@ ${PTHREAD_LIBS} ${SDL_LIBS} ${X_LIBS} -lX11 \
+	${LIBOSSAUDIO}
d13 1
a13 1
 lavrec_SOURCES = lavrec.c $(lav_headers)
@


1.3
log
@Whoops, add new patches.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
--- lavtools/Makefile.in.orig	2003-08-23 14:21:53.000000000 +0000
+++ lavtools/Makefile.in	2003-08-31 20:42:34.000000000 +0000
d14 10
@


1.2
log
@Update to 1.6.1.90 -- needed for newer versions of transcode.
There is no ChangeLog info.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.1 2003/08/02 05:22:59 mrg Exp $
d3 11
a13 10
--- mplex/systems.cc.orig	2002-04-30 00:36:01.000000000 +1000
+++ mplex/systems.cc	2003-06-28 23:54:51.000000000 +1000
@@@@ -2,6 +2,7 @@@@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include "systems.hh"
@


1.1
log
@make this build with gcc3.3: include <assert.h> if you use it, avoid invalid
C++ syntax and turn of -Werror for one subdir...
@
text
@d1 1
a1 1
$NetBSD$
@