Daniel Jahre
20 years ago
11 changed files with 242 additions and 507 deletions
Split View
Diff Options
-
+0 -67package/base/linux/linux26/74-asm-byteorder_h.patch
-
+242 -0package/base/linux/linux26/75-linux-types_h.patch
-
+0 -36package/base/lvm2/linux_prio_tree_h.patch
-
+0 -53package/base/raidtools/linux-prio_tree_h.patch
-
+0 -83package/jimmy/mplayer/linux-asm-byteorder_h.patch
-
+0 -61package/powerpc/mac-fdisk/linux_prio_tree_h.patch
-
+0 -47package/powerpc/pdisk/linux_prio_tree_h.patch
-
+0 -35package/powerpc/quik/linux-prio_tree_h.patch
-
+0 -43package/rene/cdrdao/linux-asm-byteorder.patch
-
+0 -35package/rene/libcss/linux-prio_tree_h.patch
-
+0 -47package/rene/samba/linux-prio_tree_h.patch
@ -1,67 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/linux/linux26/74-asm-byteorder_h.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./include/linux/byteorder/little_endian.h.orig 2004-11-21 18:54:27.344956208 +0100
|
|||
+++ ./include/linux/byteorder/little_endian.h 2004-11-21 18:54:36.247602800 +0100
|
|||
@@ -8,6 +8,21 @@
|
|||
#define __LITTLE_ENDIAN_BITFIELD |
|||
#endif |
|||
|
|||
+#ifndef __KERNEL__
|
|||
+/* fix for inclusion from userspace... :( */
|
|||
+#ifdef __CHECKER__
|
|||
+#define __bitwise __attribute__((bitwise))
|
|||
+#else
|
|||
+#define __bitwise
|
|||
+#endif
|
|||
+#define __le16 __bitwise __u16
|
|||
+#define __be16 __bitwise __u16
|
|||
+#define __le32 __bitwise __u32
|
|||
+#define __be32 __bitwise __u32
|
|||
+#define __le64 __bitwise __u64
|
|||
+#define __be64 __bitwise __u64
|
|||
+#endif
|
|||
+
|
|||
#include <linux/types.h> |
|||
#include <linux/byteorder/swab.h> |
|||
|
|||
--- ./include/linux/byteorder/big_endian.h.orig 2004-11-24 15:49:41.099573896 +0100
|
|||
+++ ./include/linux/byteorder/big_endian.h 2004-11-24 15:50:46.048700128 +0100
|
|||
@@ -8,6 +8,21 @@
|
|||
#define __BIG_ENDIAN_BITFIELD |
|||
#endif |
|||
|
|||
+#ifndef __KERNEL__
|
|||
+/* fix for inclusion from userspace... :( */
|
|||
+#ifdef __CHECKER__
|
|||
+#define __bitwise __attribute__((bitwise))
|
|||
+#else
|
|||
+#define __bitwise
|
|||
+#endif
|
|||
+#define __le16 __bitwise __u16
|
|||
+#define __be16 __bitwise __u16
|
|||
+#define __le32 __bitwise __u32
|
|||
+#define __be32 __bitwise __u32
|
|||
+#define __le64 __bitwise __u64
|
|||
+#define __be64 __bitwise __u64
|
|||
+#endif
|
|||
+
|
|||
#include <linux/types.h> |
|||
#include <linux/byteorder/swab.h> |
|||
|
|||
@ -0,0 +1,242 @@ |
|||
--- linux-2.6.9-rock/include/linux/types.h 2004-12-08 18:08:42.000000000 +0100
|
|||
+++ usr/include/linux/types.h 2004-12-25 07:15:44.000000000 +0100
|
|||
@@ -131,6 +131,12 @@
|
|||
#ifndef HAVE_SECTOR_T |
|||
typedef unsigned long sector_t; |
|||
#endif |
|||
+#endif /* __KERNEL_STRICT_NAMES */
|
|||
+
|
|||
+/*
|
|||
+ * Below are truly Linux-specific types that should never collide with
|
|||
+ * any application/library that wants linux/types.h.
|
|||
+ */
|
|||
|
|||
/* |
|||
* The type of an index into the pagecache. Use a #define so asm/types.h |
|||
@@ -150,15 +156,11 @@
|
|||
typedef __u16 __bitwise __be16; |
|||
typedef __u32 __bitwise __le32; |
|||
typedef __u32 __bitwise __be32; |
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
typedef __u64 __bitwise __le64; |
|||
typedef __u64 __bitwise __be64; |
|||
+#endif
|
|||
|
|||
-#endif /* __KERNEL_STRICT_NAMES */
|
|||
-
|
|||
-/*
|
|||
- * Below are truly Linux-specific types that should never collide with
|
|||
- * any application/library that wants linux/types.h.
|
|||
- */
|
|||
|
|||
struct ustat { |
|||
__kernel_daddr_t f_tfree; |
|||
diff -dur /usr/include/linux/byteorder/big_endian.h build/k6-desktop-2.1.0-DEV-x86-k6-32-desktop-expert/usr/include/linux/byteorder/big_endian.h
|
|||
--- usr/include/linux/byteorder/big_endian.h 2004-12-08 02:12:31.000000000 +0100
|
|||
+++ build/k6-desktop-2.1.0-DEV-x86-k6-32-desktop-expert/usr/include/linux/byteorder/big_endian.h 2004-12-25 08:03:08.694401672 +0100
|
|||
@@ -30,31 +15,57 @@
|
|||
#define __constant_ntohl(x) ((__force __u32)(__be32)(x)) |
|||
#define __constant_htons(x) ((__force __be16)(__u16)(x)) |
|||
#define __constant_ntohs(x) ((__force __u16)(__be16)(x)) |
|||
+
|
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
+
|
|||
#define __constant_cpu_to_le64(x) ((__force __le64)___constant_swab64((x))) |
|||
#define __constant_le64_to_cpu(x) ___constant_swab64((__force __u64)(__le64)(x)) |
|||
+
|
|||
+#endif
|
|||
+
|
|||
#define __constant_cpu_to_le32(x) ((__force __le32)___constant_swab32((x))) |
|||
#define __constant_le32_to_cpu(x) ___constant_swab32((__force __u32)(__le32)(x)) |
|||
#define __constant_cpu_to_le16(x) ((__force __le16)___constant_swab16((x))) |
|||
#define __constant_le16_to_cpu(x) ___constant_swab16((__force __u16)(__le16)(x)) |
|||
#define __constant_cpu_to_be64(x) ((__force __be64)(__u64)(x)) |
|||
+
|
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
+
|
|||
#define __constant_be64_to_cpu(x) ((__force __u64)(__be64)(x)) |
|||
+
|
|||
+#endif
|
|||
+
|
|||
#define __constant_cpu_to_be32(x) ((__force __be32)(__u32)(x)) |
|||
#define __constant_be32_to_cpu(x) ((__force __u32)(__be32)(x)) |
|||
#define __constant_cpu_to_be16(x) ((__force __be16)(__u16)(x)) |
|||
#define __constant_be16_to_cpu(x) ((__force __u16)(__be16)(x)) |
|||
+
|
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
+
|
|||
#define __cpu_to_le64(x) ((__force __le64)___swab64((x))) |
|||
#define __le64_to_cpu(x) ___swab64((__force __u64)(__le64)(x)) |
|||
+
|
|||
+#endif
|
|||
+
|
|||
#define __cpu_to_le32(x) ((__force __le32)___swab32((x))) |
|||
#define __le32_to_cpu(x) ___swab32((__force __u32)(__le32)(x)) |
|||
#define __cpu_to_le16(x) ((__force __le16)___swab16((x))) |
|||
#define __le16_to_cpu(x) ___swab16((__force __u16)(__le16)(x)) |
|||
+
|
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
+
|
|||
#define __cpu_to_be64(x) ((__force __be64)(__u64)(x)) |
|||
#define __be64_to_cpu(x) ((__force __u64)(__be64)(x)) |
|||
+
|
|||
+#endif
|
|||
+
|
|||
#define __cpu_to_be32(x) ((__force __be32)(__u32)(x)) |
|||
#define __be32_to_cpu(x) ((__force __u32)(__be32)(x)) |
|||
#define __cpu_to_be16(x) ((__force __be16)(__u16)(x)) |
|||
#define __be16_to_cpu(x) ((__force __u16)(__be16)(x)) |
|||
|
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
+
|
|||
static inline __le64 __cpu_to_le64p(const __u64 *p) |
|||
{ |
|||
return (__force __le64)__swab64p(p); |
|||
@@ -63,6 +74,9 @@
|
|||
{ |
|||
return __swab64p((__u64 *)p); |
|||
} |
|||
+
|
|||
+#endif
|
|||
+
|
|||
static inline __le32 __cpu_to_le32p(const __u32 *p) |
|||
{ |
|||
return (__force __le32)__swab32p(p); |
|||
@@ -79,6 +93,9 @@
|
|||
{ |
|||
return __swab16p((__u16 *)p); |
|||
} |
|||
+
|
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
+
|
|||
static inline __be64 __cpu_to_be64p(const __u64 *p) |
|||
{ |
|||
return (__force __be64)*p; |
|||
@@ -87,6 +104,9 @@
|
|||
{ |
|||
return (__force __u64)*p; |
|||
} |
|||
+
|
|||
+#endif
|
|||
+
|
|||
static inline __be32 __cpu_to_be32p(const __u32 *p) |
|||
{ |
|||
return (__force __be32)*p; |
|||
@@ -103,14 +123,26 @@
|
|||
{ |
|||
return (__force __u16)*p; |
|||
} |
|||
+
|
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
+
|
|||
#define __cpu_to_le64s(x) __swab64s((x)) |
|||
#define __le64_to_cpus(x) __swab64s((x)) |
|||
+
|
|||
+#endif
|
|||
+
|
|||
#define __cpu_to_le32s(x) __swab32s((x)) |
|||
#define __le32_to_cpus(x) __swab32s((x)) |
|||
#define __cpu_to_le16s(x) __swab16s((x)) |
|||
#define __le16_to_cpus(x) __swab16s((x)) |
|||
+
|
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
+
|
|||
#define __cpu_to_be64s(x) do {} while (0) |
|||
#define __be64_to_cpus(x) do {} while (0) |
|||
+
|
|||
+#endif
|
|||
+
|
|||
#define __cpu_to_be32s(x) do {} while (0) |
|||
#define __be32_to_cpus(x) do {} while (0) |
|||
#define __cpu_to_be16s(x) do {} while (0) |
|||
diff -dur /usr/include/linux/byteorder/little_endian.h build/k6-desktop-2.1.0-DEV-x86-k6-32-desktop-expert/usr/include/linux/byteorder/little_endian.h
|
|||
--- usr/include/linux/byteorder/little_endian.h 2004-12-08 02:12:31.000000000 +0100
|
|||
+++ build/k6-desktop-2.1.0-DEV-x86-k6-32-desktop-expert/usr/include/linux/byteorder/little_endian.h 2004-12-25 08:05:34.293267280 +0100
|
|||
@@ -30,31 +15,57 @@
|
|||
#define __constant_ntohl(x) ___constant_swab32((__force __be32)(x)) |
|||
#define __constant_htons(x) ((__force __be16)___constant_swab16((x))) |
|||
#define __constant_ntohs(x) ___constant_swab16((__force __be16)(x)) |
|||
+
|
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
+
|
|||
#define __constant_cpu_to_le64(x) ((__force __le64)(__u64)(x)) |
|||
#define __constant_le64_to_cpu(x) ((__force __u64)(__le64)(x)) |
|||
+
|
|||
+#endif
|
|||
+
|
|||
#define __constant_cpu_to_le32(x) ((__force __le32)(__u32)(x)) |
|||
#define __constant_le32_to_cpu(x) ((__force __u32)(__le32)(x)) |
|||
#define __constant_cpu_to_le16(x) ((__force __le16)(__u16)(x)) |
|||
#define __constant_le16_to_cpu(x) ((__force __u16)(__le16)(x)) |
|||
+
|
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
+
|
|||
#define __constant_cpu_to_be64(x) ((__force __be64)___constant_swab64((x))) |
|||
#define __constant_be64_to_cpu(x) ___constant_swab64((__force __u64)(__be64)(x)) |
|||
+
|
|||
+#endif
|
|||
+
|
|||
#define __constant_cpu_to_be32(x) ((__force __be32)___constant_swab32((x))) |
|||
#define __constant_be32_to_cpu(x) ___constant_swab32((__force __u32)(__be32)(x)) |
|||
#define __constant_cpu_to_be16(x) ((__force __be16)___constant_swab16((x))) |
|||
#define __constant_be16_to_cpu(x) ___constant_swab16((__force __u16)(__be16)(x)) |
|||
+
|
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
+
|
|||
#define __cpu_to_le64(x) ((__force __le64)(__u64)(x)) |
|||
#define __le64_to_cpu(x) ((__force __u64)(__le64)(x)) |
|||
+
|
|||
+#endif
|
|||
+
|
|||
#define __cpu_to_le32(x) ((__force __le32)(__u32)(x)) |
|||
#define __le32_to_cpu(x) ((__force __u32)(__le32)(x)) |
|||
#define __cpu_to_le16(x) ((__force __le16)(__u16)(x)) |
|||
#define __le16_to_cpu(x) ((__force __u16)(__le16)(x)) |
|||
+
|
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
+
|
|||
#define __cpu_to_be64(x) ((__force __be64)___swab64((x))) |
|||
#define __be64_to_cpu(x) ___swab64((__force __u64)(__be64)(x)) |
|||
+
|
|||
+#endif
|
|||
+
|
|||
#define __cpu_to_be32(x) ((__force __be32)___swab32((x))) |
|||
#define __be32_to_cpu(x) ___swab32((__force __u32)(__be32)(x)) |
|||
#define __cpu_to_be16(x) ((__force __be16)___swab16((x))) |
|||
#define __be16_to_cpu(x) ___swab16((__force __u16)(__be16)(x)) |
|||
|
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
+
|
|||
static inline __le64 __cpu_to_le64p(const __u64 *p) |
|||
{ |
|||
return (__force __le64)*p; |
|||
@@ -63,6 +74,9 @@
|
|||
{ |
|||
return (__force __u64)*p; |
|||
} |
|||
+
|
|||
+#endif
|
|||
+
|
|||
static inline __le32 __cpu_to_le32p(const __u32 *p) |
|||
{ |
|||
return (__force __le32)*p; |
|||
@@ -79,6 +93,9 @@
|
|||
{ |
|||
return (__force __u16)*p; |
|||
} |
|||
+
|
|||
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
|||
+
|
|||
static inline __be64 __cpu_to_be64p(const __u64 *p) |
|||
{ |
|||
return (__force __be64)__swab64p(p); |
|||
@@ -87,6 +104,9 @@
|
|||
{ |
|||
return __swab64p((__u64 *)p); |
|||
} |
|||
+
|
|||
+#endif
|
|||
+
|
|||
static inline __be32 __cpu_to_be32p(const __u32 *p) |
|||
{ |
|||
return (__force __be32)__swab32p(p); |
|||
@ -1,36 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/lvm2/linux_prio_tree_h.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
diff -dur LVM2.2.00.25/lib/device/dev-io.c LVM2.2.00.25-patch/lib/device/dev-io.c
|
|||
--- LVM2.2.00.25/lib/device/dev-io.c 2004-09-14 22:23:23.000000000 +0000
|
|||
+++ LVM2.2.00.25-patch/lib/device/dev-io.c 2004-10-23 21:47:37.092530280 +0000
|
|||
@@ -31,6 +31,13 @@
|
|||
# define u64 uint64_t /* Missing without __KERNEL__ */ |
|||
# undef WNOHANG /* Avoid redefinition */ |
|||
# undef WUNTRACED /* Avoid redefinition */ |
|||
+
|
|||
+/* for linux-2.6.9, from linux/types.h */
|
|||
+# include <asm/types.h>
|
|||
+# ifndef pgoff_t
|
|||
+# define pgoff_t unsigned long
|
|||
+# endif
|
|||
+
|
|||
# include <linux/fs.h> /* For block ioctl definitions */ |
|||
# define BLKSIZE_SHIFT SECTOR_SHIFT |
|||
# ifndef BLKGETSIZE64 /* fs.h out-of-date */ |
|||
@ -1,53 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/raidtools/linux-prio_tree_h.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
diff -dur raidtools-1.00.3/detect_multipath.c raidtools-1.00.3-p/detect_multipath.c
|
|||
--- raidtools-1.00.3/detect_multipath.c 2003-01-15 09:58:25.000000000 +0100
|
|||
+++ raidtools-1.00.3-p/detect_multipath.c 2004-11-05 15:42:16.441758008 +0100
|
|||
@@ -34,6 +34,13 @@
|
|||
#include <stdlib.h> |
|||
#include <string.h> |
|||
#include <fcntl.h> |
|||
+
|
|||
+/* for linux-2.6.9, from linux/types.h */
|
|||
+# include <asm/types.h>
|
|||
+# ifndef pgoff_t
|
|||
+# define pgoff_t unsigned long
|
|||
+# endif
|
|||
+
|
|||
#include <linux/fs.h> |
|||
|
|||
#include <errno.h> |
|||
diff -dur raidtools-1.00.3/lsraid.c raidtools-1.00.3-p/lsraid.c
|
|||
--- raidtools-1.00.3/lsraid.c 2003-01-15 09:58:25.000000000 +0100
|
|||
+++ raidtools-1.00.3-p/lsraid.c 2004-11-05 15:41:44.078677944 +0100
|
|||
@@ -42,6 +42,13 @@
|
|||
|
|||
#include <linux/types.h> |
|||
#include <linux/major.h> |
|||
+
|
|||
+/* for linux-2.6.9, from linux/types.h */
|
|||
+# include <asm/types.h>
|
|||
+# ifndef pgoff_t
|
|||
+# define pgoff_t unsigned long
|
|||
+# endif
|
|||
+
|
|||
#include <linux/fs.h> |
|||
#include <linux/raid/md_u.h> |
|||
#include <linux/raid/md_p.h> |
|||
@ -1,83 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/jimmy/mplayer/linux-asm-byteorder_h.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
diff -dur MPlayer-1.0pre5/libmpdemux/cddb.c MPlayer-1.0pre5-p/libmpdemux/cddb.c
|
|||
--- MPlayer-1.0pre5/libmpdemux/cddb.c 2004-04-26 11:33:35.000000000 +0200
|
|||
+++ MPlayer-1.0pre5-p/libmpdemux/cddb.c 2004-11-06 05:57:35.118682456 +0100
|
|||
@@ -11,6 +11,17 @@
|
|||
* Code release under GPL |
|||
* |
|||
*/ |
|||
+#ifdef __CHECKER__
|
|||
+#define __bitwise __attribute__((bitwise))
|
|||
+#else
|
|||
+#define __bitwise
|
|||
+#endif
|
|||
+#define __le16 __bitwise __u16
|
|||
+#define __be16 __bitwise __u16
|
|||
+#define __le32 __bitwise __u32
|
|||
+#define __be32 __bitwise __u32
|
|||
+#define __le64 __bitwise __u64
|
|||
+#define __be64 __bitwise __u64
|
|||
|
|||
#include "config.h" |
|||
|
|||
diff -dur MPlayer-1.0pre5/libmpdemux/stream_vcd.c MPlayer-1.0pre5-p/libmpdemux/stream_vcd.c
|
|||
--- MPlayer-1.0pre5/libmpdemux/stream_vcd.c 2004-07-12 00:23:57.000000000 +0200
|
|||
+++ MPlayer-1.0pre5-p/libmpdemux/stream_vcd.c 2004-11-06 05:55:26.123292736 +0100
|
|||
@@ -1,4 +1,16 @@
|
|||
|
|||
+#ifdef __CHECKER__
|
|||
+#define __bitwise __attribute__((bitwise))
|
|||
+#else
|
|||
+#define __bitwise
|
|||
+#endif
|
|||
+#define __le16 __bitwise __u16
|
|||
+#define __be16 __bitwise __u16
|
|||
+#define __le32 __bitwise __u32
|
|||
+#define __be32 __bitwise __u32
|
|||
+#define __le64 __bitwise __u64
|
|||
+#define __be64 __bitwise __u64
|
|||
+
|
|||
#include "config.h" |
|||
|
|||
#ifdef HAVE_VCD |
|||
--- MPlayer-1.0pre5/osdep/kerneltwosix.h 2004-01-10 10:48:15.000000000 +0100
|
|||
+++ MPlayer-1.0pre5-p/osdep/kerneltwosix.h 2004-11-06 06:57:15.776339752 +0100
|
|||
@@ -1,5 +1,20 @@
|
|||
#include <linux/version.h> |
|||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70) |
|||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
|
|||
+
|
|||
+#ifdef __CHECKER__
|
|||
+#define __bitwise __attribute__((bitwise))
|
|||
+#else
|
|||
+#define __bitwise
|
|||
+#endif
|
|||
+#define __le16 __bitwise __u16
|
|||
+#define __be16 __bitwise __u16
|
|||
+#define __le32 __bitwise __u32
|
|||
+#define __be32 __bitwise __u32
|
|||
+#define __le64 __bitwise __u64
|
|||
+#define __be64 __bitwise __u64
|
|||
+
|
|||
+#endif
|
|||
#define __KERNEL__ |
|||
#include <linux/thread_info.h> |
|||
#include <linux/list.h> |
|||
@ -1,61 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/powerpc/mac-fdisk/linux_prio_tree_h.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./pdisk.c.orig 2004-11-25 21:54:35.597082272 +0100
|
|||
+++ ./pdisk.c 2004-11-25 21:56:29.799720832 +0100
|
|||
@@ -40,6 +40,11 @@
|
|||
|
|||
#ifdef __linux__ |
|||
#include <sys/ioctl.h> |
|||
+/* for linux-2.6.9, from linux/types.h */
|
|||
+# include <asm/types.h>
|
|||
+# ifndef pgoff_t
|
|||
+# define pgoff_t unsigned long
|
|||
+# endif
|
|||
#include <linux/fs.h> |
|||
#include <linux/hdreg.h> |
|||
#endif |
|||
--- ./partition_map.c.orig 2004-11-25 21:59:50.462215496 +0100
|
|||
+++ ./partition_map.c 2004-11-25 22:00:14.971489520 +0100
|
|||
@@ -35,6 +35,11 @@
|
|||
#include <fcntl.h> |
|||
#ifdef __linux__ |
|||
#include <sys/ioctl.h> |
|||
+/* for linux-2.6.9, from linux/types.h */
|
|||
+# include <asm/types.h>
|
|||
+# ifndef pgoff_t
|
|||
+# define pgoff_t unsigned long
|
|||
+# endif
|
|||
#include <linux/fs.h> |
|||
#include <linux/hdreg.h> |
|||
#include <sys/stat.h> |
|||
--- ./fdisklabel.c.orig 2004-11-25 22:01:17.735947872 +0100
|
|||
+++ ./fdisklabel.c 2004-11-25 22:01:45.738690808 +0100
|
|||
@@ -47,6 +47,11 @@
|
|||
#include <sys/param.h> |
|||
|
|||
#include <linux/hdreg.h> |
|||
+/* for linux-2.6.9, from linux/types.h */
|
|||
+# include <asm/types.h>
|
|||
+# ifndef pgoff_t
|
|||
+# define pgoff_t unsigned long
|
|||
+# endif
|
|||
#include <linux/fs.h> |
|||
|
|||
#include "fdisk.h" |
|||
@ -1,47 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/powerpc/pdisk/linux_prio_tree_h.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./file_media.c.orig 2004-11-26 17:40:27.315376952 +0100
|
|||
+++ ./file_media.c 2004-11-26 17:41:09.681936256 +0100
|
|||
@@ -40,6 +40,11 @@
|
|||
|
|||
#ifdef __linux__ |
|||
#include <sys/ioctl.h> |
|||
+/* for linux-2.6.9, from linux/types.h */
|
|||
+# include <asm/types.h>
|
|||
+# ifndef pgoff_t
|
|||
+# define pgoff_t unsigned long
|
|||
+# endif
|
|||
#include <linux/fs.h> |
|||
#include <linux/hdreg.h> |
|||
#include <sys/stat.h> |
|||
--- ./pdisk.c.orig 2004-11-26 17:39:02.005346048 +0100
|
|||
+++ ./pdisk.c 2004-11-26 17:39:53.121575200 +0100
|
|||
@@ -51,6 +51,11 @@
|
|||
|
|||
#ifdef __linux__ |
|||
#include <sys/ioctl.h> |
|||
+/* for linux-2.6.9, from linux/types.h */
|
|||
+# include <asm/types.h>
|
|||
+# ifndef pgoff_t
|
|||
+# define pgoff_t unsigned long
|
|||
+# endif
|
|||
#include <linux/fs.h> |
|||
#include <linux/hdreg.h> |
|||
#endif |
|||
@ -1,35 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/powerpc/quik/linux-prio_tree_h.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./quik/quik.c.orig 2004-12-01 20:51:52.058945872 +0100
|
|||
+++ ./quik/quik.c 2004-12-01 20:52:16.825180832 +0100
|
|||
@@ -27,6 +27,13 @@
|
|||
#include <stdarg.h> |
|||
#include <string.h> |
|||
#include <stdlib.h> |
|||
+
|
|||
+/* for linux-2.6.9, from linux/types.h */
|
|||
+# include <asm/types.h>
|
|||
+# ifndef pgoff_t
|
|||
+# define pgoff_t unsigned long
|
|||
+# endif
|
|||
+
|
|||
#include <linux/fs.h> |
|||
#include "linux/ext2_fs.h" |
|||
#include <sys/stat.h> |
|||
@ -1,43 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/rene/cdrdao/linux-asm-byteorder.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
diff -dur cdrdao-1.1.9/scsilib/libscg/scsi-linux-sg.c cdrdao-1.1.9-p/scsilib/libscg/scsi-linux-sg.c
|
|||
--- cdrdao-1.1.9/scsilib/libscg/scsi-linux-sg.c 2004-06-07 01:04:12.000000000 +0000
|
|||
+++ cdrdao-1.1.9-p/scsilib/libscg/scsi-linux-sg.c 2004-10-25 17:53:24.944188560 +0000
|
|||
@@ -69,6 +69,19 @@
|
|||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) |
|||
#define __KERNEL__ |
|||
#include <asm/types.h> |
|||
+
|
|||
+ #ifdef __CHECKER__
|
|||
+ #define __bitwise __attribute__((bitwise))
|
|||
+ #else
|
|||
+ #define __bitwise
|
|||
+ #endif
|
|||
+ #define __le16 __bitwise __u16
|
|||
+ #define __be16 __bitwise __u16
|
|||
+ #define __le32 __bitwise __u32
|
|||
+ #define __be32 __bitwise __u32
|
|||
+ #define __le64 __bitwise __u64
|
|||
+ #define __be64 __bitwise __u64
|
|||
+
|
|||
#include <asm/byteorder.h> |
|||
#undef __KERNEL__ |
|||
#endif |
|||
Nur in cdrdao-1.1.9-p/scsilib/libscg: scsi-linux-sg.c~. |
|||
@ -1,35 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/rene/libcss/linux-prio_tree_h.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./src/css_cat.c.orig 2004-12-05 06:21:37.364185640 +0100
|
|||
+++ ./src/css_cat.c 2004-12-05 06:22:23.249210056 +0100
|
|||
@@ -208,6 +208,13 @@
|
|||
* |
|||
*/ |
|||
|
|||
+
|
|||
+/* for linux-2.6.9, from linux/types.h */
|
|||
+# include <asm/types.h>
|
|||
+# ifndef pgoff_t
|
|||
+# define pgoff_t unsigned long
|
|||
+# endif
|
|||
+
|
|||
#include <linux/fs.h> |
|||
|
|||
int path_to_lba (char *p) |
|||
@ -1,47 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/rene/samba/linux-prio_tree_h.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./client/smbmount.c.orig 2004-11-29 19:01:01.927182208 +0100
|
|||
+++ ./client/smbmount.c 2004-11-29 19:01:36.032997336 +0100
|
|||
@@ -24,6 +24,11 @@
|
|||
|
|||
#include <mntent.h> |
|||
#include <asm/types.h> |
|||
+/* for linux-2.6.9, from linux/types.h */
|
|||
+# include <asm/types.h>
|
|||
+# ifndef pgoff_t
|
|||
+# define pgoff_t unsigned long
|
|||
+# endif
|
|||
#include <linux/smb_fs.h> |
|||
|
|||
extern BOOL in_client; |
|||
--- ./client/smbumount.c.orig 2004-11-29 19:02:59.018381640 +0100
|
|||
+++ ./client/smbumount.c 2004-11-29 19:03:24.708476152 +0100
|
|||
@@ -11,6 +11,11 @@
|
|||
|
|||
#include <asm/types.h> |
|||
#include <asm/posix_types.h> |
|||
+/* for linux-2.6.9, from linux/types.h */
|
|||
+# include <asm/types.h>
|
|||
+# ifndef pgoff_t
|
|||
+# define pgoff_t unsigned long
|
|||
+# endif
|
|||
#include <linux/smb.h> |
|||
#include <linux/smb_mount.h> |
|||
#include <linux/smb_fs.h> |
|||