summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/mpd/Makefile8
-rw-r--r--package/mpd/files/mpd.conf3
-rw-r--r--package/mpd/files/mpd.init4
-rw-r--r--package/mpd/patches/patch-src_decoder_ffmpeg_decoder_plugin_c130
-rw-r--r--package/sdl/patches/patch-include_SDL_config_h311
5 files changed, 129 insertions, 327 deletions
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 3f4470c3c..c9c06e4bf 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mpd
-PKG_VERSION:= 0.17.5
-PKG_RELEASE:= 2
-PKG_MD5SUM:= b68be330deeb23989c08a9fefd9fcdeb
+PKG_VERSION:= 0.17.6
+PKG_RELEASE:= 1
+PKG_MD5SUM:= d0da6a6a1d9cf1e8710b6082f6ef7849
PKG_DESCR:= A music player daemon
PKG_SECTION:= multimedia
PKG_DEPENDS:= glib libstdcxx libgcc
@@ -206,7 +206,7 @@ else
CONFIGURE_ARGS+= --disable-lsr
endif
-post-install:
+mpd-install:
${INSTALL_DIR} ${IDIR_MPD}/usr/bin ${IDIR_MPD}/etc
${INSTALL_BIN} ${WRKINST}/usr/bin/mpd ${IDIR_MPD}/usr/bin
${INSTALL_DATA} ./files/mpd.conf ${IDIR_MPD}/etc/mpd.conf
diff --git a/package/mpd/files/mpd.conf b/package/mpd/files/mpd.conf
index 263202b1d..ee3565c15 100644
--- a/package/mpd/files/mpd.conf
+++ b/package/mpd/files/mpd.conf
@@ -1,10 +1,11 @@
# An example configuration file for MPD
user "mpd"
+auto_update "no"
music_directory "/music"
playlist_directory "/etc/mpd/playlists"
state_file "/etc/mpd/state"
db_file "/etc/mpd/database"
-pid_file "/var/run/mpd/mpd.pid"
+pid_file "/var/run/mpd.pid"
log_file "syslog"
filesystem_charset "UTF-8"
id3v1_encoding "UTF-8"
diff --git a/package/mpd/files/mpd.init b/package/mpd/files/mpd.init
index aa09381fb..8ff050b73 100644
--- a/package/mpd/files/mpd.init
+++ b/package/mpd/files/mpd.init
@@ -21,10 +21,6 @@ start)
mkdir -p /etc/mpd/playlists
chown -R mpd:mpd /etc/mpd
fi
- if [ ! -d /var/run/mpd ];then
- mkdir -p /var/run/mpd
- chown mpd:mpd /var/run/mpd
- fi
mpd
;;
stop)
diff --git a/package/mpd/patches/patch-src_decoder_ffmpeg_decoder_plugin_c b/package/mpd/patches/patch-src_decoder_ffmpeg_decoder_plugin_c
index 0114216ad..e9568905c 100644
--- a/package/mpd/patches/patch-src_decoder_ffmpeg_decoder_plugin_c
+++ b/package/mpd/patches/patch-src_decoder_ffmpeg_decoder_plugin_c
@@ -1,11 +1,127 @@
---- mpd-0.17.4.orig/src/decoder/ffmpeg_decoder_plugin.c 2013-04-08 20:01:53.000000000 +0200
-+++ mpd-0.17.4/src/decoder/ffmpeg_decoder_plugin.c 2013-07-10 11:02:20.000000000 +0200
-@@ -44,6 +44,8 @@
- #include <libavutil/dict.h>
+--- mpd-0.17.6.orig/src/decoder/ffmpeg_decoder_plugin.c 2013-08-04 14:20:16.000000000 +0200
++++ mpd-0.17.6/src/decoder/ffmpeg_decoder_plugin.c 2013-10-15 16:26:29.000000000 +0200
+@@ -255,7 +255,8 @@ copy_interleave_frame2(uint8_t *dest, ui
+ static int
+ copy_interleave_frame(const AVCodecContext *codec_context,
+ const AVFrame *frame,
+- uint8_t *buffer, size_t buffer_size)
++ uint8_t **output_buffer,
++ uint8_t **global_buffer, int *global_buffer_size)
+ {
+ int plane_size;
+ const int data_size =
+@@ -263,18 +264,26 @@ copy_interleave_frame(const AVCodecConte
+ codec_context->channels,
+ frame->nb_samples,
+ codec_context->sample_fmt, 1);
+- if (buffer_size < (size_t)data_size)
+- /* buffer is too small - shouldn't happen */
+- return AVERROR(EINVAL);
+
+ if (av_sample_fmt_is_planar(codec_context->sample_fmt) &&
+ codec_context->channels > 1) {
+- copy_interleave_frame2(buffer, frame->extended_data,
++ if(*global_buffer_size < data_size) {
++ av_freep(global_buffer);
++
++ *global_buffer = (uint8_t*)av_malloc(data_size);
++
++ if (!*global_buffer)
++ /* Not enough memory - shouldn't happen */
++ return AVERROR(ENOMEM);
++ *global_buffer_size = data_size;
++ }
++ *output_buffer = *global_buffer;
++ copy_interleave_frame2(*output_buffer, frame->extended_data,
+ frame->nb_samples,
+ codec_context->channels,
+ av_get_bytes_per_sample(codec_context->sample_fmt));
+ } else {
+- memcpy(buffer, frame->extended_data[0], data_size);
++ *output_buffer = frame->extended_data[0];
+ }
+
+ return data_size;
+@@ -285,7 +294,8 @@ static enum decoder_command
+ ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is,
+ const AVPacket *packet,
+ AVCodecContext *codec_context,
+- const AVRational *time_base)
++ const AVRational *time_base,
++ uint8_t **buffer, int *buffer_size)
+ {
+ if (packet->pts >= 0 && packet->pts != (int64_t)AV_NOPTS_VALUE)
+ decoder_timestamp(decoder,
+@@ -299,8 +309,7 @@ ffmpeg_send_packet(struct decoder *decod
+ #endif
+
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,25,0)
+- uint8_t aligned_buffer[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2 + 16];
+- const size_t buffer_size = sizeof(aligned_buffer);
++ uint8_t *output_buffer;
+ #else
+ /* libavcodec < 0.8 needs an aligned buffer */
+ uint8_t audio_buf[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2 + 16];
+@@ -316,7 +325,7 @@ ffmpeg_send_packet(struct decoder *decod
+ packet_size > 0 &&
#endif
+ cmd == DECODE_COMMAND_NONE) {
+- int audio_size = buffer_size;
++ int audio_size = 0;
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,25,0)
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
+ AVFrame *frame = avcodec_alloc_frame();
+@@ -332,12 +341,11 @@ ffmpeg_send_packet(struct decoder *decod
+ if (len >= 0 && got_frame) {
+ audio_size = copy_interleave_frame(codec_context,
+ frame,
+- aligned_buffer,
+- buffer_size);
++ &output_buffer,
++ buffer, buffer_size);
+ if (audio_size < 0)
+ len = audio_size;
+- } else if (len >= 0)
+- len = -1;
++ }
+
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0)
+ avcodec_free_frame(&frame);
+@@ -373,7 +381,7 @@ ffmpeg_send_packet(struct decoder *decod
+ continue;
+
+ cmd = decoder_data(decoder, is,
+- aligned_buffer, audio_size,
++ output_buffer, audio_size,
+ codec_context->bit_rate / 1000);
+ }
+ return cmd;
+@@ -589,6 +597,9 @@ ffmpeg_decode(struct decoder *decoder, s
+ decoder_initialized(decoder, &audio_format,
+ input->seekable, total_time);
+
++ uint8_t *interleaved_buffer = NULL;
++ int interleaved_buffer_size = 0;
+
- #undef G_LOG_DOMAIN
- #define G_LOG_DOMAIN "ffmpeg"
+ enum decoder_command cmd;
+ do {
+ AVPacket packet;
+@@ -599,7 +610,8 @@ ffmpeg_decode(struct decoder *decoder, s
+ if (packet.stream_index == audio_stream)
+ cmd = ffmpeg_send_packet(decoder, input,
+ &packet, codec_context,
+- &av_stream->time_base);
++ &av_stream->time_base,
++ &interleaved_buffer, &interleaved_buffer_size);
+ else
+ cmd = decoder_get_command(decoder);
+@@ -620,6 +632,8 @@ ffmpeg_decode(struct decoder *decoder, s
+ }
+ } while (cmd != DECODE_COMMAND_STOP);
+
++ av_freep(&interleaved_buffer);
++
+ avcodec_close(codec_context);
+ #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,17,0)
+ avformat_close_input(&format_context);
diff --git a/package/sdl/patches/patch-include_SDL_config_h b/package/sdl/patches/patch-include_SDL_config_h
deleted file mode 100644
index 371f7199f..000000000
--- a/package/sdl/patches/patch-include_SDL_config_h
+++ /dev/null
@@ -1,311 +0,0 @@
---- 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 <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"
-+/* #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 */