optional mysql support not enabled by default

remove stray patch
pkgrevision++

6 files changed, 59 insertions, 57 deletions

diff --git a/multimedia/fuppes/Makefile b/multimedia/fuppes/Makefile
index b466a1ed190..37c9e634928 100644
--- a/multimedia/fuppes/Makefile
+++ b/multimedia/fuppes/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2009/11/28 18:37:22 kefren Exp $
+# $NetBSD: Makefile,v 1.9 2009/11/28 19:31:29 kefren Exp $
 #
 
 DISTNAME=	fuppes-0.640
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fuppes/}
 
@@ -21,11 +22,7 @@ CONFIGURE_ARGS+=	--enable-video-transcoding
 CONFIGURE_ARGS+=	--enable-faad
 CONFIGURE_ARGS+=	--enable-mad
 
-SUBST_CLASSES+=		version
-SUBST_STAGE.version=	pre-patch
-SUBST_SED.version=	-e "s,UNKNOWN,${SVNREV},g"
-SUBST_FILES.version=	version.sh
-SUBST_MESSAGE.version=	Patching version script for non-SVN checkout builds.
+.include "options.mk"
 
 pre-configure:
 	cd ${WRKSRC} && autoreconf -i
@@ -48,5 +45,4 @@ BUILD_DEPENDS+=		gettext-m4>=0.14.6:../../devel/gettext-m4
 .include "../../graphics/simage/buildlink3.mk"
 .include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../multimedia/mpeg4ip/buildlink3.mk"
-.include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/fuppes/PLIST b/multimedia/fuppes/PLIST
index cba95e2ac65..7e613461ba9 100644
--- a/multimedia/fuppes/PLIST
+++ b/multimedia/fuppes/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2009/11/28 18:37:22 kefren Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/11/28 19:31:29 kefren Exp $
 bin/fuppes
 bin/fuppesd
 include/fuppes_db_connection_plugin.h
 include/fuppes_plugin.h
 include/fuppes_plugin_types.h
 lib/fuppes/libcore_presentation.la
-lib/fuppes/libdatabase_mysql.la
+${PLIST.mysql}lib/fuppes/libdatabase_mysql.la
 lib/fuppes/libdatabase_sqlite3.la
 lib/fuppes/libdecoder_flac.la
 lib/fuppes/libdecoder_musepack.la
diff --git a/multimedia/fuppes/distinfo b/multimedia/fuppes/distinfo
index 8b37db5d479..3181ed1c7e0 100644
--- a/multimedia/fuppes/distinfo
+++ b/multimedia/fuppes/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2009/11/28 18:37:22 kefren Exp $
+$NetBSD: distinfo,v 1.3 2009/11/28 19:31:29 kefren Exp $
 
 SHA1 (fuppes-0.640.tar.gz) = 51d7a3491a36969d8cd3d373a20f237600ab60fd
 RMD160 (fuppes-0.640.tar.gz) = 65e76c607056c9e6c975c960cc2aeaec4d37446c
 Size (fuppes-0.640.tar.gz) = 641228 bytes
-SHA1 (patch-aa) = 5042b1dd24117e44effc9bc14af9ba89902a6634
+SHA1 (patch-aa) = 0956c0f509d6590f9a2c9d2cf1e34600773531c3
 SHA1 (patch-ab) = 884a4130fc15f31a495db69100e1769e2c5c2787
 SHA1 (patch-ac) = 8359d390b4a3d9963240bb6bb3c467382cef6272
-SHA1 (patch-ad) = 108dfcb87739c4fb5d603a1e2c1cd4152d06b35e
+SHA1 (patch-ad) = 8602a0684e2a764810fa667d11f4339adb1bef98
diff --git a/multimedia/fuppes/options.mk b/multimedia/fuppes/options.mk
new file mode 100644
index 00000000000..d356fabdaa2
--- /dev/null
+++ b/multimedia/fuppes/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2009/11/28 19:31:29 kefren Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.fuppes
+PKG_SUPPORTED_OPTIONS=	mysql
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
+
+.if !empty(PKG_OPTIONS:Mmysql)
+PLIST.mysql=		yes
+CONFIGURE_ARGS+=	--enable-mysql
+
+.include "../../mk/mysql.buildlink3.mk"
+.endif
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;
                  }