[pkgsrc/trunk]: pkgsrc/multimedia/ggrab Fix GCC 3.4+: "typedef enum {} foo" c...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dce13617e61c
branches:  trunk
changeset: 511133:dce13617e61c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Apr 09 19:35:10 2006 +0000

description:
Fix GCC 3.4+: "typedef enum {} foo" can't be used as "enum foo".
Correct pthread linkage.

diffstat:

 multimedia/ggrab/Makefile         |   4 ++--
 multimedia/ggrab/distinfo         |   4 +++-
 multimedia/ggrab/patches/patch-aa |  13 +++++++++++++
 multimedia/ggrab/patches/patch-ab |  13 +++++++++++++
 4 files changed, 31 insertions(+), 3 deletions(-)

diffs (62 lines):

diff -r 900201fd9e5e -r dce13617e61c multimedia/ggrab/Makefile
--- a/multimedia/ggrab/Makefile Sun Apr 09 18:08:28 2006 +0000
+++ b/multimedia/ggrab/Makefile Sun Apr 09 19:35:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/04/07 15:58:36 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2006/04/09 19:35:10 joerg Exp $
 #
 
 DISTNAME=              ${PKGNAME}-linux
@@ -25,5 +25,5 @@
        ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}/
        ${INSTALL_DATA_DIR} ${EGDIR}
 
-
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 900201fd9e5e -r dce13617e61c multimedia/ggrab/distinfo
--- a/multimedia/ggrab/distinfo Sun Apr 09 18:08:28 2006 +0000
+++ b/multimedia/ggrab/distinfo Sun Apr 09 19:35:10 2006 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/07 15:58:36 mjl Exp $
+$NetBSD: distinfo,v 1.2 2006/04/09 19:35:10 joerg Exp $
 
 SHA1 (ggrab-0.22a-linux.tgz) = bb73e45ad9918e70ee21baadcc0771a6ca55032d
 RMD160 (ggrab-0.22a-linux.tgz) = a272515ac6c40d3c899527e5590bd86893f694e8
 Size (ggrab-0.22a-linux.tgz) = 503296 bytes
+SHA1 (patch-aa) = f1beb04c00e1d40123eda0e058e725d9ee55da5b
+SHA1 (patch-ab) = c89e69405a1091ed5e8dd8971271adb4c186e739
diff -r 900201fd9e5e -r dce13617e61c multimedia/ggrab/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ggrab/patches/patch-aa Sun Apr 09 19:35:10 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2006/04/09 19:35:10 joerg Exp $
+
+--- pesstream.h.orig   2006-04-09 19:32:10.000000000 +0000
++++ pesstream.h
+@@ -25,7 +25,7 @@ class pesstream {
+       private:
+               static int              m_st_nr;
+               int                     m_nr;
+-              enum S_TYPE             m_stype;
++              S_TYPE                  m_stype;
+               class CBuffer *         mp_cbuf;
+               class xlist *           mp_list;
+ 
diff -r 900201fd9e5e -r dce13617e61c multimedia/ggrab/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ggrab/patches/patch-ab Sun Apr 09 19:35:10 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/04/09 19:35:10 joerg Exp $
+
+--- Makefile.orig      2006-04-09 19:33:00.000000000 +0000
++++ Makefile
+@@ -24,7 +24,7 @@ TARGETS=ggrab sserver
+ 
+ GG_INCS=list.h tools.h cbuffer.h pesstream.h Makefile
+ GG_OBJS=list.o cbuffer.o tools.o ggrab.o pesstream.o
+-GG_LIBS=-lpthread
++GG_LIBS=${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ 
+ 
+ all: $(TARGETS)