CVS commit: pkgsrc/multimedia/smpeg

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Nov 23 23:03:01 UTC 2019

Modified Files:
        pkgsrc/multimedia/smpeg: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/multimedia/smpeg/patches: patch-audio_hufftable.cpp
Removed Files:
        pkgsrc/multimedia/smpeg/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae patch-audio_huffmantable.cpp

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/multimedia/smpeg/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/smpeg/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/multimedia/smpeg/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/smpeg/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/multimedia/smpeg/patches/patch-aa \
    pkgsrc/multimedia/smpeg/patches/patch-ad \
    pkgsrc/multimedia/smpeg/patches/patch-ae \
    pkgsrc/multimedia/smpeg/patches/patch-audio_huffmantable.cpp
cvs rdiff -u -r1.3 -r0 pkgsrc/multimedia/smpeg/patches/patch-ab
cvs rdiff -u -r1.2 -r0 pkgsrc/multimedia/smpeg/patches/patch-ac
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/smpeg/patches/patch-audio_hufftable.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/smpeg/Makefile
diff -u pkgsrc/multimedia/smpeg/Makefile:1.34 pkgsrc/multimedia/smpeg/Makefile:1.35
--- pkgsrc/multimedia/smpeg/Makefile:1.34       Sat Nov 23 22:20:29 2019
+++ pkgsrc/multimedia/smpeg/Makefile    Sat Nov 23 23:03:01 2019
@@ -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@localhost
 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
+LDFLAGS.SunOS+=        -shared -mimpure-text
+
+CONFIGURE_ARGS+=       --disable-gtk-player
+CONFIGURE_ARGS+=       --disable-sdltest
+
+pre-configure:
+       cd ${WRKSRC} && ${SH} autogen.sh
 
-MAKE_ENV.SunOS+=       SunOS_LDFLAGS="-shared -mimpure-text"
+post-install:
+       # gtk1 player is not installed
+       ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gtv.1
 
 .include "options.mk"
 .include "../../devel/SDL/buildlink3.mk"

Index: pkgsrc/multimedia/smpeg/PLIST
diff -u pkgsrc/multimedia/smpeg/PLIST:1.5 pkgsrc/multimedia/smpeg/PLIST:1.6
--- pkgsrc/multimedia/smpeg/PLIST:1.5   Sun Jun 14 18:08:10 2009
+++ pkgsrc/multimedia/smpeg/PLIST       Sat Nov 23 23:03:01 2019
@@ -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

Index: pkgsrc/multimedia/smpeg/distinfo
diff -u pkgsrc/multimedia/smpeg/distinfo:1.9 pkgsrc/multimedia/smpeg/distinfo:1.10
--- pkgsrc/multimedia/smpeg/distinfo:1.9        Thu Oct 19 15:59:22 2017
+++ pkgsrc/multimedia/smpeg/distinfo    Sat Nov 23 23:03:01 2019
@@ -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

Index: pkgsrc/multimedia/smpeg/options.mk
diff -u pkgsrc/multimedia/smpeg/options.mk:1.3 pkgsrc/multimedia/smpeg/options.mk:1.4
--- pkgsrc/multimedia/smpeg/options.mk:1.3      Sat Apr 12 22:43:07 2008
+++ pkgsrc/multimedia/smpeg/options.mk  Sat Nov 23 23:03:01 2019
@@ -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

Added files:

Index: pkgsrc/multimedia/smpeg/patches/patch-audio_hufftable.cpp
diff -u /dev/null pkgsrc/multimedia/smpeg/patches/patch-audio_hufftable.cpp:1.1
--- /dev/null   Sat Nov 23 23:03:01 2019
+++ pkgsrc/multimedia/smpeg/patches/patch-audio_hufftable.cpp   Sat Nov 23 23:03:01 2019
@@ -0,0 +1,38 @@
+$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},