[SCM] mplayer/master.experimental: Refresh patches.

[micove-guest at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit 7839dc2a7840252fae647c8e2c21ed4f61a2ce78
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Tue Dec 2 00:06:20 2014 -0500

    Refresh patches.

diff --git a/debian/patches/23mplayer-debug-printf.patch b/debian/patches/23mplayer-debug-printf.patch
index 7d35641..5d3dedd 100644
--- a/debian/patches/23mplayer-debug-printf.patch
+++ b/debian/patches/23mplayer-debug-printf.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/mplayer.c
 +++ b/mplayer.c
-@@ -846,6 +846,10 @@ static void exit_sighandler(int x)
+@@ -838,6 +838,10 @@
              mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGSEGV_SIGFPE);
          default:
              mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGCRASH);
diff --git a/debian/patches/50_Hurd_PATH_MAX.patch b/debian/patches/50_Hurd_PATH_MAX.patch
index e58e6a6..89f8260 100644
--- a/debian/patches/50_Hurd_PATH_MAX.patch
+++ b/debian/patches/50_Hurd_PATH_MAX.patch
@@ -14,8 +14,8 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
  #include <stdlib.h>
  #include <stdio.h>
  #include <dirent.h>
-@@ -418,7 +421,11 @@ static void clos(menu_t* menu) {
- static int open_fs(menu_t* menu, char* args) {
+@@ -420,7 +423,11 @@
+ static int open_fs(menu_t* menu, char* av_unused args) {
    char *path = mpriv->path;
    int r = 0;
 +#ifdef __GNU__
@@ -23,10 +23,10 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
 +#else
    char wd[PATH_MAX+1], b[PATH_MAX+1];
 +#endif
-   args = NULL; // Warning kill
  
    menu->draw = menu_list_draw;
-@@ -447,7 +454,11 @@ static int open_fs(menu_t* menu, char* a
+   menu->read_cmd = read_cmd;
+@@ -448,7 +455,11 @@
      }
    }
  
@@ -38,7 +38,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
    if (!path || path[0] == '\0') {
  #if 0
      char *slash = NULL;
-@@ -466,13 +477,24 @@ static int open_fs(menu_t* menu, char* a
+@@ -467,13 +478,24 @@
        path = wd;
    }
    if (path[0] != '/') {
@@ -63,7 +63,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
      path = b;
    }
    if (menu_chroot && menu_chroot[0] == '/') {
-@@ -483,13 +505,22 @@ static int open_fs(menu_t* menu, char* a
+@@ -484,13 +506,22 @@
        if (menu_chroot[l] == '/')
          path = menu_chroot;
        else {
@@ -88,9 +88,9 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
  
 --- a/libmpdemux/mf.c
 +++ b/libmpdemux/mf.c
-@@ -16,6 +16,9 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
+@@ -18,6 +18,9 @@
+ 
+ #define _BSD_SOURCE
  
 +#ifdef __GNU__
 +#define _GNU_SOURCE
@@ -98,7 +98,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
  #include <ctype.h>
  #include <stdio.h>
  #include <stdlib.h>
-@@ -64,8 +67,13 @@ mf_t* open_mf(char * filename){
+@@ -66,8 +69,13 @@
     FILE *lst_f=fopen(filename + 1,"r");
     if ( lst_f )
      {
@@ -112,7 +112,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
        {
         /* remove spaces from end of fname */
         char *t=fname + strlen( fname ) - 1;
-@@ -80,6 +88,10 @@ mf_t* open_mf(char * filename){
+@@ -82,6 +90,10 @@
           mf->names[mf->nr_of_files]=strdup( fname );
           mf->nr_of_files++;
          }
@@ -136,7 +136,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
  #include <stdio.h>
  #include <limits.h>
  #include <ctype.h>
-@@ -145,7 +149,11 @@ static void id2str(const uint8_t *id, in
+@@ -148,7 +152,11 @@
  static int find_vuk(struct bd_priv *bd, const uint8_t discid[20])
  {
      char line[1024];
@@ -148,7 +148,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
      const char *home;
      int vukfound = 0;
      stream_t *file;
-@@ -153,13 +161,23 @@ static int find_vuk(struct bd_priv *bd,
+@@ -156,13 +164,23 @@
  
      // look up discid in KEYDB.cfg to get VUK
      home = getenv("HOME");
@@ -172,7 +172,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
      id2str(discid, 20, idstr);
      while (stream_read_line(file, line, sizeof(line), 0)) {
          char *vst;
-@@ -204,23 +222,40 @@ static int bd_get_uks(struct bd_priv *bd
+@@ -207,23 +225,40 @@
      struct AVAES *a;
      struct AVSHA *asha;
      stream_t *file;
@@ -213,7 +213,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
      buf = av_malloc(file_size);
      stream_read(file, buf, file_size);
      free_stream(file);
-@@ -411,15 +446,29 @@ static void get_clipinf(struct bd_priv *
+@@ -414,15 +449,29 @@
  {
      int i;
      int langmap_offset, index_offset, end_offset;
@@ -243,7 +243,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
      if (stream_read_qword(file) != AV_RB64("HDMV0200")) {
          mp_msg(MSGT_OPEN, MSGL_ERR, "Unknown clipinf format\n");
          return;
-@@ -453,7 +502,11 @@ static void get_clipinf(struct bd_priv *
+@@ -472,7 +521,11 @@
  
  static int bd_stream_open(stream_t *s, int mode, void* opts, int* file_format)
  {
@@ -255,7 +255,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
  
      struct stream_priv_s* p = opts;
      struct bd_priv *bd = calloc(1, sizeof(*bd));
-@@ -489,9 +542,16 @@ static int bd_stream_open(stream_t *s, i
+@@ -509,9 +562,16 @@
      // set up AES key from uk
      av_aes_init(bd->aeseed, bd->uks.keys[0].u8, 128, 0);
  

-- 
mplayer packaging