9 files changed, 157 insertions, 1 deletions
diff --git a/multimedia/Makefile b/multimedia/Makefile
index e7c9a61468e..7e1864d0192 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2004/06/25 07:00:04 sekiya Exp $
+# $NetBSD: Makefile,v 1.50 2004/06/26 09:16:10 grant Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -61,6 +61,7 @@ SUBDIR+=	ogmtools
 SUBDIR+=	openquicktime
 SUBDIR+=	realplayer
 SUBDIR+=	realplayer-codecs
+SUBDIR+=	smpeg
 SUBDIR+=	transcode
 SUBDIR+=	trplayer
 SUBDIR+=	vlc
diff --git a/multimedia/smpeg/DESCR b/multimedia/smpeg/DESCR
new file mode 100644
index 00000000000..9ef2c6159be
--- /dev/null
+++ b/multimedia/smpeg/DESCR
@@ -0,0 +1,4 @@
+SMPEG is based on UC Berkeley's mpeg_play software MPEG decoder
+and SPLAY, an MPEG audio decoder created by Woo-jae Jung.  The
+current version is capable of playing back MPEG video and sound on
+Pentium II based systems.
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
new file mode 100644
index 00000000000..aea1c019f85
--- /dev/null
+++ b/multimedia/smpeg/Makefile
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.1 2004/06/26 09:16:10 grant Exp $
+#
+
+DISTNAME=	smpeg-0.4.4
+PKGREVISION=	6
+CATEGORIES=	devel multimedia
+MASTER_SITES=	ftp://sunsite.auc.dk/pub/os/linux/loki/open-source/smpeg/ \
+		ftp://ftp.linuxgames.com/loki/open-source/smpeg/
+
+MAINTAINER=	wulf@NetBSD.org
+HOMEPAGE=	http://www.lokigames.com/development/smpeg.php3
+COMMENT=	SDL MPEG Player Library
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	yes
+USE_GNU_TOOLS+=	make
+GNU_CONFIGURE=	yes
+USE_GCC_SHLIB=	yes
+USE_LANGUAGES=	c c++
+USE_X11=	yes
+USE_LIBTOOL=	yes
+
+.include "../../mk/compiler.mk"
+
+.if !empty(CC_VERSION:MSun)
+LIBS.SunOS+=	-lCrun
+.endif
+
+CPPFLAGS+=	-Dunix=1
+
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/smpeg/PLIST b/multimedia/smpeg/PLIST
new file mode 100644
index 00000000000..9bfd72af4a7
--- /dev/null
+++ b/multimedia/smpeg/PLIST
@@ -0,0 +1,25 @@
+@comment $NetBSD: PLIST,v 1.1 2004/06/26 09:16:10 grant Exp $
+bin/glmovie
+bin/gtv
+bin/plaympeg
+bin/smpeg-config
+include/smpeg/MPEG.h
+include/smpeg/MPEGaction.h
+include/smpeg/MPEGaudio.h
+include/smpeg/MPEGerror.h
+include/smpeg/MPEGfilter.h
+include/smpeg/MPEGlist.h
+include/smpeg/MPEGring.h
+include/smpeg/MPEGstream.h
+include/smpeg/MPEGsystem.h
+include/smpeg/MPEGvideo.h
+include/smpeg/smpeg.h
+lib/libsmpeg-0.4.so.1
+lib/libsmpeg-0.4.so.1.3
+lib/libsmpeg.a
+lib/libsmpeg.la
+lib/libsmpeg.so
+man/man1/gtv.1
+man/man1/plaympeg.1
+share/aclocal/smpeg.m4
+@dirrm include/smpeg
diff --git a/multimedia/smpeg/buildlink3.mk b/multimedia/smpeg/buildlink3.mk
new file mode 100644
index 00000000000..387d9a48030
--- /dev/null
+++ b/multimedia/smpeg/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/06/26 09:16:10 grant Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+SPMEG_BUILDLINK3_MK:=	${SPMEG_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	smpeg
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsmpeg}
+BUILDLINK_PACKAGES+=	smpeg
+
+.if !empty(SPMEG_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.smpeg+=	smpeg>=0.4.4nb3
+BUILDLINK_PKGSRCDIR.smpeg?=	../../devel/smpeg
+.endif	# SMPEG_BUILDLINK3_MK
+
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/smpeg/distinfo b/multimedia/smpeg/distinfo
new file mode 100644
index 00000000000..b7e074d4eed
--- /dev/null
+++ b/multimedia/smpeg/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2004/06/26 09:16:10 grant Exp $
+
+SHA1 (smpeg-0.4.4.tar.gz) = 6d7f4449472e6270ab435b2224f3fad951c35259
+Size (smpeg-0.4.4.tar.gz) = 315054 bytes
+SHA1 (patch-aa) = 0a691663e1966dbd5d37225b11b6f5f6d9ad0bf0
+SHA1 (patch-ab) = dd6517226c672ce24aded66dd07e8e54ab7e0bb3
+SHA1 (patch-ac) = 60a8cd16216f4d2ec64b2727fa020d18dda7bec7
diff --git a/multimedia/smpeg/patches/patch-aa b/multimedia/smpeg/patches/patch-aa
new file mode 100644
index 00000000000..697bd22594b
--- /dev/null
+++ b/multimedia/smpeg/patches/patch-aa
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.1 2004/06/26 09:16:10 grant Exp $
+
+--- plaympeg.c.orig	Tue Feb  4 15:59:22 2003
++++ plaympeg.c	Tue Feb  4 15:59:48 2003
+@@ -492,6 +492,7 @@
+     int fd;
+     char buf[32];
+     int status;
++    int (*audio_init)();
+ 
+     /* Get the command line options */
+     use_audio = 1;
+@@ -600,7 +601,12 @@
+ 	}
+ 	
+ 	if ( use_audio ) {
+-	  if ((SDL_Init(SDL_INIT_AUDIO) < 0) || !SDL_AudioDriverName(buf, 1)) {
++	  if ( use_video )
++	    audio_init = SDL_InitSubSystem;
++	  else
++	    audio_init = SDL_Init;
++
++          if ((audio_init(SDL_INIT_AUDIO) < 0) || !SDL_AudioDriverName(buf, 1)) {
+ 	    fprintf(stderr, "Warning: Couldn't init SDL audio: %s\n",
+ 		    SDL_GetError());
+ 	    fprintf(stderr, "Will ignore audio stream\n");
diff --git a/multimedia/smpeg/patches/patch-ab b/multimedia/smpeg/patches/patch-ab
new file mode 100644
index 00000000000..62e187b2201
--- /dev/null
+++ b/multimedia/smpeg/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1 2004/06/26 09:16:10 grant Exp $
+
+--- Makefile.in.orig	2001-06-18 22:59:14.000000000 +0200
++++ Makefile.in
+@@ -310,15 +310,15 @@ uninstall-binPROGRAMS:
+ 
+ plaympeg: $(plaympeg_OBJECTS) $(plaympeg_DEPENDENCIES)
+ 	@rm -f plaympeg
+-	$(LINK) $(plaympeg_LDFLAGS) $(plaympeg_OBJECTS) $(plaympeg_LDADD) $(LIBS)
++	$(CXXLINK) $(plaympeg_LDFLAGS) $(plaympeg_OBJECTS) $(plaympeg_LDADD) $(LIBS)
+ 
+ gtv: $(gtv_OBJECTS) $(gtv_DEPENDENCIES)
+ 	@rm -f gtv
+-	$(LINK) $(gtv_LDFLAGS) $(gtv_OBJECTS) $(gtv_LDADD) $(LIBS)
++	$(CXXLINK) $(gtv_LDFLAGS) $(gtv_OBJECTS) $(gtv_LDADD) $(LIBS)
+ 
+ glmovie: $(glmovie_OBJECTS) $(glmovie_DEPENDENCIES)
+ 	@rm -f glmovie
+-	$(LINK) $(glmovie_LDFLAGS) $(glmovie_OBJECTS) $(glmovie_LDADD) $(LIBS)
++	$(CXXLINK) $(glmovie_LDFLAGS) $(glmovie_OBJECTS) $(glmovie_LDADD) $(LIBS)
+ 
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
diff --git a/multimedia/smpeg/patches/patch-ac b/multimedia/smpeg/patches/patch-ac
new file mode 100644
index 00000000000..7af7271bd57
--- /dev/null
+++ b/multimedia/smpeg/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/06/26 09:16:10 grant Exp $
+
+--- video/video.h.orig	2004-03-01 02:14:39.000000000 +0100
++++ video/video.h	2004-03-01 02:16:02.000000000 +0100
+@@ -413,7 +413,7 @@
+ #define __SCO__ 1
+ #endif
+ 
+-#if defined(__i386__) || defined(__VAX__) || defined(__MIPSEL__) || defined(__alpha__) || defined(__SCO__)
++#if defined(__x86_64__) || defined(__i386__) || defined(__VAX__) || defined(__MIPSEL__) || defined(__alpha__) || defined(__SCO__)
+ #undef  BIG_ENDIAN_ARCHITECTURE
+ #define LITTLE_ENDIAN_ARCHITECTURE 1
+ #endif