diff options
| author | joerg <joerg> | 2006-04-09 19:35:10 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-04-09 19:35:10 +0000 |
| commit | 173d6cfd0f0ef53f9374abc3c4a4e3e9aa82a319 (patch) | |
| tree | 262e1e4056a9319c5b33bdb89b898348eab312f1 /multimedia | |
| parent | 4487f2b552fb6447c954914e606820a0cb93ac6f (diff) | |
| download | pkgsrc-173d6cfd0f0ef53f9374abc3c4a4e3e9aa82a319.tar.gz | |
Fix GCC 3.4+: "typedef enum {} foo" can't be used as "enum foo".
Correct pthread linkage.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ggrab/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ggrab/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/ggrab/patches/patch-aa | 13 | ||||
| -rw-r--r-- | multimedia/ggrab/patches/patch-ab | 13 |
4 files changed, 31 insertions, 3 deletions
diff --git a/multimedia/ggrab/Makefile b/multimedia/ggrab/Makefile index 9fe3573e495..9975dd5c379 100644 --- a/multimedia/ggrab/Makefile +++ b/multimedia/ggrab/Makefile @@ -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 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}/ ${INSTALL_DATA_DIR} ${EGDIR} - +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/ggrab/distinfo b/multimedia/ggrab/distinfo index d13c041ab23..dfe2bce6244 100644 --- a/multimedia/ggrab/distinfo +++ b/multimedia/ggrab/distinfo @@ -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 --git a/multimedia/ggrab/patches/patch-aa b/multimedia/ggrab/patches/patch-aa new file mode 100644 index 00000000000..d1aa8a0f81b --- /dev/null +++ b/multimedia/ggrab/patches/patch-aa @@ -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 --git a/multimedia/ggrab/patches/patch-ab b/multimedia/ggrab/patches/patch-ab new file mode 100644 index 00000000000..1c6f8ac6eff --- /dev/null +++ b/multimedia/ggrab/patches/patch-ab @@ -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) |