pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/gramofile Fix build on SunOS.
details: https://anonhg.NetBSD.org/pkgsrc/rev/441149197667
branches: trunk
changeset: 599480:441149197667
user: hans <hans%pkgsrc.org@localhost>
date: Wed Feb 15 21:37:48 2012 +0000
description:
Fix build on SunOS.
diffstat:
audio/gramofile/distinfo | 8 ++--
audio/gramofile/patches/patch-aa | 4 +-
audio/gramofile/patches/patch-ab | 6 +--
audio/gramofile/patches/patch-ac | 56 +++++++++++++++++++++------------------
4 files changed, 38 insertions(+), 36 deletions(-)
diffs (170 lines):
diff -r e34f7702dbb6 -r 441149197667 audio/gramofile/distinfo
--- a/audio/gramofile/distinfo Wed Feb 15 21:25:52 2012 +0000
+++ b/audio/gramofile/distinfo Wed Feb 15 21:37:48 2012 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2011/09/04 01:42:24 dholland Exp $
+$NetBSD: distinfo,v 1.10 2012/02/15 21:37:48 hans Exp $
SHA1 (gramofile-1.6.tar.gz) = 6e5365d9e04801725be694fefcff5fc10ea2f912
RMD160 (gramofile-1.6.tar.gz) = 3f7c8a8e8053e92ece830bbb1138fc7ed1c49967
Size (gramofile-1.6.tar.gz) = 108596 bytes
-SHA1 (patch-aa) = be9de0d0c8699328610c707c57edf26b9bf28863
-SHA1 (patch-ab) = 504cdb14c7ab11179e6cddfc32179a7a3528a67a
-SHA1 (patch-ac) = 38094ec6a4e1e90e3d03eef5ce3f6fdb8d0621bb
+SHA1 (patch-aa) = d9cfec7b0243efeb9785b65dbb5c95725d646bdb
+SHA1 (patch-ab) = 1f599c0dc94dd6d420c7ba59e75a9829180dc4df
+SHA1 (patch-ac) = 86e4431b5cd3e98a19e63f070fb1e374b1fdd4ca
SHA1 (patch-bplaysrc_bplay_c) = 59f0db9a664245c2d21e791c2910854f5c9ecdce
SHA1 (patch-gramofile_c) = 8c73c1db912894bc6f7cfc3fa191f1521e5d5b8d
diff -r e34f7702dbb6 -r 441149197667 audio/gramofile/patches/patch-aa
--- a/audio/gramofile/patches/patch-aa Wed Feb 15 21:25:52 2012 +0000
+++ b/audio/gramofile/patches/patch-aa Wed Feb 15 21:37:48 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2008/03/17 22:28:13 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2012/02/15 21:37:48 hans Exp $
--- Makefile.orig 2000-03-28 15:23:58.000000000 -0500
+++ Makefile
@@ -23,7 +23,7 @@
COPY_A = -a
-
+else
-+ifeq (,$(filter-out NetBSD DragonFly,$(OS)))
++ifeq (,$(filter-out NetBSD DragonFly SunOS,$(OS)))
# For FreeBSD (and maybe others), use these:
-#CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER
-#DEPS = $(OBJS) makebplay
diff -r e34f7702dbb6 -r 441149197667 audio/gramofile/patches/patch-ab
--- a/audio/gramofile/patches/patch-ab Wed Feb 15 21:25:52 2012 +0000
+++ b/audio/gramofile/patches/patch-ab Wed Feb 15 21:37:48 2012 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/11/11 16:49:32 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2012/02/15 21:37:48 hans Exp $
--- bplaysrc/Makefile.orig 2000-03-27 21:24:46.000000000 +0000
+++ bplaysrc/Makefile
-@@ -6,18 +6,29 @@ OBJS = bplay.o sndfunc.o shmbuf.o ../yes
+@@ -6,18 +6,27 @@ OBJS = bplay.o sndfunc.o shmbuf.o ../yes
../clrscr.o ../secshms.o
#SRCS = bplay.c sndfunc.o shmbuf.c
@@ -25,7 +25,6 @@
+CFLAGS = -Wall -O2 -DLP2CD -DVUMETER
+LIBS = -lcurses ${LIBOSSAUDIO}
+else
-+ifeq (${OS}, NetBSD)
# For FreeBSD (and maybe others), use these:
-#CFLAGS = -Wall -O2 -DLP2CD -DVUMETER # -DDEBUG
-#LIBS = -lncurses
@@ -33,7 +32,6 @@
+LIBS = -lcurses ${LIBOSSAUDIO}
+endif
+endif
-+endif
# -DOLD_CURSES can be used here, too.
diff -r e34f7702dbb6 -r 441149197667 audio/gramofile/patches/patch-ac
--- a/audio/gramofile/patches/patch-ac Wed Feb 15 21:25:52 2012 +0000
+++ b/audio/gramofile/patches/patch-ac Wed Feb 15 21:37:48 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2004/11/29 09:17:10 agc Exp $
+$NetBSD: patch-ac,v 1.4 2012/02/15 21:37:48 hans Exp $
Use fixed size fields
@@ -11,9 +11,9 @@
-#define DATALEN(bp) ((u_long)(bp.BlockLen[0]) | \
- ((u_long)(bp.BlockLen[1]) << 8) | \
- ((u_long)(bp.BlockLen[2]) << 16) )
-+#define DATALEN(bp) ((u_int32_t)(bp.BlockLen[0]) | \
-+ ((u_int32_t)(bp.BlockLen[1]) << 8) | \
-+ ((u_int32_t)(bp.BlockLen[2]) << 16) )
++#define DATALEN(bp) ((uint32_t)(bp.BlockLen[0]) | \
++ ((uint32_t)(bp.BlockLen[1]) << 8) | \
++ ((uint32_t)(bp.BlockLen[2]) << 16) )
typedef struct vochead
{
@@ -21,31 +21,35 @@
- u_short BlockOffset; /* Offset to first block from top of file */
- u_short Version; /* VOC-file version */
- u_short IDCode; /* complement of version + 0x1234 */
-+ u_int16_t BlockOffset; /* Offset to first block from top of file */
-+ u_int16_t Version; /* VOC-file version */
-+ u_int16_t IDCode; /* complement of version + 0x1234 */
++ uint16_t BlockOffset; /* Offset to first block from top of file */
++ uint16_t Version; /* VOC-file version */
++ uint16_t IDCode; /* complement of version + 0x1234 */
}
vochead;
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ blockT1;
typedef struct blockT8
{
- u_short TimeConstant;
-+ u_int16_t TimeConstant;
++ uint16_t TimeConstant;
u_char PackMethod;
u_char VoiceMode;
}
-@@ -47,7 +47,7 @@
- u_int SamplesPerSec;
+@@ -44,10 +44,10 @@ blockT8;
+
+ typedef struct blockT9
+ {
+- u_int SamplesPerSec;
++ uint SamplesPerSec;
u_char BitsPerSample;
u_char Channels;
- u_short Format;
-+ u_int16_t Format;
++ uint16_t Format;
u_char reserved[4];
}
blockT9;
-@@ -62,21 +62,21 @@
+@@ -62,21 +62,21 @@ blockT9;
*/
typedef struct wavhead
{
@@ -61,23 +65,23 @@
- u_long byte_p_sec;
- u_short byte_p_spl; /* samplesize; 1 or 2 bytes */
- u_short bit_p_spl; /* 8, 12 or 16 bit */
-+ u_int32_t main_chunk; /* 'RIFF' */
-+ u_int32_t length; /* Length of rest of file */
-+ u_int32_t chunk_type; /* 'WAVE' */
++ uint32_t main_chunk; /* 'RIFF' */
++ uint32_t length; /* Length of rest of file */
++ uint32_t chunk_type; /* 'WAVE' */
+
-+ u_int32_t sub_chunk; /* 'fmt ' */
-+ u_int32_t sc_len; /* length of sub_chunk, =16 (rest of chunk) */
-+ u_int16_t format; /* should be 1 for PCM-code */
-+ u_int16_t modus; /* 1 Mono, 2 Stereo */
-+ u_int32_t sample_fq; /* frequence of sample */
-+ u_int32_t byte_p_sec;
-+ u_int16_t byte_p_spl; /* samplesize; 1 or 2 bytes */
-+ u_int16_t bit_p_spl; /* 8, 12 or 16 bit */
++ uint32_t sub_chunk; /* 'fmt ' */
++ uint32_t sc_len; /* length of sub_chunk, =16 (rest of chunk) */
++ uint16_t format; /* should be 1 for PCM-code */
++ uint16_t modus; /* 1 Mono, 2 Stereo */
++ uint32_t sample_fq; /* frequence of sample */
++ uint32_t byte_p_sec;
++ uint16_t byte_p_spl; /* samplesize; 1 or 2 bytes */
++ uint16_t bit_p_spl; /* 8, 12 or 16 bit */
- u_long data_chunk; /* 'data' */
- u_long data_length; /* samplecount (lenth of rest of block?) */
-+ u_int32_t data_chunk; /* 'data' */
-+ u_int32_t data_length; /* samplecount (lenth of rest of block?) */
++ uint32_t data_chunk; /* 'data' */
++ uint32_t data_length; /* samplecount (lenth of rest of block?) */
}
wavhead;
Home |
Main Index |
Thread Index |
Old Index