[pkgsrc/trunk]: pkgsrc/multimedia/libmpeg3 Update to 1.7:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/multimedia/libmpeg3 Update to 1.7:
From: xtraeme <xtraeme%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:48:39 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/aa8edee326a0
branches:  trunk
changeset: 538833:aa8edee326a0
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed Feb 20 09:56:44 2008 +0000

description:
Update to 1.7:

Frames are cached when reading the first frame after a seek. This allows
faster reverse playback.

diffstat:

 multimedia/libmpeg3/Makefile         |   33 +-
 multimedia/libmpeg3/PLIST            |    4 +-
 multimedia/libmpeg3/buildlink3.mk    |    4 +-
 multimedia/libmpeg3/distinfo         |   20 +-
 multimedia/libmpeg3/patches/patch-aa |   69 +++--
 multimedia/libmpeg3/patches/patch-ab |   17 -
 multimedia/libmpeg3/patches/patch-ac |   19 +-
 multimedia/libmpeg3/patches/patch-ae |   29 +-
 multimedia/libmpeg3/patches/patch-af |   39 ---
 multimedia/libmpeg3/patches/patch-ah |  402 ++--------------------------------
 multimedia/libmpeg3/patches/patch-ai |   28 +-
 11 files changed, 132 insertions(+), 532 deletions(-)

diffs (truncated from 837 to 300 lines):

diff -r 425f035c7ff8 -r aa8edee326a0 multimedia/libmpeg3/Makefile
--- a/multimedia/libmpeg3/Makefile      Wed Feb 20 09:53:03 2008 +0000
+++ b/multimedia/libmpeg3/Makefile      Wed Feb 20 09:56:44 2008 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:15 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/02/20 09:56:44 xtraeme Exp $
 #
 
-DISTNAME=      libmpeg3-1.3
-PKGREVISION=   6
+DISTNAME=      libmpeg3-1.7-src
+PKGNAME=       ${DISTNAME:S/-src//}
+#PKGREVISION=  1
 CATEGORIES=    devel audio graphics multimedia
-MASTER_SITES=  http://heroines.sourceforge.net/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=heroines/}
+EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://heroines.sourceforge.net/libmpeg3.php3
@@ -13,21 +15,23 @@
 .include "../../mk/bsd.prefs.mk"
 
 .if (${MACHINE_ARCH} == "i386")
+MAKE_ENV+=     USE_MMX=1
+MAKE_ENV+=     USE_CSS=1
 BUILD_DEPENDS+=        nasm-[0-9]*:../../devel/nasm
 .else
-CONFIGURE_ARGS+= --no-mmx --no-css
+.  if ${OPSYS} == "DragonFly"
+MAKE_ENV+=     USE_MMX=0
+MAKE_ENV+=     USE_CSS=0
+.  endif
 .endif
 
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+= --no-css
-.endif
-
-HAS_CONFIGURE= yes
+NO_CONFIGURE=  yes
 USE_TOOLS+=    gmake
+WRKSRC=        ${WRKDIR}/${PKGNAME_NOREV}
 
 ONLY_FOR_COMPILER=     gcc
-
-PTHREAD_OPTS+= require
+PTHREAD_AUTO_VARS=     yes
+PTHREAD_OPTS+=         require
 
 post-configure:
        ${ECHO} "CFLAGS+=-O2" >>${WRKSRC}/global_config
@@ -39,12 +43,11 @@
                mpeg3private.inc mpeg3title.h mpeg3vtrack.h timecode.h
 AINSTHDRS=     ac3.h mpeg3audio.h
 VINSTHDRS=     idct.h mpeg3video.h slice.h
-INSTBINS=      mpeg3cat mpeg3toc mpeg3split
+INSTBINS=      mpeg3cat mpeg3peek mpeg3toc mpeg3dump
 
 INSTALLATION_DIRS=     bin lib
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/work/dump ${PREFIX}/bin/mpeg3dump
        for f in ${INSTBINS}; do \
                ${INSTALL_PROGRAM} ${WRKSRC}/work/$$f ${PREFIX}/bin; \
        done
@@ -62,7 +65,7 @@
                ${INSTALL_DATA} ${WRKSRC}/video/$$f \
                        ${PREFIX}/include/mpeg3/video; \
        done
-       ${INSTALL_DATA} ${WRKSRC}/work/libmpeg3.a ${PREFIX}/lib
+       ${INSTALL_LIB} ${WRKSRC}/work/libmpeg3.a ${PREFIX}/lib
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/libmpeg3
        ${INSTALL_DATA} ${WRKSRC}/docs/index.html \
                ${PREFIX}/share/doc/html/libmpeg3
diff -r 425f035c7ff8 -r aa8edee326a0 multimedia/libmpeg3/PLIST
--- a/multimedia/libmpeg3/PLIST Wed Feb 20 09:53:03 2008 +0000
+++ b/multimedia/libmpeg3/PLIST Wed Feb 20 09:56:44 2008 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2005/07/13 13:17:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/02/20 09:56:44 xtraeme Exp $
 bin/mpeg3cat
 bin/mpeg3dump
-bin/mpeg3split
+bin/mpeg3peek
 bin/mpeg3toc
 include/mpeg3/audio/ac3.h
 include/mpeg3/audio/mpeg3audio.h
diff -r 425f035c7ff8 -r aa8edee326a0 multimedia/libmpeg3/buildlink3.mk
--- a/multimedia/libmpeg3/buildlink3.mk Wed Feb 20 09:53:03 2008 +0000
+++ b/multimedia/libmpeg3/buildlink3.mk Wed Feb 20 09:56:44 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2008/02/20 09:56:44 xtraeme Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 LIBMPEG3_BUILDLINK3_MK:=       ${LIBMPEG3_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@
 .if !empty(LIBMPEG3_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmpeg3+=       libmpeg3>=1.3nb4
 BUILDLINK_ABI_DEPENDS.libmpeg3?=       libmpeg3>=1.3nb6
-BUILDLINK_PKGSRCDIR.libmpeg3?= ../../multimedia/libmpeg3
+BUILDLINK_PKGSRCDIR.libmpeg3?=         ../../multimedia/libmpeg3
 .endif # LIBMPEG3_BUILDLINK3_MK
 
 .include "../../mk/pthread.buildlink3.mk"
diff -r 425f035c7ff8 -r aa8edee326a0 multimedia/libmpeg3/distinfo
--- a/multimedia/libmpeg3/distinfo      Wed Feb 20 09:53:03 2008 +0000
+++ b/multimedia/libmpeg3/distinfo      Wed Feb 20 09:56:44 2008 +0000
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.10 2006/08/09 17:55:51 mrg Exp $
+$NetBSD: distinfo,v 1.11 2008/02/20 09:56:44 xtraeme Exp $
 
-SHA1 (libmpeg3-1.3.tar.gz) = e7e8b03ab45d5593558b0d19e31f0694cfdfa2b5
-RMD160 (libmpeg3-1.3.tar.gz) = b1751f681d26758873746aa38368150eb0a4bafd
-Size (libmpeg3-1.3.tar.gz) = 154062 bytes
-SHA1 (patch-aa) = 65ce6f7bddb393a9c051a030bd8e9c3a9d791dd1
-SHA1 (patch-ab) = 3223b9f7d81dd73eec6767f9e1bb2cb26b4bcd80
-SHA1 (patch-ac) = 68576efb30a0d6f4cfe23fd543a04c4f3ada8936
+SHA1 (libmpeg3-1.7-src.tar.bz2) = 577da1ddf77f1e1fcd1deb69829eec3567daed36
+RMD160 (libmpeg3-1.7-src.tar.bz2) = f1989c4b52d97ee29833edc79efd731b6219f126
+Size (libmpeg3-1.7-src.tar.bz2) = 320897 bytes
+SHA1 (patch-aa) = c05dfda5b2b43593044af2328244858453add46c
+SHA1 (patch-ac) = f83af5e90c93f7d02395923d2f93fb916057c434
 SHA1 (patch-ad) = 86edf9af264370bf89050b02e956b5bacc86881e
-SHA1 (patch-ae) = 5418e29f4f5c30f235cfb075d99c0022d0ad2394
-SHA1 (patch-af) = 9965dda181ebc73aae4d975dc09d071036b81352
+SHA1 (patch-ae) = 4a9034c2fc0e424b8426aa4015f4910beb5a8406
 SHA1 (patch-ag) = bf321ac689b82889ca1a2bb8a96cb6e387280f32
-SHA1 (patch-ah) = 72c4f133ef9e6f3e55144bb75766ec7988351caf
-SHA1 (patch-ai) = 5f2aeff3558ddbc28e276dd827c32ad4757f9995
+SHA1 (patch-ah) = 265b70c9f785b2ce80aec17d73f4e9719f71edba
+SHA1 (patch-ai) = 859735f677cb469b782e27da2a14bacd3fd02003
diff -r 425f035c7ff8 -r aa8edee326a0 multimedia/libmpeg3/patches/patch-aa
--- a/multimedia/libmpeg3/patches/patch-aa      Wed Feb 20 09:53:03 2008 +0000
+++ b/multimedia/libmpeg3/patches/patch-aa      Wed Feb 20 09:56:44 2008 +0000
@@ -1,47 +1,54 @@
-$NetBSD: patch-aa,v 1.3 2006/04/19 17:03:26 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2008/02/20 09:56:44 xtraeme Exp $
 
---- Makefile.orig      2001-05-20 05:05:26.000000000 +0200
-+++ Makefile
-@@ -2,12 +2,7 @@ include global_config
+--- Makefile.orig      2006-02-15 06:09:31.000000000 +0100
++++ Makefile   2008-02-19 19:35:28.000000000 +0100
+@@ -1,7 +1,7 @@
+ CC = gcc
+ NASM = nasm
+-USE_MMX = 0
+-USE_CSS = 1
++#USE_MMX = 0
++#USE_CSS = 1
+ A52DIR := $(shell expr a52dec* )
  
- CFLAGS += 
  
--OBJDIR = $(shell uname --machine)
--
--$(shell sh -c 'if ! test -d $(OBJDIR)\; then \
--      mkdir $(OBJDIR)\; \
--      mkdir $(OBJDIR)/audio\; \
--      mkdir $(OBJDIR)/video\; fi' )
+@@ -16,7 +16,7 @@
+ endif
+ 
+ 
+-OBJDIR := $(shell uname --machine)
 +OBJDIR = work
  
- ifeq ($(OBJDIR), alpha)
-   USE_MMX = 0
-@@ -69,11 +64,16 @@ OBJS = \
+ 
  
- OUTPUT = $(OBJDIR)/libmpeg3.a
- UTILS = $(OBJDIR)/dump $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3toc $(OBJDIR)/mpeg3split
+@@ -147,19 +147,19 @@
+ #$(OBJDIR)/mpeg3split
+ 
+ 
 -LIBS = -lm -lpthread
 +LIBS = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
-+
-+all: prepare $(OUTPUT) util
++all: prepare $(OUTPUT) $(UTILS)
  
--all: $(OUTPUT) util
+-$(shell if ! test -d $(OBJDIR) \; then mkdir -p $(OBJDIR) \; fi )
 +prepare:
 +      mkdir -p $(OBJDIR)
 +      mkdir -p $(OBJDIR)/audio
 +      mkdir -p $(OBJDIR)/video
- 
--$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS)
-+$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) prepare
-       ar rcs $(OUTPUT) $(OBJS) $(ASMOBJS) $(NASMOBJS)
++      echo $(CFLAGS) > $(OBJDIR)/c_flags
++      echo $(A52CFLAGS) > $(OBJDIR)/a52_flags
++      echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs
++      mkdir -p $(DIRS)
  
- $(OBJDIR)/dump: $(OBJDIR)/dump.o $(OUTPUT)
-@@ -88,7 +88,7 @@ $(OBJDIR)/mpeg3toc: $(OBJDIR)/mpeg3toc.o
- $(OBJDIR)/mpeg3split: $(OBJDIR)/mpeg3split.o $(OUTPUT)
-       $(CC) -o $(OBJDIR)/mpeg3split $(OBJDIR)/mpeg3split.o $(OUTPUT) $(LIBS)
+-$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
+-$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags)
+-$(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs)
+-$(shell mkdir -p $(DIRS) )
+-
+-all: $(OUTPUT) $(UTILS)
+-
+-
+-$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS)
++$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS) prepare
+       ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
  
--util: $(UTILS)
-+util: $(UTILS) prepare
  
- clean:
-       find \( -name core \
diff -r 425f035c7ff8 -r aa8edee326a0 multimedia/libmpeg3/patches/patch-ab
--- a/multimedia/libmpeg3/patches/patch-ab      Wed Feb 20 09:53:03 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/10/29 01:43:18 grant Exp $
-
---- mpeg3css.c.orig    2001-05-20 13:05:26.000000000 +1000
-+++ mpeg3css.c
-@@ -45,7 +45,11 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/types.h>
--#include <linux/cdrom.h>
-+#ifdef __linux__
-+# include <linux/cdrom.h>
-+#else
-+# include <sys/dvdio.h>
-+#endif
- 
- #ifndef FIBMAP
- #define FIBMAP           _IO(0x00,1)  /* bmap access */
diff -r 425f035c7ff8 -r aa8edee326a0 multimedia/libmpeg3/patches/patch-ac
--- a/multimedia/libmpeg3/patches/patch-ac      Wed Feb 20 09:53:03 2008 +0000
+++ b/multimedia/libmpeg3/patches/patch-ac      Wed Feb 20 09:56:44 2008 +0000
@@ -1,14 +1,15 @@
-$NetBSD: patch-ac,v 1.3 2005/07/13 13:16:36 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2008/02/20 09:56:44 xtraeme Exp $
 
---- mpeg3ifo.c.orig    2001-05-20 05:05:26.000000000 +0200
-+++ mpeg3ifo.c
-@@ -1,10 +1,26 @@
+--- mpeg3ifo.c.orig    2008-02-19 19:14:12.000000000 +0100
++++ mpeg3ifo.c 2008-02-19 19:14:46.000000000 +0100
+@@ -1,4 +1,3 @@
 -#include <byteswap.h>
  #include <dirent.h>
  #include <fcntl.h>
  #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
+@@ -10,6 +9,23 @@
+ #include "mpeg3private.h"
+ #include "mpeg3protos.h"
  
 +#if defined(__NetBSD__)
 +#  include <sys/endian.h>
@@ -27,6 +28,6 @@
 +#  define bswap_32(x) OSSwapInt32(x)
 +#endif
 +
- #include "ifo.h"
- #include "mpeg3private.h"
- #include "mpeg3protos.h"
+ typedef struct
+ {
+ // Bytes relative to start of stream.
diff -r 425f035c7ff8 -r aa8edee326a0 multimedia/libmpeg3/patches/patch-ae
--- a/multimedia/libmpeg3/patches/patch-ae      Wed Feb 20 09:53:03 2008 +0000
+++ b/multimedia/libmpeg3/patches/patch-ae      Wed Feb 20 09:56:44 2008 +0000
@@ -1,18 +1,25 @@
-$NetBSD: patch-ae,v 1.6 2005/12/06 17:47:56 joerg Exp $
+$NetBSD: patch-ae,v 1.7 2008/02/20 09:56:44 xtraeme Exp $
 
---- mpeg3io.c.orig     2001-05-20 13:05:26.000000000 +1000
-+++ mpeg3io.c
-@@ -1,8 +1,21 @@
+--- mpeg3io.c.orig     2005-05-01 07:57:56.000000000 +0200
++++ mpeg3io.c  2008-02-19 19:25:09.000000000 +0100
+@@ -1,11 +1,27 @@
  #include "mpeg3private.h"
  #include "mpeg3protos.h"
  
 -#include <mntent.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
 -#include <sys/stat.h>
++
Prev by Date: [pkgsrc/trunk]: pkgsrc/mk/install Eliminated some code duplication, provided ...
Next by Date: [pkgsrc/trunk]: pkgsrc/mk/install Add colon in comment to aid "make help" in ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mk/install Eliminated some code duplication, provided ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/mk/install Add colon in comment to aid "make help" in ...
Indexes:
Home | Main Index | Thread Index | Old Index