smpeg: Update to 0.4.5

I've had to create a distfile by checking out the latest available SVN
tag, because there are no tarballs available. You can diff it if you
like.

Here's the latest available changelog before they stopped updating it:

current:
Ryan C. Gordon - Sun Oct 29 02:16:02 EST 2006
 * Patch from Chris Nelson to deal with SMPEG_error(NULL).
Ryan C. Gordon - Sat Mar 18 14:57:28 EST 2006
 * Patch from Mike Frysinger to fix more asm stuff.
Sam Lantinga - Sun Mar  5 21:08:09 PST 2006
 * Updated libtool build configuration
Ryan C. Gordon - Fri Dec 16 22:07:22 EST 2005
 * gcc4 fixes (compliments of Gentoo Bugzilla #73579).
 * gcc4.1 fixes, too. (compliments of Robert Marmorstein).
 * Shortened filenames because "ar" apparently doesn't like them (thanks, LGP).
Ryan C. Gordon - Wed Oct 12 18:22:02 EDT 2005
 * Patch from Jorge to allow graceful (and faster) exit of threads.
 * Patch from Mike Frysinger to disable executable stack.
 * Patch from Mike Frysinger to add sanity checks to autogen.sh
 * Patch from Mike Frysinger for MMX/asm code fixes (PIC and TEXTREL stuff).
Ryan C. Gordon - Wed Aug 31 22:55:18 EDT 2005
 * Disable executable stack in library (thanks, Mike Frysinger!)
Ryan C. Gordon - Wed Apr 27 11:15:01 EDT 2005
 * automake fix in smpeg.m4 by Thomas Klausner.
Martin Köhler -  Sun Mar 20 10:48:54 EST 2005
 * PBProjects fix.
Steven Fuller - Mon Feb  9 23:26:08 CST 2004
 * Added a --enable-video-callback-thread configure flag to disable thread
   usage in smpeg.
Ryan C. Gordon - Fri Jan  2 22:50:11 EST 2004
 * Added some sanity checks.
Ryan C. Gordon - Fri Jan  2 22:18:41 EST 2004
 * Removed "Patches" file...it was screwing up my greps too much.
Ryan C. Gordon - Fri Jan  2 22:16:47 EST 2004
 * SMPEG builds on Cygwin again.
Ryan C. Gordon - Wed Dec 31 00:07:51 EST 2003
 * Check for SDL_CreateYUVOverlay() failure (happens for OpenGL surfaces).
Ryan C. Gordon - Tue Dec 30 23:37:07 EST 2003
 * Check that SDL_BYTEORDER is sane (it wasn't, for SDL 1.2.5 on Linux/amd64).
Ryan C. Gordon - Fri Feb 14 21:02:00 EST 2003
 * Memory leak fix that I missed from before (thanks, Pete Shinners).
Ryan C. Gordon - Sat Jan 25 19:20:58 EST 2003
 * Memory leak fixes from NUNOKAWA Masato and Robert Diel.
Ryan C. Gordon - Wed Dec 18 16:47:52 EST 2002
 * Apple Project Builder support by Eric Wing.
Ryan C. Gordon - Fri Dec  6 14:32:29 EST 2002
 * Fixed for newer automakes.
Ryan C. Gordon - Wed Dec  4 18:00:33 EST 2002
 * Now builds again when --enable-mmx is specified at configure time.
Ryan C. Gordon - Thu Sep 26 01:13:58 EDT 2002
 * Minor Makefile.am patch for GCC 3.2
Ryan C. Gordon - Tue Jul  9 22:28:21 EDT 2002
 * Removed #include <unistd.h> from glmovie.c
Ryan C. Gordon - Sun Jun 02 20:10:42 EST 2002
 * ./autogen.sh accepts aclocal commandlines via the ACLOCAL_FLAGS envr var.
Ryan C. Gordon - Sun Jun 02 20:10:42 EST 2002
 * ./autogen.sh is now flagged as executable in CVS.
Ryan C. Gordon - Sun Jun 02 20:10:42 EST 2002
 * ./configure.in tweaked to not complain with newer autoconf.
Ryan C. Gordon - Sun Jun 02 20:10:42 EST 2002
 * Newer ltconfig and hacks for libtool and .S files.
Adam Procter - Sat Jun  8 05:41:30 EDT 2002
 * Fixed potential deadlock in MPEGaudio.cpp
Sam Lantinga - Sun Jun  9 00:24:10 EDT 2002
 * Fix for crash when an MPEG file can't be opened.

0.4.5:
Sam Lantinga - Tue Jul 17 12:27:20 PDT 2001
 * Skip MPEG audio frames with wildly varying frequencies

10 files changed, 32 insertions, 192 deletions

diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index f0054f6ab56..5b06b979459 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -1,42 +1,33 @@
-# $NetBSD: Makefile,v 1.34 2019/11/23 22:20:29 nia Exp $
-#
+# $NetBSD: Makefile,v 1.35 2019/11/23 23:03:01 nia Exp $
 
-DISTNAME=	smpeg-0.4.4
-PKGREVISION=	17
+DISTNAME=	smpeg-0.4.5
 CATEGORIES=	devel multimedia
 MASTER_SITES=	#
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://icculus.org/smpeg/
 COMMENT=	SDL MPEG Player Library
 LICENSE=	gnu-lgpl-v2
 
-USE_TOOLS+=	gmake
-GNU_CONFIGURE=	yes
+USE_TOOLS+=	aclocal automake autoconf gmake
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-Dunix=1
 
-# smpeg sources (glmovie.c & glmovie-tile.c) assume <malloc.h> exists.
-# Create a fake one for platforms that don't have it.
-#
-post-wrapper:
-	if ${TEST} ! -f /usr/include/malloc.h; then			\
-		${ECHO} "#include <stdlib.h>"				\
-			> ${BUILDLINK_DIR}/include/malloc.h;		\
-	fi
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-.  if ${OPSYS} != "Darwin" && \
-     empty(MACHINE_PLATFORM:MNetBSD-[89].*-i386)
-CONFIGURE_ARGS+=	--enable-mmx
-.  endif
-.endif
-
-MAKE_ENV.SunOS+=	SunOS_LDFLAGS="-shared -mimpure-text"
+LDFLAGS.SunOS+=	-shared -mimpure-text
+
+CONFIGURE_ARGS+=	--disable-gtk-player
+CONFIGURE_ARGS+=	--disable-sdltest
+
+pre-configure:
+	cd ${WRKSRC} && ${SH} autogen.sh
+
+post-install:
+	# gtk1 player is not installed
+	${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gtv.1
 
 .include "options.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/multimedia/smpeg/PLIST b/multimedia/smpeg/PLIST
index c873f826759..6a7cedd2de6 100644
--- a/multimedia/smpeg/PLIST
+++ b/multimedia/smpeg/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:08:10 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/11/23 23:03:01 nia Exp $
 ${PLIST.opengl}bin/glmovie
-${PLIST.gtk}bin/gtv
 bin/plaympeg
 bin/smpeg-config
 include/smpeg/MPEG.h
@@ -15,6 +14,5 @@ include/smpeg/MPEGsystem.h
 include/smpeg/MPEGvideo.h
 include/smpeg/smpeg.h
 lib/libsmpeg.la
-${PLIST.gtk}man/man1/gtv.1
 man/man1/plaympeg.1
 share/aclocal/smpeg.m4
diff --git a/multimedia/smpeg/distinfo b/multimedia/smpeg/distinfo
index 32904e6531e..5d68de7463f 100644
--- a/multimedia/smpeg/distinfo
+++ b/multimedia/smpeg/distinfo
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.9 2017/10/19 15:59:22 jperkin Exp $
+$NetBSD: distinfo,v 1.10 2019/11/23 23:03:01 nia Exp $
 
-SHA1 (smpeg-0.4.4.tar.gz) = 6d7f4449472e6270ab435b2224f3fad951c35259
-RMD160 (smpeg-0.4.4.tar.gz) = d55249ad53417fa0df3d925aed0e83d2204e28b7
-SHA512 (smpeg-0.4.4.tar.gz) = d566bb68b0caacecdf61cd766b26e003fd4e153c243d873f7aae33ab69919202bd121bb9c10f494bd9530267ddec2a9e018eb46ee8bb9d502a29cd2de2f1bbfb
-Size (smpeg-0.4.4.tar.gz) = 315054 bytes
-SHA1 (patch-aa) = 0a691663e1966dbd5d37225b11b6f5f6d9ad0bf0
-SHA1 (patch-ab) = 8b4ef487dc7176dd0ef21e9a6d90e72e26d68c73
-SHA1 (patch-ac) = 6f0cdeb9864db4db6730c8137287a073172a09ab
-SHA1 (patch-ad) = 021ffc5024723173c8a6cda04ae6f70add974faa
-SHA1 (patch-ae) = 0c7646ec3ce331b6991d59d96efa1ba07fbb91e5
-SHA1 (patch-audio_huffmantable.cpp) = 4bde79539a6fe488bc6be7092f23fac18efa362e
+SHA1 (smpeg-0.4.5.tar.xz) = 3fb37e2f8d756231c1b2c8bbf248aa417a35ceae
+RMD160 (smpeg-0.4.5.tar.xz) = d4b3802f5cc15de155994f47f3b8e794590d9789
+SHA512 (smpeg-0.4.5.tar.xz) = ab0d589d7e4b3fcd444f8b740471ea1eb8105b55c3e3c913cd05afad49db33ba5a2dd68aca30b16338342843bf9804ee82950cd035db94a70b2f1539886863c8
+Size (smpeg-0.4.5.tar.xz) = 289524 bytes
+SHA1 (patch-audio_hufftable.cpp) = 0989457761d5a12206d1f5b3d949e0e5e30ff68b
diff --git a/multimedia/smpeg/options.mk b/multimedia/smpeg/options.mk
index 68bd85bb2e5..d8a9d29c741 100644
--- a/multimedia/smpeg/options.mk
+++ b/multimedia/smpeg/options.mk
@@ -1,20 +1,12 @@
-# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:07 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/23 23:03:01 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.smpeg
-PKG_SUPPORTED_OPTIONS=	gtk-player opengl-player
+PKG_SUPPORTED_OPTIONS=	opengl-player
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		gtk opengl
 
-.if !empty(PKG_OPTIONS:Mgtk-player)
-PLIST.gtk=		yes
-CONFIGURE_ARGS+=	--enable-gtk-player
-.  include "../../x11/gtk/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-gtk-player --disable-gtk-test
-.endif
-
 .if !empty(PKG_OPTIONS:Mopengl-player)
 PLIST.opengl=		yes
 CONFIGURE_ARGS+=	--enable-opengl-player
diff --git a/multimedia/smpeg/patches/patch-aa b/multimedia/smpeg/patches/patch-aa
deleted file mode 100644
index 697bd22594b..00000000000
--- a/multimedia/smpeg/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$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
deleted file mode 100644
index 3a4140e052e..00000000000
--- a/multimedia/smpeg/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2011/09/14 17:24:14 hans Exp $
-
---- Makefile.in.orig	2001-06-18 22:59:14.000000000 +0200
-+++ Makefile.in	2011-09-08 19:08:45.100951557 +0200
-@@ -120,7 +120,7 @@ EXTRA_DIST =  	CHANGES			COPYING			TODO	
- bin_PROGRAMS = plaympeg $(GTK_PLAYER) $(OPENGL_PLAYER)
- 
- # Sources for plaympeg
--man_MANS = plaympeg.1 gtv.1
-+man_MANS = plaympeg.1 @HAVE_GTK_TRUE@gtv.1
- plaympeg_SOURCES = plaympeg.c
- plaympeg_LDADD = libsmpeg.la
- 
-@@ -281,7 +281,7 @@ distclean-libtool:
- maintainer-clean-libtool:
- 
- libsmpeg.la: $(libsmpeg_la_OBJECTS) $(libsmpeg_la_DEPENDENCIES)
--	$(CXXLINK) -rpath $(libdir) $(libsmpeg_la_LDFLAGS) $(libsmpeg_la_OBJECTS) $(libsmpeg_la_LIBADD) $(LIBS)
-+	$(CXXLINK) -rpath $(libdir) $(SunOS_LDFLAGS) $(libsmpeg_la_LDFLAGS) $(libsmpeg_la_OBJECTS) $(libsmpeg_la_LIBADD) $(LIBS) 
- 
- mostlyclean-binPROGRAMS:
- 
-@@ -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
deleted file mode 100644
index 227bbd53657..00000000000
--- a/multimedia/smpeg/patches/patch-ac
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2010/08/10 06:20:59 tsutsui Exp $
-
---- video/video.h.orig	2001-02-10 07:36:42.000000000 +0000
-+++ video/video.h	2010-08-07 22:45:45.000000000 +0000
-@@ -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
-@@ -424,6 +424,17 @@
- #endif
- 
- #if !defined(LITTLE_ENDIAN_ARCHITECTURE) && !defined(BIG_ENDIAN_ARCHITECTURE)
-+#if defined(__NetBSD__)
-+#include <sys/endian.h>
-+#if _BYTE_ORDER == _LITTLE_ENDIAN
-+#undef  BIG_ENDIAN_ARCHITECTURE
-+#define LITTLE_ENDIAN_ARCHITECTURE 1
-+#endif
-+#if _BYTE_ORDER == _BIG_ENDIAN
-+#undef  LITTLE_ENDIAN_ARCHITECTURE
-+#define BIG_ENDIAN_ARCHITECTURE 1
-+#endif
-+#else
- #ifdef WIN32
- #undef  BIG_ENDIAN_ARCHITECTURE
- #define LITTLE_ENDIAN_ARCHITECTURE
-@@ -444,6 +455,7 @@
- #endif
- #endif
- #endif
-+#endif
- 
- #if !defined(LITTLE_ENDIAN_ARCHITECTURE) && !defined(BIG_ENDIAN_ARCHITECTURE)
- #error Unknown endianism of architecture
diff --git a/multimedia/smpeg/patches/patch-ad b/multimedia/smpeg/patches/patch-ad
deleted file mode 100644
index b617543a797..00000000000
--- a/multimedia/smpeg/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/04/27 11:06:39 wiz Exp $
-
---- smpeg.m4.orig	2001-04-04 22:28:14.000000000 +0200
-+++ smpeg.m4
-@@ -10,7 +10,7 @@ dnl AM_PATH_SMPEG([MINIMUM-VERSION, [ACT
- ACTION-IF-NOT-FOUND]]])
- dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS
- dnl
--AC_DEFUN(AM_PATH_SMPEG,
-+AC_DEFUN([AM_PATH_SMPEG],
- [dnl
- dnl Get the cflags and libraries from the smpeg-config script
- dnl
diff --git a/multimedia/smpeg/patches/patch-ae b/multimedia/smpeg/patches/patch-ae
deleted file mode 100644
index 7e3e3506f70..00000000000
--- a/multimedia/smpeg/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/06/19 00:13:58 christos Exp $
-
---- MPEGaudio.h.orig	2001-04-04 16:42:40.000000000 -0400
-+++ MPEGaudio.h	2006-06-18 20:07:34.000000000 -0400
-@@ -148,6 +148,13 @@
-   char buffer[2*WINDOWSIZE];
- };
- 
-+class MPEGaudio;
-+void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
-+int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
-+#ifdef THREADED_AUDIO
-+int Decode_MPEGaudio(void *udata);
-+#endif
-+
- /* The actual MPEG audio class */
- class MPEGaudio : public MPEGerror, public MPEGaudioaction {
- 
diff --git a/multimedia/smpeg/patches/patch-audio_huffmantable.cpp b/multimedia/smpeg/patches/patch-audio_hufftable.cpp
index 8f8549012ba..1092bfae521 100644
--- a/multimedia/smpeg/patches/patch-audio_huffmantable.cpp
+++ b/multimedia/smpeg/patches/patch-audio_hufftable.cpp
@@ -1,18 +1,19 @@
-$NetBSD: patch-audio_huffmantable.cpp,v 1.1 2017/10/19 15:59:22 jperkin Exp $
+$NetBSD: patch-audio_hufftable.cpp,v 1.1 2019/11/23 23:03:01 nia Exp $
 
 Fix build with GCC >= 6.
 
---- audio/huffmantable.cpp.orig	1999-08-26 04:37:52.000000000 +0000
-+++ audio/huffmantable.cpp
-@@ -9,6 +9,7 @@
+--- audio/hufftable.cpp.orig	2019-11-23 22:30:57.000000000 +0000
++++ audio/hufftable.cpp
+@@ -9,6 +9,8 @@
  #include "config.h"
  #endif
  
 +#include <climits>
++
  #include "MPEGaudio.h"
  
  static const unsigned int
-@@ -550,11 +551,11 @@ htd33[ 31][2]={{ 16,  1},{  8,  1},{  4,
+@@ -550,11 +552,11 @@ htd33[ 31][2]={{ 16,  1},{  8,  1},{  4,
  
  const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
  {
@@ -26,7 +27,7 @@ Fix build with GCC >= 6.
    { 5, 4-1, 4-1, 0, 31,htd05},
    { 6, 4-1, 4-1, 0, 31,htd06},
    { 7, 6-1, 6-1, 0, 71,htd07},
-@@ -564,7 +565,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN
+@@ -564,7 +566,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN
    {11, 8-1, 8-1, 0,127,htd11},
    {12, 8-1, 8-1, 0,127,htd12},
    {13,16-1,16-1, 0,511,htd13},