optional mysql support not enabled by default

remove stray patch
pkgrevision++

2 files changed, 36 insertions, 45 deletions

diff --git a/multimedia/fuppes/patches/patch-aa b/multimedia/fuppes/patches/patch-aa
index 6022e5862c4..2e548ce1412 100644
--- a/multimedia/fuppes/patches/patch-aa
+++ b/multimedia/fuppes/patches/patch-aa
@@ -1,25 +1,30 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/27 01:13:41 jmcneill Exp $
-
---- src/plugins/ffmpeg/ffmpeg.cpp.orig	2009-01-26 19:32:25.000000000 -0500
-+++ src/plugins/ffmpeg/ffmpeg.cpp
-@@ -1021,19 +1021,8 @@ int output_packet(AVInputStream *ist, in
-         if (subtitle_to_free) {
-             if (subtitle_to_free->rects != NULL) {
-                 for (i = 0; i < subtitle_to_free->num_rects; i++) {
--									
--#ifndef LIBAVCODEC_VERSION_MINOR
--#define LIBAVCODEC_VERSION_MINOR 0
--#endif
--
--#if LIBAVCODEC_VERSION_MINOR >= 11
--                    av_freep(subtitle_to_free->rects[i]->pict.data[0]);
--                    av_freep(subtitle_to_free->rects[i]->pict.data[1]);
--                    av_freep(subtitle_to_free->rects[i]);
--#else
-                     av_free(subtitle_to_free->rects[i].bitmap);
--                    av_free(subtitle_to_free->rects[i].rgba_palette);									
--#endif
-+                    av_free(subtitle_to_free->rects[i].rgba_palette);
-                 }
-                 av_freep(&subtitle_to_free->rects);
-             }
+$NetBSD: patch-aa,v 1.2 2009/11/28 19:31:29 kefren Exp $
+--- configure.ac.orig	2009-11-28 21:20:07.000000000 +0200
++++ configure.ac	2009-11-28 21:20:10.000000000 +0200
+@@ -574,11 +574,15 @@
+ MYSQL_CFLAGS=""
+ MYSQL_LIBS=""
+ have_mysql=no
+-if test -z "$MYSQL_CONFIG"; then
++AC_ARG_ENABLE([mysql], [AC_HELP_STRING([--enable-mysql],
++    [enable MySQL support [default=no]])],
++    [enable_mysql=$enableval], [enable_mysql='no'])
++if test "x$enable_mysql" = "xyes" ; then
++ if test -z "$MYSQL_CONFIG"; then
+   AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no, $prefix/bin/)
+-fi
++ fi
+ 
+-if test "$MYSQL_CONFIG" != "no" ; then   
++ if test "$MYSQL_CONFIG" != "no" ; then   
+   AC_MSG_CHECKING(MYSQL_CFLAGS)
+   MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags`
+   AC_MSG_RESULT($MYSQL_CFLAGS)
+@@ -588,6 +592,7 @@
+   AC_MSG_RESULT($MYSQL_LIBS)
+   
+   have_mysql=yes
++ fi
+ fi
+ AM_CONDITIONAL(MYSQL_DATABASE_PLUGIN, test "x$have_mysql" = "xyes")
+ AC_SUBST(MYSQL_CFLAGS)
diff --git a/multimedia/fuppes/patches/patch-ad b/multimedia/fuppes/patches/patch-ad
index f24c156a42f..08b8b8b3d42 100644
--- a/multimedia/fuppes/patches/patch-ad
+++ b/multimedia/fuppes/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2009/11/28 18:37:22 kefren Exp $
---- src/plugins/ffmpeg/ffmpeg.cpp.orig	2009-11-28 18:48:32.000000000 +0200
-+++ src/plugins/ffmpeg/ffmpeg.cpp	2009-11-28 19:04:32.000000000 +0200
+$NetBSD: patch-ad,v 1.2 2009/11/28 19:31:29 kefren Exp $
+--- src/plugins/ffmpeg/ffmpeg.cpp.orig	2009-07-18 16:08:59.000000000 +0300
++++ src/plugins/ffmpeg/ffmpeg.cpp	2009-11-28 21:00:33.000000000 +0200
 @@ -201,7 +201,7 @@
  
      if(pFFmpeg->audio_sync_method){
@@ -40,21 +40,7 @@ $NetBSD: patch-ad,v 1.1 2009/11/28 18:37:22 kefren Exp $
              AVPacket pkt;
              av_init_packet(&pkt);
  
-@@ -1020,11 +1020,11 @@
-         /* XXX: allocate the subtitles in the codec ? */
-         if (subtitle_to_free) {
-             if (subtitle_to_free->rects != NULL) {
--                for (i = 0; i < subtitle_to_free->num_rects; i++) {
-+/*                for (i = 0; i < subtitle_to_free->num_rects; i++) {
-                     av_free(subtitle_to_free->rects[i].bitmap);
-                     av_free(subtitle_to_free->rects[i].rgba_palette);
-                 }
--                av_freep(&subtitle_to_free->rects);
-+*/                av_freep(&subtitle_to_free->rects);
-             }
-             subtitle_to_free->num_rects = 0;
-             subtitle_to_free = NULL;
-@@ -1054,13 +1054,13 @@
+@@ -1065,13 +1065,13 @@
  
                          switch(ost->st->codec->codec_type) {
                          case CODEC_TYPE_AUDIO:
@@ -70,7 +56,7 @@ $NetBSD: patch-ad,v 1.1 2009/11/28 18:37:22 kefren Exp $
                                      ret = avcodec_encode_audio(enc, pFFmpeg->bit_buffer, pFFmpeg->bit_buffer_size, samples);
                                  }
                                  enc->frame_size = fs_tmp;
-@@ -1309,7 +1309,7 @@
+@@ -1320,7 +1320,7 @@
          } else {
              switch(codec->codec_type) {
              case CODEC_TYPE_AUDIO:
@@ -79,7 +65,7 @@ $NetBSD: patch-ad,v 1.1 2009/11/28 18:37:22 kefren Exp $
                      goto fail;
  
                  if (codec->channels == icodec->channels &&
-@@ -1766,7 +1766,7 @@
+@@ -1777,7 +1777,7 @@
                      fclose(ost->logfile);
                      ost->logfile = NULL;
                  }