diff options
author | Trevor Johnson <trevor@FreeBSD.org> | 2001-03-28 21:55:31 +0000 |
---|---|---|
committer | Trevor Johnson <trevor@FreeBSD.org> | 2001-03-28 21:55:31 +0000 |
commit | 8e5e9b8711e554071a575ab76800268a4bdae4c1 (patch) | |
tree | d9fc67dd0f9b766f83831624d5aaefb9ce49727b /audio/vorbis-tools/files/patch-ab | |
parent | Bump PORTREVISION. (diff) |
Install documentation in a better place.
Patch ogg123/Makefile.am because automake will be run even though
we do not need it. Continue to patch ogg123/Makefile.in just the
same, so automake will not be required.
Effectively rename some patches, and change some:
- patch-aa to patch-configure.in
- patch-ab to patch-ogg123_buffer.c
- patch-ac to patch-ogg123_Makefile.in
- patch-ad to patch-ogg123_ogg123.c (with changes)
- patch-ae to patch-aclocal.m4 (with changes)
- patch-af to patch-ogg123_Makefile.am (with changes)
The maintainer requested this. He said that the history of these
files is not worth keeping.
Add $FreeBSD$ tags to the patches.
Change pkg-comment.
Submitted by: maintainer
PR: 26136
Notes
Notes:
svn path=/head/; revision=40505
Diffstat (limited to 'audio/vorbis-tools/files/patch-ab')
-rw-r--r-- | audio/vorbis-tools/files/patch-ab | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/audio/vorbis-tools/files/patch-ab b/audio/vorbis-tools/files/patch-ab deleted file mode 100644 index 4207e753c0e2..000000000000 --- a/audio/vorbis-tools/files/patch-ab +++ /dev/null @@ -1,65 +0,0 @@ ---- ogg123/buffer.c.orig Tue Jan 30 11:42:48 2001 -+++ ogg123/buffer.c Sat Mar 17 17:12:02 2001 -@@ -6,17 +6,16 @@ - */ - - #include <sys/types.h> -+#if HAVE_SMMAP -+#include <sys/mman.h> -+#else - #include <sys/ipc.h> - #include <sys/shm.h> --#include <sys/stat.h> -+#endif - #include <sys/time.h> - #include <unistd.h> /* for fork and pipe*/ - #include <fcntl.h> - --#ifndef DARWIN --#include <malloc.h> --#endif -- - #include "ogg123.h" - #include "buffer.h" - -@@ -73,10 +72,26 @@ buf_t *fork_writer (long size, devices_t - int childpid; - buf_t *buf; - -+#if HAVE_SMMAP -+ int fd; -+ -+ if ((fd = open("/dev/zero", O_RDWR)) < 0) -+ { -+ perror ("cannot open /dev/zero"); -+ exit (1); -+ } -+ if ((buf = (buf_t *) mmap (0, sizeof(buf_t) + sizeof (chunk_t) * (size - 1), -+ PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) < 0) -+ { -+ perror("mmap"); -+ exit(1); -+ } -+ close(fd); -+#else - /* Get the shared memory segment. */ - int shmid = shmget (IPC_PRIVATE, - sizeof(buf_t) + sizeof (chunk_t) * (size - 1), -- IPC_CREAT|S_IREAD|S_IWRITE); -+ IPC_CREAT|SHM_R|SHM_W); - - if (shmid == -1) - { -@@ -92,7 +107,11 @@ buf_t *fork_writer (long size, devices_t - perror ("shmat"); - exit (1); - } -- -+ -+ /* Remove segment after last process detaches it or terminates. */ -+ shmctl(shmid, IPC_RMID, 0); -+#endif /* HAVE_SMMAP */ -+ - buffer_init (buf, size); - - /* Create a pipe for communication between the two processes. Unlike |