Author: titmuss
Date: Tue May 27 06:20:26 2008
New Revision: 2530
URL: http://svn.slimdevices.com?rev=2530&root=Jive&view=rev
Log:
Bug: N/A
Description:
Compile fixes, including moving to SDL 1.2.13.
Modified:
7.2/trunk/squeezeplay/src/Makefile.linux
7.2/trunk/squeezeplay/src/Makefile.osx
7.2/trunk/squeezeplay/src/Makefile.squeezeos
7.2/trunk/squeezeplay/src/SDL-1.2.13/include/SDL_config.h
7.2/trunk/squeezeplay/src/flac-1.2.1/examples/cpp/encode/file/main.cpp
Modified: 7.2/trunk/squeezeplay/src/Makefile.linux
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Makefile.linux?rev=2530&root=Jive&r1=2529&r2=2530&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Makefile.linux (original)
+++ 7.2/trunk/squeezeplay/src/Makefile.linux Tue May 27 06:20:26 2008
@@ -49,11 +49,11 @@
cd freetype-2.1.10; make; make install
# sdl
-SDL-1.2.11/Makefile:
- cd SDL-1.2.11; ./configure ${ENABLE_PROFILING} --prefix=${PREFIX}
-
-sdl: SDL-1.2.11/Makefile
- cd SDL-1.2.11; make && make install
+SDL-1.2.13/Makefile:
+ cd SDL-1.2.13; ./configure ${ENABLE_PROFILING} --prefix=${PREFIX}
+
+sdl: SDL-1.2.13/Makefile
+ cd SDL-1.2.13; make && make install
# sdl_image (requires jpeg tiff png)
SDL_image-1.2.5/Makefile:
@@ -155,7 +155,7 @@
# flac
flac-1.2.1/Makefile:
- cd flac-1.2.1; ./configure --disable-ogg --prefix=${PREFIX}
+ cd flac-1.2.1; ./configure --disable-ogg --disable-xmms-plugin
--prefix=${PREFIX}
flac: flac-1.2.1/Makefile
cd flac-1.2.1; make && make install
@@ -207,7 +207,7 @@
.PHONY: clean
clean:
-cd freetype-2.1.10; make distclean
- -cd SDL-1.2.11; make distclean; rm -f include/SDL_config.h;
+ -cd SDL-1.2.13; make distclean; rm -f include/SDL_config.h;
-cd SDL_image-1.2.5; make distclean
-cd SDL_ttf-2.0.8; make distclean
-cd SDL_gfx-2.0.15; make distclean
Modified: 7.2/trunk/squeezeplay/src/Makefile.osx
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Makefile.osx?rev=2530&root=Jive&r1=2529&r2=2530&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Makefile.osx (original)
+++ 7.2/trunk/squeezeplay/src/Makefile.osx Tue May 27 06:20:26 2008
@@ -63,11 +63,11 @@
cd freetype-2.1.10; make; make DESTDIR= install
# sdl
-SDL-1.2.11/Makefile:
- cd SDL-1.2.11; ./configure --prefix=${PREFIX} --disable-video-x11;
-
-sdl: SDL-1.2.11/Makefile
- cd SDL-1.2.11; make && make install
+SDL-1.2.13/Makefile:
+ cd SDL-1.2.13; ./configure --prefix=${PREFIX} --disable-video-x11;
+
+sdl: SDL-1.2.13/Makefile
+ cd SDL-1.2.13; make && make install
# sdl_image (requires jpeg tiff png)
SDL_image-1.2.5/Makefile:
@@ -229,7 +229,7 @@
-cd squeezeplay; make distclean
@echo "----------------------------------------------------------"
@echo "Cleaning: SDL"
- -cd SDL-1.2.11; make distclean; rm -f include/SDL_config.h;
+ -cd SDL-1.2.13; make distclean; rm -f include/SDL_config.h;
@echo "----------------------------------------------------------"
@echo "Cleaning: SDL_image"
-cd SDL_image-1.2.5; make distclean
Modified: 7.2/trunk/squeezeplay/src/Makefile.squeezeos
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Makefile.squeezeos?rev=2530&root=Jive&r1=2529&r2=2530&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Makefile.squeezeos (original)
+++ 7.2/trunk/squeezeplay/src/Makefile.squeezeos Tue May 27 06:20:26 2008
@@ -48,11 +48,11 @@
# sdl
-SDL-1.2.11/Makefile:
- cd SDL-1.2.11; ./configure --enable-audio --enable-video
--enable-events --disable-joystick --disable-cdrom --enable-threads
--enable-timers --enable-file --enable-loadso --disable-oss --enable-alsa
--disable-esd --disable-arts --disable-video-x11 --disable-video-directfb
--enable-clock_gettime --host=${TARGET} --target=${TARGET} --prefix=${PREFIX}
${ENABLE_PROFILING}
-
-sdl: SDL-1.2.11/Makefile
- cd SDL-1.2.11; make && make DESTDIR= install
+SDL-1.2.13/Makefile:
+ cd SDL-1.2.13; ./configure --enable-audio --enable-video
--enable-events --disable-joystick --disable-cdrom --enable-threads
--enable-timers --enable-file --enable-loadso --disable-oss --enable-alsa
--disable-esd --disable-arts --disable-video-x11 --disable-video-directfb
--enable-clock_gettime --host=${TARGET} --target=${TARGET} --prefix=${PREFIX}
${ENABLE_PROFILING}
+
+sdl: SDL-1.2.13/Makefile
+ cd SDL-1.2.13; make && make DESTDIR= install
# sdl_image (requires jpeg tiff png)
SDL_image-1.2.5/Makefile:
@@ -206,7 +206,7 @@
.PHONY: clean
clean:
-cd freetype-2.1.10; make distclean
- -cd SDL-1.2.11; make distclean; rm -f include/SDL_config.h;
+ -cd SDL-1.2.13; make distclean; rm -f include/SDL_config.h;
-cd SDL_image-1.2.5; make distclean
-cd SDL_ttf-2.0.8; make distclean
-cd SDL_gfx-2.0.15; make distclean
Modified: 7.2/trunk/squeezeplay/src/SDL-1.2.13/include/SDL_config.h
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/SDL-1.2.13/include/SDL_config.h?rev=2530&root=Jive&r1=2529&r2=2530&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/SDL-1.2.13/include/SDL_config.h (original)
+++ 7.2/trunk/squeezeplay/src/SDL-1.2.13/include/SDL_config.h Tue May 27
06:20:26 2008
@@ -1,3 +1,4 @@
+/* include/SDL_config.h. Generated from SDL_config.h.in by configure. */
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997-2006 Sam Lantinga
@@ -23,23 +24,284 @@
#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
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+/* #undef HAVE_STRLCPY */
+/* #undef HAVE_STRLCAT */
+#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
+#define HAVE_STRTOD 1
+#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
+#define HAVE_ICONV 1
+#define HAVE_SIGACTION 1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP 1
+/* #undef HAVE_CLOCK_GETTIME */
+#define HAVE_DLVSYM 1
+#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 <stdarg.h>
+#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"
+#define SDL_AUDIO_DRIVER_ARTS 1
+#define SDL_AUDIO_DRIVER_ARTS_DYNAMIC "libartsc.so.0"
+/* #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 */
+#define SDL_AUDIO_DRIVER_ESD 1
+#define SDL_AUDIO_DRIVER_ESD_DYNAMIC "libesd.so.0"
+/* #undef SDL_AUDIO_DRIVER_MINT */
+/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */
+#define SDL_AUDIO_DRIVER_NAS 1
+#define SDL_AUDIO_DRIVER_OSS 1
+/* #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
+/* #undef SDL_INPUT_TSLIB */
+/* #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_DC */
+/* #undef SDL_VIDEO_DRIVER_DDRAW */
+#define SDL_VIDEO_DRIVER_DGA 1
+#define SDL_VIDEO_DRIVER_DIRECTFB 1
+/* #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_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_DPMS 1
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "libXrandr.so.2"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER "libXrender.so.1"
+#define SDL_VIDEO_DRIVER_X11_VIDMODE 1
+#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
+#define SDL_VIDEO_DRIVER_X11_XME 1
+#define SDL_VIDEO_DRIVER_X11_XRANDR 1
+#define SDL_VIDEO_DRIVER_X11_XV 1
+/* #undef SDL_VIDEO_DRIVER_XBIOS */
+
+/* Enable OpenGL support */
+#define SDL_VIDEO_OPENGL 1
+#define SDL_VIDEO_OPENGL_GLX 1
+/* #undef SDL_VIDEO_OPENGL_WGL */
+/* #undef SDL_VIDEO_OPENGL_OSMESA */
+/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
+
+/* Enable assembly routines */
+#define SDL_ASSEMBLY_ROUTINES 1
+/* #undef SDL_HERMES_BLITTERS */
+/* #undef SDL_ALTIVEC_BLITTERS */
#endif /* _SDL_config_h */
Modified: 7.2/trunk/squeezeplay/src/flac-1.2.1/examples/cpp/encode/file/main.cpp
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/flac-1.2.1/examples/cpp/encode/file/main.cpp?rev=2530&root=Jive&r1=2529&r2=2530&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/flac-1.2.1/examples/cpp/encode/file/main.cpp
(original)
+++ 7.2/trunk/squeezeplay/src/flac-1.2.1/examples/cpp/encode/file/main.cpp Tue
May 27 06:20:26 2008
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "FLAC++/metadata.h"
#include "FLAC++/encoder.h"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
