From 1ee30e3c419824f45dc52d67516274548548b574 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 13 Jan 2011 17:26:47 +0100 Subject: update to Linux Kernel 2.6.37 --- package/iproute2/Makefile | 9 +- package/iproute2/files/Config | 2 + package/iproute2/patches/patch-tc_Makefile | 18 -- package/iptables-snmp/patches/patch-Makefile_in | 11 + .../iptables-snmp/patches/patch-iptables-snmp_c | 12 + package/iptables/Makefile | 9 +- package/libvirt/patches/patch-configure | 38 +++ package/libvirt/patches/patch-libvirt_pc | 9 + .../patches/patch-agent_mibgroup_mibII_tcpTable_c | 48 ++++ package/sdl/patches/patch-include_SDL_config_h | 311 +++++++++++++++++++++ package/sdl/patches/patch-sdl-config_in | 16 ++ package/sdl/patches/patch-sdl_pc_in | 10 + package/tcl/patches/patch-unix_configure | 33 +++ package/tcl/patches/patch-unix_tclUnixTime_c | 39 +++ 14 files changed, 538 insertions(+), 27 deletions(-) create mode 100644 package/iproute2/files/Config delete mode 100644 package/iproute2/patches/patch-tc_Makefile create mode 100644 package/iptables-snmp/patches/patch-Makefile_in create mode 100644 package/iptables-snmp/patches/patch-iptables-snmp_c create mode 100644 package/libvirt/patches/patch-configure create mode 100644 package/libvirt/patches/patch-libvirt_pc create mode 100644 package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c create mode 100644 package/sdl/patches/patch-include_SDL_config_h create mode 100644 package/sdl/patches/patch-sdl-config_in create mode 100644 package/sdl/patches/patch-sdl_pc_in create mode 100644 package/tcl/patches/patch-unix_configure create mode 100644 package/tcl/patches/patch-unix_tclUnixTime_c (limited to 'package') diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 90b27a057..f0c815e59 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -41,18 +41,21 @@ $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PK TCFLAGS+= -D_GNU_SOURCE XAKE_FLAGS+= CCOPTS="${TCFLAGS}" MFLAGS="CC=${TARGET_CC}" \ HOSTCFLAGS="-I${LINUX_HEADER_DIR}/include" - CONFIGURE_FLAGS+= KERNEL_INCLUDE="${LINUX_DIR}/include" +post-configure: + $(CP) ./files/Config $(WRKBUILD)/ + ip-install: ${INSTALL_DIR} ${IDIR_IP}/{etc/iproute2,usr/sbin} ${INSTALL_DATA} ${WRKINST}/etc/iproute2/* ${IDIR_IP}/etc/iproute2/ ${INSTALL_BIN} ${WRKINST}/sbin/ip ${IDIR_IP}/usr/sbin/ip tc-install: - ${INSTALL_DIR} ${IDIR_TC}/{lib/tc,usr/sbin} + ${INSTALL_DIR} ${IDIR_TC}/{lib/tc,usr/sbin,usr/lib/tc} # use ${CP} here, since m_ipt.so is a symlink to m_xt.so - ${CP} ${WRKINST}/lib/tc/{m_*.so,*.dist} ${IDIR_TC}/lib/tc/ + ${CP} ${WRKINST}/lib/tc/m_*.so ${IDIR_TC}/lib/tc/ + ${CP} ${WRKINST}/usr/lib/tc/*.dist ${IDIR_TC}/usr/lib/tc/ ${INSTALL_BIN} ${WRKINST}/sbin/tc ${IDIR_TC}/usr/sbin/ tc-atm-install: diff --git a/package/iproute2/files/Config b/package/iproute2/files/Config new file mode 100644 index 000000000..0ba7d387d --- /dev/null +++ b/package/iproute2/files/Config @@ -0,0 +1,2 @@ +TC_CONFIG_ATM:=y +TC_CONFIG_XT:=y diff --git a/package/iproute2/patches/patch-tc_Makefile b/package/iproute2/patches/patch-tc_Makefile deleted file mode 100644 index 29a11b40b..000000000 --- a/package/iproute2/patches/patch-tc_Makefile +++ /dev/null @@ -1,18 +0,0 @@ - yeah, right. Disabling everything with echo-statements is really useful. ---- iproute2-2.6.34.orig/tc/Makefile 2010-05-19 17:32:43.000000000 +0200 -+++ iproute2-2.6.34/tc/Makefile 2011-01-03 18:28:02.980563959 +0100 -@@ -99,10 +99,11 @@ libtc.a: $(TCLIB) - $(AR) rcs $@ $(TCLIB) - - install: all -- echo mkdir -p $(MODDESTDIR) -- echo install -m 0755 tc $(DESTDIR)$(SBINDIR) -+ mkdir -p $(MODDESTDIR) -+ mkdir -p $(DESTDIR)$(SBINDIR) -+ install -m 0755 tc $(DESTDIR)$(SBINDIR) - for i in $(TCSO); \ -- do echo install -m 755 $$i $(MODDESTDIR); \ -+ do install -m 755 $$i $(MODDESTDIR); \ - done - if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \ - if [ -f $(MODDESTDIR)/m_xt.so ]; \ diff --git a/package/iptables-snmp/patches/patch-Makefile_in b/package/iptables-snmp/patches/patch-Makefile_in new file mode 100644 index 000000000..164003986 --- /dev/null +++ b/package/iptables-snmp/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- iptables-snmp-0.1.orig/Makefile.in 2005-11-02 13:00:10.000000000 +0100 ++++ iptables-snmp-0.1/Makefile.in 2011-01-12 15:44:48.000000000 +0100 +@@ -67,7 +67,7 @@ OTHER = -Iinclude -DIPTABLES_VERSION=$( + + all: iptables-snmp.so + +-iptables-snmp.so: $(OBJS) libiptc.a Makefile ++iptables-snmp.so: $(OBJS) Makefile + $(CC) $(CFLAGS) $(OTHER) $(DFLAGS) -shared -o $@ $(OBJS) $(LDFLAGS) + + libiptc.a: $(LIBIPTC_OBJS) Makefile diff --git a/package/iptables-snmp/patches/patch-iptables-snmp_c b/package/iptables-snmp/patches/patch-iptables-snmp_c new file mode 100644 index 000000000..c129ff0e9 --- /dev/null +++ b/package/iptables-snmp/patches/patch-iptables-snmp_c @@ -0,0 +1,12 @@ +--- iptables-snmp-0.1.orig/iptables-snmp.c 2005-11-02 12:10:54.000000000 +0100 ++++ iptables-snmp-0.1/iptables-snmp.c 2011-01-12 15:46:19.000000000 +0100 +@@ -37,6 +37,9 @@ + + #include "libiptc/libiptc.h" + ++/* For backward compatibility */ ++//typedef struct iptc_handle *iptc_handle_t; ++ + static oid agent_version_oid[] = { + BASE_OID, 1, 0, AGENT_VERSION_INDEX + }; diff --git a/package/iptables/Makefile b/package/iptables/Makefile index d9229dc50..e20e117c5 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iptables -PKG_VERSION:= 1.4.8 +PKG_VERSION:= 1.4.10 PKG_RELEASE:= 1 -PKG_MD5SUM:= 697ed89f37af4473a5f6349ba2700f2d +PKG_MD5SUM:= f382fe693f0b59d87bd47bea65eca198 PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= firewall PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack @@ -17,10 +17,7 @@ PKG_DEPENDS+= kmod-netfilter-xt-target-tcpmss PKG_DEPENDS6:= kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6 PKG_DEPENDS6+= kmod-ip6-nf-filter kmod-ip6-nf-target-reject PKG_URL:= http://www.netfilter.org -PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ \ - ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ - ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \ - ftp://ftp.no.netfilter.org/pub/netfilter/iptables/ +PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ PKG_SUBPKGS:= IPTABLES IP6TABLES diff --git a/package/libvirt/patches/patch-configure b/package/libvirt/patches/patch-configure new file mode 100644 index 000000000..87eb324fc --- /dev/null +++ b/package/libvirt/patches/patch-configure @@ -0,0 +1,38 @@ +--- libvirt-0.8.7.orig/configure 2011-01-04 03:22:44.000000000 +0100 ++++ libvirt-0.8.7/configure 2011-01-12 18:43:03.000000000 +0100 +@@ -36745,7 +36745,7 @@ $as_echo "$as_me: Found python in enviro + + # Find any Python interpreter. + if test -z "$PYTHON"; then +- for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 ++ for ac_prog in python python2 python3 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -36920,25 +36920,7 @@ $as_echo "$am_cv_python_pyexecdir" >&6; + if test -x "$PYTHON_CONFIG" + then + PYTHON_INCLUDES=`$PYTHON_CONFIG --includes` +- else +- if test -r $PYTHON_EXEC_PREFIX/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=-I$PYTHON_EXEC_PREFIX/include/python$PYTHON_VERSION +- else +- if test -r $prefix/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=-I$prefix/include/python$PYTHON_VERSION +- else +- if test -r /usr/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=-I/usr/include/python$PYTHON_VERSION +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find python$PYTHON_VERSION/Python.h, disabling bindings" >&5 +-$as_echo "$as_me: Could not find python$PYTHON_VERSION/Python.h, disabling bindings" >&6;} +- with_python=no +- fi +- fi +- fi ++ echo "DEBUG: $PYTHON_CONFIG" + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find python interpreter, disabling bindings" >&5 diff --git a/package/libvirt/patches/patch-libvirt_pc b/package/libvirt/patches/patch-libvirt_pc new file mode 100644 index 000000000..a46fcce14 --- /dev/null +++ b/package/libvirt/patches/patch-libvirt_pc @@ -0,0 +1,9 @@ +--- libvirt-0.8.7.orig/libvirt.pc 2011-01-04 03:23:23.000000000 +0100 ++++ libvirt-0.8.7/libvirt.pc 2011-01-12 18:31:53.000000000 +0100 +@@ -7,5 +7,5 @@ Name: libvirt + Version: 0.8.7 + Description: libvirt library + Requires: +-Libs: -L${libdir} -lvirt -ldl ++Libs: -L${libdir} -lvirt -lintl + Cflags: -I${includedir} diff --git a/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c b/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c new file mode 100644 index 000000000..f0be57e78 --- /dev/null +++ b/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c @@ -0,0 +1,48 @@ +--- net-snmp-5.6.1.orig/agent/mibgroup/mibII/tcpTable.c 2010-10-20 15:12:08.000000000 +0200 ++++ net-snmp-5.6.1/agent/mibgroup/mibII/tcpTable.c 2011-01-12 14:48:14.000000000 +0100 +@@ -33,6 +33,12 @@ + #include + #include + #include ++ ++/* libnl 2.0 compatibility code */ ++#define nl_handle nl_sock ++#define nl_handle_alloc nl_socket_alloc ++#define nl_handle_alloc_cb nl_socket_alloc_cb ++#define nl_handle_destroy nl_socket_free + #endif + + #include +@@ -565,8 +571,8 @@ tcpTable_load_netlink(void) + } + + if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); ++ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(1))); ++ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(1)); + nl_handle_destroy(nl); + return -1; + } +@@ -580,8 +586,8 @@ tcpTable_load_netlink(void) + nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); + + if (nl_send_auto_complete(nl, nm) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); ++ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(1))); ++ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(1)); + nl_handle_destroy(nl); + return -1; + } +@@ -593,8 +599,8 @@ tcpTable_load_netlink(void) + + while (running) { + if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); ++ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(1))); ++ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(1)); + nl_handle_destroy(nl); + return -1; + } diff --git a/package/sdl/patches/patch-include_SDL_config_h b/package/sdl/patches/patch-include_SDL_config_h new file mode 100644 index 000000000..371f7199f --- /dev/null +++ b/package/sdl/patches/patch-include_SDL_config_h @@ -0,0 +1,311 @@ +--- SDL-1.2.14.orig/include/SDL_config.h 2009-10-19 13:51:07.000000000 +0200 ++++ SDL-1.2.14/include/SDL_config.h 2011-01-12 11:57:30.000000000 +0100 +@@ -1,3 +1,4 @@ ++/* include/SDL_config.h. Generated from SDL_config.h.in by configure. */ + /* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2009 Sam Lantinga +@@ -23,23 +24,288 @@ + #ifndef _SDL_config_h + #define _SDL_config_h + ++/* This is a set of defines to configure the SDL features */ ++ ++/* General platform specific identifiers */ + #include "SDL_platform.h" + +-/* Add any platform that doesn't build using the configure system */ +-#if defined(__DREAMCAST__) +-#include "SDL_config_dreamcast.h" +-#elif defined(__MACOS__) +-#include "SDL_config_macos.h" +-#elif defined(__MACOSX__) +-#include "SDL_config_macosx.h" +-#elif defined(__SYMBIAN32__) +-#include "SDL_config_symbian.h" /* must be before win32! */ +-#elif defined(__WIN32__) +-#include "SDL_config_win32.h" +-#elif defined(__OS2__) +-#include "SDL_config_os2.h" ++/* Make sure that this isn't included by Visual C++ */ ++#ifdef _MSC_VER ++#error You should copy include/SDL_config.h.default to include/SDL_config.h ++#endif ++ ++/* C language features */ ++/* #undef const */ ++/* #undef inline */ ++/* #undef volatile */ ++ ++/* C datatypes */ ++/* #undef size_t */ ++/* #undef int8_t */ ++/* #undef uint8_t */ ++/* #undef int16_t */ ++/* #undef uint16_t */ ++/* #undef int32_t */ ++/* #undef uint32_t */ ++/* #undef int64_t */ ++/* #undef uint64_t */ ++/* #undef uintptr_t */ ++#define SDL_HAS_64BIT_TYPE 1 ++ ++/* Endianness */ ++#define SDL_BYTEORDER 1234 ++ ++/* Comment this if you want to build without any C library requirements */ ++#define HAVE_LIBC 1 ++#if HAVE_LIBC ++ ++/* Useful headers */ ++#define HAVE_ALLOCA_H 1 ++#define HAVE_SYS_TYPES_H 1 ++#define HAVE_STDIO_H 1 ++#define STDC_HEADERS 1 ++#define HAVE_STDLIB_H 1 ++#define HAVE_STDARG_H 1 ++#define HAVE_MALLOC_H 1 ++#define HAVE_MEMORY_H 1 ++#define HAVE_STRING_H 1 ++#define HAVE_STRINGS_H 1 ++#define HAVE_INTTYPES_H 1 ++#define HAVE_STDINT_H 1 ++#define HAVE_CTYPE_H 1 ++#define HAVE_MATH_H 1 ++#define HAVE_ICONV_H 1 ++#define HAVE_SIGNAL_H 1 ++/* #undef HAVE_ALTIVEC_H */ ++ ++/* C library functions */ ++#define HAVE_MALLOC 1 ++#define HAVE_CALLOC 1 ++#define HAVE_REALLOC 1 ++#define HAVE_FREE 1 ++#define HAVE_ALLOCA 1 ++#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */ ++#define HAVE_GETENV 1 ++#define HAVE_PUTENV 1 ++#define HAVE_UNSETENV 1 ++#endif ++#define HAVE_QSORT 1 ++#define HAVE_ABS 1 ++#define HAVE_BCOPY 1 ++#define HAVE_MEMSET 1 ++#define HAVE_MEMCPY 1 ++#define HAVE_MEMMOVE 1 ++/* #undef HAVE_MEMCMP */ ++#define HAVE_STRLEN 1 ++#define HAVE_STRLCPY 1 ++#define HAVE_STRLCAT 1 ++#define HAVE_STRDUP 1 ++/* #undef HAVE__STRREV */ ++/* #undef HAVE__STRUPR */ ++/* #undef HAVE__STRLWR */ ++/* #undef HAVE_INDEX */ ++/* #undef HAVE_RINDEX */ ++#define HAVE_STRCHR 1 ++#define HAVE_STRRCHR 1 ++#define HAVE_STRSTR 1 ++/* #undef HAVE_ITOA */ ++/* #undef HAVE__LTOA */ ++/* #undef HAVE__UITOA */ ++/* #undef HAVE__ULTOA */ ++#define HAVE_STRTOL 1 ++#define HAVE_STRTOUL 1 ++/* #undef HAVE__I64TOA */ ++/* #undef HAVE__UI64TOA */ ++#define HAVE_STRTOLL 1 ++#define HAVE_STRTOULL 1 ++/* #undef HAVE_STRTOD */ ++#define HAVE_ATOI 1 ++#define HAVE_ATOF 1 ++#define HAVE_STRCMP 1 ++#define HAVE_STRNCMP 1 ++/* #undef HAVE__STRICMP */ ++#define HAVE_STRCASECMP 1 ++/* #undef HAVE__STRNICMP */ ++#define HAVE_STRNCASECMP 1 ++#define HAVE_SSCANF 1 ++#define HAVE_SNPRINTF 1 ++#define HAVE_VSNPRINTF 1 ++/* #undef HAVE_ICONV */ ++#define HAVE_SIGACTION 1 ++#define HAVE_SETJMP 1 ++#define HAVE_NANOSLEEP 1 ++/* #undef HAVE_CLOCK_GETTIME */ ++#define HAVE_GETPAGESIZE 1 ++#define HAVE_MPROTECT 1 ++ + #else +-#include "SDL_config_minimal.h" +-#endif /* platform config */ ++/* We may need some replacement for stdarg.h here */ ++#include ++#endif /* HAVE_LIBC */ ++ ++/* Allow disabling of core subsystems */ ++/* #undef SDL_AUDIO_DISABLED */ ++/* #undef SDL_CDROM_DISABLED */ ++/* #undef SDL_CPUINFO_DISABLED */ ++/* #undef SDL_EVENTS_DISABLED */ ++/* #undef SDL_FILE_DISABLED */ ++/* #undef SDL_JOYSTICK_DISABLED */ ++/* #undef SDL_LOADSO_DISABLED */ ++/* #undef SDL_THREADS_DISABLED */ ++/* #undef SDL_TIMERS_DISABLED */ ++/* #undef SDL_VIDEO_DISABLED */ ++ ++/* Enable various audio drivers */ ++#define SDL_AUDIO_DRIVER_ALSA 1 ++#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2" ++/* #undef SDL_AUDIO_DRIVER_ARTS */ ++/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */ ++/* #undef SDL_AUDIO_DRIVER_BAUDIO */ ++/* #undef SDL_AUDIO_DRIVER_BSD */ ++/* #undef SDL_AUDIO_DRIVER_COREAUDIO */ ++/* #undef SDL_AUDIO_DRIVER_DART */ ++/* #undef SDL_AUDIO_DRIVER_DC */ ++#define SDL_AUDIO_DRIVER_DISK 1 ++#define SDL_AUDIO_DRIVER_DUMMY 1 ++/* #undef SDL_AUDIO_DRIVER_DMEDIA */ ++/* #undef SDL_AUDIO_DRIVER_DSOUND */ ++/* #undef SDL_AUDIO_DRIVER_PULSE */ ++/* #undef SDL_AUDIO_DRIVER_PULSE_DYNAMIC */ ++/* #undef SDL_AUDIO_DRIVER_ESD */ ++/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */ ++/* #undef SDL_AUDIO_DRIVER_MINT */ ++/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */ ++/* #undef SDL_AUDIO_DRIVER_NAS */ ++/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */ ++/* #undef SDL_AUDIO_DRIVER_OSS */ ++/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */ ++/* #undef SDL_AUDIO_DRIVER_PAUD */ ++/* #undef SDL_AUDIO_DRIVER_QNXNTO */ ++/* #undef SDL_AUDIO_DRIVER_SNDMGR */ ++/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */ ++/* #undef SDL_AUDIO_DRIVER_WAVEOUT */ ++ ++/* Enable various cdrom drivers */ ++/* #undef SDL_CDROM_AIX */ ++/* #undef SDL_CDROM_BEOS */ ++/* #undef SDL_CDROM_BSDI */ ++/* #undef SDL_CDROM_DC */ ++/* #undef SDL_CDROM_DUMMY */ ++/* #undef SDL_CDROM_FREEBSD */ ++#define SDL_CDROM_LINUX 1 ++/* #undef SDL_CDROM_MACOS */ ++/* #undef SDL_CDROM_MACOSX */ ++/* #undef SDL_CDROM_MINT */ ++/* #undef SDL_CDROM_OPENBSD */ ++/* #undef SDL_CDROM_OS2 */ ++/* #undef SDL_CDROM_OSF */ ++/* #undef SDL_CDROM_QNX */ ++/* #undef SDL_CDROM_WIN32 */ ++ ++/* Enable various input drivers */ ++#define SDL_INPUT_LINUXEV 1 ++#define SDL_INPUT_TSLIB 1 ++/* #undef SDL_JOYSTICK_BEOS */ ++/* #undef SDL_JOYSTICK_DC */ ++/* #undef SDL_JOYSTICK_DUMMY */ ++/* #undef SDL_JOYSTICK_IOKIT */ ++#define SDL_JOYSTICK_LINUX 1 ++/* #undef SDL_JOYSTICK_MACOS */ ++/* #undef SDL_JOYSTICK_MINT */ ++/* #undef SDL_JOYSTICK_OS2 */ ++/* #undef SDL_JOYSTICK_RISCOS */ ++/* #undef SDL_JOYSTICK_WINMM */ ++/* #undef SDL_JOYSTICK_USBHID */ ++/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */ ++ ++/* Enable various shared object loading systems */ ++/* #undef SDL_LOADSO_BEOS */ ++/* #undef SDL_LOADSO_DLCOMPAT */ ++#define SDL_LOADSO_DLOPEN 1 ++/* #undef SDL_LOADSO_DUMMY */ ++/* #undef SDL_LOADSO_LDG */ ++/* #undef SDL_LOADSO_MACOS */ ++/* #undef SDL_LOADSO_OS2 */ ++/* #undef SDL_LOADSO_WIN32 */ ++ ++/* Enable various threading systems */ ++/* #undef SDL_THREAD_BEOS */ ++/* #undef SDL_THREAD_DC */ ++/* #undef SDL_THREAD_OS2 */ ++/* #undef SDL_THREAD_PTH */ ++#define SDL_THREAD_PTHREAD 1 ++#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 ++/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */ ++/* #undef SDL_THREAD_SPROC */ ++/* #undef SDL_THREAD_WIN32 */ ++ ++/* Enable various timer systems */ ++/* #undef SDL_TIMER_BEOS */ ++/* #undef SDL_TIMER_DC */ ++/* #undef SDL_TIMER_DUMMY */ ++/* #undef SDL_TIMER_MACOS */ ++/* #undef SDL_TIMER_MINT */ ++/* #undef SDL_TIMER_OS2 */ ++/* #undef SDL_TIMER_RISCOS */ ++#define SDL_TIMER_UNIX 1 ++/* #undef SDL_TIMER_WIN32 */ ++/* #undef SDL_TIMER_WINCE */ ++ ++/* Enable various video drivers */ ++/* #undef SDL_VIDEO_DRIVER_AALIB */ ++/* #undef SDL_VIDEO_DRIVER_BWINDOW */ ++/* #undef SDL_VIDEO_DRIVER_CACA */ ++/* #undef SDL_VIDEO_DRIVER_DC */ ++/* #undef SDL_VIDEO_DRIVER_DDRAW */ ++#define SDL_VIDEO_DRIVER_DGA 1 ++/* #undef SDL_VIDEO_DRIVER_DIRECTFB */ ++/* #undef SDL_VIDEO_DRIVER_DRAWSPROCKET */ ++#define SDL_VIDEO_DRIVER_DUMMY 1 ++#define SDL_VIDEO_DRIVER_FBCON 1 ++/* #undef SDL_VIDEO_DRIVER_GAPI */ ++/* #undef SDL_VIDEO_DRIVER_GEM */ ++/* #undef SDL_VIDEO_DRIVER_GGI */ ++/* #undef SDL_VIDEO_DRIVER_IPOD */ ++/* #undef SDL_VIDEO_DRIVER_NANOX */ ++/* #undef SDL_VIDEO_DRIVER_OS2FS */ ++/* #undef SDL_VIDEO_DRIVER_PHOTON */ ++/* #undef SDL_VIDEO_DRIVER_PICOGUI */ ++/* #undef SDL_VIDEO_DRIVER_PS2GS */ ++/* #undef SDL_VIDEO_DRIVER_PS3 */ ++/* #undef SDL_VIDEO_DRIVER_QTOPIA */ ++/* #undef SDL_VIDEO_DRIVER_QUARTZ */ ++/* #undef SDL_VIDEO_DRIVER_RISCOS */ ++/* #undef SDL_VIDEO_DRIVER_SVGALIB */ ++/* #undef SDL_VIDEO_DRIVER_TOOLBOX */ ++/* #undef SDL_VIDEO_DRIVER_VGL */ ++/* #undef SDL_VIDEO_DRIVER_WINDIB */ ++/* #undef SDL_VIDEO_DRIVER_WSCONS */ ++#define SDL_VIDEO_DRIVER_X11 1 ++#define SDL_VIDEO_DRIVER_X11_DGAMOUSE 1 ++#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6" ++#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6" ++/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR */ ++/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER */ ++#define SDL_VIDEO_DRIVER_X11_VIDMODE 1 ++#define SDL_VIDEO_DRIVER_X11_XINERAMA 1 ++#define SDL_VIDEO_DRIVER_X11_XME 1 ++/* #undef SDL_VIDEO_DRIVER_X11_XRANDR */ ++#define SDL_VIDEO_DRIVER_X11_XV 1 ++/* #undef SDL_VIDEO_DRIVER_XBIOS */ ++ ++/* Enable OpenGL support */ ++/* #undef SDL_VIDEO_OPENGL */ ++/* #undef SDL_VIDEO_OPENGL_GLX */ ++/* #undef SDL_VIDEO_OPENGL_WGL */ ++/* #undef SDL_VIDEO_OPENGL_OSMESA */ ++/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */ ++ ++/* Disable screensaver */ ++#define SDL_VIDEO_DISABLE_SCREENSAVER 1 ++ ++/* Enable assembly routines */ ++#define SDL_ASSEMBLY_ROUTINES 1 ++#define SDL_HERMES_BLITTERS 1 ++/* #undef SDL_ALTIVEC_BLITTERS */ + + #endif /* _SDL_config_h */ diff --git a/package/sdl/patches/patch-sdl-config_in b/package/sdl/patches/patch-sdl-config_in new file mode 100644 index 000000000..4d3de58ed --- /dev/null +++ b/package/sdl/patches/patch-sdl-config_in @@ -0,0 +1,16 @@ +--- SDL-1.2.14.orig/sdl-config.in 2009-10-13 01:07:20.000000000 +0200 ++++ SDL-1.2.14/sdl-config.in 2011-01-12 21:46:41.000000000 +0100 +@@ -45,11 +45,11 @@ while test $# -gt 0; do + echo -I@includedir@/SDL @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) +-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ ++@ENABLE_SHARED_TRUE@ echo @SDL_LIBS@ + @ENABLE_SHARED_TRUE@ ;; + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) +-@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ ++@ENABLE_STATIC_TRUE@ echo @SDL_STATIC_LIBS@ + @ENABLE_STATIC_TRUE@ ;; + *) + echo "${usage}" 1>&2 diff --git a/package/sdl/patches/patch-sdl_pc_in b/package/sdl/patches/patch-sdl_pc_in new file mode 100644 index 000000000..fd0ae8d52 --- /dev/null +++ b/package/sdl/patches/patch-sdl_pc_in @@ -0,0 +1,10 @@ +--- SDL-1.2.14.orig/sdl.pc.in 2009-10-13 01:07:20.000000000 +0200 ++++ SDL-1.2.14/sdl.pc.in 2011-01-12 21:54:44.000000000 +0100 +@@ -10,6 +10,6 @@ Description: Simple DirectMedia Layer is + Version: @SDL_VERSION@ + Requires: + Conflicts: +-Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@ ++Libs: @SDL_LIBS@ + Libs.private: @SDL_STATIC_LIBS@ + Cflags: -I${includedir}/SDL @SDL_CFLAGS@ diff --git a/package/tcl/patches/patch-unix_configure b/package/tcl/patches/patch-unix_configure new file mode 100644 index 000000000..393c2b45e --- /dev/null +++ b/package/tcl/patches/patch-unix_configure @@ -0,0 +1,33 @@ +--- tcl8.5.8.orig/unix/configure 2009-11-13 19:38:45.000000000 +0100 ++++ tcl8.5.8/unix/configure 2011-01-13 16:22:59.000000000 +0100 +@@ -7968,9 +7968,6 @@ fi + LD_SEARCH_FLAGS="" + LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH" + +-cat >>confdefs.h <<\_ACEOF +-#define MAC_OSX_TCL 1 +-_ACEOF + + PLAT_OBJS='${MAC_OSX_OBJS}' + PLAT_SRCS='${MAC_OSX_SRCS}' +@@ -17646,11 +17643,6 @@ _ACEOF + + + cat >>confdefs.h <<\_ACEOF +-#define TCL_LOAD_FROM_MEMORY 1 +-_ACEOF +- +- +-cat >>confdefs.h <<\_ACEOF + #define TCL_WIDE_CLICKS 1 + _ACEOF + +@@ -18817,7 +18809,7 @@ HTML_DIR='$(DISTDIR)/html' + # AIX remembers this path and will attempt to use it at run-time to look + # up the Tcl library. + +-if test "`uname -s`" = "Darwin" ; then ++if test "Linux" = "Darwin" ; then + + if test "`uname -s`" = "Darwin" ; then + echo "$as_me:$LINENO: checking how to package libraries" >&5 diff --git a/package/tcl/patches/patch-unix_tclUnixTime_c b/package/tcl/patches/patch-unix_tclUnixTime_c new file mode 100644 index 000000000..e0334126f --- /dev/null +++ b/package/tcl/patches/patch-unix_tclUnixTime_c @@ -0,0 +1,39 @@ +--- tcl8.5.8.orig/unix/tclUnixTime.c 2008-04-14 19:49:59.000000000 +0200 ++++ tcl8.5.8/unix/tclUnixTime.c 2011-01-13 15:59:00.000000000 +0100 +@@ -164,12 +164,6 @@ TclpGetWideClicks(void) + + (*tclGetTimeProcPtr) (&time, tclTimeClientData); + now = (Tcl_WideInt) (time.sec*1000000 + time.usec); +- } else { +-#ifdef MAC_OSX_TCL +- now = (Tcl_WideInt) (mach_absolute_time() & INT64_MAX); +-#else +-#error Wide high-resolution clicks not implemented on this platform +-#endif + } + + return now; +@@ -200,23 +194,6 @@ TclpWideClicksToNanoseconds( + + if (tclGetTimeProcPtr != NativeGetTime) { + nsec = clicks * 1000; +- } else { +-#ifdef MAC_OSX_TCL +- static mach_timebase_info_data_t tb; +- static uint64_t maxClicksForUInt64; +- +- if (!tb.denom) { +- mach_timebase_info(&tb); +- maxClicksForUInt64 = UINT64_MAX / tb.numer; +- } +- if ((uint64_t) clicks < maxClicksForUInt64) { +- nsec = ((uint64_t) clicks) * tb.numer / tb.denom; +- } else { +- nsec = ((long double) (uint64_t) clicks) * tb.numer / tb.denom; +- } +-#else +-#error Wide high-resolution clicks not implemented on this platform +-#endif + } + + return nsec; -- cgit v1.2.3