[SCM] mplayer packaging branch, ubuntu, updated. debian/1.0.rc3+svn20100502-3-14-g0c42aea

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Tue Jun 1 21:20:41 UTC 2010


The following commit has been merged in the ubuntu branch:
commit cf26a8bfc6bee8f204797953da013fc47dc6158e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 1 22:58:39 2010 +0200

    remove patches that were merged upstream

diff --git a/debian/patches/20upstream-rtsp-underflow-fix-r29447.patch b/debian/patches/20upstream-rtsp-underflow-fix-r29447.patch
deleted file mode 100644
index ff28f6f..0000000
--- a/debian/patches/20upstream-rtsp-underflow-fix-r29447.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: <devin at debian.org>
-Subject: Patch for integer underflow in RTSP streaming code, taken from upstream 
-X-Upstream: commit 29447
-
-diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c
-index 6539930..2e550ac 100644
---- a/stream/realrtsp/real.c
-+++ b/stream/realrtsp/real.c
-@@ -388,6 +388,8 @@ int real_get_rdt_chunk(rtsp_t *rtsp_session, char **buffer, int rdt_rawdata) {
-     return (n <= 0) ? 0 : n;
-   }
-   rmff_dump_pheader(&ph, *buffer);
-+  if (size < 12)
-+    return 0;
-   size-=12;
-   n=rtsp_read_data(rtsp_session, (*buffer)+12, size);
- 
diff --git a/debian/patches/21upstream-trsp-underflow-fix-r29455.patch b/debian/patches/21upstream-trsp-underflow-fix-r29455.patch
deleted file mode 100644
index ce5a3e3..0000000
--- a/debian/patches/21upstream-trsp-underflow-fix-r29455.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: uau
-Subject: stream/realrtsp/real.c: Fix another integer overflow
-X-Upstream: commit r29455
-
---- trunk/stream/realrtsp/real.c	(revision 29454)
-+++ trunk/stream/realrtsp/real.c	(revision 29455)
-@@ -382,6 +382,8 @@
-     ph.flags=0;
-   *buffer = xbuffer_ensure_size(*buffer, 12+size);
-   if(rdt_rawdata) {
-+      if (size < 12)
-+          return 0;
-     n=rtsp_read_data(rtsp_session, *buffer, size-12);
-     return (n <= 0) ? 0 : n;
-   }
diff --git a/debian/patches/60_backport_x264_wrapper.patch b/debian/patches/60_backport_x264_wrapper.patch
deleted file mode 100644
index b4c34ac..0000000
--- a/debian/patches/60_backport_x264_wrapper.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From: Reinhard Tartler <siretart at tauware.de>
-Subject: Backport libmpcodecs/ve_x264.c from trunk
-Bug: https://bugs.launchpad.net/bugs/539555
-
---- a/libmpcodecs/ve_x264.c
-+++ b/libmpcodecs/ve_x264.c
-@@ -59,20 +59,6 @@ static int turbo = 0;
- static x264_param_t param;
- static int parse_error = 0;
- 
--static int encode_nals(uint8_t *buf, int size, x264_nal_t *nals, int nnal){
--    uint8_t *p = buf;
--    int i;
--
--    for(i = 0; i < nnal; i++){
--        int s = x264_nal_encode(p, &size, 1, nals + i);
--        if(s < 0)
--            return -1;
--        p += s;
--    }
--
--    return p - buf;
--}
--
- static int put_image(struct vf_instance_s *vf, mp_image_t *mpi, double pts);
- static int encode_frame(struct vf_instance_s *vf, x264_picture_t *pic_in);
- 
-@@ -148,7 +134,7 @@ void x264enc_set_param(const m_option_t*
-     }
- }
- 
--static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) {
-+static int config(struct vf_instance_s *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) {
-     h264_module_t *mod=(h264_module_t*)vf->priv;
- 
-     if(parse_error)
-@@ -158,7 +144,7 @@ static int config(struct vf_instance_s* 
-     mod->mux->bih->biHeight = height;
-     mod->mux->bih->biSizeImage = width * height * 3;
-     mod->mux->aspect = (float)d_width/d_height;
--    
-+
-     // make sure param is initialized
-     x264enc_set_param(NULL, "");
-     param.i_width = width;
-@@ -181,7 +167,7 @@ static int config(struct vf_instance_s* 
-         mp_msg(MSGT_MENCODER, MSGL_ERR, "Wrong colorspace.\n");
-         return 0;
-     }
--    
-+
-     mod->x264 = x264_encoder_open(&param);
-     if(!mod->x264) {
-         mp_msg(MSGT_MENCODER, MSGL_ERR, "x264_encoder_open failed.\n");
-@@ -189,46 +175,38 @@ static int config(struct vf_instance_s* 
-     }
- 
-     if(!param.b_repeat_headers){
--        uint8_t *extradata;
-         x264_nal_t *nal;
--        int extradata_size, nnal, i, s = 0;
-+        int extradata_size, nnal;
- 
--        x264_encoder_headers(mod->x264, &nal, &nnal);
--
--        /* 5 bytes NAL header + worst case escaping */
--        for(i = 0; i < nnal; i++)
--            s += 5 + nal[i].i_payload * 4 / 3;
--
--        extradata = malloc(s);
--        extradata_size = encode_nals(extradata, s, nal, nnal);
-+        extradata_size = x264_encoder_headers(mod->x264, &nal, &nnal);
- 
-         mod->mux->bih= realloc(mod->mux->bih, sizeof(BITMAPINFOHEADER) + extradata_size);
--        memcpy(mod->mux->bih + 1, extradata, extradata_size);
-+        memcpy(mod->mux->bih + 1, nal->p_payload, extradata_size);
-         mod->mux->bih->biSize= sizeof(BITMAPINFOHEADER) + extradata_size;
-     }
--    
--    if (param.i_bframe > 1 && param.b_bframe_pyramid)
-+
-+    if (param.i_bframe > 1 && param.i_bframe_pyramid)
-         mod->mux->decoder_delay = 2;
-     else
-         mod->mux->decoder_delay = param.i_bframe ? 1 : 0;
--    
-+
-     return 1;
- }
- 
--static int control(struct vf_instance_s* vf, int request, void *data)
-+static int control(struct vf_instance_s *vf, int request, void *data)
- {
-     h264_module_t *mod=(h264_module_t*)vf->priv;
-     switch(request){
-         case VFCTRL_FLUSH_FRAMES:
--            if(param.i_bframe)
--                while(encode_frame(vf, NULL) > 0);
-+            while (x264_encoder_delayed_frames(mod->x264) > 0)
-+                encode_frame(vf, NULL);
-             return CONTROL_TRUE;
-         default:
-             return CONTROL_UNKNOWN;
-     }
- }
- 
--static int query_format(struct vf_instance_s* vf, unsigned int fmt)
-+static int query_format(struct vf_instance_s *vf, unsigned int fmt)
- {
-     switch(fmt) {
-     case IMGFMT_I420:
-@@ -251,7 +229,7 @@ static int put_image(struct vf_instance_
- {
-     h264_module_t *mod=(h264_module_t*)vf->priv;
-     int i;
--    
-+
-     memset(&mod->pic, 0, sizeof(x264_picture_t));
-     mod->pic.img.i_csp=param.i_csp;
-     mod->pic.img.i_plane=3;
-@@ -271,24 +249,18 @@ static int encode_frame(struct vf_instan
-     x264_picture_t pic_out;
-     x264_nal_t *nal;
-     int i_nal;
--    int i_size = 0;
--    int i;
-+    int i_size;
- 
--    if(x264_encoder_encode(mod->x264, &nal, &i_nal, pic_in, &pic_out) < 0) {
-+    i_size = x264_encoder_encode(mod->x264, &nal, &i_nal, pic_in, &pic_out);
-+
-+    if(i_size<0) {
-         mp_msg(MSGT_MENCODER, MSGL_ERR, "x264_encoder_encode failed\n");
-         return -1;
-     }
--    
--    for(i=0; i < i_nal; i++) {
--        int i_data = mod->mux->buffer_size - i_size;
--        i_size += x264_nal_encode(mod->mux->buffer + i_size, &i_data, 1, &nal[i]);
--    }
-     if(i_size>0) {
--        int keyframe = (pic_out.i_type == X264_TYPE_IDR) ||
--                       (pic_out.i_type == X264_TYPE_I
--                        && param.i_frame_reference == 1
--                        && !param.i_bframe);
--        muxer_write_chunk(mod->mux, i_size, keyframe?0x10:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
-+        int keyframe = pic_out.b_keyframe;
-+        memcpy(mod->mux->buffer, nal->p_payload, i_size);
-+        muxer_write_chunk(mod->mux, i_size, keyframe?AVIIF_KEYFRAME:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
-     }
-     else
-         ++mod->mux->encoder_delay;
diff --git a/debian/patches/61_backport_ao_pulse.patch b/debian/patches/61_backport_ao_pulse.patch
deleted file mode 100644
index 9b8f0b7..0000000
--- a/debian/patches/61_backport_ao_pulse.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From: siretart at tauware.de
-Subject: sync libao2/ao_pulse.c with svn r30062
-
-
-diff --git a/libao2/ao_pulse.c b/libao2/ao_pulse.c
-index 30a2380..a07bf31 100644
---- a/libao2/ao_pulse.c
-+++ b/libao2/ao_pulse.c
-@@ -49,9 +49,6 @@ static struct pa_context *context;
- /** Main event loop object */
- static struct pa_threaded_mainloop *mainloop;
- 
--/** A temporary variable to store the current volume */
--static pa_cvolume volume;
--
- static int broken_pause;
- 
- LIBAO_EXTERN(pulse)
-@@ -102,7 +99,10 @@ static void success_cb(pa_stream *s, int success, void *userdata) {
-  */
- static int waitop(pa_operation *op) {
-     pa_operation_state_t state;
--    if (!op) return 0;
-+    if (!op) {
-+        pa_threaded_mainloop_unlock(mainloop);
-+        return 0;
-+    }
-     state = pa_operation_get_state(op);
-     while (state == PA_OPERATION_RUNNING) {
-         pa_threaded_mainloop_wait(mainloop);
-@@ -140,7 +140,7 @@ static int init(int rate_hz, int channels, int format, int flags) {
-     char *devarg = NULL;
-     char *host = NULL;
-     char *sink = NULL;
--    char *version = pa_get_library_version();
-+    const char *version = pa_get_library_version();
- 
-     if (ao_subdevice) {
-         devarg = strdup(ao_subdevice);
-@@ -150,11 +150,11 @@ static int init(int rate_hz, int channels, int format, int flags) {
-     }
- 
-     broken_pause = 0;
--    // not sure which versions are affected, assume 0.9.1*
-+    // not sure which versions are affected, assume 0.9.11* to 0.9.14*
-     // known bad: 0.9.14, 0.9.13
--    // known good: 0.9.9, 0.9.10
-+    // known good: 0.9.9, 0.9.10, 0.9.15
-     // to test: pause, wait ca. 5 seconds framestep and see if MPlayer hangs somewhen
--    if (strncmp(version, "0.9.1", 5) == 0 && strncmp(version, "0.9.10", 6) != 0) {
-+    if (strncmp(version, "0.9.1", 5) == 0 && version[5] >= '1' && version[5] <= '4') {
-         mp_msg(MSGT_AO, MSGL_WARN, "[pulse] working around probably broken pause functionality,\n"
-                                    "        see http://www.pulseaudio.org/ticket/440\n");
-         broken_pause = 1;
-@@ -345,13 +345,14 @@ static float get_delay(void) {
-  * 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) {
-+    struct pa_cvolume *volume = userdata;
-     if (is_last < 0) {
-         GENERIC_ERR_MSG(context, "Failed to get sink input info");
-         return;
-     }
-     if (!i)
-         return;
--    volume = i->volume;
-+    *volume = i->volume;
-     pa_threaded_mainloop_signal(mainloop, 0);
- }
- 
-@@ -360,8 +361,9 @@ static int control(int cmd, void *arg) {
-         case AOCONTROL_GET_VOLUME: {
-             ao_control_vol_t *vol = arg;
-             uint32_t devidx = pa_stream_get_index(stream);
-+            struct pa_cvolume volume;
-             pa_threaded_mainloop_lock(mainloop);
--            if (!waitop(pa_context_get_sink_input_info(context, devidx, info_func, NULL))) {
-+            if (!waitop(pa_context_get_sink_input_info(context, devidx, info_func, &volume))) {
-                 GENERIC_ERR_MSG(context, "pa_stream_get_sink_input_info() failed");
-                 return CONTROL_ERROR;
-             }
-@@ -379,7 +381,9 @@ static int control(int cmd, void *arg) {
-         case AOCONTROL_SET_VOLUME: {
-             const ao_control_vol_t *vol = arg;
-             pa_operation *o;
-+            struct pa_cvolume volume;
- 
-+            pa_cvolume_reset(&volume, ao_data.channels);
-             if (volume.channels != 2)
-                 pa_cvolume_set(&volume, volume.channels, (pa_volume_t)vol->left*PA_VOLUME_NORM/100);
-             else {
-@@ -387,12 +391,16 @@ static int control(int cmd, void *arg) {
-                 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))) {
-+            pa_threaded_mainloop_lock(mainloop);
-+            o = pa_context_set_sink_input_volume(context, pa_stream_get_index(stream), &volume, NULL, NULL);
-+            if (!o) {
-+                pa_threaded_mainloop_unlock(mainloop);
-                 GENERIC_ERR_MSG(context, "pa_context_set_sink_input_volume() failed");
-                 return CONTROL_ERROR;
-             }
-             /* We don't wait for completion here */
-             pa_operation_unref(o);
-+            pa_threaded_mainloop_unlock(mainloop);
-             return CONTROL_OK;
-         }
- 
-
diff --git a/debian/patches/62_backport_fribidi_detection.patch b/debian/patches/62_backport_fribidi_detection.patch
deleted file mode 100644
index 1fe583d..0000000
--- a/debian/patches/62_backport_fribidi_detection.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Reinhard Tartler <siretart at tauware.de>
-Subject: make configure use pkg-config for fribidi checks
-
-taken from upstream trunk
-
-r31209 | siretart | 2010-05-24 21:32:17 +0200 (Mon, 24 May 2010) | 11 lines
-
-make configure use pkg-config for fribidi checks
-
-fribidi upstream has dropped fribidi-config in favor of pkg-config
-now: http://lists.freedesktop.org/archives/fribidi/2008-May/000532.html
-
-This commit fixes:
-
-http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1675
-https://launchpad.net/bugs/556200
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582784
-
-
---- a/configure
-+++ b/configure
-@@ -473,7 +473,6 @@ Use these options if autodetection fails
-   --with-xvmclib=NAME         adapter-specific library name (e.g. XvMCNVIDIA)
- 
-   --with-freetype-config=PATH path to freetype-config
--  --with-fribidi-config=PATH  path to fribidi-config
-   --with-glib-config=PATH     path to glib*-config
-   --with-gtk-config=PATH      path to gtk*-config
-   --with-sdl-config=PATH      path to sdl*-config
-@@ -710,7 +709,6 @@ _macosx_bundle=auto
- _sortsub=yes
- _freetypeconfig='freetype-config'
- _fribidi=auto
--_fribidiconfig='fribidi-config'
- _enca=auto
- _inet6=auto
- _gethostbyname2=auto
-@@ -778,9 +776,6 @@ for ac_option do
-   --with-freetype-config=*)
-     _freetypeconfig=`echo $ac_option | cut -d '=' -f 2`
-     ;;
--  --with-fribidi-config=*)
--    _fribidiconfig=`echo $ac_option | cut -d '=' -f 2`
--    ;;
-   --with-gtk-config=*)
-     _gtkconfig=`echo $ac_option | cut -d '=' -f 2`
-     ;;
-@@ -6041,8 +6036,7 @@ echores "$_ass"
- 
- echocheck "fribidi with charsets"
- if test "$_fribidi" = auto ; then
--    if ( $_fribidiconfig --version ) >/dev/null 2>&1 ; then
--	cat > $TMPC << EOF
-+    cat > $TMPC << EOF
- #include <stdio.h>
- /* workaround for fribidi 0.10.4 and below */
- #define FRIBIDI_CHARSET_UTF8 FRIBIDI_CHAR_SET_UTF8
-@@ -6055,16 +6049,15 @@ int main(void) {
-     return 0;
- }
- EOF
--	_fribidi=no
--	cc_check `$_fribidiconfig --cflags` `$_fribidiconfig --libs` && tmp_run && _fribidi=yes
--    else
--	_fribidi=no
--    fi
-+    _fribidi=no
-+    _inc_tmp="$($_pkg_config --cflags fribidi)"
-+    _ld_tmp="$($_pkg_config --libs fribidi)"
-+    cc_check $_inc_tmp $_ld_tmp && _fribidi=yes
- fi
- if test "$_fribidi" = yes ; then
-     def_fribidi='#define CONFIG_FRIBIDI'
--    extra_cflags="$extra_cflags `$_fribidiconfig --cflags`"
--    extra_ldflags="$extra_ldflags `$_fribidiconfig --libs`"
-+    extra_cflags="$extra_cflags $_inc_tmp"
-+    extra_ldflags="$extra_ldflags $_ld_tmp"
- else
-     def_fribidi='#undef CONFIG_FRIBIDI'
- fi
diff --git a/debian/patches/series b/debian/patches/series
index 5151c95..31ac392 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,3 @@
 11configure-mktemp.patch
-20upstream-rtsp-underflow-fix-r29447.patch
-21upstream-trsp-underflow-fix-r29455.patch
 22disable-xscreensaver.patch
 23mplayer-debug-printf.patch
-60_backport_x264_wrapper.patch
-61_backport_ao_pulse.patch
-62_backport_fribidi_detection.patch

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list