--- mplayer-1.0~rc1.orig/etc/mplayer.desktop +++ mplayer-1.0~rc1/etc/mplayer.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Encoding=UTF-8 -Name=MPlayer +Name=MPlayer Movie Player GenericName=Multimedia player Comment=Multimedia player Comment[de]=Multimedia-Player --- mplayer-1.0~rc1.orig/etc/example.conf +++ mplayer-1.0~rc1/etc/example.conf @@ -71,7 +71,7 @@ ################## # Specify default audio driver (see -ao help for a list). -#ao=oss +ao=alsa, # Use SDL audio driver with the esd subdriver by default. #ao = sdl:esd @@ -82,6 +82,9 @@ # Resample the sound to 44100Hz with the lavcresample audio filter. #af=lavcresample=44100 +# Specify default audio codec (see -ac help for a list). +ac=mad, + ################## # other settings # --- mplayer-1.0~rc1.orig/libvo/osd_template.c +++ mplayer-1.0~rc1/libvo/osd_template.c @@ -435,7 +435,7 @@ "movb %%dh, 2(%0)\n\t" : - :"r" (&dstbase[4*x]), + :"R" (&dstbase[4*x]), "r" ((unsigned)srca[x]), "r" (((unsigned)src[x])<<8) :"%eax", "%ecx", "%edx" --- mplayer-1.0~rc1.orig/libvo/gnome_screensaver.h +++ mplayer-1.0~rc1/libvo/gnome_screensaver.h @@ -0,0 +1,6 @@ +#ifndef _GNOME_SCREENSAVER_H +#define _GNOME_SCREENSAVER_H + +extern void gnome_screensaver_control(int enable); + +#endif /* !_GNOME_SCREENSAVER_H */ --- mplayer-1.0~rc1.orig/libvo/Makefile +++ mplayer-1.0~rc1/libvo/Makefile @@ -58,6 +58,9 @@ $(AR) r $(LIBNAME) $(OBJS) $(RANLIB) $(LIBNAME) +gnome_screensaver.o: gnome_screensaver.c + $(CC) -c $(CFLAGS) $(DBUS_GLIB_INC) -o $@ $< + all: $(LIBNAME) clean: --- mplayer-1.0~rc1.orig/libvo/gnome_screensaver.c +++ mplayer-1.0~rc1/libvo/gnome_screensaver.c @@ -0,0 +1,120 @@ +/* + * gnome_screensaver.c v0.0.7 + * + * Enable/Disable the GNOME screensaver + * Supports GNOME screensaver API 2.14 and 2.15 + * + * Call gnome_screensaver_control(1) to enable and + * gnome_screensaver_control(0) to disable + * + */ + +#include +#include +#include + +#include "gnome_screensaver.h" +#include "mp_msg.h" +#include "help_mp.h" + +#define GS_SERVICE "org.gnome.ScreenSaver" +#define GS_PATH "/org/gnome/ScreenSaver" +#define GS_INTERFACE "org.gnome.ScreenSaver" + +#define GS_APPLICATION_NAME "MPlayer" +#define GS_REASON_FOR_INHIBIT "Playing a movie" + +static guint32 cookie; + +void gnome_screensaver_control(int enable) +{ + DBusGConnection *connection; + GError *error; + DBusGProxy *proxy; + gboolean ret; + char *funcname = "gnome_screensaver_control()"; + + g_type_init(); + + /* Get a connection to the session bus */ + error = NULL; + connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error); + if (connection == NULL) { + mp_msg(MSGT_VO, MSGL_ERR, + funcname, MSGTR_OpenBusConnectionError, error->message); + g_error_free(error); + return; + } + + /* Create a proxy object */ + proxy = dbus_g_proxy_new_for_name(connection, + GS_SERVICE, GS_PATH, GS_INTERFACE); + + /* Enable the screensaver */ + if (enable) { + /* First call the GNOME screensaver 2.15 API method */ + error = NULL; + ret = + dbus_g_proxy_call(proxy, "UnInhibit", &error, G_TYPE_UINT, + cookie, G_TYPE_INVALID); + + /* If this fails, try the GNOME screensaver 2.14 API */ + if (!ret && error->domain == DBUS_GERROR + && error->code == DBUS_GERROR_UNKNOWN_METHOD) { + mp_msg(MSGT_VO, MSGL_V, + "%s: GNOME screensaver 2.15 API failed, trying 2.14 API\n", + funcname); + g_error_free(error); + error = NULL; + ret = + dbus_g_proxy_call(proxy, "AllowActivation", &error, + G_TYPE_INVALID, G_TYPE_INVALID); + } + } + /* Disable the screensaver */ + else { + /* First call the GNOME screensaver 2.15 API method */ + error = NULL; + ret = + dbus_g_proxy_call(proxy, "Inhibit", &error, G_TYPE_STRING, + GS_APPLICATION_NAME, G_TYPE_STRING, + GS_REASON_FOR_INHIBIT, G_TYPE_INVALID, + G_TYPE_UINT, cookie, G_TYPE_INVALID); + + /* If this fails, try the GNOME screensaver 2.14 API */ + if (!ret && error->domain == DBUS_GERROR + && error->code == DBUS_GERROR_UNKNOWN_METHOD) { + mp_msg(MSGT_VO, MSGL_V, + "%s: GNOME screensaver 2.15 API failed, trying 2.14 API\n", + funcname); + g_error_free(error); + error = NULL; + ret = + dbus_g_proxy_call(proxy, "InhibitActivation", &error, + G_TYPE_STRING, GS_REASON_FOR_INHIBIT, + G_TYPE_INVALID, G_TYPE_INVALID); + } + } + + if (!ret) { + /* Check if it's a remote exception or a regular GError */ + if (error->domain == DBUS_GERROR + && error->code == DBUS_GERROR_REMOTE_EXCEPTION) { + mp_msg(MSGT_VO, MSGL_ERR, + funcname, MSGTR_RemoteMethodException, + dbus_g_error_get_name(error), error->message); + } + else { + mp_msg(MSGT_VO, MSGL_ERR, + funcname, MSGTR_GError, error->message); + } + g_error_free(error); + } + else { + mp_msg(MSGT_VO, MSGL_INFO, + enable ? MSGTR_GNOMEScreensaverEnabled : + MSGTR_GNOMEScreensaverDisabled); + } + + g_object_unref(proxy); +} --- mplayer-1.0~rc1.orig/libvo/x11_common.c +++ mplayer-1.0~rc1/libvo/x11_common.c @@ -58,6 +58,10 @@ #include "mplayer.h" #endif +#ifdef HAVE_DBUS_GLIB +#include "gnome_screensaver.h" +#endif + #define WIN_LAYER_ONBOTTOM 2 #define WIN_LAYER_NORMAL 4 #define WIN_LAYER_ONTOP 6 @@ -1701,8 +1705,12 @@ timeout_save = 0; } - if (stop_xscreensaver) + if (stop_xscreensaver) { xscreensaver_enable(); +#ifdef HAVE_DBUS_GLIB + gnome_screensaver_control(1); +#endif + } if (kdescreensaver_was_running && stop_xscreensaver) { system @@ -1747,8 +1755,12 @@ allow_exp); } // turning off screensaver - if (stop_xscreensaver) + if (stop_xscreensaver) { xscreensaver_disable(mDisplay); +#ifdef HAVE_DBUS_GLIB + gnome_screensaver_control(0); +#endif + } if (stop_xscreensaver && !kdescreensaver_was_running) { kdescreensaver_was_running = --- mplayer-1.0~rc1.orig/libao2/ao_pulse.c +++ mplayer-1.0~rc1/libao2/ao_pulse.c @@ -0,0 +1,566 @@ +#include +#include +#include + +#include + +#include "config.h" +#include "libaf/af_format.h" +#include "mp_msg.h" +#include "audio_out.h" +#include "audio_out_internal.h" + +#define PULSE_CLIENT_NAME "MPlayer" + +/*#define PULSE_DEBUG*/ + +/** General driver info */ +static ao_info_t info = { + "PulseAudio audio output", + "pulse", + "Lennart Poettering", + "" +}; + +/** The sink to connect to */ +static char *sink = NULL; + +/** PulseAudio playback stream object */ +static struct pa_stream *stream = NULL; + +/** PulseAudio connection context */ +static struct pa_context *context = NULL; + +/** Main event loop object */ +static struct pa_threaded_mainloop *mainloop = NULL; + +/** A temporary variable to store the current volume */ +static pa_cvolume volume; +static int volume_initialized = 0; + +/** Some special libao macro magic */ +LIBAO_EXTERN(pulse) + +#define CHECK_DEAD_GOTO(label) do { \ +if (!context || pa_context_get_state(context) != PA_CONTEXT_READY || \ + !stream || pa_stream_get_state(stream) != PA_STREAM_READY) { \ + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Connection died: %s\n", context ? pa_strerror(pa_context_errno(context)) : "NULL"); \ + goto label; \ + } \ +} while(0); + +static void context_state_cb(pa_context *c, void *userdata) { + assert(c); + + switch (pa_context_get_state(c)) { + case PA_CONTEXT_READY: + case PA_CONTEXT_TERMINATED: + case PA_CONTEXT_FAILED: + pa_threaded_mainloop_signal(mainloop, 0); + break; + + case PA_CONTEXT_UNCONNECTED: + case PA_CONTEXT_CONNECTING: + case PA_CONTEXT_AUTHORIZING: + case PA_CONTEXT_SETTING_NAME: + break; + } +} + +static void stream_state_cb(pa_stream *s, void * userdata) { + assert(s); + + switch (pa_stream_get_state(s)) { + + case PA_STREAM_READY: + case PA_STREAM_FAILED: + case PA_STREAM_TERMINATED: + pa_threaded_mainloop_signal(mainloop, 0); + break; + + case PA_STREAM_UNCONNECTED: + case PA_STREAM_CREATING: + break; + } +} + +static void stream_request_cb(pa_stream *s, size_t length, void *userdata) { + assert(s); + + pa_threaded_mainloop_signal(mainloop, 0); +} + +static void stream_latency_update_cb(pa_stream *s, void *userdata) { + assert(s); + + pa_threaded_mainloop_signal(mainloop, 0); +} + +static void success_cb(pa_stream *s, int success, void *userdata) { + assert(s); + + if (userdata) + *(int*) userdata = success; + pa_threaded_mainloop_signal(mainloop, 0); +} + +/** libao initialization function, arguments are sampling frequency, + * number of channels, sample type and some flags */ +static int init(int rate_hz, int channels, int format, int flags) { + struct pa_sample_spec ss; + struct pa_channel_map map; + char hn[128]; + char *host = NULL; + + assert(!context); + assert(!stream); + assert(!mainloop); + + if (ao_subdevice) { + int i = strcspn(ao_subdevice, ":"); + if ((size_t) i >= sizeof(hn)) + i = sizeof(hn)-1; + + if (i > 0) { + strncpy(host = hn, ao_subdevice, i); + hn[i] = 0; + } + + if (ao_subdevice[i] == ':') + sink = ao_subdevice+i+1; + } + + ss.channels = channels; + ss.rate = rate_hz; + + ao_data.samplerate = rate_hz; + ao_data.format = format; + ao_data.channels = channels; + + switch (format) { + case AF_FORMAT_U8: + ss.format = PA_SAMPLE_U8; + break; + case AF_FORMAT_S16_LE: + ss.format = PA_SAMPLE_S16LE; + break; + case AF_FORMAT_S16_BE: + ss.format = PA_SAMPLE_S16BE; + break; + case AF_FORMAT_FLOAT_LE: + ss.format = PA_SAMPLE_FLOAT32LE; + break; + case AF_FORMAT_FLOAT_BE: + ss.format = PA_SAMPLE_FLOAT32BE; + break; + case AF_FORMAT_MU_LAW: + ss.format = PA_SAMPLE_ULAW; + break; + case AF_FORMAT_A_LAW: + ss.format = PA_SAMPLE_ALAW; + break; + default: + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Unsupported sample spec\n"); + goto fail; + } + + if (!pa_sample_spec_valid(&ss)) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Invalid sample spec\n"); + goto fail; + } + + pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_ALSA); + ao_data.bps = pa_bytes_per_second(&ss); + + if (!volume_initialized || ss.channels != volume.channels) { + pa_cvolume_reset(&volume, ss.channels); + volume_initialized = 1; + } + + if (!(mainloop = pa_threaded_mainloop_new())) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to allocate main loop\n"); + goto fail; + } + + if (!(context = pa_context_new(pa_threaded_mainloop_get_api(mainloop), PULSE_CLIENT_NAME))) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to allocate context\n"); + goto fail; + } + + pa_context_set_state_callback(context, context_state_cb, NULL); + + if (pa_context_connect(context, host, 0, NULL) < 0) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to connect to server: %s\n", pa_strerror(pa_context_errno(context))); + goto fail; + } + + pa_threaded_mainloop_lock(mainloop); + + if (pa_threaded_mainloop_start(mainloop) < 0) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to start main loop\n"); + goto unlock_and_fail; + } + + /* Wait until the context is ready */ + pa_threaded_mainloop_wait(mainloop); + + if (pa_context_get_state(context) != PA_CONTEXT_READY) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to connect to server: %s\n", pa_strerror(pa_context_errno(context))); + goto unlock_and_fail; + } + + if (!(stream = pa_stream_new(context, "audio stream", &ss, &map))) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to create stream: %s\n", pa_strerror(pa_context_errno(context))); + goto unlock_and_fail; + } + + pa_stream_set_state_callback(stream, stream_state_cb, NULL); + pa_stream_set_write_callback(stream, stream_request_cb, NULL); + pa_stream_set_latency_update_callback(stream, stream_latency_update_cb, NULL); + + if (pa_stream_connect_playback(stream, sink, NULL, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, &volume, NULL) < 0) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to connect stream: %s\n", pa_strerror(pa_context_errno(context))); + goto unlock_and_fail; + } + + /* Wait until the stream is ready */ + pa_threaded_mainloop_wait(mainloop); + + if (pa_stream_get_state(stream) != PA_STREAM_READY) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to connect to server: %s\n", pa_strerror(pa_context_errno(context))); + goto unlock_and_fail; + } + + pa_threaded_mainloop_unlock(mainloop); + + return 1; + +unlock_and_fail: + + if (mainloop) + pa_threaded_mainloop_unlock(mainloop); + +fail: + + uninit(1); + return 0; +} + +/** Destroy libao driver */ +static void uninit(int immed) { +#ifdef PULSE_DEBUG + fprintf(stderr, "uninit(%i) ***\n", immed); +#endif + + if (stream) { + if (!immed) { + pa_operation *o; + + pa_threaded_mainloop_lock(mainloop); + + if ((o = pa_stream_drain(stream, success_cb, NULL))) { + + while (pa_operation_get_state(o) != PA_OPERATION_DONE) { + CHECK_DEAD_GOTO(fail); + pa_threaded_mainloop_wait(mainloop); + } + + fail: + + pa_operation_unref(o); + } + + pa_threaded_mainloop_unlock(mainloop); + } + } + + if (mainloop) + pa_threaded_mainloop_stop(mainloop); + + if (stream) { + pa_stream_disconnect(stream); + pa_stream_unref(stream); + stream = NULL; + } + + if (context) { + pa_context_disconnect(context); + pa_context_unref(context); + context = NULL; + } + + if (mainloop) { + pa_threaded_mainloop_free(mainloop); + mainloop = NULL; + } +} + +/** Play the specified data to the pulseaudio server */ +static int play(void* data, int len, int flags) { + int r = -1; + pa_operation *o = NULL; + + assert(stream); + assert(context); + +#ifdef PULSE_DEBUG + fprintf(stderr, "playing %lu ***\n", len); +#endif + + pa_threaded_mainloop_lock(mainloop); + + CHECK_DEAD_GOTO(fail); + + if (len) { + + if (pa_stream_write(stream, data, len, NULL, 0, PA_SEEK_RELATIVE) < 0) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] pa_stream_write() failed: %s\n", pa_strerror(pa_context_errno(context))); + goto fail; + } + + } else { + + if (!(o = pa_stream_trigger(stream, NULL, NULL))) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] pa_stream_trigger() failed: %s\n", pa_strerror(pa_context_errno(context))); + goto fail; + } + + /* We don't wait for this operation to complete */ + } + + r = len; + +fail: + if (o) + pa_operation_unref(o); + + pa_threaded_mainloop_unlock(mainloop); + + return r; +} + +static void cork(int b) { + pa_operation *o = NULL; + int success = 0; + + assert(stream); + assert(context); + +#ifdef PULSE_DEBUG + fprintf(stderr, "cork(%i) ***\n", b); +#endif + + pa_threaded_mainloop_lock(mainloop); + + CHECK_DEAD_GOTO(fail); + + if (!(o = pa_stream_cork(stream, b, success_cb, &success))) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] pa_stream_cork() failed: %s\n", pa_strerror(pa_context_errno(context))); + goto fail; + } + + while (pa_operation_get_state(o) != PA_OPERATION_DONE) { + CHECK_DEAD_GOTO(fail); + pa_threaded_mainloop_wait(mainloop); + } + + if (!success) + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] pa_stream_cork() failed: %s\n", pa_strerror(pa_context_errno(context))); + + pa_operation_unref(o); + +fail: + pa_threaded_mainloop_unlock(mainloop); +} + +/** Pause the audio stream by corking it on the server */ +static void audio_pause(void) { + cork(1); + } + +/** Resume the audio stream by uncorking it on the server */ +static void audio_resume(void) { + cork(0); +} + +/** Reset the audio stream, i.e. flush the playback buffer on the server side */ +static void reset(void) { + pa_operation *o = NULL; + int success = 0; + + assert(stream); + assert(context); + +#ifdef PULSE_DEBUG + fprintf(stderr, "reset() ***\n"); +#endif + + pa_threaded_mainloop_lock(mainloop); + + CHECK_DEAD_GOTO(fail); + + if (!(o = pa_stream_flush(stream, success_cb, &success))) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] pa_stream_flush() failed: %s\n", pa_strerror(pa_context_errno(context))); + goto fail; + } + + while (pa_operation_get_state(o) != PA_OPERATION_DONE) { + CHECK_DEAD_GOTO(fail); + pa_threaded_mainloop_wait(mainloop); + } + + if (!success) + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] pa_stream_flush() failed: %s\n", pa_strerror(pa_context_errno(context))); + + pa_operation_unref(o); + +fail: + pa_threaded_mainloop_unlock(mainloop); +} + +/** Return number of bytes that may be written to the server without blocking */ +static int get_space(void) { + size_t l = (size_t) -1; + + pa_threaded_mainloop_lock(mainloop); + + CHECK_DEAD_GOTO(fail); + + l = pa_stream_writable_size(stream); + +#ifdef PULSE_DEBUG + fprintf(stderr, "\nspace = %lu\n", l); +#endif + +fail: + + pa_threaded_mainloop_unlock(mainloop); + + return l == (size_t) -1 ? -1 : (int) l; +} + +/** Return the current latency in seconds */ +static float get_delay(void) { + pa_usec_t latency = (pa_usec_t) -1; + + pa_threaded_mainloop_lock(mainloop); + + for (;;) { + CHECK_DEAD_GOTO(fail); + + if (pa_stream_get_latency(stream, &latency, NULL) >= 0) + break; + + if (pa_context_errno(context) != PA_ERR_NODATA) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] pa_stream_get_latency() failed: %s\n", pa_strerror(pa_context_errno(context))); + goto fail; + } + + /* Wait until latency data is available again */ + pa_threaded_mainloop_wait(mainloop); + } + +#ifdef PULSE_DEBUG + fprintf(stderr, "latency=%0.3f sec\n", (double) latency / 1000000); +#endif + +fail: + pa_threaded_mainloop_unlock(mainloop); + + return (latency == (pa_usec_t) -1) ? 0 : ((float) latency / 1000000.0); +} + +/** A callback function that is called when the + * pa_context_get_sink_input_info() operation completes. Saves the + * volume field of the specified structure to the global variable volume. */ +static void info_func(struct pa_context *c, const struct pa_sink_input_info *i, int is_last, void *userdata) { + if (is_last < 0) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to get sink input info: %s\n", pa_strerror(pa_context_errno(context))); + return; + } + + if (!i) + return; + + volume = i->volume; + volume_initialized = 1; + + pa_threaded_mainloop_signal(mainloop, 0); +} + +/** Issue special libao controls on the device */ +static int control(int cmd, void *arg) { + + if (!context || !stream) + return CONTROL_ERROR; + + switch (cmd) { + + case AOCONTROL_GET_VOLUME: { + /* Return the current volume of the playback stream */ + ao_control_vol_t *vol = (ao_control_vol_t*) arg; + pa_operation *o; + + if (!(o = pa_context_get_sink_input_info(context, pa_stream_get_index(stream), info_func, NULL))) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] pa_stream_get_sink_input_info() failed: %s\n", pa_strerror(pa_context_errno(context))); + return CONTROL_ERROR; + } + + while (pa_operation_get_state(o) != PA_OPERATION_DONE) { + CHECK_DEAD_GOTO(fail); + pa_threaded_mainloop_wait(mainloop); + } + + fail: + pa_operation_unref(o); + + if (!volume_initialized) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] pa_stream_get_sink_input_info() failed: %s\n", pa_strerror(pa_context_errno(context))); + return CONTROL_ERROR; + } + + if (volume.channels != 2) + vol->left = vol->right = (int) ((pa_cvolume_avg(&volume)*100)/PA_VOLUME_NORM); + else { + vol->left = (int) (volume.values[0]*100)/PA_VOLUME_NORM; + vol->right = (int) (volume.values[1]*100)/PA_VOLUME_NORM; + } + + return CONTROL_OK; + } + + case AOCONTROL_SET_VOLUME: { + /* Set the playback volume of the stream */ + const ao_control_vol_t *vol = (ao_control_vol_t*) arg; + pa_operation *o; + + if (!volume_initialized) { + pa_cvolume_reset(&volume, 2); + volume_initialized = 1; + } + + if (volume.channels != 2) + pa_cvolume_set(&volume, volume.channels, ((pa_volume_t) vol->left*PA_VOLUME_NORM)/100); + else { + volume.values[0] = ((pa_volume_t) vol->left*PA_VOLUME_NORM)/100; + volume.values[1] = ((pa_volume_t) vol->right*PA_VOLUME_NORM)/100; + } + + if (!(o = pa_context_set_sink_input_volume(context, pa_stream_get_index(stream), &volume, NULL, NULL))) { + mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] pa_context_set_sink_input_volume() failed: %s\n", pa_strerror(pa_context_errno(context))); + return CONTROL_ERROR; + } + + pa_operation_unref(o); + + /* We don't wait for completion here */ + + return CONTROL_OK; + } + + default: + /* Unknown CONTROL command */ + return CONTROL_UNKNOWN; + } +} + --- mplayer-1.0~rc1.orig/libao2/audio_out.c +++ mplayer-1.0~rc1/libao2/audio_out.c @@ -25,8 +25,8 @@ #ifdef USE_ESD extern ao_functions_t audio_out_esd; #endif -#ifdef USE_POLYP -extern ao_functions_t audio_out_polyp; +#ifdef USE_PULSE +extern ao_functions_t audio_out_pulse; #endif #ifdef USE_JACK extern ao_functions_t audio_out_jack; @@ -109,8 +109,8 @@ #ifdef USE_ESD &audio_out_esd, #endif -#ifdef USE_POLYP - &audio_out_polyp, +#ifdef USE_PULSE + &audio_out_pulse, #endif #ifdef USE_JACK &audio_out_jack, --- mplayer-1.0~rc1.orig/help/help_mp-en.h +++ mplayer-1.0~rc1/help/help_mp-en.h @@ -679,6 +679,13 @@ #define MSGTR_InsertingAfVolume "[Mixer] No hardware mixing, inserting volume filter.\n" #define MSGTR_NoVolume "[Mixer] No volume control available.\n" +// gnome_screensaver.c +#define MSGTR_OpenBusConnectionError "%s: Failed to open connection to bus: %s\n" +#define MSGTR_RemoteMethodException "%s: Caught remote method exception %s: %s\n" +#define MSGTR_GError "%s: Error: %s\n" +#define MSGTR_GNOMEScreensaverEnabled "GNOME screensaver enabled\n" +#define MSGTR_GNOMEScreensaverDisabled "GNOME screensaver disabled\n" + // ====================== GUI messages/buttons ======================== #ifdef HAVE_NEW_GUI --- mplayer-1.0~rc1.orig/debian/README +++ mplayer-1.0~rc1/debian/README @@ -0,0 +1,16 @@ +Source managment of ubuntu package + +Short: go here: + +https://launchpad.net/products/mplayer/+branches + +In the past we used dpatch to handle the mplayer package. +nowadays, we handle the ubuntu package in bzr. Have a look +at https://launchpad.net/products/mplayer/+branches to see +the different branches, into which the former dpatches +where included. + +Please be careful when you update to 'upstream' branch. +Use the 'get-orig-source' target to clean the upstream tarballs. + +use bzr export to generate new orig.tar.gz --- mplayer-1.0~rc1.orig/debian/copyright +++ mplayer-1.0~rc1/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by Sebastian Dröge +Thu, 01 Dec 2005 20:40:19 +0100. + +It was downloaded from http://www.mplayerhq.hu + +Copyright Holders: + MPlayer is copyrighted by various authors. + They are all listed in the 'Copyright' file + +License: + + mplayer is free software; you can redistribute it and/or + modify it 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. + + mplayer 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 + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- mplayer-1.0~rc1.orig/debian/control +++ mplayer-1.0~rc1/debian/control @@ -0,0 +1,66 @@ +Source: mplayer +Section: graphics +Priority: extra +Maintainer: Ubuntu MOTU Media Team +Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 5.0.37), libncurses5-dev, libesd0-dev, liblircclient-dev, libgtk2.0-dev, libvorbis-dev, libsdl1.2-dev, sharutils, libasound2-dev (>= 1.0.1), liblzo-dev, gawk, libjpeg62-dev, libaudiofile-dev, libsmbclient-dev, libxv-dev, libpng3-dev, libungif4-dev, libcdparanoia0-dev, libxvidcore4-dev, libdv-dev, liblivemedia-dev (>= 2004.05.01), libfreetype6-dev, em8300-headers, libgl1-mesa-dev | libgl-dev, libdvdread-dev, libdts-dev, libtheora-dev, libglu1-mesa-dev | libglu-dev, libartsc0-dev, libfontconfig-dev, libxxf86dga-dev, libxinerama-dev, libxxf86vm-dev, liblame-dev, libxvmc-dev, libggi2-dev, ttf-bitstream-vera, libmpcdec-dev, libspeex-dev, libfribidi-dev, libfaac-dev, sed (>= 4.0), libaa1-dev, libcaca-dev, libx264-dev (>= 1:0.cvs20060720), libpulse-dev, libmad0-dev, ladspa-sdk, libdbus-glib-1-dev, libaudio-dev, dpatch +XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-dev/mplayer/ubuntu + +Package: mplayer +Architecture: any +Depends: ${shlibs:Depends}, ttf-bitstream-vera, mplayer-skins +Suggests: w32codecs, libdvdcss, mplayer-doc, ladspa-sdk +Conflicts: mplayer-nogui +Replaces: mplayer-nogui +Description: The Ultimate Movie Player For Linux + It plays most mpeg, avi and asf files, supported by many native and win32 + DLL codecs. You can watch VCD, DVD and even DivX movies too. The other + big feature of mplayer is the wide range of supported output drivers. It + works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and + this way all drivers of SDL) and some lowlevel card-specific drivers (for + Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, + so you can enjoy movies in fullscreen. + . + This version includes the Gtk GUI + +Package: mplayer-nogui +Architecture: any +Depends: ${shlibs:Depends}, ttf-bitstream-vera +Suggests: w32codecs, libdvdcss, mplayer-doc, ladspa-sdk +Conflicts: mplayer +Replaces: mplayer +Provides: mplayer +Description: The Ultimate Movie Player For Linux + It plays most mpeg, avi and asf files, supported by many native and win32 + DLL codecs. You can watch VCD, DVD and even DivX movies too. The other + big feature of mplayer is the wide range of supported output drivers. It + works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and + this way all drivers of SDL) and some lowlevel card-specific drivers (for + Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, + so you can enjoy movies in fullscreen. + . + This version comes with no GUI + +Package: mencoder +Architecture: any +Depends: ${shlibs:Depends} +Suggests: w32codecs, libdvdcss, mplayer-doc +Description: MPlayer's Movie Encoder + A simple movie encoder, designed to encode MPlayer-playable movies + (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other + MPlayer-playable formats. It can encode with various codecs, like DivX4 (1 + or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream copying and + video resizing abilities. + +Package: mplayer-doc +Architecture: all +Description: The Ultimate Movie Player For Linux (Documentation) + It plays most mpeg, avi and asf files, supported by many native and win32 + DLL codecs. You can watch VCD, DVD and even DivX movies too. The other + big feature of mplayer is the wide range of supported output drivers. It + works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, but you can use SDL (and + this way all drivers of SDL) and some lowlevel card-specific drivers (for + Matrox/3dfx/SiS) too! Most of them supports software or hardware scaling, + so you can enjoy movies in fullscreen. + . + This package contains the documentation for mplayer/mencoder --- mplayer-1.0~rc1.orig/debian/mplayer.examples +++ mplayer-1.0~rc1/debian/mplayer.examples @@ -0,0 +1 @@ +TOOLS/* --- mplayer-1.0~rc1.orig/debian/compat +++ mplayer-1.0~rc1/debian/compat @@ -0,0 +1 @@ +5 --- mplayer-1.0~rc1.orig/debian/mplayer.preinst +++ mplayer-1.0~rc1/debian/mplayer.preinst @@ -0,0 +1,40 @@ +#!/bin/sh + +set -e + +# Remove a no-longer used conffile +rm_conffile() { + CONFFILE="$1" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE '{s/ obsolete$//;s/.* //;p}}\" /var/lib/dpkg/status`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +case "$1" in + install|upgrade) + if dpkg --compare-versions "$2" le "2:0.99+1.0pre8-0ubuntu5"; then + rm_conffile "/etc/mplayer/codecs.conf" + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + --- mplayer-1.0~rc1.orig/debian/patches/00list +++ mplayer-1.0~rc1/debian/patches/00list @@ -0,0 +1,2 @@ +01_default_config.dpatch + --- mplayer-1.0~rc1.orig/debian/patches/01_default_config.dpatch +++ mplayer-1.0~rc1/debian/patches/01_default_config.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_default_config.dpatch by Mario Limonciello +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enable xv as default output rather than xmga +## DP: Also make sure to stop screen saver if it is running. + +@DPATCH@ +diff -urNad mplayer-1.0~rc1~/etc/example.conf mplayer-1.0~rc1/etc/example.conf +--- mplayer-1.0~rc1~/etc/example.conf 2007-10-08 00:56:12.000000000 -0500 ++++ mplayer-1.0~rc1/etc/example.conf 2007-10-08 01:13:07.000000000 -0500 +@@ -17,7 +17,7 @@ + ################## + + # Specify default video driver (see -vo help for a list). +-#vo=xv ++vo=xv + + # Use SDL video with the aalib subdriver by default. + #vo = sdl:aalib +@@ -124,3 +124,7 @@ + + # You can also include other configuration files. + #include = /path/to/the/file/you/want/to/include ++ ++#Screensaver support (for non gmplayer) ++stop-xscreensaver = "yes" ++ --- mplayer-1.0~rc1.orig/debian/mplayer-nogui.preinst +++ mplayer-1.0~rc1/debian/mplayer-nogui.preinst @@ -0,0 +1,40 @@ +#!/bin/sh + +set -e + +# Remove a no-longer used conffile +rm_conffile() { + CONFFILE="$1" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE '{s/ obsolete$//;s/.* //;p}}\" /var/lib/dpkg/status`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +case "$1" in + install|upgrade) + if dpkg --compare-versions "$2" le "2:0.99+1.0pre8-0ubuntu5"; then + rm_conffile "/etc/mplayer/codecs.conf" + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + --- mplayer-1.0~rc1.orig/debian/changelog +++ mplayer-1.0~rc1/debian/changelog @@ -0,0 +1,356 @@ +mplayer (2:1.0~rc1-0ubuntu13) gutsy; urgency=low + + * 01_default_config.dpatch: Fix typo that prevent the screensaver to be + disabled (LP: #152080) + + -- Laurent Bigonville Sat, 13 Oct 2007 14:28:11 +0200 + +mplayer (2:1.0~rc1-0ubuntu12) gutsy; urgency=low + + * Add 01_default_config.dpatch. + - Sets screensaver by default for non gmplayer. + (LP: #95038), (LP: #139770) + - Sets xv as video output for gmplayer and mplayer. + (LP: #65165), (LP: #146307) + * Add dpatch to build-depends in debian/control. + * Add dpatch support to debian/rules. + + -- Mario Limonciello Mon, 08 Oct 2007 01:07:53 -0500 + +mplayer (2:1.0~rc1-0ubuntu11) gutsy; urgency=low + + * Added Network Audio System (NAS) support (LP: #110151) + + -- Alfredo Matos Thu, 07 Jun 2007 21:53:04 +0100 + +mplayer (2:1.0~rc1-0ubuntu10) gutsy; urgency=low + + * SECURITY UPDATE: Upstream fix for CVE 2007-2948. Fixes a buffer overrun in + the cddb code. (LP: #118855) + + -- William Grant Wed, 06 Jun 2007 17:22:22 +1000 + +mplayer (2:1.0~rc1-0ubuntu9) feisty; urgency=low + + * Rebuild to get correct version of libdirectfb + * Modified Maintainer value to match Debian-Maintainer-Field Spec + + -- Sarah Hobbs Mon, 9 Apr 2007 21:55:23 +1000 + +mplayer (2:1.0~rc1-0ubuntu8) feisty; urgency=low + + * Fix some formatting in our patches. + * etc/examples.conf: + - Add ac=mad, to use libmad as first choice. + * debian/rules: + - Reenable mp3lib again... *sigh* + + -- Christian Bjälevik Mon, 12 Mar 2007 03:42:49 +0100 + +mplayer (2:1.0~rc1-0ubuntu7) feisty; urgency=low + + [ Christian Bjälevik ] + * debian/rules: + - Add --disable-mp3lib to actually disable the damn thing. + * DOCS/man/en/mplayer.1: + - Remove documentation about -vo aa:help (LP: #43301). + * Various files (see bzr diff for info): + - Apply patch taken from Mandriva CVS (LP: #53947) + to use dbus for disabling gnome-screensaver. + + [ William Grant ] + * Enable LADSPA (LP: #67400) + - Add ladspa-sdk to Build-Depends. + + -- Christian Bjälevik Sun, 11 Mar 2007 05:43:02 +0100 + +mplayer (2:1.0~rc1-0ubuntu6) feisty; urgency=low + + * debian/rules: + - Disable mp3lib and enable mad (LP: #85751). + * debian/control: + - Add libmad0-dev to Build-Deps. + + -- Christian Bjälevik Sat, 10 Mar 2007 11:05:40 +0100 + +mplayer (2:1.0~rc1-0ubuntu5) feisty; urgency=low + + * SECURITY UPDATE: DirectShow decoder heap overflow. + * loader/dshow/DS_VideoDecoder.c: added upstream fix. + * References + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=414072 + + -- Kees Cook Fri, 9 Mar 2007 08:52:34 -0800 + +mplayer (2:1.0~rc1-0ubuntu4) feisty; urgency=low + + * SECURITY UPDATE: DMO decoder heap overflow. + * loader/dmo/DMO_VideoDecoder.c: added upstream fix. + * References + http://svn.mplayerhq.hu/mplayer/trunk/loader/dmo/DMO_VideoDecoder.c?r1=22019&r2=22204 + CVE-2007-1246 + + -- Kees Cook Tue, 6 Mar 2007 15:21:26 -0800 + +mplayer (2:1.0~rc1-0ubuntu3) feisty; urgency=low + + * debian/rules: + - Add --enable-mp3lib to CONFIGURE_AUDIO_CODECS (LP: #83580). + - Remove --disable-mp3lib. This one took some time to find. + + -- Christian Bjälevik Tue, 6 Feb 2007 19:47:34 +0100 + +mplayer (2:1.0~rc1-0ubuntu2) feisty; urgency=low + + * debian/rules: + - Add --enable-libvorbis to CONFIGURE_AUDIO_CODECS. + * debian/{compat,control}: + - Bump Standard-Versions and debhelper >=. + * Applied patch from: http://0pointer.de/public/mplayer-pulse.patch + and adapted it for our current mplayer. Closes: #83493. + * debian/{control,rules} + - Add Build-Deps on libpulse-dev and --enable-pulse. + + -- Christian Bjälevik Tue, 6 Feb 2007 07:19:34 +0100 + +mplayer (2:1.0~rc1-0ubuntu1) feisty; urgency=low + + * New upstream version. + * Apply RTSP buffer overflow fix patch from upstream. + * Remove --enable-{vorbis,x264} and s/internal-tremor/tremor-internal/ in + debian/rules. The defaults are detected properly, and forcing x264 now + causes it to FTBFS. + * Remove DOCS/it from dh_installdocs. Aforementioned directory no longer + exists. + + -- William Grant Sun, 4 Feb 2007 15:04:46 +1100 + +mplayer (2:0.99+1.0pre8-0ubuntu8) edgy; urgency=low + + * No-change rebuild against newer libx264-dev (affects + Ubuntu: #63842), + - RC freeze exception granted by Andrew Mitchell. + + -- Daniel T Chen Thu, 12 Oct 2006 17:07:36 -0400 + +mplayer (2:0.99+1.0pre8-0ubuntu7) edgy; urgency=low + + * libvo/osd_template.c: + - Add patch from Ubuntu #62209 to fix AMD64 FTBFS. + Thanks Andreas Schultz. + + -- Christian Bjälevik Tue, 26 Sep 2006 15:15:27 +0200 + +mplayer (2:0.99+1.0pre8-0ubuntu6) edgy; urgency=low + + * debian/preinst: + - Remove codecs.conf if it exists on the system + (thanks Johan Kiviniemi). + + -- Christian Bjälevik Fri, 22 Sep 2006 20:45:08 +0200 + +mplayer (2:0.99+1.0pre8-0ubuntu5) edgy; urgency=low + + * configure: + - Revert "if cygwin", we don't want to care changes like that. + * etc/example.conf: + - Revert vo and make "ao=alsa,". That means prefer alsa and + then auto-detect the rest. + * libmpcodecs/ve_lavc.c: + - Revert our changes. We build against internal ffmpeg again. + * debian/control: + - Dropped dpatch and libmad0-dev as Build-Deps. + - Drop all dummy packages and fix Conflicts/Replaces. + - Dropped the field Uploaders. Useless for Ubuntu. + - Dropped libavcodec-dev, libavformat-dev, libpostproc-dev + from Build-Deps. + * debian/rules: + - Stop copying config.{guess,sub}, this just add bloat to the + diff. + - Use --with-codecsdir instead of setting the same for win32, + xanim and real. Also drop --enable-{win32,real}, they are + implied by --with-codecsdir and enabled on all arches now. + - Drop defaults (--datadir and --disable-external-faad). + - Dropped libmad, the other two mp3-decoders should be enough. + - --enable-dshow was dropped upstream. + - Stop installing codecs.conf. + - Build against internal ffmpeg. + + -- Christian Bjälevik Thu, 21 Sep 2006 14:18:44 +0200 + +mplayer (2:0.99+1.0pre8-0ubuntu4) edgy; urgency=low + + * debian/control, + debian/rules: + + Use the system's libavcodec, libavformat and libpostproc + * debian/rules: + + Add hack to enable more runtime-detected CPU optimizations on i386 + * debian/control: + + Build-Depend on libx264-dev (>= 1:0.cvs20060720) to get a compatible + version + * debian/rules: + + disable internal mp3lib. This will enable mad or ffmpeg as + replacement (Ubuntu: #52729) + * libmpcodecs/ve_lavc.c: + + remove stuff that uses a newer libavcodec API than we have + * libmpcodecs/ve_x264.c: + + fix from upstream svn to build against our latest libx264 + + -- Sebastian Dröge Sun, 23 Jul 2006 13:33:53 +0200 + +mplayer (2:0.99+1.0pre8-0ubuntu3) edgy; urgency=low + + * Remove a broken newline in debian/rules to really build with i586 as + target + + -- Sebastian Dröge Sat, 8 Jul 2006 19:50:53 +0200 + +mplayer (2:0.99+1.0pre8-0ubuntu2) edgy; urgency=low + + * Don't use --enable-vidix on powerpc. This parameter doesn't exist anymore + + -- Sebastian Dröge Sat, 8 Jul 2006 19:28:42 +0200 + +mplayer (2:0.99+1.0pre8-0ubuntu1) edgy; urgency=low + + * converted to bzr + * dropped dpatch, converted them all to bzr branches + * remerged all missing branches, except 57_demuxer_heap_overflow, + which has been merged upstream + * revert nsv-support patch, due to syntax error in codecs.conf + + -- Reinhard Tartler Sat, 8 Jul 2006 15:05:34 +0200 + +mplayer (2:0.99+1.0pre8-0ubuntu0) UNRELEASED; urgency=low + + * unreleased testversion + * new upstream version + + far too many changes to list here + * disabled dpatches temporarily: + -04_ubuntu-branding.dpatch + -57_demuxer_heap_overflow + -06_close_gracefully.dpatch + + -- Reinhard Tartler Sat, 8 Jul 2006 12:03:40 +0200 + +mplayer (2:0.99+1.0pre7try2+cvs20060117-0ubuntu8) dapper; urgency=low + + * 07_hig-compliant-desktop-file.dpatch: + - Use a more HIG compliant name for mplayer in the .desktop file. + Thanks to Matthew East for the patch (Ubuntu: #38205) + * 08_nsv-support.dpatch: + - Add support for specific NSV files. Thanks to Dana Olson for the patch. + (Ubuntu: #44831) + + -- Sebastian Dröge Mon, 15 May 2006 22:22:34 +0200 + +mplayer (2:0.99+1.0pre7try2+cvs20060117-0ubuntu7) dapper; urgency=low + + * debian/patches/06_close_gracefully.dpatch: + + Close gracefully when closing the mplayer window (Ubuntu: #38737) + + -- Sebastian Dröge Wed, 10 May 2006 16:04:56 +0200 + +mplayer (2:0.99+1.0pre7try2+cvs20060117-0ubuntu6) dapper; urgency=low + + * add libx264-dev to builddeps and activate that in debian rules + Thanks to Yagisan (Closes: M#31519) + * disable external faad (Closes: M#33828) + * add some of the script which upstream distributs in TOOLS/ to + /usr/share/doc/mplayer/examples. Please report bugs if you want + additional scripts added there. + + -- Reinhard Tartler Sat, 25 Mar 2006 19:14:02 +0100 + +mplayer (2:0.99+1.0pre7try2+cvs20060117-0ubuntu5) dapper; urgency=low + + * [SECURITY]: Fix heap overflow in libmpdemux/demuxer.h. Patch + retrieved from upstream CVS courtesy of Dennis Kaarsemaker. + * References + - CVE-2006-0579 + - http://bugs.gentoo.org/show_bug.cgi?id=122029 + + -- Daniel T Chen Sat, 25 Feb 2006 23:19:46 -0800 + +mplayer (2:0.99+1.0pre7try2+cvs20060117-0ubuntu4) dapper; urgency=low + + * added 05_gnome-screensaver-handling.dpatch to add support for + gnome-screensaver to the -stop-xscreensaver option + + -- Oliver Grawert Sat, 25 Feb 2006 20:52:36 +0100 + +mplayer (2:0.99+1.0pre7try2+cvs20060117-0ubuntu3) dapper; urgency=low + + * Add support for real codecs on powerpc (Closes Malone: #29190) + + -- Sebastian Dröge Sat, 18 Feb 2006 11:05:18 +0100 + +mplayer (2:0.99+1.0pre7try2+cvs20060117-0ubuntu2) dapper; urgency=low + + * enable libaa and libcaca support + - enable in debian/rules + - fix configure to link mplayer with -laa (update 03_fix-linking.dpatch) + + -- Reinhard Tartler Tue, 24 Jan 2006 01:31:46 +0100 + +mplayer (2:0.99+1.0pre7try2+cvs20060117-0ubuntu1) dapper; urgency=low + + * New CVS snapshot + * Improved Ubuntu branding by using the version from the changelog instead + of the default "dev-CVS--Ubuntu-4.0.3" + + -- Sebastian Dröge Tue, 17 Jan 2006 08:21:48 +0100 + +mplayer (2:0.99+1.0pre7try2+cvs20051205-0ubuntu7) dapper; urgency=low + + * Revert last change... I see no way how win32 support could ever work with + a 64bit binary on amd64 but when someone has a patch to enable it please + send it to me + + -- Sebastian Dröge Fri, 9 Dec 2005 17:50:36 +0100 + +mplayer (2:0.99+1.0pre7try2+cvs20051205-0ubuntu6) dapper; urgency=low + + * Enable win32 support for amd64 (thanks fabbione) :) + + -- Sebastian Dröge Thu, 8 Dec 2005 23:04:07 +0100 + +mplayer (2:0.99+1.0pre7try2+cvs20051205-0ubuntu5) dapper; urgency=low + + * Don't install the mencoder manpage in the mplayer package to prevent a + conflict + + -- Sebastian Dröge Thu, 8 Dec 2005 19:35:18 +0100 + +mplayer (2:0.99+1.0pre7try2+cvs20051205-0ubuntu4) dapper; urgency=low + + * Don't install .libdeps in examples + * Install {input,codecs,menu}.conf to /etc/mplayer where we had them before + + -- Sebastian Dröge Thu, 8 Dec 2005 19:15:39 +0100 + +mplayer (2:0.99+1.0pre7try2+cvs20051205-0ubuntu3) dapper; urgency=low + + * Stop having mplayer conflict with the mplayer-$arch transitional + packages, so the transition can actually happen correctly. + + -- Adam Conrad Thu, 8 Dec 2005 15:43:58 +1100 + +mplayer (2:0.99+1.0pre7try2+cvs20051205-0ubuntu2) dapper; urgency=low + + * Add dummy packages for the mplayer-$arch packages we had before + * Patch away the CPU runtime detection warning + + -- Sebastian Dröge Wed, 7 Dec 2005 15:39:24 +0100 + +mplayer (2:0.99+1.0pre7try2+cvs20051205-0ubuntu1) dapper; urgency=low + + * Initial release. + * Completly repackaged + * Based on ffmpeg/mplayer CVS 2005-12-05 + * debian/patches/01_configure.dpatch: fixes live.com bulding. + the patch is taken from Marillat's mplayer package + * debian/patches/02_mplayer.conf.dpatch: use a better suited config for + ubuntu + + -- Sebastian Dröge Wed, 05 Dec 2005 14:43:37 +0100 --- mplayer-1.0~rc1.orig/debian/rules +++ mplayer-1.0~rc1/debian/rules @@ -0,0 +1,213 @@ +#!/usr/bin/make -f +#-*- makefile -*- + +include /usr/share/dpatch/dpatch.make + +#export DH_VERBOSE=1 + +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) + +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +ifeq "$(DEB_BUILD_ARCH)" "i386" + CONFIGURE_ARCH = --target=i586-linux +else +ifeq "$(DEB_BUILD_ARCH)" "powerpc" + CONFIGURE_ARCH = --enable-altivec +else +ifeq "$(DEB_BUILD_ARCH)" "amd64" + CONFIGURE_ARCH = +endif +endif +endif + +CONFIGURE_PATH := --prefix=/usr --confdir=/etc/mplayer --mandir=/usr/share/man --with-codecsdir=/usr/lib/win32 +CONFIGURE_COMMON := --enable-runtime-cpudetection --enable-largefiles +CONFIGURE_INPUT := --disable-mpdvdkit --enable-dvdread --enable-smb --enable-live --enable-ftp --enable-cdparanoia +CONFIGURE_CONTROL := --enable-lirc --enable-joystick --enable-xf86keysym +CONFIGURE_AUDIO_CODECS := --disable-tremor-internal --enable-liba52 --enable-libdts --enable-musepack --enable-faac --enable-speex --enable-libvorbis --enable-mad --enable-mp3lib +CONFIGURE_VIDEO_CODECS := --enable-xvid --enable-libavcodec --enable-libavformat --enable-theora --enable-libdv --enable-libmpeg2 --enable-tv-v4l2 +CONFIGURE_AUDIO_OUT := --enable-alsa --enable-ossaudio --enable-esd --enable-arts --enable-pulse --enable-nas +CONFIGURE_VIDEO_OUT := --enable-xinerama --enable-menu --enable-xv --enable-vm --enable-gl --enable-xmga --enable-mga --enable-3dfx --enable-tdfxfb --enable-sdl --enable-aa --enable-caca --enable-dxr3 --enable-xvmc --with-xvmclib=XvMCW --enable-ggi --enable-fbdev +CONFIGURE_MISC := --enable-freetype --enable-fontconfig --enable-gif --enable-png --enable-jpeg --enable-liblzo --enable-fribidi --enable-ladspa + +CONFIGURE_ALL := $(CONFIGURE_ARCH) $(CONFIGURE_PATH) $(CONFIGURE_COMMON) $(CONFIGURE_INPUT) $(CONFIGURE_CONTROL) $(CONFIGURE_AUDIO_CODECS) $(CONFIGURE_VIDEO_CODECS) $(CONFIGURE_AUDIO_OUT) $(CONFIGURE_VIDEO_OUT) $(CONFIGURE_MISC) + + +modify-config: +ifeq "$(DEB_BUILD_ARCH)" "i386" + sed -i 's;#undef HAVE_3DNOW;#define HAVE_3DNOW 1;g' config.h + sed -i 's;#undef HAVE_3DNOWEX;#define HAVE_3DNOWEX 1;g' config.h + sed -i 's;#undef HAVE_MMX;#define HAVE_MMX 1;g' config.h + sed -i 's;#undef HAVE_MMX2;#define HAVE_MMX2 1;g' config.h + sed -i 's;#undef HAVE_SSE;#define HAVE_SSE 1;g' config.h + sed -i 's;#undef HAVE_SSE2;#define HAVE_SSE2 1;g' config.h + sed -i 's;#undef HAVE_BUILTIN_VECTOR;#define HAVE_BUILTIN_VECTOR 1;g' config.h + sed -i 's;#undef HAVE_MM3DNOW;#define HAVE_MM3DNOW 1;g' config.h + sed -i '/TARGET_MMX =/d' config.mak + echo 'TARGET_MMX = yes' >> config.mak + sed -i '/TARGET_MMX2 =/d' config.mak + echo 'TARGET_MMX2 = yes' >> config.mak + sed -i '/TARGET_SSE =/d' config.mak + echo 'TARGET_SSE = yes' >> config.mak + sed -i '/TARGET_SSE2 =/d' config.mak + echo 'TARGET_SSE2 = yes' >> config.mak + sed -i '/TARGET_3DNOW =/d' config.mak + echo 'TARGET_3DNOW = yes' >> config.mak + sed -i '/TARGET_3DNOWEX =/d' config.mak + echo 'TARGET_3DNOWEX = yes' >> config.mak + sed -i '/TARGET_BUILTIN_VECTOR =/d' config.mak + echo 'TARGET_BUILTIN_VECTOR = yes' >> config.mak + sed -i '/TARGET_BUILTIN_3DNOW =/d' config.mak + echo 'TARGET_BUILTIN_3DNOW = yes' >> config.mak +endif + +build: patch-stamp + +build-gui: build-gui-stamp +build-gui-stamp: + dh_testdir + if test -f build-nogui-stamp; then \ + $(MAKE) distclean; \ + rm -f build-nogui-stamp; \ + fi + ./configure $(CONFIGURE_ALL) --enable-gui --enable-mencoder + $(MAKE) -f debian/rules modify-config + $(MAKE) + touch build-gui-stamp + +build-nogui: build-nogui-stamp +build-nogui-stamp: + dh_testdir + if test -f build-gui-stamp; then \ + $(MAKE) distclean; \ + rm -f build-gui-stamp; \ + fi + ./configure $(CONFIGURE_ALL) --disable-gui --disable-mencoder + $(MAKE) -f debian/rules modify-config + $(MAKE) + touch build-nogui-stamp + +install: + dh_testdir + dh_testroot + dh_clean -k + $(MAKE) -f debian/rules install-gui + $(MAKE) -f debian/rules install-nogui + +install-gui: build-gui + dh_installdirs -pmplayer + $(MAKE) install DESTDIR=$(CURDIR)/debian/mplayer + + dh_link -pmplayer usr/bin/mplayer usr/bin/gmplayer + dh_link -pmplayer usr/share/man/man1/mplayer.1.gz usr/share/man/man1/gmplayer.1.gz + dh_link -pmplayer usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf usr/share/mplayer/subfont.ttf + cp etc/example.conf etc/mplayer.conf + dh_install -pmplayer etc/mplayer.conf etc/mplayer + rm -f etc/mplayer.conf + dh_install -pmplayer etc/input.conf etc/mplayer + dh_install -pmplayer etc/menu.conf etc/mplayer + dh_installexamples -pmplayer -X.libdeps etc + dh_install -pmplayer + + #remove mencoder manpage link to prevent conflict with the mencoder package + rm debian/mplayer/usr/share/man/man1/mencoder.1 + + #split off mencoder package + mkdir -p debian/mencoder/usr/bin + mv debian/mplayer/usr/bin/mencoder debian/mencoder/usr/bin + mkdir -p debian/mencoder/usr/share/man/man1 + cp debian/mplayer/usr/share/man/man1/mplayer.1 debian/mencoder/usr/share/man/man1/mencoder.1 + +install-nogui: build-nogui + dh_installdirs -pmplayer-nogui + $(MAKE) install DESTDIR=$(CURDIR)/debian/mplayer-nogui + dh_link -pmplayer-nogui usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf usr/share/mplayer/subfont.ttf + cp etc/example.conf etc/mplayer.conf + dh_install -pmplayer-nogui etc/mplayer.conf etc/mplayer + rm -f etc/mplayer.conf + dh_install -pmplayer-nogui etc/input.conf etc/mplayer + dh_install -pmplayer-nogui etc/menu.conf etc/mplayer + dh_installexamples -pmplayer-nogui -X.libdeps etc + dh_install -pmplayer-nogui + +clean:: + dh_testdir + dh_testroot + -$(MAKE) distclean + -rm -f build-nogui-stamp build-gui-stamp + # additional cleanups + -rm config.mak version.h libaf/config.mak libao2/config.mak libvo/config.mak Gui/config.mak + dh_clean + +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installdocs -pmplayer-doc Copyright DOCS/HTML DOCS/tech DOCS/zh + dh_installchangelogs + dh_compress + dh_link + dh_fixperms + dh_strip + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-arch: DH_OPTIONS=-a +binary-arch: build install + dh_testdir + dh_testroot + dh_install + dh_installdocs -A Copyright + dh_installmenu + dh_installmime + dh_installman + dh_installchangelogs ChangeLog + dh_desktop + dh_compress + dh_link + dh_fixperms + dh_strip + dh_perl + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +#greatly inspired by the mplayer package of Dariush Pietrzak +UPVERSION := 1.0pre7try2 +DEBIANVERSION := 0.99+1.0pre7try2 +UPVERSIONNAME := MPlayer-$(UPVERSION) +UPVERSIONURL := http://www1.mplayerhq.hu/MPlayer/releases/$(UPVERSIONNAME).tar.bz2 +get-orig-source: + mkdir tmp + ### download file, or link it if available + if [ -r $(M).tar.bz2 ] ; then ln -s ../$(UPVERSIONNAME).tar.bz2 tmp/. ; else \ + cd tmp && wget $(UPVERSIONURL) ; fi + cd tmp && tar xjf $(UPVERSIONNAME).tar.bz2 && rm $(UPVERSIONAME).tar.bz2 + #according to the README, this file should be there + cp -v /usr/share/doc/libjpeg62/README.gz tmp/$(UPVERSIONNAME)/libavcodec/README.jfdct.gz + + # this contains the dreaded libdvdcss code. We can live without, by + # using libdvdread3 (and the optional library installed by + # /usr/share/doc/libdvdread3/examples/install-css.sh :-) + cd tmp/$(UPVERSIONNAME) && rm -r libmpdvdkit2 + # Well this may seem a bit excessive... but this code is not useful + # for building the package, and most of it does not correctly state + # author-license-copyright : so I throw out the baby and the bath... + # When and if someone needs this stuff, I will carefully scrutinize + # it and add what is suitable + cd tmp/$(UPVERSIONNAME) && rm -r TOOLS + # move the upstream debian dir out of the way + cd tmp/$(UPVERSIONNAME) && mv debian debian_upstream + # ok lets repackage + cd tmp && mv $(UPVERSIONNAME) mplayer-$(DEBIANVERSION) && tar czf mplayer_$(DEBIANVERSION).orig.tar.gz mplayer-$(DEBIANVERSION) && mv mplayer_$(DEBIANVERSION).orig.tar.gz .. && rm -r mplayer-$(DEBIANVERSION) + rmdir tmp + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary --- mplayer-1.0~rc1.orig/Makefile +++ mplayer-1.0~rc1/Makefile @@ -75,6 +75,7 @@ $(DIRECTFB_LIB) \ $(CACA_LIB) \ $(VESA_LIB) \ + $(DBUS_GLIB_LIB) \ ifeq ($(VIDIX),yes) VO_LIBS += vidix/libvidix.a @@ -89,7 +90,7 @@ $(OPENAL_LIB) \ $(NAS_LIB) \ $(SGIAUDIO_LIB) \ - $(POLYP_LIB) \ + $(PULSE_LIB) \ CODEC_LIBS = $(AV_LIB) \ $(FAME_LIB) \ --- mplayer-1.0~rc1.orig/stream/realrtsp/asmrp.c +++ mplayer-1.0~rc1/stream/realrtsp/asmrp.c @@ -40,6 +40,7 @@ #include #include #include +#include "asmrp.h" /* #define LOG @@ -645,8 +646,10 @@ #ifdef LOG printf ("rule #%d is true\n", rule_num); #endif - matches[num_matches] = rule_num; - num_matches++; + if(num_matches < MAX_RULEMATCHES - 1) + matches[num_matches++] = rule_num; + else + printf("Ignoring matched asm rule %d, too many matched rules.\n", rule_num); } rule_num++; --- mplayer-1.0~rc1.orig/stream/realrtsp/real.c +++ mplayer-1.0~rc1/stream/realrtsp/real.c @@ -271,7 +271,7 @@ int j=0; int n; char b[64]; - int rulematches[16]; + int rulematches[MAX_RULEMATCHES]; #ifdef LOG printf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth); --- mplayer-1.0~rc1.orig/stream/realrtsp/asmrp.h +++ mplayer-1.0~rc1/stream/realrtsp/asmrp.h @@ -40,6 +40,8 @@ #ifndef HAVE_ASMRP_H #define HAVE_ASMRP_H +#define MAX_RULEMATCHES 16 + int asmrp_match (const char *rules, int bandwidth, int *matches) ; #endif --- mplayer-1.0~rc1.orig/stream/stream_cddb.c +++ mplayer-1.0~rc1/stream/stream_cddb.c @@ -435,7 +435,7 @@ switch(status) { case 210: - ret = sscanf( http_hdr->body, "%d %s %08lx", &status, category, &disc_id); + ret = sscanf( http_hdr->body, "%d %99s %08lx", &status, category, &disc_id); if( ret!=3 ) { mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError); return -1; @@ -496,7 +496,7 @@ ptr++; // We have a list of exact/inexact matches, so which one do we use? // So let's take the first one. - ret = sscanf(ptr, "%s %08lx %s", cddb_data->category, &(cddb_data->disc_id), album_title); + ret = sscanf(ptr, "%99s %08lx %99s", cddb_data->category, &(cddb_data->disc_id), album_title); if( ret!=3 ) { mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError); return -1; @@ -533,7 +533,7 @@ switch(status) { case 200: // Found exact match - ret = sscanf(http_hdr->body, "%d %s %08lx %s", &status, cddb_data->category, &(cddb_data->disc_id), album_title); + ret = sscanf(http_hdr->body, "%d %99s %08lx %99s", &status, cddb_data->category, &(cddb_data->disc_id), album_title); if( ret!=4 ) { mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError); return -1; --- mplayer-1.0~rc1.orig/version.sh +++ mplayer-1.0~rc1/version.sh @@ -1,2 +1,2 @@ #!/bin/sh -echo "#define VERSION \"1.0rc1-$1\"" > version.h +echo "#define VERSION \"`dpkg-parsechangelog | grep ^Version: | cut -d' ' -f 2`\"" >version.h --- mplayer-1.0~rc1.orig/configure +++ mplayer-1.0~rc1/configure @@ -257,6 +257,7 @@ --disable-ftp Disable ftp support [enabled] --disable-vstream Disable tivo vstream client support [autodetect] --disable-pthreads Disable Posix threads support [autodetect] + --disable-dbus-glib Disable D-BUS GLib interface (required for GNOME screensaver support) [autodetect] --disable-ass Disable internal SSA/ASS subtitles support [autodetect] --enable-rpath Enable runtime linker path for extra libs [disabled] @@ -365,7 +366,7 @@ --disable-ossaudio disable OSS sound support [autodetect] --disable-arts disable aRts sound support [autodetect] --disable-esd disable esd sound support [autodetect] - --disable-polyp disable Polypaudio sound support [autodetect] + --disable-pulse disable PulseAudio sound support [autodetect] --disable-jack disable JACK sound support [autodetect] --disable-openal disable OpenAL sound support [autodetect] --disable-nas disable NAS sound support [autodetect] @@ -1609,7 +1610,7 @@ _ossaudio=auto _arts=auto _esd=auto -_polyp=auto +_pulse=auto _jack=auto _openal=auto _libcdio=auto @@ -1721,6 +1722,7 @@ _musepack=auto _vstream=auto _pthreads=auto +_dbus_glib=auto _ass=auto _rpath=no _asmalign_pot=auto @@ -1821,8 +1823,8 @@ --disable-arts) _arts=no ;; --enable-esd) _esd=yes ;; --disable-esd) _esd=no ;; - --enable-polyp) _polyp=yes ;; - --disable-polyp) _polyp=no ;; + --enable-pulse) _pulse=yes ;; + --disable-pulse) _pulse=no ;; --enable-jack) _jack=yes ;; --disable-jack) _jack=no ;; --enable-openal) _openal=yes ;; @@ -2033,6 +2035,8 @@ --disable-vstream) _vstream=no ;; --enable-pthreads) _pthreads=yes ;; --disable-pthreads) _pthreads=no ;; + --enable-dbus-glib) _dbus_glib=yes ;; + --disable-dbus-glib) _dbus_glib=no ;; --enable-ass) _ass=yes ;; --disable-ass) _ass=no ;; --enable-rpath) _rpath=yes ;; @@ -4880,32 +4884,30 @@ _noaomodules="esd $_noaomodules" fi -echocheck "Polyp" -if test "$_polyp" = auto ; then - _polyp=no - if pkg-config --exists 'polyplib >= 0.6 polyplib-error >= 0.6 polyplib-mainloop >= 0.6' ; then +echocheck "pulse" +if test "$_pulse" = auto ; then + _pulse=no + if pkg-config --exists 'pulse >= 0.9' ; then cat > $TMPC << EOF -#include -#include -#include +#include int main(void) { return 0; } EOF -cc_check `pkg-config --libs --cflags polyplib polyplib-error polyplib-mainloop` && tmp_run && _polyp=yes +cc_check `pkg-config --libs --cflags libpulse` && tmp_run && _pulse=yes fi fi -echores "$_polyp" +echores "$_pulse" -if test "$_polyp" = yes ; then - _def_polyp='#define USE_POLYP 1' - _aosrc="$_aosrc ao_polyp.c" - _aomodules="polyp $_aomodules" - _ld_polyp=`pkg-config --libs polyplib polyplib-error polyplib-mainloop` - _inc_extra="$_inc_extra `pkg-config --cflags polyplib polyplib-error polyplib-mainloop`" +if test "$_pulse" = yes ; then + _def_pulse='#define USE_PULSE 1' + _aosrc="$_aosrc ao_pulse.c" + _aomodules="pulse $_aomodules" + _ld_pulse=`pkg-config --libs libpulse` + _inc_extra="$_inc_extra `pkg-config --cflags libpulse`" else - _def_polyp='#undef USE_POLYP' - _noaomodules="polyp $_noaomodules" + _def_pulse='#undef USE_PULSE' + _noaomodules="pulse $_noaomodules" fi @@ -5428,6 +5430,7 @@ else _def_fontconfig='#undef HAVE_FONTCONFIG' fi +_ld_fontconfig="-lfontconfig" echores "$_fontconfig" @@ -5860,6 +5863,7 @@ _def_faac="#define HAVE_FAAC 1" _def_lavc_faac="#define CONFIG_FAAC 1" _codecmodules="faac $_codecmodules" + _ld_faac="-lfaac -lmp4v2 -lstdc++" else _def_faac="#undef HAVE_FAAC" _nocodecmodules="faac $_nocodecmodules" @@ -6086,15 +6090,15 @@ if test "$_live" = yes && test "$_network" = yes ; then _res_comment="using $_livelibdir" _def_live='#define STREAMING_LIVE555 1' - _ld_live="$_livelibdir/liveMedia/libliveMedia.a \ - $_livelibdir/groupsock/libgroupsock.a \ - $_livelibdir/UsageEnvironment/libUsageEnvironment.a \ - $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \ + _ld_live="/usr/lib/libliveMedia.a \ + /usr/lib/libgroupsock.a \ + /usr/lib/libUsageEnvironment.a \ + /usr/lib/libBasicUsageEnvironment.a \ -lstdc++" - _inc_extra="$_inc_extra -I$_livelibdir/liveMedia/include \ - -I$_livelibdir/UsageEnvironment/include \ - -I$_livelibdir/BasicUsageEnvironment/include \ - -I$_livelibdir/groupsock/include" + _inc_extra="$_inc_extra -I/usr/include/liveMedia \ + -I/usr/include/UsageEnvironment \ + -I/usr/include/BasicUsageEnvironment \ + -I/usr/include/groupsock" _inputmodules="live555 $_inputmodules" elif test "$_live_dist" = yes && test "$_network" = yes ; then _res_comment="using distribution version" @@ -7030,6 +7034,24 @@ echores "$_gethostbyname2" +echocheck "D-BUS GLib interface" +if test "$_dbus_glib" = auto && pkg-config --exists dbus-glib-1; then + _dbus_glib=yes + _inc_dbus_glib=`pkg-config --cflags dbus-glib-1 2>/dev/null` + _ld_dbus_glib=`pkg-config --libs dbus-glib-1 2>/dev/null` +fi + +if test "$_dbus_glib" = yes; then + _def_dbus_glib='#define HAVE_DBUS_GLIB 1' + # Enable GNOME screensaver support if both D-BUS GLib and X11 are present + if test "$_x11" = yes; then + _vosrc="$_vosrc gnome_screensaver.c" + fi +else + _def_dbus_glib='#undef HAVE_DBUS_GLIB' +fi +echores "$_dbus_glib" + # --------------- GUI specific tests begin ------------------- echocheck "GUI" echo "$_gui" @@ -7521,6 +7543,8 @@ VESA_LIB = $_ld_vesa AA_LIB = $_ld_aa CACA_LIB = $_ld_caca +DBUS_GLIB_INC = $_inc_dbus_glib +DBUS_GLIB_LIB = $_ld_dbus_glib # audio output OSS = $_ossaudio @@ -7532,7 +7556,7 @@ NAS_LIB = $_ld_nas ARTS_LIB = $_ld_arts ESD_LIB = $_ld_esd -POLYP_LIB = $_ld_polyp +PULSE_LIB = $_ld_pulse JACK_LIB = $_ld_jack OPENAL_LIB = $_ld_openal SGIAUDIO_LIB = $_ld_sgiaudio @@ -8062,7 +8086,7 @@ $_def_arts $_def_esd $_def_esd_latency -$_def_polyp +$_def_pulse $_def_jack $_def_openal $_def_sys_asoundlib_h @@ -8378,6 +8402,7 @@ $_def_tga $_def_toolame $_def_twolame +$_def_dbus_glib /* used by GUI: */ $_def_xshape --- mplayer-1.0~rc1.orig/loader/dshow/DS_VideoDecoder.c +++ mplayer-1.0~rc1/loader/dshow/DS_VideoDecoder.c @@ -116,6 +116,7 @@ this->iv.m_bh = malloc(bihs); memcpy(this->iv.m_bh, format, bihs); + this->iv.m_bh->biSize = bihs; this->iv.m_State = STOP; //this->iv.m_pFrame = 0; --- mplayer-1.0~rc1.orig/loader/dmo/DMO_VideoDecoder.c +++ mplayer-1.0~rc1/loader/dmo/DMO_VideoDecoder.c @@ -121,6 +121,7 @@ this->iv.m_bh = malloc(bihs); memcpy(this->iv.m_bh, format, bihs); + this->iv.m_bh->biSize = bihs; this->iv.m_State = STOP; //this->iv.m_pFrame = 0; --- mplayer-1.0~rc1.orig/DOCS/man/en/mplayer.1 +++ mplayer-1.0~rc1/DOCS/man/en/mplayer.1 @@ -3403,8 +3403,6 @@ .TP .B "aa\ \ \ \ \ " ASCII art video output driver that works on a text console. -You can get a list and an explanation of available suboptions executing -.I mplayer \-vo aa:help . .TP .B "caca\ \ \ " --- mplayer-1.0~rc1.orig/AUTHORS +++ mplayer-1.0~rc1/AUTHORS @@ -626,7 +626,7 @@ * Darwin VCD/SVCD support Poettering, Lennart - * audio driver for the Polypaudio sound server + * audio driver for the PulseAudio sound server Poirier, Guillaume (poirierg) * French documentation translation and synchronization