Sat Nov 23 23:03:01 2019 UTC ()
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


(nia)
diff -r1.34 -r1.35 pkgsrc/multimedia/smpeg/Makefile
diff -r1.5 -r1.6 pkgsrc/multimedia/smpeg/PLIST
diff -r1.9 -r1.10 pkgsrc/multimedia/smpeg/distinfo
diff -r1.3 -r1.4 pkgsrc/multimedia/smpeg/options.mk
diff -r1.1 -r0 pkgsrc/multimedia/smpeg/patches/patch-aa
diff -r1.1 -r0 pkgsrc/multimedia/smpeg/patches/patch-ad
diff -r1.1 -r0 pkgsrc/multimedia/smpeg/patches/patch-ae
diff -r1.1 -r0 pkgsrc/multimedia/smpeg/patches/patch-audio_huffmantable.cpp
diff -r1.3 -r0 pkgsrc/multimedia/smpeg/patches/patch-ab
diff -r1.2 -r0 pkgsrc/multimedia/smpeg/patches/patch-ac
diff -r0 -r1.1 pkgsrc/multimedia/smpeg/patches/patch-audio_hufftable.cpp

cvs diff -r1.34 -r1.35 pkgsrc/multimedia/smpeg/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/smpeg/Makefile 2019/11/23 22:20:29 1.34
+++ pkgsrc/multimedia/smpeg/Makefile 2019/11/23 23:03:01 1.35
@@ -1,43 +1,34 @@ @@ -1,43 +1,34 @@
1# $NetBSD: Makefile,v 1.34 2019/11/23 22:20:29 nia Exp $ 1# $NetBSD: Makefile,v 1.35 2019/11/23 23:03:01 nia Exp $
2# 
3 2
4DISTNAME= smpeg-0.4.4 3DISTNAME= smpeg-0.4.5
5PKGREVISION= 17 
6CATEGORIES= devel multimedia 4CATEGORIES= devel multimedia
7MASTER_SITES= # 5MASTER_SITES= #
 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://icculus.org/smpeg/ 9HOMEPAGE= http://icculus.org/smpeg/
11COMMENT= SDL MPEG Player Library 10COMMENT= SDL MPEG Player Library
12LICENSE= gnu-lgpl-v2 11LICENSE= gnu-lgpl-v2
13 12
14USE_TOOLS+= gmake 13USE_TOOLS+= aclocal automake autoconf gmake
15GNU_CONFIGURE= yes 
16USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
17USE_LIBTOOL= yes 15USE_LIBTOOL= yes
 16GNU_CONFIGURE= yes
18 17
19CPPFLAGS+= -Dunix=1 18CPPFLAGS+= -Dunix=1
20 19
21# smpeg sources (glmovie.c & glmovie-tile.c) assume <malloc.h> exists. 20LDFLAGS.SunOS+= -shared -mimpure-text
22# Create a fake one for platforms that don't have it. 21
23# 22CONFIGURE_ARGS+= --disable-gtk-player
24post-wrapper: 23CONFIGURE_ARGS+= --disable-sdltest
25 if ${TEST} ! -f /usr/include/malloc.h; then \ 24
26 ${ECHO} "#include <stdlib.h>" \ 25pre-configure:
27 > ${BUILDLINK_DIR}/include/malloc.h; \ 26 cd ${WRKSRC} && ${SH} autogen.sh
28 fi 
29 
30.include "../../mk/bsd.prefs.mk" 
31 
32.if ${MACHINE_ARCH} == "i386" 
33. if ${OPSYS} != "Darwin" && \ 
34 empty(MACHINE_PLATFORM:MNetBSD-[89].*-i386) 
35CONFIGURE_ARGS+= --enable-mmx 
36. endif 
37.endif 
38 27
39MAKE_ENV.SunOS+= SunOS_LDFLAGS="-shared -mimpure-text" 28post-install:
 29 # gtk1 player is not installed
 30 ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gtv.1
40 31
41.include "options.mk" 32.include "options.mk"
42.include "../../devel/SDL/buildlink3.mk" 33.include "../../devel/SDL/buildlink3.mk"
43.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"

cvs diff -r1.5 -r1.6 pkgsrc/multimedia/smpeg/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/smpeg/PLIST 2009/06/14 18:08:10 1.5
+++ pkgsrc/multimedia/smpeg/PLIST 2019/11/23 23:03:01 1.6
@@ -1,20 +1,18 @@ @@ -1,20 +1,18 @@
1@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:08:10 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.6 2019/11/23 23:03:01 nia Exp $
2${PLIST.opengl}bin/glmovie 2${PLIST.opengl}bin/glmovie
3${PLIST.gtk}bin/gtv 
4bin/plaympeg 3bin/plaympeg
5bin/smpeg-config 4bin/smpeg-config
6include/smpeg/MPEG.h 5include/smpeg/MPEG.h
7include/smpeg/MPEGaction.h 6include/smpeg/MPEGaction.h
8include/smpeg/MPEGaudio.h 7include/smpeg/MPEGaudio.h
9include/smpeg/MPEGerror.h 8include/smpeg/MPEGerror.h
10include/smpeg/MPEGfilter.h 9include/smpeg/MPEGfilter.h
11include/smpeg/MPEGlist.h 10include/smpeg/MPEGlist.h
12include/smpeg/MPEGring.h 11include/smpeg/MPEGring.h
13include/smpeg/MPEGstream.h 12include/smpeg/MPEGstream.h
14include/smpeg/MPEGsystem.h 13include/smpeg/MPEGsystem.h
15include/smpeg/MPEGvideo.h 14include/smpeg/MPEGvideo.h
16include/smpeg/smpeg.h 15include/smpeg/smpeg.h
17lib/libsmpeg.la 16lib/libsmpeg.la
18${PLIST.gtk}man/man1/gtv.1 
19man/man1/plaympeg.1 17man/man1/plaympeg.1
20share/aclocal/smpeg.m4 18share/aclocal/smpeg.m4

cvs diff -r1.9 -r1.10 pkgsrc/multimedia/smpeg/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/smpeg/distinfo 2017/10/19 15:59:22 1.9
+++ pkgsrc/multimedia/smpeg/distinfo 2019/11/23 23:03:01 1.10
@@ -1,12 +1,7 @@ @@ -1,12 +1,7 @@
1$NetBSD: distinfo,v 1.9 2017/10/19 15:59:22 jperkin Exp $ 1$NetBSD: distinfo,v 1.10 2019/11/23 23:03:01 nia Exp $
2 2
3SHA1 (smpeg-0.4.4.tar.gz) = 6d7f4449472e6270ab435b2224f3fad951c35259 3SHA1 (smpeg-0.4.5.tar.xz) = 3fb37e2f8d756231c1b2c8bbf248aa417a35ceae
4RMD160 (smpeg-0.4.4.tar.gz) = d55249ad53417fa0df3d925aed0e83d2204e28b7 4RMD160 (smpeg-0.4.5.tar.xz) = d4b3802f5cc15de155994f47f3b8e794590d9789
5SHA512 (smpeg-0.4.4.tar.gz) = d566bb68b0caacecdf61cd766b26e003fd4e153c243d873f7aae33ab69919202bd121bb9c10f494bd9530267ddec2a9e018eb46ee8bb9d502a29cd2de2f1bbfb 5SHA512 (smpeg-0.4.5.tar.xz) = ab0d589d7e4b3fcd444f8b740471ea1eb8105b55c3e3c913cd05afad49db33ba5a2dd68aca30b16338342843bf9804ee82950cd035db94a70b2f1539886863c8
6Size (smpeg-0.4.4.tar.gz) = 315054 bytes 6Size (smpeg-0.4.5.tar.xz) = 289524 bytes
7SHA1 (patch-aa) = 0a691663e1966dbd5d37225b11b6f5f6d9ad0bf0 7SHA1 (patch-audio_hufftable.cpp) = 0989457761d5a12206d1f5b3d949e0e5e30ff68b
8SHA1 (patch-ab) = 8b4ef487dc7176dd0ef21e9a6d90e72e26d68c73 
9SHA1 (patch-ac) = 6f0cdeb9864db4db6730c8137287a073172a09ab 
10SHA1 (patch-ad) = 021ffc5024723173c8a6cda04ae6f70add974faa 
11SHA1 (patch-ae) = 0c7646ec3ce331b6991d59d96efa1ba07fbb91e5 
12SHA1 (patch-audio_huffmantable.cpp) = 4bde79539a6fe488bc6be7092f23fac18efa362e 

cvs diff -r1.3 -r1.4 pkgsrc/multimedia/smpeg/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/smpeg/options.mk 2008/04/12 22:43:07 1.3
+++ pkgsrc/multimedia/smpeg/options.mk 2019/11/23 23:03:01 1.4
@@ -1,24 +1,16 @@ @@ -1,24 +1,16 @@
1# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:07 jlam Exp $ 1# $NetBSD: options.mk,v 1.4 2019/11/23 23:03:01 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.smpeg 3PKG_OPTIONS_VAR= PKG_OPTIONS.smpeg
4PKG_SUPPORTED_OPTIONS= gtk-player opengl-player 4PKG_SUPPORTED_OPTIONS= opengl-player
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8PLIST_VARS+= gtk opengl 8PLIST_VARS+= gtk opengl
9 9
10.if !empty(PKG_OPTIONS:Mgtk-player) 
11PLIST.gtk= yes 
12CONFIGURE_ARGS+= --enable-gtk-player 
13. include "../../x11/gtk/buildlink3.mk" 
14.else 
15CONFIGURE_ARGS+= --disable-gtk-player --disable-gtk-test 
16.endif 
17 
18.if !empty(PKG_OPTIONS:Mopengl-player) 10.if !empty(PKG_OPTIONS:Mopengl-player)
19PLIST.opengl= yes 11PLIST.opengl= yes
20CONFIGURE_ARGS+= --enable-opengl-player 12CONFIGURE_ARGS+= --enable-opengl-player
21. include "../../graphics/glu/buildlink3.mk" 13. include "../../graphics/glu/buildlink3.mk"
22.else 14.else
23CONFIGURE_ARGS+= --disable-opengl-player 15CONFIGURE_ARGS+= --disable-opengl-player
24.endif 16.endif

File Deleted: pkgsrc/multimedia/smpeg/patches/Attic/patch-aa

File Deleted: pkgsrc/multimedia/smpeg/patches/Attic/patch-ad

File Deleted: pkgsrc/multimedia/smpeg/patches/Attic/patch-ae

File Deleted: pkgsrc/multimedia/smpeg/patches/Attic/patch-audio_huffmantable.cpp

File Deleted: pkgsrc/multimedia/smpeg/patches/Attic/patch-ab

File Deleted: pkgsrc/multimedia/smpeg/patches/Attic/patch-ac

File Added: pkgsrc/multimedia/smpeg/patches/patch-audio_hufftable.cpp
$NetBSD: patch-audio_hufftable.cpp,v 1.1 2019/11/23 23:03:01 nia Exp $

Fix build with GCC >= 6.

--- 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 +552,11 @@ htd33[ 31][2]={{ 16,  1},{  8,  1},{  4,
 
 const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
 {
-  { 0, 0-1, 0-1, 0,  0, htd33},
+  { 0, UINT_MAX, UINT_MAX, 0,  0, htd33},
   { 1, 2-1, 2-1, 0,  7,htd01},
   { 2, 3-1, 3-1, 0, 17,htd02},
   { 3, 3-1, 3-1, 0, 17,htd03},
-  { 4, 0-1, 0-1, 0,  0, htd33},
+  { 4, UINT_MAX, UINT_MAX, 0,  0, htd33},
   { 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 +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},
-  {14, 0-1, 0-1, 0,  0, htd33},
+  {14, UINT_MAX, UINT_MAX, 0,  0, htd33},
   {15,16-1,16-1, 0,511,htd15},
   {16,16-1,16-1, 1,511,htd16},
   {17,16-1,16-1, 2,511,htd16},