diff options
Diffstat (limited to 'audio/ocp/files')
-rw-r--r-- | audio/ocp/files/patch-dev_mix.c | 10 | ||||
-rw-r--r-- | audio/ocp/files/patch-filesel_arctar.c | 12 | ||||
-rw-r--r-- | audio/ocp/files/patch-lrmi-0.8_vbetest.c | 12 | ||||
-rw-r--r-- | audio/ocp/files/patch-playgmd_gmdlokt.c | 10 | ||||
-rw-r--r-- | audio/ocp/files/patch-playmp2_Makefile | 17 | ||||
-rw-r--r-- | audio/ocp/files/patch-playmp2_memmem.c | 62 |
6 files changed, 123 insertions, 0 deletions
diff --git a/audio/ocp/files/patch-dev_mix.c b/audio/ocp/files/patch-dev_mix.c new file mode 100644 index 0000000..7f1be1c --- /dev/null +++ b/audio/ocp/files/patch-dev_mix.c @@ -0,0 +1,10 @@ +--- dev/mix.c.orig Sat Apr 23 23:13:56 2005 ++++ dev/mix.c Sat Apr 23 23:14:04 2005 +@@ -13,6 +13,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/types.h> + #include <sys/mman.h> + #include <unistd.h> + #include "mcp.h" diff --git a/audio/ocp/files/patch-filesel_arctar.c b/audio/ocp/files/patch-filesel_arctar.c new file mode 100644 index 0000000..18ec635 --- /dev/null +++ b/audio/ocp/files/patch-filesel_arctar.c @@ -0,0 +1,12 @@ +--- filesel/arctar.c.orig Sun Apr 24 02:06:12 2005 ++++ filesel/arctar.c Sun Apr 24 02:07:06 2005 +@@ -13,9 +13,6 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#ifndef __linux +-#include <sys/resource.h> +-#endif + #include <sys/signal.h> + #include <sys/stat.h> + #include <sys/time.h> diff --git a/audio/ocp/files/patch-lrmi-0.8_vbetest.c b/audio/ocp/files/patch-lrmi-0.8_vbetest.c new file mode 100644 index 0000000..0b2892c --- /dev/null +++ b/audio/ocp/files/patch-lrmi-0.8_vbetest.c @@ -0,0 +1,12 @@ +--- lrmi-0.8/vbetest.c.orig Fri Mar 25 18:13:15 2005 ++++ lrmi-0.8/vbetest.c Sat Apr 23 19:51:05 2005 +@@ -18,7 +18,8 @@ + #include <dev/wscons/wsconsio.h> + #include <machine/sysarch.h> + #elif defined(__FreeBSD__) +-#include <machine/console.h> ++#include <sys/consio.h> ++#include <sys/kbio.h> + #include <machine/sysarch.h> + #endif + diff --git a/audio/ocp/files/patch-playgmd_gmdlokt.c b/audio/ocp/files/patch-playgmd_gmdlokt.c new file mode 100644 index 0000000..672d523 --- /dev/null +++ b/audio/ocp/files/patch-playgmd_gmdlokt.c @@ -0,0 +1,10 @@ +--- playgmd/gmdlokt.c.orig Sun Apr 24 02:08:10 2005 ++++ playgmd/gmdlokt.c Sun Apr 24 02:08:24 2005 +@@ -9,6 +9,7 @@ + */ + + #include "config.h" ++#include <sys/types.h> + #include <netinet/in.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/audio/ocp/files/patch-playmp2_Makefile b/audio/ocp/files/patch-playmp2_Makefile new file mode 100644 index 0000000..2a77f5b --- /dev/null +++ b/audio/ocp/files/patch-playmp2_Makefile @@ -0,0 +1,17 @@ +--- playmp2/Makefile.orig Sat Apr 23 22:20:07 2005 ++++ playmp2/Makefile Sat Apr 23 22:20:39 2005 +@@ -13,7 +13,7 @@ + ../filesel/mdb.h + $(CC) mpptype.c -o $@ -c + +-playmp2_so=mppplay.o mpplay.o ++playmp2_so=mppplay.o mpplay.o memmem.o + playmp2.so: $(playmp2_so) + $(CC) -shared -o $@ $^ -lmad -lid3tag -lz + +@@ -45,3 +45,5 @@ + mpplay.h + $(CC) mpplay.c -o $@ -c + ++memmem.o: memmem.c ++ $(CC) memmem.c -o $@ -c diff --git a/audio/ocp/files/patch-playmp2_memmem.c b/audio/ocp/files/patch-playmp2_memmem.c new file mode 100644 index 0000000..eb0c762 --- /dev/null +++ b/audio/ocp/files/patch-playmp2_memmem.c @@ -0,0 +1,62 @@ +--- playmp2/memmem.c.orig Sat Apr 23 22:19:21 2005 ++++ playmp2/memmem.c Sat Apr 23 22:19:15 2005 +@@ -0,0 +1,59 @@ ++/* Copyright (C) 1991,92,93,94,96,97,98,2000 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#include <stddef.h> ++#include <string.h> ++ ++/* Prepare for the case that `__builtin_expect' is not available. */ ++#ifndef HAVE_BUILTIN_EXPECT ++# define __builtin_expect(expr, val) (expr) ++#endif ++ ++#undef memmem ++ ++/* Return the first occurrence of NEEDLE in HAYSTACK. */ ++void * ++memmem (haystack, haystack_len, needle, needle_len) ++ const void *haystack; ++ size_t haystack_len; ++ const void *needle; ++ size_t needle_len; ++{ ++ const char *begin; ++ const char *const last_possible ++ = (const char *) haystack + haystack_len - needle_len; ++ ++ if (needle_len == 0) ++ /* The first occurrence of the empty string is deemed to occur at ++ the beginning of the string. */ ++ return (void *) haystack; ++ ++ /* Sanity check, otherwise the loop might search through the whole ++ memory. */ ++ if (__builtin_expect (haystack_len < needle_len, 0)) ++ return NULL; ++ ++ for (begin = (const char *) haystack; begin <= last_possible; ++begin) ++ if (begin[0] == ((const char *) needle)[0] && ++ !memcmp ((const void *) &begin[1], ++ (const void *) ((const char *) needle + 1), ++ needle_len - 1)) ++ return (void *) begin; ++ ++ return NULL; ++} |