Subject: pkg/23771: graphics/mjpegtools doesn't build on NetBSD
To: None <gnats-bugs@gnats.NetBSD.org>
From: None <snj@pobox.com>
List: netbsd-bugs
Date: 12/15/2003 18:08:59
>Number:         23771
>Category:       pkg
>Synopsis:       graphics/mjpegtools doesn't build on NetBSD
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Dec 16 02:09:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Soren Jacobsen
>Release:        NetBSD 1.6ZG
>Organization:
>Environment:
Recent pkgsrc.
>Description:
lavplay needs -lossaudio to build on NetBSD. I presume this package was
tested on Linux.

While here, might as well fix HOMEPAGE and sort PLIST. patch-aa should be
removed, as it is unnecessary.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mjpegtools/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	2003/09/23 12:18:56	1.10
+++ Makefile	2003/12/16 02:03:53
@@ -6,7 +6,7 @@
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://sourceforge.net/projects/mjpeg
+HOMEPAGE=	http://mjpeg.sourceforge.net/
 COMMENT=	Programs for compressing video streams
 
 DEPENDS+=		toolame>=02l:../../audio/toolame
@@ -31,5 +31,6 @@
 .include "../../graphics/ImageMagick/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mjpegtools/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- PLIST	2003/08/31 21:58:23	1.2
+++ PLIST	2003/12/16 02:03:53
@@ -73,8 +73,8 @@
 lib/libmmxsse.a
 lib/libmotion.a
 lib/pkgconfig/mjpegtools.pc
-man/man1/jpeg2yuv.1
 man/man1/img2mpg.1
+man/man1/jpeg2yuv.1
 man/man1/lav2mpeg.1
 man/man1/lav2wav.1
 man/man1/lav2yuv.1
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mjpegtools/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	2003/08/31 21:58:23	1.4
+++ distinfo	2003/12/16 02:03:53
@@ -2,5 +2,4 @@
 
 SHA1 (mjpegtools-1.6.1.90.tar.gz) = c66ed5ba3cb5b8835facaeeb80b05bb9f5014206
 Size (mjpegtools-1.6.1.90.tar.gz) = 1168921 bytes
-SHA1 (patch-aa) = 446e3c8a3ef385ca4244c0826435737e51fa0225
-SHA1 (patch-ab) = de6d7fd8a307141ef7d3d160ca2cdb955e8e5154
+SHA1 (patch-ab) = 5562496d75bc470ffe6030e9fea02c94a22855e7
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mjpegtools/patches/patch-ab,v
retrieving revision 1.3
diff -u -r1.3 patch-ab
--- patches/patch-ab	2003/08/31 22:31:38	1.3
+++ patches/patch-ab	2003/12/16 02:03:53
@@ -1,7 +1,7 @@
 $NetBSD: patch-ab,v 1.3 2003/08/31 22:31:38 mycroft Exp $
 
---- lavtools/Makefile.in.orig	2003-08-23 14:21:53.000000000 +0000
-+++ lavtools/Makefile.in	2003-08-31 20:42:34.000000000 +0000
+--- 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)
@@ -11,3 +11,13 @@
  
  
  transist_flt_SOURCES = transist.flt.c ${lav_headers}
+@@ -235,7 +235,8 @@
+ lavplay_SOURCES = lavplay.c ${lav_headers}
+ lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \
+ 	liblavplay.la liblavjpeg.la liblavfile.la \
+-	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} ${X_LIBS} -lX11
++	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} ${X_LIBS} -lX11 \
++	${LIBOSSAUDIO}
+ 
+ 
+ lavrec_SOURCES = lavrec.c $(lav_headers)
>Release-Note:
>Audit-Trail:
>Unformatted: